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 1c8790f..63d71d7 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 256be36..1c8e572 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 94b96ad..1ae709d 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.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/TabularCompare/ConnectionInfo.cs b/BismNormalizer/BismNormalizer/TabularCompare/ConnectionInfo.cs index a8abe75..1e504cd 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/ConnectionInfo.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/ConnectionInfo.cs @@ -695,7 +695,7 @@ $@"{{ } _compatibilityLevel = amoDatabase.CompatibilityLevel; - _dataSourceVersion = amoDatabase.Model.DefaultPowerBIDataSourceVersion.ToString(); + if (_compatibilityLevel >= 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/