KPI fix

microsoft · Oct 20, 2020 · 2e038da · 2e038da
1 parent ae3f6ab
commit 2e038da
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 15 deletions.
diff --git a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs b/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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
@@ -32,5 +32,5 @@
 // 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
@@ -32,5 +32,5 @@
 // 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
diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.exe b/BismNormalizer/BismNormalizer/BismNormalizer.exe
diff --git a/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 // 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
@@ -1823,8 +1823,7 @@ private void UpdateMeasure(ComparisonObject comparisonObject, string tableName)
 
         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 @@ private void DeleteCalculationItem(ComparisonObject comparisonObject, string tab
 
         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 @@ private void CreateCalculationItem(ComparisonObject comparisonObject, string tab
 
         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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="BismNormalizer.ea2aeb43-64a6-4dee-8816-099fb44513fa" Version="5.0.12.0" Language="en-US" Publisher="BISM Normalizer" />
+        <Identity Id="BismNormalizer.ea2aeb43-64a6-4dee-8816-099fb44513fa" Version="5.0.12.1" Language="en-US" Publisher="BISM Normalizer" />
         <DisplayName>BISM Normalizer</DisplayName>
         <Description xml:space="preserve">BISM Normalizer manages Analysis Services tabular models</Description>
         <MoreInfo>http://bism-normalizer.com/</MoreInfo>