From 2e038da791e4acdccc63d47ac1cee62160d14c2d Mon Sep 17 00:00:00 2001 From: Christian Wade Date: Mon, 19 Oct 2020 20:29:41 -0700 Subject: [PATCH] KPI fix --- .../AlmToolkit/Properties/AssemblyInfo.cs | 4 ++-- .../Properties/AssemblyInfo.cs | 4 ++-- .../Properties/AssemblyInfo.cs | 4 ++-- .../BismNormalizer.IconSetup.exe | Bin 10240 -> 10240 bytes .../BismNormalizer/BismNormalizer.exe | Bin 16384 -> 16384 bytes .../BismNormalizer/Properties/AssemblyInfo.cs | 4 ++-- .../TabularMetadata/Comparison.cs | 9 +++------ .../source.extension.vsixmanifest | 2 +- 8 files changed, 12 insertions(+), 15 deletions(-) diff --git a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs b/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs index 60e2eea..c4196c6 100644 --- a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs +++ b/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.0.12.0")] -[assembly: AssemblyFileVersion("5.0.12.0")] +[assembly: AssemblyVersion("5.0.12.1")] +[assembly: AssemblyFileVersion("5.0.12.1")] diff --git a/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs index f0ccf86..7d8997f 100644 --- a/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs +++ b/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.0.12.0")] -[assembly: AssemblyFileVersion("5.0.12.0")] +[assembly: AssemblyVersion("5.0.12.1")] +[assembly: AssemblyFileVersion("5.0.12.1")] diff --git a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs index 26d60db..28471b0 100644 --- a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs +++ b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.0.12.0")] -[assembly: AssemblyFileVersion("5.0.12.0")] +[assembly: AssemblyVersion("5.0.12.1")] +[assembly: AssemblyFileVersion("5.0.12.1")] diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe index 1be307fb010d8bd6d4e533f74f3255274d515fff..5c0050b0210fe308cdd623c55986e4efbe27b206 100644 GIT binary patch delta 134 zcmZn&Xb70l!E77ex3T*#J0s)fP7Z!ff!_tQ*OxeE`}W`Xq?~(Ns9^I7!Doz&hLih+ zLv?^k;~9W}35aDF85sT;0$X^CpiEB delta 134 zcmZn&Xb70l!R*shys`T)J0rv9P7Z!ffj<#?Z)VmuI8OTeX~$-xV^cS;5PZhSXfU~7 zI8+CyG@bznn1EP@k%8flArK2QFa!m=1TXj2ihMJH%W3DMYqzf~ZE4>uAhLytlYxN; fsFsz1Ve?tBR-iGPgC(|uOyica26Eh`cJcxM1$Hd+ diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.exe b/BismNormalizer/BismNormalizer/BismNormalizer.exe index 96bba4d8ef21b9c842ab9e90544ffa6799515346..751ecdea2c3e2a248a7b668fac5cf8cfaa89ee14 100644 GIT binary patch delta 122 zcmZo@U~Fh$oY28+8{W6Ed!;ZV<7872RYu0m(IT!g0)h^IweSDB=CM^XFre-7)4Q8D z7$h(;8cr584hLzNoNX*Aka8udpk%d#=lamtDBLfcu0|P4qwtRYr!*(IT!g0ug0>ix*nvdTbREUHVx)=D_9+ z1_?}z29pJi!$BG*XB$fjY>e(cw`G!nLr3`E%>|F&mTjJ5Y{1OPz`(=6z`)ADu=%W6 YFC(MD=4gw_Kx*=POKTuU+v+MS08cL|_y7O^ diff --git a/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs index 6ae2eca..281543f 100644 --- a/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs +++ b/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.0.12.0")] -[assembly: AssemblyFileVersion("5.0.12.0")] +[assembly: AssemblyVersion("5.0.12.1")] +[assembly: AssemblyFileVersion("5.0.12.1")] diff --git a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs index cec3f25..d0d8e9c 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs @@ -1823,8 +1823,7 @@ namespace BismNormalizer.TabularCompare.TabularMetadata private void DeleteCalculationItem(ComparisonObject comparisonObject, string tableName) { - if ((comparisonObject.ComparisonObjectType == ComparisonObjectType.CalculationItem || comparisonObject.ComparisonObjectType == ComparisonObjectType.Kpi) && - comparisonObject.MergeAction == MergeAction.Delete) + if (comparisonObject.ComparisonObjectType == ComparisonObjectType.CalculationItem && comparisonObject.MergeAction == MergeAction.Delete) { Table tableTarget = _targetTabularModel.Tables.FindByName(tableName); if (tableTarget != null) @@ -1843,8 +1842,7 @@ namespace BismNormalizer.TabularCompare.TabularMetadata private void CreateCalculationItem(ComparisonObject comparisonObject, string tableName) { - if ((comparisonObject.ComparisonObjectType == ComparisonObjectType.CalculationItem || comparisonObject.ComparisonObjectType == ComparisonObjectType.Kpi) && - comparisonObject.MergeAction == MergeAction.Create) + if (comparisonObject.ComparisonObjectType == ComparisonObjectType.CalculationItem && comparisonObject.MergeAction == MergeAction.Create) { Table tableSource = _sourceTabularModel.Tables.FindByName(tableName); Table tableTarget = _targetTabularModel.Tables.FindByName(tableName); @@ -1869,8 +1867,7 @@ namespace BismNormalizer.TabularCompare.TabularMetadata private void UpdateCalculationItem(ComparisonObject comparisonObject, string tableName) { - if ((comparisonObject.ComparisonObjectType == ComparisonObjectType.CalculationItem || comparisonObject.ComparisonObjectType == ComparisonObjectType.Kpi) && - comparisonObject.MergeAction == MergeAction.Update) + if (comparisonObject.ComparisonObjectType == ComparisonObjectType.CalculationItem && comparisonObject.MergeAction == MergeAction.Update) { Table tableSource = _sourceTabularModel.Tables.FindByName(tableName); Table tableTarget = _targetTabularModel.Tables.FindByName(tableName); diff --git a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest index 8cb2a7c..d2b9440 100644 --- a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest +++ b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + BISM Normalizer BISM Normalizer manages Analysis Services tabular models http://bism-normalizer.com/