From d7fc98cc48ea646806e7746c0343891ef7e73a74 Mon Sep 17 00:00:00 2001 From: Christian Wade Date: Wed, 9 Dec 2020 18:09:37 -0800 Subject: [PATCH] AAS servername check --- .../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/TabularModel.cs | 3 ++- .../source.extension.vsixmanifest | 2 +- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs b/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs index 0c3e8a9..8b478c9 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.14.0")] -[assembly: AssemblyFileVersion("5.0.14.0")] +[assembly: AssemblyVersion("5.0.14.1")] +[assembly: AssemblyFileVersion("5.0.14.1")] diff --git a/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs index a0fbadd..1922660 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.14.0")] -[assembly: AssemblyFileVersion("5.0.14.0")] +[assembly: AssemblyVersion("5.0.14.1")] +[assembly: AssemblyFileVersion("5.0.14.1")] diff --git a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs index 8b19851..985d673 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.14.0")] -[assembly: AssemblyFileVersion("5.0.14.0")] +[assembly: AssemblyVersion("5.0.14.1")] +[assembly: AssemblyFileVersion("5.0.14.1")] diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe index 43354291f335c9cb7c1f1d0e520d2240e17885bd..ac4f108a3ff6e605e42a6b266e4850b4a729c78b 100644 GIT binary patch delta 134 zcmZn&Xb70l!MwZa;>Pa3?2L??J306{1rj$GnKp&~_t|&c@Y3E5uKk-=2tH$EG@RTo z9I69U8qWX(Oh7Ed$iVQ&5Qv2t7=nUbg6G^ncj$Y7sY9dt{fmo*g;s4A5ZS`S$;iM5 eRLjc1xcRJDE6|wD!4lg+rg2MI13B(eJ9z;xZ7mJ} delta 134 zcmZn&Xb70l!F(WM{l@OU?2HVXJ306{1=3Q3JJP%}92fnuZ!Vsg8@_pk;4?->gUS8E zp*ldN@eDw~1jI6o3=Dq^fmoPoQ>BE&-H(ra<`@zDQ}))Y{1OP$iTKfq|8QVe?tD YUPeZP&CwQ@~ diff --git a/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs index 0523372..5bb9df2 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.14.0")] -[assembly: AssemblyFileVersion("5.0.14.0")] +[assembly: AssemblyVersion("5.0.14.1")] +[assembly: AssemblyFileVersion("5.0.14.1")] diff --git a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs index 62d9328..0961850 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs @@ -96,7 +96,8 @@ namespace BismNormalizer.TabularCompare.TabularMetadata foreach (ModelRole role in _database.Model.Roles) { //Workaround for AAD role members - todo delete if changed in Azure AS - if (_parentComparison?.TargetTabularModel?.ConnectionInfo?.ServerName?.Substring(0, 7) == "asazure") + if (_parentComparison?.TargetTabularModel?.ConnectionInfo?.ServerName?.Length > 7 && + _parentComparison?.TargetTabularModel?.ConnectionInfo?.ServerName?.Substring(0, 7) == "asazure") { List membersToAdd = new List(); foreach (ModelRoleMember member in role.Members) diff --git a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest index aec2aed..1c9a388 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/