diff --git a/BismNormalizer/AlmToolkit/AlmToolkit.csproj b/BismNormalizer/AlmToolkit/AlmToolkit.csproj index e3d9eac..ce32248 100644 --- a/BismNormalizer/AlmToolkit/AlmToolkit.csproj +++ b/BismNormalizer/AlmToolkit/AlmToolkit.csproj @@ -46,20 +46,20 @@ BismNorm.ico - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.22.0.1\lib\net45\Microsoft.AnalysisServices.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.22.0.1\lib\net45\Microsoft.AnalysisServices.Core.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Core.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.22.0.1\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.22.0.1\lib\net45\Microsoft.AnalysisServices.Tabular.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Tabular.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.22.0.1\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs b/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs index e7d5463..c1edbf8 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.29.0")] -[assembly: AssemblyFileVersion("5.0.29.0")] +[assembly: AssemblyVersion("5.0.31.0")] +[assembly: AssemblyFileVersion("5.0.31.0")] diff --git a/BismNormalizer/AlmToolkit/packages.config b/BismNormalizer/AlmToolkit/packages.config index 6e97603..caeeef9 100644 --- a/BismNormalizer/AlmToolkit/packages.config +++ b/BismNormalizer/AlmToolkit/packages.config @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj b/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj index e76ed52..99611d9 100644 --- a/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj +++ b/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj @@ -423,6 +423,18 @@ } "Entry" { + "MsmKey" = "8:_2FF8691D554FA07D2FB9B12FDB7C85AE" + "OwnerKey" = "8:_5A164155F3A26ADD1FBD98FBEB077513" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2FF8691D554FA07D2FB9B12FDB7C85AE" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_31051673150A4B48BF86FB1343E60DEC" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -783,6 +795,12 @@ } "Entry" { + "MsmKey" = "8:_5A164155F3A26ADD1FBD98FBEB077513" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_5ADC3BD7F893420D9AA24B075B8B2A7C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1018,12 +1036,6 @@ "Entry" { "MsmKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "MsmSig" = "8:_UNDEFINED" } @@ -1240,12 +1252,6 @@ "Entry" { "MsmKey" = "8:_82DAFE8276E3EAF6338E99A4D478878D" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_82DAFE8276E3EAF6338E99A4D478878D" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "MsmSig" = "8:_UNDEFINED" } @@ -1599,6 +1605,24 @@ } "Entry" { + "MsmKey" = "8:_A2BB30A0C7525C72A4C8B713E62E81B4" + "OwnerKey" = "8:_2FF8691D554FA07D2FB9B12FDB7C85AE" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A2BB30A0C7525C72A4C8B713E62E81B4" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_A2BB30A0C7525C72A4C8B713E62E81B4" + "OwnerKey" = "8:_5A164155F3A26ADD1FBD98FBEB077513" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_A37BEE0D4FE44280AD474E431B0217E7" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1701,6 +1725,18 @@ } "Entry" { + "MsmKey" = "8:_B260699A6CBAD54E7697F76DD213ED5D" + "OwnerKey" = "8:_FA184EDD5D2621AD89B28478565DE814" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B260699A6CBAD54E7697F76DD213ED5D" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_B3013186E3054C6E8955ACEF56E5F48A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2146,12 +2182,6 @@ "Entry" { "MsmKey" = "8:_E6C48E30804B563751F799BDB82D2D5F" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E6C48E30804B563751F799BDB82D2D5F" "OwnerKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D" "MsmSig" = "8:_UNDEFINED" } @@ -2235,12 +2265,6 @@ } "Entry" { - "MsmKey" = "8:_EEEF3B4DA37D965DCA452A1E7B283C82" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_EF0C782C601F42DE8C7EF094FA4ED82E" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2278,12 +2302,6 @@ "Entry" { "MsmKey" = "8:_F27EC43FC3B12703E1AC626345868C2F" - "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_F27EC43FC3B12703E1AC626345868C2F" "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542" "MsmSig" = "8:_UNDEFINED" } @@ -2313,6 +2331,24 @@ } "Entry" { + "MsmKey" = "8:_FA184EDD5D2621AD89B28478565DE814" + "OwnerKey" = "8:_7936400E6C154464B76D26251125123A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FA184EDD5D2621AD89B28478565DE814" + "OwnerKey" = "8:_2FF8691D554FA07D2FB9B12FDB7C85AE" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_FA184EDD5D2621AD89B28478565DE814" + "OwnerKey" = "8:_5A164155F3A26ADD1FBD98FBEB077513" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_FB48CD08F86F4E088E6AC75108A88247" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -2398,6 +2434,36 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_5A164155F3A26ADD1FBD98FBEB077513" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_2FF8691D554FA07D2FB9B12FDB7C85AE" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_A2BB30A0C7525C72A4C8B713E62E81B4" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_FA184EDD5D2621AD89B28478565DE814" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_B260699A6CBAD54E7697F76DD213ED5D" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_505B9CD6FBF318D5810A11D52DB3B890" "MsmSig" = "8:_UNDEFINED" } @@ -2698,7 +2764,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" } @@ -2710,7 +2776,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.28.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.29.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" "ScatterAssemblies" { "_0020EC0A2900F50F0F5DCC3E7BBE4237" @@ -3637,7 +3703,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.28.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.29.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL" "ScatterAssemblies" { "_1F23AE629378259BAD7F2BCAB42727AD" @@ -3844,6 +3910,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2FF8691D554FA07D2FB9B12FDB7C85AE" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_2FF8691D554FA07D2FB9B12FDB7C85AE" + { + "Name" = "8:Microsoft.AnalysisServices.Tabular.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Microsoft.AnalysisServices.Tabular.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_CAD31D6A85364CAA9F9BFC2750F80458" + "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}:_31051673150A4B48BF86FB1343E60DEC" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\html-resources\\dist\\34.chunk.js" @@ -4797,6 +4894,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5A164155F3A26ADD1FBD98FBEB077513" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_5A164155F3A26ADD1FBD98FBEB077513" + { + "Name" = "8:Microsoft.AnalysisServices.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Microsoft.AnalysisServices.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_CAD31D6A85364CAA9F9BFC2750F80458" + "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}:_5ADC3BD7F893420D9AA24B075B8B2A7C" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x64\\locales\\ml.pak" @@ -6808,6 +6936,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A2BB30A0C7525C72A4C8B713E62E81B4" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular.Json, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_A2BB30A0C7525C72A4C8B713E62E81B4" + { + "Name" = "8:Microsoft.AnalysisServices.Tabular.Json.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Microsoft.AnalysisServices.Tabular.Json.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_CAD31D6A85364CAA9F9BFC2750F80458" + "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}:_A37BEE0D4FE44280AD474E431B0217E7" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x86\\locales\\ro.pak" @@ -7154,6 +7313,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B260699A6CBAD54E7697F76DD213ED5D" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.SPClient.Interfaces, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_B260699A6CBAD54E7697F76DD213ED5D" + { + "Name" = "8:Microsoft.AnalysisServices.SPClient.Interfaces.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Microsoft.AnalysisServices.SPClient.Interfaces.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_CAD31D6A85364CAA9F9BFC2750F80458" + "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}:_B3013186E3054C6E8955ACEF56E5F48A" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x64\\chrome_elf.dll" @@ -8644,6 +8834,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FA184EDD5D2621AD89B28478565DE814" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Core, Version=19.39.2.2, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_FA184EDD5D2621AD89B28478565DE814" + { + "Name" = "8:Microsoft.AnalysisServices.Core.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Microsoft.AnalysisServices.Core.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_CAD31D6A85364CAA9F9BFC2750F80458" + "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}:_FB48CD08F86F4E088E6AC75108A88247" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x64\\widevinecdmadapter.dll" @@ -9063,15 +9284,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Power BI ALM Toolkit" - "ProductCode" = "8:{01072227-F237-4962-8D23-D789DE836FBB}" - "PackageCode" = "8:{FA6E09F0-A5BB-4146-803D-853AE9F08F0C}" + "ProductCode" = "8:{BB0B7276-6025-48C7-B78F-70C1A5AD13B4}" + "PackageCode" = "8:{F5907F96-8228-4FB9-814B-F9C59D026ED8}" "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.29" + "ProductVersion" = "8:5.0.31" "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 6ce9f8d..28c8673 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.29.0")] -[assembly: AssemblyFileVersion("5.0.29.0")] +[assembly: AssemblyVersion("5.0.31.0")] +[assembly: AssemblyFileVersion("5.0.31.0")] diff --git a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs index 9b1217d..3688ecf 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.29.0")] -[assembly: AssemblyFileVersion("5.0.29.0")] +[assembly: AssemblyVersion("5.0.31.0")] +[assembly: AssemblyFileVersion("5.0.31.0")] diff --git a/BismNormalizer/BismNormalizer.Tests/BismNormalizer.Tests.csproj b/BismNormalizer/BismNormalizer.Tests/BismNormalizer.Tests.csproj index 61e72c2..e4a6480 100644 --- a/BismNormalizer/BismNormalizer.Tests/BismNormalizer.Tests.csproj +++ b/BismNormalizer/BismNormalizer.Tests/BismNormalizer.Tests.csproj @@ -40,20 +40,20 @@ 4 - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.22.0.1\lib\net45\Microsoft.AnalysisServices.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.22.0.1\lib\net45\Microsoft.AnalysisServices.Core.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Core.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.22.0.1\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.22.0.1\lib\net45\Microsoft.AnalysisServices.Tabular.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Tabular.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.22.0.1\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll diff --git a/BismNormalizer/BismNormalizer.Tests/packages.config b/BismNormalizer/BismNormalizer.Tests/packages.config index a66fbfc..01c4326 100644 --- a/BismNormalizer/BismNormalizer.Tests/packages.config +++ b/BismNormalizer/BismNormalizer.Tests/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe index a0fd9da..75a9f96 100644 Binary files a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe and b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe differ diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.csproj b/BismNormalizer/BismNormalizer/BismNormalizer.csproj index 58a2c42..eafd8cf 100644 --- a/BismNormalizer/BismNormalizer/BismNormalizer.csproj +++ b/BismNormalizer/BismNormalizer/BismNormalizer.csproj @@ -101,20 +101,20 @@ ..\packages\Microsoft.ApplicationInsights.WindowsServer.2.8.1\lib\net45\Microsoft.AI.WindowsServer.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.22.0.1\lib\net45\Microsoft.AnalysisServices.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.22.0.1\lib\net45\Microsoft.AnalysisServices.Core.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Core.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.22.0.1\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.22.0.1\lib\net45\Microsoft.AnalysisServices.Tabular.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Tabular.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.22.0.1\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.39.2.2\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll ..\packages\Microsoft.ApplicationInsights.2.8.1\lib\net46\Microsoft.ApplicationInsights.dll diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.exe b/BismNormalizer/BismNormalizer/BismNormalizer.exe index 55a87ae..73818aa 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 888b3ee..e38bd26 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.29.0")] -[assembly: AssemblyFileVersion("5.0.29.0")] +[assembly: AssemblyVersion("5.0.31.0")] +[assembly: AssemblyFileVersion("5.0.31.0")] diff --git a/BismNormalizer/BismNormalizer/Settings.Designer.cs b/BismNormalizer/BismNormalizer/Settings.Designer.cs index 0a7a146..556c207 100644 --- a/BismNormalizer/BismNormalizer/Settings.Designer.cs +++ b/BismNormalizer/BismNormalizer/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace BismNormalizer { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -349,7 +349,7 @@ namespace BismNormalizer { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] + [global::System.Configuration.DefaultSettingValueAttribute("False")] public bool OptionLineageTag { get { return ((bool)(this["OptionLineageTag"])); diff --git a/BismNormalizer/BismNormalizer/Settings.settings b/BismNormalizer/BismNormalizer/Settings.settings index 5b96a72..b2103ee 100644 --- a/BismNormalizer/BismNormalizer/Settings.settings +++ b/BismNormalizer/BismNormalizer/Settings.settings @@ -84,7 +84,7 @@ True - True + False False diff --git a/BismNormalizer/BismNormalizer/TabularCompare/UI/ConnectionsAlmt.cs b/BismNormalizer/BismNormalizer/TabularCompare/UI/ConnectionsAlmt.cs index 76a738c..14ae4de 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/UI/ConnectionsAlmt.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/UI/ConnectionsAlmt.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using System.Windows.Forms; -using Microsoft.AnalysisServices; +using Tom=Microsoft.AnalysisServices.Tabular; using System.Drawing; using BismNormalizer.TabularCompare.UI.DesktopInstances; using System.Linq.Expressions; @@ -505,10 +505,10 @@ namespace BismNormalizer.TabularCompare.UI string currentDb = cboCatalog.Text; // discover databases - Server server = new Server(); + Tom.Server server = new Tom.Server(); server.Connect($"Provider=MSOLAP;Data Source={serverName};"); List databases = new List(); - foreach (Database database in server.Databases) + foreach (Tom.Database database in server.Databases) { databases.Add(database.Name); } diff --git a/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.Designer.cs b/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.Designer.cs index 9ef5242..9b091ee 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.Designer.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.Designer.cs @@ -49,6 +49,7 @@ this.panel2 = new System.Windows.Forms.Panel(); this.btnCancel = new System.Windows.Forms.Button(); this.btnOK = new System.Windows.Forms.Button(); + this.lblProcessingWarning = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.panel2.SuspendLayout(); @@ -126,7 +127,7 @@ this.groupBox1.Margin = new System.Windows.Forms.Padding(6); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(6); - this.groupBox1.Size = new System.Drawing.Size(822, 756); + this.groupBox1.Size = new System.Drawing.Size(794, 756); this.groupBox1.TabIndex = 22; this.groupBox1.TabStop = false; this.groupBox1.Text = "Comparison Options"; @@ -239,6 +240,8 @@ // // groupBox2 // + this.groupBox2.AutoSize = true; + this.groupBox2.Controls.Add(this.lblProcessingWarning); this.groupBox2.Controls.Add(this.chkAffectedTables); this.groupBox2.Controls.Add(this.cboProcessingOption); this.groupBox2.Controls.Add(this.label1); @@ -247,7 +250,7 @@ this.groupBox2.Margin = new System.Windows.Forms.Padding(6); this.groupBox2.Name = "groupBox2"; this.groupBox2.Padding = new System.Windows.Forms.Padding(6); - this.groupBox2.Size = new System.Drawing.Size(822, 194); + this.groupBox2.Size = new System.Drawing.Size(794, 255); this.groupBox2.TabIndex = 23; this.groupBox2.TabStop = false; this.groupBox2.Text = "Database Deployment"; @@ -257,7 +260,7 @@ this.chkAffectedTables.AutoSize = true; this.chkAffectedTables.Checked = true; this.chkAffectedTables.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkAffectedTables.Location = new System.Drawing.Point(38, 121); + this.chkAffectedTables.Location = new System.Drawing.Point(38, 103); this.chkAffectedTables.Margin = new System.Windows.Forms.Padding(6); this.chkAffectedTables.Name = "chkAffectedTables"; this.chkAffectedTables.Size = new System.Drawing.Size(315, 29); @@ -278,8 +281,9 @@ this.cboProcessingOption.Location = new System.Drawing.Point(238, 46); this.cboProcessingOption.Margin = new System.Windows.Forms.Padding(6); this.cboProcessingOption.Name = "cboProcessingOption"; - this.cboProcessingOption.Size = new System.Drawing.Size(404, 33); + this.cboProcessingOption.Size = new System.Drawing.Size(376, 33); this.cboProcessingOption.TabIndex = 30; + this.cboProcessingOption.SelectedIndexChanged += new System.EventHandler(this.cboProcessingOption_SelectedIndexChanged); // // label1 // @@ -296,17 +300,17 @@ this.panel2.Controls.Add(this.btnCancel); this.panel2.Controls.Add(this.btnOK); this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel2.Location = new System.Drawing.Point(0, 972); + this.panel2.Location = new System.Drawing.Point(0, 1015); this.panel2.Margin = new System.Windows.Forms.Padding(2); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(822, 86); + this.panel2.Size = new System.Drawing.Size(794, 86); this.panel2.TabIndex = 24; // // btnCancel // this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(652, 19); + this.btnCancel.Location = new System.Drawing.Point(624, 19); this.btnCancel.Margin = new System.Windows.Forms.Padding(6); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(142, 44); @@ -318,7 +322,7 @@ // this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.Location = new System.Drawing.Point(502, 19); + this.btnOK.Location = new System.Drawing.Point(474, 19); this.btnOK.Margin = new System.Windows.Forms.Padding(6); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(138, 44); @@ -326,6 +330,19 @@ this.btnOK.Text = "OK"; this.btnOK.UseVisualStyleBackColor = true; this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // + // lblProcessingWarning + // + this.lblProcessingWarning.AutoSize = true; + this.lblProcessingWarning.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.875F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblProcessingWarning.Location = new System.Drawing.Point(73, 150); + this.lblProcessingWarning.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.lblProcessingWarning.Name = "lblProcessingWarning"; + this.lblProcessingWarning.Size = new System.Drawing.Size(612, 75); + this.lblProcessingWarning.TabIndex = 32; + this.lblProcessingWarning.Text = "⚠️ Warning: if your dataset requires long-running refreshes, it\'s\r\nrecommended to" + + " select Recalc or Do Not Process and refresh\r\nfrom SSMS after deployment for bet" + + "ter visibility of progress."; // // Options // @@ -333,7 +350,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.btnCancel; - this.ClientSize = new System.Drawing.Size(822, 1058); + this.ClientSize = new System.Drawing.Size(794, 1101); this.Controls.Add(this.panel2); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); @@ -353,6 +370,7 @@ this.groupBox2.PerformLayout(); this.panel2.ResumeLayout(false); this.ResumeLayout(false); + this.PerformLayout(); } @@ -378,5 +396,6 @@ private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Button btnCancel; private System.Windows.Forms.Button btnOK; + private System.Windows.Forms.Label lblProcessingWarning; } } \ No newline at end of file diff --git a/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.cs b/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.cs index 7099ac7..3e7ff23 100644 --- a/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.cs +++ b/BismNormalizer/BismNormalizer/TabularCompare/UI/Options.cs @@ -139,5 +139,10 @@ namespace BismNormalizer.TabularCompare.UI get { return _dpiScaleFactor; } set { _dpiScaleFactor = value; } } + + private void cboProcessingOption_SelectedIndexChanged(object sender, EventArgs e) + { + lblProcessingWarning.Visible = (cboProcessingOption.Text != "Recalc" && cboProcessingOption.Text != "Do Not Process"); + } } } diff --git a/BismNormalizer/BismNormalizer/app.config b/BismNormalizer/BismNormalizer/app.config index 21cacd0..6110106 100644 --- a/BismNormalizer/BismNormalizer/app.config +++ b/BismNormalizer/BismNormalizer/app.config @@ -89,7 +89,7 @@ True - True + False False diff --git a/BismNormalizer/BismNormalizer/packages.config b/BismNormalizer/BismNormalizer/packages.config index 37a8bc7..3c1d11b 100644 --- a/BismNormalizer/BismNormalizer/packages.config +++ b/BismNormalizer/BismNormalizer/packages.config @@ -2,7 +2,7 @@ - + diff --git a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest index 8ee051c..9544e88 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/