From edb8a5f560b8c86ac71addadae145f20641cee25 Mon Sep 17 00:00:00 2001 From: Christian Wade Date: Mon, 13 Jan 2020 13:14:13 -0800 Subject: [PATCH] 1103 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 ++-- .../TabularCompare/ConnectionInfo.cs | 2 +- .../TabularMetadata/TabularModel.cs | 1 - .../UI/TreeGridViewComparison.cs | 11 +++++++---- .../source.extension.vsixmanifest | 2 +- 10 files changed, 17 insertions(+), 15 deletions(-) diff --git a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs b/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs index 2472f7e..1ca6520 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.1.0")] -[assembly: AssemblyFileVersion("5.0.1.0")] +[assembly: AssemblyVersion("5.0.0.13")] +[assembly: AssemblyFileVersion("5.0.0.13")] diff --git a/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs index 3286130..d0b9945 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.1.0")] -[assembly: AssemblyFileVersion("5.0.1.0")] +[assembly: AssemblyVersion("5.0.0.13")] +[assembly: AssemblyFileVersion("5.0.0.13")] diff --git a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs index 233515a..42db231 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.1.0")] -[assembly: AssemblyFileVersion("5.0.1.0")] +[assembly: AssemblyVersion("5.0.0.13")] +[assembly: AssemblyFileVersion("5.0.0.13")] diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe index 1c8790ff76d855a022eaee5d42a6053be31c91b6..63d71d7530bb3f713f1ab48f2aae0f26d18c2f48 100644 GIT binary patch delta 263 zcmZn&Xb70l!93-T%*5_SrV0EL6@@1&GPW~L*u0YQI2+^3$%P!E%nS^?n>#u9IR%uO zX5LeoKhM8$?}an_i{IC8ULkm!k%yO&fx}eK00<3@C-(`5>HtlPV*mmsAeLcdVEAJQ z#KH^=LBTG;Ro#NcISv*M+p6C`msETrwOK$Uhe_0jg@Iv$0|Ub@pj|MqYw|=fV{TqB zmz4oXPd+b}$S5`0P+Xbu+vHI3^UOvJoRifhR5=Y8^cV~oj2Rd<2TC+EGMfQ~uS;t3 d!-auHSOLYjrF40b#bP!)N^RlZ%&7LC5dcpALA3w? delta 254 zcmZn&Xb70l!L0p+dt!GZQw#q@Md8VcjO~mqn^!U(XJdRZxsXGYnUR5Eb0-Hsr-00! z#z%{E`ur!@mwi7eAy>0`h2U*QZXQMkc2hkAJwrW%$^F8ix(q%piRbuwn8MKc8Tv5|;hU@>+Qn@(PrP50d( zd3Ivaq$`Q&P9kFA2Vh|>E<&7}_wKzXdFP({9ETi-vL|ZpG31`M(~Db7*X5Uhc`!17 zQSFACGzZYQ-&+JiBCPZan|kS89P@36BBiM!NNLi%J%9=Y1XK%u+>i^(flin5y59D5 z>?*DJ0MQKX;0QPHQ;<9?T*bnGE)s!mm9tzAOotlUg7(=dlvWL~>^UOVbKlUdVCjb&c% z7f)YxryFjeiY&!vNz_?~&4vfaW`F|w`9(pvmRYNRw^iUQ?yPP45V7HIdJrqa_v#RQ zB03WB85l$i>_FNhTclb{UnTqM|7eyNW$raOp#SG4WMs6W`WAkE`fW)1$6v`cYCZws CUs{j= delta 408 zcmXw#KS)AR6voea?`euJ%e074QZyned-nX>kPwLkMW%^J^mmSywsLrFL5q*8;N0dW z+%>7CC4^igXbQ?Df*OLBh>nV9xc7XA`+fI!uco1NmctzUzjw9h5j{g== 1400) _dataSourceVersion = amoDatabase.Model.DefaultPowerBIDataSourceVersion.ToString(); _serverMode = amoServer.ServerMode; _directQuery = ((amoDatabase.Model != null && amoDatabase.Model.DefaultMode == Microsoft.AnalysisServices.Tabular.ModeType.DirectQuery) || amoDatabase.DirectQueryMode == DirectQueryMode.DirectQuery || amoDatabase.DirectQueryMode == DirectQueryMode.InMemoryWithDirectQuery || amoDatabase.DirectQueryMode == DirectQueryMode.DirectQueryWithInMemory); diff --git a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs index 152c916..1e1b33e 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs @@ -2194,7 +2194,6 @@ namespace BismNormalizer.TabularCompare.TabularMetadata //Need recalc even if created no tables in case of new relationships without tables _database.Model.RequestRefresh(RefreshType.Calculate); - _database.Model.SaveChanges(); // Show row count for each table diff --git a/BismNormalizer/BismNormalizer/TabularCompare/UI/TreeGridViewComparison.cs b/BismNormalizer/BismNormalizer/TabularCompare/UI/TreeGridViewComparison.cs index cfca846..225a9f2 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/UI/TreeGridViewComparison.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/UI/TreeGridViewComparison.cs @@ -215,8 +215,11 @@ namespace BismNormalizer.TabularCompare.UI node.Cells[10].Value = comparisonObject.SourceObjectDefinition; node.Cells[11].Value = comparisonObject.TargetObjectDefinition; + bool isMdMetadata = (comparisonObject is MultidimensionalMetadata.ComparisonObject); + string treeIndentLevel1 = new String(' ', 13); string treeIndentLevel2 = new String(' ', 20); + string treeIndentLevel3 = new String(' ', 27); switch (comparisonObject.ComparisonObjectType) { @@ -242,20 +245,20 @@ namespace BismNormalizer.TabularCompare.UI else { node.ImageIndex = 1; - node.Cells[0].Value = treeIndentLevel1 + "Table"; + node.Cells[0].Value = (isMdMetadata ? treeIndentLevel2 : treeIndentLevel1) + "Table"; } break; case ComparisonObjectType.Relationship: node.ImageIndex = 2; - node.Cells[0].Value = treeIndentLevel2 + "Relationship"; + node.Cells[0].Value = (isMdMetadata ? treeIndentLevel3 : treeIndentLevel2) + "Relationship"; break; case ComparisonObjectType.Measure: node.ImageIndex = 3; - node.Cells[0].Value = treeIndentLevel2 + "Measure"; + node.Cells[0].Value = (isMdMetadata ? treeIndentLevel3 : treeIndentLevel2) + "Measure"; break; case ComparisonObjectType.Kpi: node.ImageIndex = 4; - node.Cells[0].Value = treeIndentLevel2 + "KPI"; + node.Cells[0].Value = (isMdMetadata ? treeIndentLevel3 : treeIndentLevel2) + "KPI"; break; case ComparisonObjectType.CalculationItem: node.ImageIndex = 24; diff --git a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest index 27c241c..69ec939 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/