From 8e9a26c7988659389d336e881ebf1aa01e386f98 Mon Sep 17 00:00:00 2001 From: Christian Wade Date: Mon, 10 Oct 2022 18:45:04 -0700 Subject: [PATCH] Fixes for hybrid tables and PBIT serialization --- BismNormalizer/AlmToolkit/AlmToolkit.csproj | 24 +++++++------ .../AlmToolkit/Properties/AssemblyInfo.cs | 4 +-- BismNormalizer/AlmToolkit/packages.config | 3 +- .../AlmToolkitSetup/AlmToolkitSetup.vdproj | 12 +++---- .../Properties/AssemblyInfo.cs | 4 +-- .../Properties/AssemblyInfo.cs | 4 +-- .../BismNormalizer.Tests.csproj | 32 ++++++++++++------ .../BismNormalizer.Tests/packages.config | 3 +- .../BismNormalizer.IconSetup.exe | Bin 10240 -> 10240 bytes .../BismNormalizer/BismNormalizer.csproj | 26 ++++++++------ .../BismNormalizer/BismNormalizer.exe | Bin 16384 -> 16384 bytes .../BismNormalizer/Properties/AssemblyInfo.cs | 4 +-- .../TabularCompare/ConnectionInfo.cs | 10 ++++-- .../TabularMetadata/Comparison.cs | 2 +- .../TabularMetadata/TabularModel.cs | 2 +- .../TabularMetadata/TabularObject.cs | 10 +++++- BismNormalizer/BismNormalizer/packages.config | 3 +- .../source.extension.vsixmanifest | 2 +- 18 files changed, 92 insertions(+), 53 deletions(-) diff --git a/BismNormalizer/AlmToolkit/AlmToolkit.csproj b/BismNormalizer/AlmToolkit/AlmToolkit.csproj index ce32248..1007a6e 100644 --- a/BismNormalizer/AlmToolkit/AlmToolkit.csproj +++ b/BismNormalizer/AlmToolkit/AlmToolkit.csproj @@ -46,20 +46,23 @@ BismNorm.ico - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Core.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.Core.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Tabular.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.Tabular.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll + + + ..\packages\Microsoft.Identity.Client.4.43.0\lib\net461\Microsoft.Identity.Client.dll ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -69,6 +72,7 @@ + False .\System.Windows.Forms.Ribbon.dll diff --git a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs b/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs index 8c6f3c7..34f276a 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.32.0")] -[assembly: AssemblyFileVersion("5.0.32.0")] +[assembly: AssemblyVersion("5.0.33.0")] +[assembly: AssemblyFileVersion("5.0.33.0")] diff --git a/BismNormalizer/AlmToolkit/packages.config b/BismNormalizer/AlmToolkit/packages.config index caeeef9..4f13d3d 100644 --- a/BismNormalizer/AlmToolkit/packages.config +++ b/BismNormalizer/AlmToolkit/packages.config @@ -4,7 +4,8 @@ - + + \ No newline at end of file diff --git a/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj b/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj index 0984d6b..7173db8 100644 --- a/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj +++ b/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj @@ -2842,7 +2842,7 @@ { "Name" = "8:.NET Framework" "Message" = "8:[VSDNETMSG]" - "FrameworkVersion" = "8:v4.6.1 " + "FrameworkVersion" = "8:v4.6.1 " "AllowLaterVersions" = "11:FALSE" "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=671728" } @@ -2854,7 +2854,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.31.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.32.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" "ScatterAssemblies" { "_0020EC0A2900F50F0F5DCC3E7BBE4237" @@ -3791,7 +3791,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.31.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.32.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" "ScatterAssemblies" { "_1F23AE629378259BAD7F2BCAB42727AD" @@ -9288,15 +9288,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Power BI ALM Toolkit" - "ProductCode" = "8:{FDC7726C-CE6B-4CED-B829-FAFF1CE015D9}" - "PackageCode" = "8:{88420696-968D-4162-B22F-DD0F878E4A82}" + "ProductCode" = "8:{E2D47781-E7AC-4976-BCED-AFF8ADF5046E}" + "PackageCode" = "8:{89D0ECEB-4D5F-4E60-AEEC-BDF22045036E}" "UpgradeCode" = "8:{96819CFD-6462-4AD1-ADB4-7903F30ADB92}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:5.0.32" + "ProductVersion" = "8:5.0.33" "Manufacturer" = "8:Power BI ALM Toolkit" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs index 7d919b7..aa3e3b0 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.32.0")] -[assembly: AssemblyFileVersion("5.0.32.0")] +[assembly: AssemblyVersion("5.0.33.0")] +[assembly: AssemblyFileVersion("5.0.33.0")] diff --git a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs index 1c881be..b6adb02 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.32.0")] -[assembly: AssemblyFileVersion("5.0.32.0")] +[assembly: AssemblyVersion("5.0.33.0")] +[assembly: AssemblyFileVersion("5.0.33.0")] diff --git a/BismNormalizer/BismNormalizer.Tests/BismNormalizer.Tests.csproj b/BismNormalizer/BismNormalizer.Tests/BismNormalizer.Tests.csproj index e4a6480..d1499bf 100644 --- a/BismNormalizer/BismNormalizer.Tests/BismNormalizer.Tests.csproj +++ b/BismNormalizer/BismNormalizer.Tests/BismNormalizer.Tests.csproj @@ -40,22 +40,34 @@ 4 - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Core.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.Core.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Tabular.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.Tabular.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll + + + + ..\packages\Microsoft.Identity.Client.4.43.0\lib\net461\Microsoft.Identity.Client.dll + + + + + + + + diff --git a/BismNormalizer/BismNormalizer.Tests/packages.config b/BismNormalizer/BismNormalizer.Tests/packages.config index 01c4326..d3fb1e9 100644 --- a/BismNormalizer/BismNormalizer.Tests/packages.config +++ b/BismNormalizer/BismNormalizer.Tests/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe index f4e0be944df05c4d49ed708a715afd98aff87660..f3e2235129c95184c5a0e97a5fbaf5a1f5ba5ede 100644 GIT binary patch delta 135 zcmZn&Xb70l!E)}nOY+8^U+j#Eo7*`AIR!it7`SutKY7dwyEw1F>sapQ6@pI~8I33R z3Ww`})G`186A;TVGBErx1Y%(ZhM-`V;KGkdud-LSInCVT^mGb;^^?s4BHNfa6@e;Q dfmm_#d9iw+F`NA*wu4M#m$C+OoTc{i0syhgEFS;> delta 135 zcmZn&Xb70l!SemZzod;lzt|ZSHn(#KatbVbFLmrYqp8DcZI$@B@!bWRR|q~~WHg%G zD;%x^Qp*4YOh7Ed$iVQ&5Qv2t7=nUbf*HJbwatoC@}8HnwcmUyW7}o{k!?(z3P6>t cK&-I&yjVTZn9cqY+d-zWOIZUs&Qg1M0Unkswg3PC diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.csproj b/BismNormalizer/BismNormalizer/BismNormalizer.csproj index eafd8cf..814c2c9 100644 --- a/BismNormalizer/BismNormalizer/BismNormalizer.csproj +++ b/BismNormalizer/BismNormalizer/BismNormalizer.csproj @@ -101,25 +101,28 @@ ..\packages\Microsoft.ApplicationInsights.WindowsServer.2.8.1\lib\net45\Microsoft.AI.WindowsServer.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Core.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.Core.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Tabular.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.Tabular.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.51.0\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll ..\packages\Microsoft.ApplicationInsights.2.8.1\lib\net46\Microsoft.ApplicationInsights.dll + + ..\packages\Microsoft.Identity.Client.4.43.0\lib\net461\Microsoft.Identity.Client.dll + ..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll True @@ -204,12 +207,14 @@ + ..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + @@ -220,6 +225,7 @@ + diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.exe b/BismNormalizer/BismNormalizer/BismNormalizer.exe index d0ba50eb23d7ce18dd9b48aa22004094d5a69734..c9652e8abda4ab847c109e64c80d4e704a2a2b7a 100644 GIT binary patch delta 124 zcmZo@U~Fh$oY28?{#-3%ujEa+uMN}CTH%E%N%Lq(<{DbMe;x4~^Ca-30vB*Ea zd4oY56Ql8De&a~6j>$R35&}2EOJXn2>F`^f{rq%!5Wo25DaJ<3oQez#46Hz`xcR(U YJ0qj<=5UM2Kx*=9OKTuU-RdSQ0Gr_~&;S4c delta 124 zcmZo@U~Fh$oY2AY{l&kejXleR85JfQi>NXxY>pIhml0rF!}1}{d#&Hv71mY%ceb!^ z-e3^N#Aq~`-#8MiV{(qMgupWSs2ldb0{j--o7cKC*X;7 - + + diff --git a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest index 21510b8..f421c62 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/