From d04aefa31ac0bb655eef752a45dfb9ed24e00e43 Mon Sep 17 00:00:00 2001 From: Christian Wade Date: Thu, 23 Apr 2020 18:27:28 -0700 Subject: [PATCH] Calc item dup name validation removed for Robson Soares --- .../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 | 11 ----------- .../source.extension.vsixmanifest | 2 +- 8 files changed, 9 insertions(+), 20 deletions(-) diff --git a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs b/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs index a0dd266..c1036b2 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.0")] -[assembly: AssemblyFileVersion("5.0.4.0")] +[assembly: AssemblyVersion("5.0.4.1")] +[assembly: AssemblyFileVersion("5.0.4.1")] diff --git a/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs index 9f2a553..c62c9fc 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.0")] -[assembly: AssemblyFileVersion("5.0.4.0")] +[assembly: AssemblyVersion("5.0.4.1")] +[assembly: AssemblyFileVersion("5.0.4.1")] diff --git a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs index f13b3bf..9d5e369 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.0")] -[assembly: AssemblyFileVersion("5.0.4.0")] +[assembly: AssemblyVersion("5.0.4.1")] +[assembly: AssemblyFileVersion("5.0.4.1")] diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe index 9899f25e32eb6b9f74cf847ac161f843cdbd9718..2f2cf027341294d32ff5c695a8d12bb58217a271 100644 GIT binary patch delta 134 zcmZn&Xb70l!93M|(Z=q-?2L??J306{1q4nd)!S;M`>sec-syIB$L!531fMc88cyyL z4$}cDjbi`;CLoq!WMKGX2*kn+3_-yz!SkIn7F@F3;J4zF{)e6A-kqBTM7A(-GBU6L e)v_`$Zayp43^ZnQpu}d7X{=J_K#r}{VO{_YmMT#I delta 134 zcmZn&Xb70l!K{3D?#AxF?2HVXJ306{1$36Xe&6hW&9P~FQ2)B<%gLKp2tH+GG??5c z9Hs+Q8pi+xOh7Ed$iVQ&5Qv2t7=nUbf*)?-2{=4JHd1hv)z`#4!K?6A;TVGBDHx0OLy~EH)`( diff --git a/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs index 07570c7..6d86aa4 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.0")] -[assembly: AssemblyFileVersion("5.0.4.0")] +[assembly: AssemblyVersion("5.0.4.1")] +[assembly: AssemblyFileVersion("5.0.4.1")] diff --git a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs index 6dc0d3a..476c766 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs @@ -1837,17 +1837,6 @@ namespace BismNormalizer.TabularCompare.TabularMetadata if ((comparisonObject.ComparisonObjectType == ComparisonObjectType.CalculationItem || comparisonObject.ComparisonObjectType == ComparisonObjectType.Kpi) && comparisonObject.MergeAction == MergeAction.Create) { - foreach (Table tableInTarget in _targetTabularModel.Tables) - { - CalculationItem calculationItemInTarget = tableInTarget.CalculationItems.FindByName(comparisonObject.SourceObjectInternalName); - - if (calculationItemInTarget != null) - { - OnValidationMessage(new ValidationMessageEventArgs($"Unable to create calculation item {comparisonObject.SourceObjectInternalName} because name already exists in target model.", ValidationMessageType.CalculationItem, ValidationMessageStatus.Warning)); - return; - } - } - 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 1c517d7..d30a332 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/