From d1e38e3f45d324a46ff73c310cc8efe7db383ff2 Mon Sep 17 00:00:00 2001 From: Christian Wade Date: Tue, 19 Nov 2024 19:17:33 -0800 Subject: [PATCH] PreRelease fix for https://github.com/microsoft/Analysis-Services/issues/313 --- .../AlmToolkitSetup/AlmToolkitSetup.vdproj | 126 +++++++++--------- .../TabularMetadata/TabularModel.cs | 5 +- AlmToolkit/VersionInfo.cs | 4 +- 3 files changed, 69 insertions(+), 66 deletions(-) diff --git a/AlmToolkit/AlmToolkitSetup/AlmToolkitSetup.vdproj b/AlmToolkit/AlmToolkitSetup/AlmToolkitSetup.vdproj index 7d796d8e..78337303 100644 --- a/AlmToolkit/AlmToolkitSetup/AlmToolkitSetup.vdproj +++ b/AlmToolkit/AlmToolkitSetup/AlmToolkitSetup.vdproj @@ -226,13 +226,13 @@ "Entry" { "MsmKey" = "8:_1FB375A7FE9C13BE13D5697E99BF7DFA" - "OwnerKey" = "8:_61ABF76D5E8E100BE9ABC064657B5FE5" + "OwnerKey" = "8:_5E924C1019D34309AEEFFBDF815BDE91" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_1FB375A7FE9C13BE13D5697E99BF7DFA" - "OwnerKey" = "8:_5E924C1019D34309AEEFFBDF815BDE91" + "OwnerKey" = "8:_251A14F72C19775F1894B31CD64F2626" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -279,6 +279,18 @@ } "Entry" { + "MsmKey" = "8:_251A14F72C19775F1894B31CD64F2626" + "OwnerKey" = "8:_3D696E5A39F34571B6B0384AA8C5D0D3" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_251A14F72C19775F1894B31CD64F2626" + "OwnerKey" = "8:_5E924C1019D34309AEEFFBDF815BDE91" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_25550BE6A1694EAE921B1E3F1180BD04" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -646,19 +658,19 @@ "Entry" { "MsmKey" = "8:_46D6BDF02B4CD01FE1FEE3863ED3427A" - "OwnerKey" = "8:_61ABF76D5E8E100BE9ABC064657B5FE5" + "OwnerKey" = "8:_5E924C1019D34309AEEFFBDF815BDE91" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_46D6BDF02B4CD01FE1FEE3863ED3427A" - "OwnerKey" = "8:_5E924C1019D34309AEEFFBDF815BDE91" + "OwnerKey" = "8:_3D696E5A39F34571B6B0384AA8C5D0D3" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_46D6BDF02B4CD01FE1FEE3863ED3427A" - "OwnerKey" = "8:_3D696E5A39F34571B6B0384AA8C5D0D3" + "OwnerKey" = "8:_251A14F72C19775F1894B31CD64F2626" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -873,18 +885,6 @@ } "Entry" { - "MsmKey" = "8:_61ABF76D5E8E100BE9ABC064657B5FE5" - "OwnerKey" = "8:_3D696E5A39F34571B6B0384AA8C5D0D3" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_61ABF76D5E8E100BE9ABC064657B5FE5" - "OwnerKey" = "8:_5E924C1019D34309AEEFFBDF815BDE91" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_644C7238EBBD44DD9FE5170074E8129B" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1018,7 +1018,7 @@ "Entry" { "MsmKey" = "8:_70A2AB7941F3A974FA5763638AB75346" - "OwnerKey" = "8:_61ABF76D5E8E100BE9ABC064657B5FE5" + "OwnerKey" = "8:_251A14F72C19775F1894B31CD64F2626" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1408,7 +1408,7 @@ "Entry" { "MsmKey" = "8:_9CE6B39D21D885B0849AA95A2F621729" - "OwnerKey" = "8:_61ABF76D5E8E100BE9ABC064657B5FE5" + "OwnerKey" = "8:_251A14F72C19775F1894B31CD64F2626" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1546,7 +1546,7 @@ "Entry" { "MsmKey" = "8:_AB6A435C366A0B10386ABA66E29A0C9E" - "OwnerKey" = "8:_61ABF76D5E8E100BE9ABC064657B5FE5" + "OwnerKey" = "8:_251A14F72C19775F1894B31CD64F2626" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2074,7 +2074,7 @@ "Entry" { "MsmKey" = "8:_F359F56EB5F4694F022DF1FD509C0589" - "OwnerKey" = "8:_61ABF76D5E8E100BE9ABC064657B5FE5" + "OwnerKey" = "8:_251A14F72C19775F1894B31CD64F2626" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2188,12 +2188,6 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_61ABF76D5E8E100BE9ABC064657B5FE5" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_E01C23D042974CFDADC6880ED91380B3" "MsmSig" = "8:_UNDEFINED" } @@ -2284,6 +2278,12 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_251A14F72C19775F1894B31CD64F2626" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_F359F56EB5F4694F022DF1FD509C0589" "MsmSig" = "8:_UNDEFINED" } @@ -3330,6 +3330,37 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_251A14F72C19775F1894B31CD64F2626" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.1.4.0, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_251A14F72C19775F1894B31CD64F2626" + { + "Name" = "8:BismNormalizer.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:BismNormalizer.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C3C2AB347C6D4BB2B146347638598C77" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_25550BE6A1694EAE921B1E3F1180BD04" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\html-resources\\dist\\ts.worker.js" @@ -4907,37 +4938,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_61ABF76D5E8E100BE9ABC064657B5FE5" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.1.4.0, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_61ABF76D5E8E100BE9ABC064657B5FE5" - { - "Name" = "8:BismNormalizer.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:BismNormalizer.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C3C2AB347C6D4BB2B146347638598C77" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_644C7238EBBD44DD9FE5170074E8129B" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\html-resources\\src\\assets\\node-type-Calculation-Group.png" @@ -9293,15 +9293,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Power BI ALM Toolkit" - "ProductCode" = "8:{047FCACC-4B29-4D16-A1C5-8DD534433C5B}" - "PackageCode" = "8:{C126BE17-7FE8-4141-A67E-D3CCC86E0D3D}" + "ProductCode" = "8:{08881E44-69A7-4C60-B228-7E5CFA45C849}" + "PackageCode" = "8:{8AF7D996-90AC-4004-A700-8B57F9F94374}" "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.1.4" + "ProductVersion" = "8:5.1.5" "Manufacturer" = "8:Power BI ALM Toolkit" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" @@ -9934,7 +9934,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3D696E5A39F34571B6B0384AA8C5D0D3" { - "SourcePath" = "8:..\\AlmToolkit\\obj\\Debug\\AlmToolkit.exe" + "SourcePath" = "8:..\\AlmToolkit\\obj\\Release\\AlmToolkit.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C3C2AB347C6D4BB2B146347638598C77" @@ -9962,7 +9962,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5E924C1019D34309AEEFFBDF815BDE91" { - "SourcePath" = "8:..\\BismNormalizer.CommandLine\\obj\\Debug\\BismNormalizer.CommandLine.exe" + "SourcePath" = "8:..\\BismNormalizer.CommandLine\\obj\\Release\\BismNormalizer.CommandLine.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_C3C2AB347C6D4BB2B146347638598C77" diff --git a/AlmToolkit/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs b/AlmToolkit/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs index c8993427..ceec2611 100644 --- a/AlmToolkit/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs +++ b/AlmToolkit/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs @@ -633,7 +633,10 @@ public void CreateTable(Table tableSource) if (partition.SourceType == PartitionSourceType.Query) { QueryPartitionSource queryPartition = ((QueryPartitionSource)partition.Source); - string dataSourceName = queryPartition.DataSource.Name; + //string dataSourceName = queryPartition.DataSource.Name; + //11/19/2024 commented above line due to another instance of Oren's change where CopyTo loses object references. + //However, we know there is at least 1 partition in tableSource and all partitions in a table must have the same SourceType and DataSource, so can reliably do this instead: + string dataSourceName = ((QueryPartitionSource)tableSource.TomTable.Partitions[0].Source).DataSource.Name; queryPartition.DataSource = _dataSources.FindByName(dataSourceName).TomDataSource; } } diff --git a/AlmToolkit/VersionInfo.cs b/AlmToolkit/VersionInfo.cs index 1c6d8683..ce0e6ace 100644 --- a/AlmToolkit/VersionInfo.cs +++ b/AlmToolkit/VersionInfo.cs @@ -10,5 +10,5 @@ // 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.1.4.0")] -[assembly: AssemblyFileVersion("5.1.4.0")] +[assembly: AssemblyVersion("5.1.5.0")] +[assembly: AssemblyFileVersion("5.1.5.0")]