diff --git a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs b/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs index c1036b2..20b7bf3 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.4.1")] -[assembly: AssemblyFileVersion("5.0.4.1")] +[assembly: AssemblyVersion("5.0.4.2")] +[assembly: AssemblyFileVersion("5.0.4.2")] diff --git a/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs index c62c9fc..f070eae 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.4.1")] -[assembly: AssemblyFileVersion("5.0.4.1")] +[assembly: AssemblyVersion("5.0.4.2")] +[assembly: AssemblyFileVersion("5.0.4.2")] diff --git a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs index 9d5e369..62e6857 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.4.1")] -[assembly: AssemblyFileVersion("5.0.4.1")] +[assembly: AssemblyVersion("5.0.4.2")] +[assembly: AssemblyFileVersion("5.0.4.2")] diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe index 2f2cf02..976ed75 100644 Binary files a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe and b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe differ diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.exe b/BismNormalizer/BismNormalizer/BismNormalizer.exe index ed4f573..d6b1d5e 100644 Binary files a/BismNormalizer/BismNormalizer/BismNormalizer.exe and b/BismNormalizer/BismNormalizer/BismNormalizer.exe differ diff --git a/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs index 6d86aa4..0bec6e7 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.4.1")] -[assembly: AssemblyFileVersion("5.0.4.1")] +[assembly: AssemblyVersion("5.0.4.2")] +[assembly: AssemblyFileVersion("5.0.4.2")] diff --git a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs index 476c766..72d7f63 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs @@ -828,7 +828,7 @@ namespace BismNormalizer.TabularCompare.TabularMetadata { foreach (ComparisonObject childComparisonObject in comparisonObject.ChildComparisonObjects) { - DeleteCalculationItem(childComparisonObject); //CalculationItem + DeleteCalculationItem(childComparisonObject, comparisonObject.SourceObjectName); //CalculationItem, Table } } @@ -1811,20 +1811,19 @@ namespace BismNormalizer.TabularCompare.TabularMetadata #region CalculationItems - private void DeleteCalculationItem(ComparisonObject comparisonObject) + private void DeleteCalculationItem(ComparisonObject comparisonObject, string tableName) { if ((comparisonObject.ComparisonObjectType == ComparisonObjectType.CalculationItem || comparisonObject.ComparisonObjectType == ComparisonObjectType.Kpi) && comparisonObject.MergeAction == MergeAction.Delete) { - foreach (Table tableTarget in _targetTabularModel.Tables) + Table tableTarget = _targetTabularModel.Tables.FindByName(tableName); + if (tableTarget != null) { CalculationItem calculationItemTarget = tableTarget.CalculationItems.FindByName(comparisonObject.TargetObjectInternalName); - if (calculationItemTarget != null) { // CalculationItem may have already been deleted if parent table was deleted tableTarget.DeleteCalculationItem(comparisonObject.TargetObjectInternalName); - break; } } diff --git a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest index d30a332..3192599 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/