From de12f24fa4fa5a6a13c4f5dff8c8aa3b7b779ab9 Mon Sep 17 00:00:00 2001 From: Christian Wade Date: Thu, 23 Apr 2020 19:00:12 -0700 Subject: [PATCH] Calc item delete fix for Robson S. --- .../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, 13 insertions(+), 14 deletions(-) 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 2f2cf027341294d32ff5c695a8d12bb58217a271..976ed757cbf94c3ef85f63716e6ba2786734a477 100644 GIT binary patch delta 133 zcmZn&Xb70l!PM%$vFjf@Bh%(i4t`F7?cOg$+l(9>cOGkz`jxA-bMp$pr;Ln7llz3j zbXwgP#W4T@6A;TVGBErx1Y%(ZhM-`VV24?MR=E6>blBqSV)}ajsp`!FB3qa^nHX4r eYFQbWHlG!11{$+DP+~L4G*&5dAjekfFfRbx>M7X( delta 133 zcmZn&Xb70l!8Fx=W7j`+M#jyZ9Q>RD0;iJdZ8g$;SEL#5bUV9a_U09WPZ=2vC-(`5 z=}fg>6vqGrOh7Ed$iVQ&5Qv2t7=nUbg6BJDEVyL5!EePU{SQ0Ky*oDxh-_ivWMp6g es%2$h+b|jSl`tdIWK$7UMyActBCaw5)sMtCslU7AwlXMKZS9;t>o#vN zh-YFnnk--(qSNZWD2@RLn1EP@k%6Hm5QvQ#7=nUbf={1sP!hbl!Fl^W$;iM@dR3bz o7@IJ2GBL0K)v_`$Z9Z$(&B$o9IntsZNKJleX%6HlTHR*_0GX>Ri~s-t delta 141 zcmZo@U~Fh$oY28E)qZ2wDq%*($)+NzjEtM3MO{N%c46`FR~DNm o7@IJ2GBU6L)v_`$Za!<)&B$oDIntsZNKJleX%6HlTHR*_0AI5!2><{9 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/