diff --git a/AlmToolkit/AlmToolkit/AlmToolkit.csproj b/AlmToolkit/AlmToolkit/AlmToolkit.csproj index 6502bc9..e99bd2c 100644 --- a/AlmToolkit/AlmToolkit/AlmToolkit.csproj +++ b/AlmToolkit/AlmToolkit/AlmToolkit.csproj @@ -62,20 +62,20 @@ true - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.67.0\lib\net45\Microsoft.AnalysisServices.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.74.2\lib\net45\Microsoft.AnalysisServices.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.67.0\lib\net45\Microsoft.AnalysisServices.Core.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.74.2\lib\net45\Microsoft.AnalysisServices.Core.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.67.0\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.74.2\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.67.0\lib\net45\Microsoft.AnalysisServices.Tabular.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.74.2\lib\net45\Microsoft.AnalysisServices.Tabular.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.67.0\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.74.2\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll ..\packages\Microsoft.Identity.Client.4.43.0\lib\net461\Microsoft.Identity.Client.dll diff --git a/AlmToolkit/AlmToolkit/ComparisonForm.cs b/AlmToolkit/AlmToolkit/ComparisonForm.cs index 0398618..73fc662 100644 --- a/AlmToolkit/AlmToolkit/ComparisonForm.cs +++ b/AlmToolkit/AlmToolkit/ComparisonForm.cs @@ -123,12 +123,19 @@ namespace AlmToolkit var client = new Octokit.GitHubClient(new Octokit.ProductHeaderValue("Microsoft")); var releases = await client.Repository.Release.GetAll("Microsoft", "Analysis-Services"); - //TODO: iterate releases and check for latest.Name starts with "ALM Toolkit" - var latest = releases[0]; - _latestVersion = latest.TagName; - var installedVersion = new Version(Utils.AssemblyVersion); - var latestVersion = new Version(_latestVersion); - var result = latestVersion.CompareTo(installedVersion); + var result = 0; + for (int i = 0; i < releases.Count - 1; i++) + { + if (!releases[i].Prerelease && releases[i].Name.StartsWith("ALM Toolkit")) + { + var latest = releases[i]; + _latestVersion = latest.TagName; + var installedVersion = new Version(Utils.AssemblyVersion); + var latestVersion = new Version(_latestVersion); + result = latestVersion.CompareTo(installedVersion); + break; + } + } if (result > 0) { diff --git a/AlmToolkit/AlmToolkit/packages.config b/AlmToolkit/AlmToolkit/packages.config index 0dc0bc2..5760c8b 100644 --- a/AlmToolkit/AlmToolkit/packages.config +++ b/AlmToolkit/AlmToolkit/packages.config @@ -4,7 +4,7 @@ - + diff --git a/AlmToolkit/AlmToolkitSetup/AlmToolkitSetup.vdproj b/AlmToolkit/AlmToolkitSetup/AlmToolkitSetup.vdproj index 749eb42..f97785a 100644 --- a/AlmToolkit/AlmToolkitSetup/AlmToolkitSetup.vdproj +++ b/AlmToolkit/AlmToolkitSetup/AlmToolkitSetup.vdproj @@ -45,6 +45,24 @@ } "Entry" { + "MsmKey" = "8:_02560C355A156BFB878AC6B19B8E8E26" + "OwnerKey" = "8:_AB4B94DF593FA17412A5DE06DE46CBCA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_02560C355A156BFB878AC6B19B8E8E26" + "OwnerKey" = "8:_F309827370AC495A9BD0DB04FAD28655" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_02560C355A156BFB878AC6B19B8E8E26" + "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_02B908EED05544D48D060CDE98C98500" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -141,6 +159,48 @@ } "Entry" { + "MsmKey" = "8:_0DF2C71DE59EE13251BE9D1066136FAB" + "OwnerKey" = "8:_AB4B94DF593FA17412A5DE06DE46CBCA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0DF2C71DE59EE13251BE9D1066136FAB" + "OwnerKey" = "8:_F309827370AC495A9BD0DB04FAD28655" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0DF2C71DE59EE13251BE9D1066136FAB" + "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0E00FB1834FFB679A8CF21DDC95D674B" + "OwnerKey" = "8:_0DF2C71DE59EE13251BE9D1066136FAB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0E00FB1834FFB679A8CF21DDC95D674B" + "OwnerKey" = "8:_F309827370AC495A9BD0DB04FAD28655" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0E00FB1834FFB679A8CF21DDC95D674B" + "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_0E00FB1834FFB679A8CF21DDC95D674B" + "OwnerKey" = "8:_AB4B94DF593FA17412A5DE06DE46CBCA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_0F49DEDB2074463D9030FA4AE38D45AD" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -153,18 +213,6 @@ } "Entry" { - "MsmKey" = "8:_123466263E0F5E290CCB5AF8D134D456" - "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_123466263E0F5E290CCB5AF8D134D456" - "OwnerKey" = "8:_F309827370AC495A9BD0DB04FAD28655" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_12952E1B518442C792B0E14B8A26A96C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -267,12 +315,36 @@ } "Entry" { + "MsmKey" = "8:_1CBA7B7389E9502B11BFEBD5B65825CB" + "OwnerKey" = "8:_AB4B94DF593FA17412A5DE06DE46CBCA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1CBA7B7389E9502B11BFEBD5B65825CB" + "OwnerKey" = "8:_F309827370AC495A9BD0DB04FAD28655" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_1CBA7B7389E9502B11BFEBD5B65825CB" + "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_1CBC0D31B94847B8AB3F4EEE8C2E2AEA" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { + "MsmKey" = "8:_1CC188F33B7669B1B0DA64F982EF1CB5" + "OwnerKey" = "8:_0E00FB1834FFB679A8CF21DDC95D674B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_1DB98A7A0CB444D1A2B66705A9D39072" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -399,6 +471,24 @@ } "Entry" { + "MsmKey" = "8:_369420F98DB02C7550B8A6D3CE280708" + "OwnerKey" = "8:_ACD75FE8A5AB414137084DAFAE4F2810" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_369420F98DB02C7550B8A6D3CE280708" + "OwnerKey" = "8:_F309827370AC495A9BD0DB04FAD28655" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_369420F98DB02C7550B8A6D3CE280708" + "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_398A6E4223264F1A983B367A01F3D711" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -531,30 +621,6 @@ } "Entry" { - "MsmKey" = "8:_51891C8FA300D23C81F1763BC0D0AF7D" - "OwnerKey" = "8:_F873E4A058ECBACDF0763357A8761EBC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_51891C8FA300D23C81F1763BC0D0AF7D" - "OwnerKey" = "8:_F309827370AC495A9BD0DB04FAD28655" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_51891C8FA300D23C81F1763BC0D0AF7D" - "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_51891C8FA300D23C81F1763BC0D0AF7D" - "OwnerKey" = "8:_E4C2BEB281075EBC25D1BEB26525D550" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_53E4E5E57424451BA3E043313D35FFAB" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -651,36 +717,6 @@ } "Entry" { - "MsmKey" = "8:_5E2E943870CB11337AA18A51A8C67156" - "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5E2E943870CB11337AA18A51A8C67156" - "OwnerKey" = "8:_F309827370AC495A9BD0DB04FAD28655" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5E2E943870CB11337AA18A51A8C67156" - "OwnerKey" = "8:_123466263E0F5E290CCB5AF8D134D456" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5E2E943870CB11337AA18A51A8C67156" - "OwnerKey" = "8:_F873E4A058ECBACDF0763357A8761EBC" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5E2E943870CB11337AA18A51A8C67156" - "OwnerKey" = "8:_E4C2BEB281075EBC25D1BEB26525D550" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_5E32BA564C7841D39495225F421F651C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -753,6 +789,30 @@ } "Entry" { + "MsmKey" = "8:_68EB97D62CA7A283B36B8BE719FF0740" + "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_68EB97D62CA7A283B36B8BE719FF0740" + "OwnerKey" = "8:_E1A714C751224A7B8E0E5C14E99D58DD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_68EB97D62CA7A283B36B8BE719FF0740" + "OwnerKey" = "8:_64B4818F1DC94D179587C8D5D56594A6" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_68EB97D62CA7A283B36B8BE719FF0740" + "OwnerKey" = "8:_74D0CFFDC0D4C8D72F223E0F32A8F8A8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_68FF424367C5466A88CFC007A9E30B49" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -850,7 +910,7 @@ "Entry" { "MsmKey" = "8:_75BB22B17DBBC9365301E85E6861CE11" - "OwnerKey" = "8:_5E2E943870CB11337AA18A51A8C67156" + "OwnerKey" = "8:_ACD75FE8A5AB414137084DAFAE4F2810" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -945,6 +1005,24 @@ } "Entry" { + "MsmKey" = "8:_806FD120791C1B61ADE93788E25FD572" + "OwnerKey" = "8:_F309827370AC495A9BD0DB04FAD28655" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_806FD120791C1B61ADE93788E25FD572" + "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_806FD120791C1B61ADE93788E25FD572" + "OwnerKey" = "8:_ACD75FE8A5AB414137084DAFAE4F2810" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_816EB9A9EB144D69B698491B28F0084C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1042,7 +1120,7 @@ "Entry" { "MsmKey" = "8:_9077CE3465D561E97CE2A5DD6EED4DB8" - "OwnerKey" = "8:_123466263E0F5E290CCB5AF8D134D456" + "OwnerKey" = "8:_AB4B94DF593FA17412A5DE06DE46CBCA" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1071,6 +1149,78 @@ } "Entry" { + "MsmKey" = "8:_949F2DFAF830746B200660AC67401BAB" + "OwnerKey" = "8:_68EB97D62CA7A283B36B8BE719FF0740" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_949F2DFAF830746B200660AC67401BAB" + "OwnerKey" = "8:_E1A714C751224A7B8E0E5C14E99D58DD" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_949F2DFAF830746B200660AC67401BAB" + "OwnerKey" = "8:_B291DB438DA0419D85C92E3C51EF00D8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_949F2DFAF830746B200660AC67401BAB" + "OwnerKey" = "8:_775A7D5A870A431DB554A3FA6AFA1184" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_949F2DFAF830746B200660AC67401BAB" + "OwnerKey" = "8:_7665035E445F469891AA5877B91E8B91" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_949F2DFAF830746B200660AC67401BAB" + "OwnerKey" = "8:_64B4818F1DC94D179587C8D5D56594A6" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_949F2DFAF830746B200660AC67401BAB" + "OwnerKey" = "8:_461550E8A9454231B859B9D326CD1927" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_949F2DFAF830746B200660AC67401BAB" + "OwnerKey" = "8:_2FD7D0991CEE4239B0A4A595169E13C6" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_949F2DFAF830746B200660AC67401BAB" + "OwnerKey" = "8:_1751AD5E082923E8A2F105F819A43BC7" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_949F2DFAF830746B200660AC67401BAB" + "OwnerKey" = "8:_26D597F6444A4F02AEEEAD5FC81423CE" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_949F2DFAF830746B200660AC67401BAB" + "OwnerKey" = "8:_74D0CFFDC0D4C8D72F223E0F32A8F8A8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_949F2DFAF830746B200660AC67401BAB" + "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_95AA6A3C8C0141878024D165AA53686B" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1096,7 +1246,7 @@ "Entry" { "MsmKey" = "8:_9A7522C8CBE504E72FF4AED00A556F7D" - "OwnerKey" = "8:_5E2E943870CB11337AA18A51A8C67156" + "OwnerKey" = "8:_ACD75FE8A5AB414137084DAFAE4F2810" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1167,80 +1317,20 @@ } "Entry" { - "MsmKey" = "8:_AB4CD7788D0347F4923B943154E11779" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_ABBF03C1243CDAD68E41F94BEB537230" - "OwnerKey" = "8:_26D597F6444A4F02AEEEAD5FC81423CE" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_ABBF03C1243CDAD68E41F94BEB537230" - "OwnerKey" = "8:_74D0CFFDC0D4C8D72F223E0F32A8F8A8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_ABBF03C1243CDAD68E41F94BEB537230" + "MsmKey" = "8:_AB4B94DF593FA17412A5DE06DE46CBCA" "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ABBF03C1243CDAD68E41F94BEB537230" - "OwnerKey" = "8:_E1A714C751224A7B8E0E5C14E99D58DD" + "MsmKey" = "8:_AB4B94DF593FA17412A5DE06DE46CBCA" + "OwnerKey" = "8:_F309827370AC495A9BD0DB04FAD28655" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ABBF03C1243CDAD68E41F94BEB537230" - "OwnerKey" = "8:_B291DB438DA0419D85C92E3C51EF00D8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_ABBF03C1243CDAD68E41F94BEB537230" - "OwnerKey" = "8:_775A7D5A870A431DB554A3FA6AFA1184" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_ABBF03C1243CDAD68E41F94BEB537230" - "OwnerKey" = "8:_7665035E445F469891AA5877B91E8B91" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_ABBF03C1243CDAD68E41F94BEB537230" - "OwnerKey" = "8:_64B4818F1DC94D179587C8D5D56594A6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_ABBF03C1243CDAD68E41F94BEB537230" - "OwnerKey" = "8:_E383BB200512FE4411F5848C4C7AD9AD" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_ABBF03C1243CDAD68E41F94BEB537230" - "OwnerKey" = "8:_461550E8A9454231B859B9D326CD1927" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_ABBF03C1243CDAD68E41F94BEB537230" - "OwnerKey" = "8:_2FD7D0991CEE4239B0A4A595169E13C6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_ABBF03C1243CDAD68E41F94BEB537230" - "OwnerKey" = "8:_1751AD5E082923E8A2F105F819A43BC7" + "MsmKey" = "8:_AB4CD7788D0347F4923B943154E11779" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1257,6 +1347,36 @@ } "Entry" { + "MsmKey" = "8:_ACD75FE8A5AB414137084DAFAE4F2810" + "OwnerKey" = "8:_AB4B94DF593FA17412A5DE06DE46CBCA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_ACD75FE8A5AB414137084DAFAE4F2810" + "OwnerKey" = "8:_F309827370AC495A9BD0DB04FAD28655" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_ACD75FE8A5AB414137084DAFAE4F2810" + "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_ACD75FE8A5AB414137084DAFAE4F2810" + "OwnerKey" = "8:_0E00FB1834FFB679A8CF21DDC95D674B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_ACD75FE8A5AB414137084DAFAE4F2810" + "OwnerKey" = "8:_0DF2C71DE59EE13251BE9D1066136FAB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_AE37447378914583BE92C8012BF0288C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1269,6 +1389,30 @@ } "Entry" { + "MsmKey" = "8:_B10F09E76339A1B2EE2869D104A8256F" + "OwnerKey" = "8:_0E00FB1834FFB679A8CF21DDC95D674B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B10F09E76339A1B2EE2869D104A8256F" + "OwnerKey" = "8:_F309827370AC495A9BD0DB04FAD28655" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B10F09E76339A1B2EE2869D104A8256F" + "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B10F09E76339A1B2EE2869D104A8256F" + "OwnerKey" = "8:_0DF2C71DE59EE13251BE9D1066136FAB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_B230AC4F3CAA464E9AFD5431EFE77A82" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1287,24 +1431,6 @@ } "Entry" { - "MsmKey" = "8:_B367628BE2B9F486B387A7E18255E03A" - "OwnerKey" = "8:_5E2E943870CB11337AA18A51A8C67156" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_B367628BE2B9F486B387A7E18255E03A" - "OwnerKey" = "8:_F309827370AC495A9BD0DB04FAD28655" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_B367628BE2B9F486B387A7E18255E03A" - "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_B3EF9601914C4B7CB566571B458703A3" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1521,24 +1647,6 @@ } "Entry" { - "MsmKey" = "8:_D94778EEA828A01B94502DDDEB22AD6F" - "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D94778EEA828A01B94502DDDEB22AD6F" - "OwnerKey" = "8:_F309827370AC495A9BD0DB04FAD28655" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D94778EEA828A01B94502DDDEB22AD6F" - "OwnerKey" = "8:_123466263E0F5E290CCB5AF8D134D456" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_D9BA16716A1A47C78E868D5351A48CE3" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1593,30 +1701,6 @@ } "Entry" { - "MsmKey" = "8:_E383BB200512FE4411F5848C4C7AD9AD" - "OwnerKey" = "8:_64B4818F1DC94D179587C8D5D56594A6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E383BB200512FE4411F5848C4C7AD9AD" - "OwnerKey" = "8:_74D0CFFDC0D4C8D72F223E0F32A8F8A8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E383BB200512FE4411F5848C4C7AD9AD" - "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E383BB200512FE4411F5848C4C7AD9AD" - "OwnerKey" = "8:_E1A714C751224A7B8E0E5C14E99D58DD" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_E3A372072C6E49FA844C6B6159862BAB" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1641,24 +1725,6 @@ } "Entry" { - "MsmKey" = "8:_E4C2BEB281075EBC25D1BEB26525D550" - "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E4C2BEB281075EBC25D1BEB26525D550" - "OwnerKey" = "8:_F309827370AC495A9BD0DB04FAD28655" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E4C2BEB281075EBC25D1BEB26525D550" - "OwnerKey" = "8:_123466263E0F5E290CCB5AF8D134D456" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_E5675B1E103A46029D1ABC3AA133081C" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1785,30 +1851,6 @@ } "Entry" { - "MsmKey" = "8:_F873E4A058ECBACDF0763357A8761EBC" - "OwnerKey" = "8:_E4C2BEB281075EBC25D1BEB26525D550" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_F873E4A058ECBACDF0763357A8761EBC" - "OwnerKey" = "8:_F309827370AC495A9BD0DB04FAD28655" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_F873E4A058ECBACDF0763357A8761EBC" - "OwnerKey" = "8:_123466263E0F5E290CCB5AF8D134D456" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_F873E4A058ECBACDF0763357A8761EBC" - "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_FCA912825A97469DB76BA5883B5B70D2" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -1852,42 +1894,6 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_123466263E0F5E290CCB5AF8D134D456" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_9077CE3465D561E97CE2A5DD6EED4DB8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_9C3EE83DC602B3FE678AED58CCAB913C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_74D0CFFDC0D4C8D72F223E0F32A8F8A8" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_E1A714C751224A7B8E0E5C14E99D58DD" "MsmSig" = "8:_UNDEFINED" } @@ -1924,18 +1930,6 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E383BB200512FE4411F5848C4C7AD9AD" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5E2E943870CB11337AA18A51A8C67156" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_461550E8A9454231B859B9D326CD1927" "MsmSig" = "8:_UNDEFINED" } @@ -1966,12 +1960,6 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_ABBF03C1243CDAD68E41F94BEB537230" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_0746E7B0341C477986CF7317120481F8" "MsmSig" = "8:_UNDEFINED" } @@ -1984,37 +1972,85 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D94778EEA828A01B94502DDDEB22AD6F" + "OwnerKey" = "8:_3F7854F6A19449499C929F1FD38D90D8" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E4C2BEB281075EBC25D1BEB26525D550" + "OwnerKey" = "8:_9C3EE83DC602B3FE678AED58CCAB913C" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_F873E4A058ECBACDF0763357A8761EBC" + "OwnerKey" = "8:_74D0CFFDC0D4C8D72F223E0F32A8F8A8" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_51891C8FA300D23C81F1763BC0D0AF7D" + "OwnerKey" = "8:_68EB97D62CA7A283B36B8BE719FF0740" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5E2E943870CB11337AA18A51A8C67156" + "OwnerKey" = "8:_949F2DFAF830746B200660AC67401BAB" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_B367628BE2B9F486B387A7E18255E03A" + "OwnerKey" = "8:_AB4B94DF593FA17412A5DE06DE46CBCA" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_02560C355A156BFB878AC6B19B8E8E26" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_0DF2C71DE59EE13251BE9D1066136FAB" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_0E00FB1834FFB679A8CF21DDC95D674B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_1CC188F33B7669B1B0DA64F982EF1CB5" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_B10F09E76339A1B2EE2869D104A8256F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_ACD75FE8A5AB414137084DAFAE4F2810" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_369420F98DB02C7550B8A6D3CE280708" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_1CBA7B7389E9502B11BFEBD5B65825CB" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2035,6 +2071,12 @@ "OwnerKey" = "8:_0C2E31F3C93C1D40E4ED84A33D755F3F" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_9077CE3465D561E97CE2A5DD6EED4DB8" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -2292,6 +2334,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_02560C355A156BFB878AC6B19B8E8E26" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_02560C355A156BFB878AC6B19B8E8E26" + { + "Name" = "8:Newtonsoft.Json.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Newtonsoft.Json.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" + "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}:_02B908EED05544D48D060CDE98C98500" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x64\\locales\\sl.pak" @@ -2614,6 +2687,68 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0DF2C71DE59EE13251BE9D1066136FAB" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices, Version=19.74.2.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_0DF2C71DE59EE13251BE9D1066136FAB" + { + "Name" = "8:Microsoft.AnalysisServices.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Microsoft.AnalysisServices.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" + "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:" + } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0E00FB1834FFB679A8CF21DDC95D674B" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular, Version=19.74.2.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_0E00FB1834FFB679A8CF21DDC95D674B" + { + "Name" = "8:Microsoft.AnalysisServices.Tabular.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Microsoft.AnalysisServices.Tabular.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" + "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}:_0F49DEDB2074463D9030FA4AE38D45AD" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\html-resources\\dist\\23.chunk.js" @@ -2654,37 +2789,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_123466263E0F5E290CCB5AF8D134D456" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.65.0, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_123466263E0F5E290CCB5AF8D134D456" - { - "Name" = "8:BismNormalizer.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:BismNormalizer.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" - "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}:_12952E1B518442C792B0E14B8A26A96C" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x86\\locales\\el.pak" @@ -3016,6 +3120,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1CBA7B7389E9502B11BFEBD5B65825CB" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Ookii.Dialogs.WinForms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=66aa232afad40158, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_1CBA7B7389E9502B11BFEBD5B65825CB" + { + "Name" = "8:Ookii.Dialogs.WinForms.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Ookii.Dialogs.WinForms.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" + "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}:_1CBC0D31B94847B8AB3F4EEE8C2E2AEA" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x64\\locales\\ko.pak" @@ -3036,6 +3171,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1CC188F33B7669B1B0DA64F982EF1CB5" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:TRUE" + "AssemblyAsmDisplayName" = "8:System.IO.Compression, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_1CC188F33B7669B1B0DA64F982EF1CB5" + { + "Name" = "8:System.IO.Compression.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:System.IO.Compression.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" + "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}:_1DB98A7A0CB444D1A2B66705A9D39072" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x86\\locales\\bg.pak" @@ -3478,6 +3644,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_369420F98DB02C7550B8A6D3CE280708" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.SPClient.Interfaces, Version=19.74.2.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_369420F98DB02C7550B8A6D3CE280708" + { + "Name" = "8:Microsoft.AnalysisServices.SPClient.Interfaces.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Microsoft.AnalysisServices.SPClient.Interfaces.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" + "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}:_398A6E4223264F1A983B367A01F3D711" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x86\\locales\\gu.pak" @@ -3920,37 +4117,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_51891C8FA300D23C81F1763BC0D0AF7D" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular.Json, Version=19.67.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_51891C8FA300D23C81F1763BC0D0AF7D" - { - "Name" = "8:Microsoft.AnalysisServices.Tabular.Json.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Microsoft.AnalysisServices.Tabular.Json.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" - "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}:_53E4E5E57424451BA3E043313D35FFAB" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x86\\locales\\lt.pak" @@ -4271,37 +4437,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5E2E943870CB11337AA18A51A8C67156" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Core, Version=19.67.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_5E2E943870CB11337AA18A51A8C67156" - { - "Name" = "8:Microsoft.AnalysisServices.Core.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Microsoft.AnalysisServices.Core.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" - "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}:_5E32BA564C7841D39495225F421F651C" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x86\\CefSharp.Core.pdb" @@ -4553,6 +4688,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_68EB97D62CA7A283B36B8BE719FF0740" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:CefSharp.Core, Version=63.0.3.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86" + "ScatterAssemblies" + { + "_68EB97D62CA7A283B36B8BE719FF0740" + { + "Name" = "8:CefSharp.Core.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:CefSharp.Core.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" + "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:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_68FF424367C5466A88CFC007A9E30B49" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\html-resources\\dist\\17.chunk.js" @@ -5574,6 +5740,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_949F2DFAF830746B200660AC67401BAB" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:CefSharp, Version=63.0.3.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86" + "ScatterAssemblies" + { + "_949F2DFAF830746B200660AC67401BAB" + { + "Name" = "8:CefSharp.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:CefSharp.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" + "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:TRUE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_95AA6A3C8C0141878024D165AA53686B" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\html-resources\\dist\\7.chunk.js" @@ -5876,6 +6073,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_AB4B94DF593FA17412A5DE06DE46CBCA" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.68.0, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_AB4B94DF593FA17412A5DE06DE46CBCA" + { + "Name" = "8:BismNormalizer.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:BismNormalizer.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" + "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}:_AB4CD7788D0347F4923B943154E11779" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\html-resources\\dist\\25.chunk.js" @@ -5896,37 +6124,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_ABBF03C1243CDAD68E41F94BEB537230" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:CefSharp, Version=63.0.3.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86" - "ScatterAssemblies" - { - "_ABBF03C1243CDAD68E41F94BEB537230" - { - "Name" = "8:CefSharp.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:CefSharp.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" - "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:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ACA403E240EF4203BD2B14AFC6C9FAEF" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x86\\libEGL.dll" @@ -5978,6 +6175,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_ACD75FE8A5AB414137084DAFAE4F2810" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Core, Version=19.74.2.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_ACD75FE8A5AB414137084DAFAE4F2810" + { + "Name" = "8:Microsoft.AnalysisServices.Core.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Microsoft.AnalysisServices.Core.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" + "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}:_AE37447378914583BE92C8012BF0288C" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x86\\cef_extensions.pak" @@ -6018,6 +6246,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B10F09E76339A1B2EE2869D104A8256F" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular.Json, Version=19.74.2.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_B10F09E76339A1B2EE2869D104A8256F" + { + "Name" = "8:Microsoft.AnalysisServices.Tabular.Json.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Microsoft.AnalysisServices.Tabular.Json.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" + "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}:_B230AC4F3CAA464E9AFD5431EFE77A82" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x86\\locales\\nl.pak" @@ -6089,37 +6348,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B367628BE2B9F486B387A7E18255E03A" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.SPClient.Interfaces, Version=19.67.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_B367628BE2B9F486B387A7E18255E03A" - { - "Name" = "8:Microsoft.AnalysisServices.SPClient.Interfaces.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Microsoft.AnalysisServices.SPClient.Interfaces.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" - "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}:_B3EF9601914C4B7CB566571B458703A3" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x64\\locales\\fi.pak" @@ -6840,37 +7068,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D94778EEA828A01B94502DDDEB22AD6F" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_D94778EEA828A01B94502DDDEB22AD6F" - { - "Name" = "8:Newtonsoft.Json.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Newtonsoft.Json.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" - "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}:_D9BA16716A1A47C78E868D5351A48CE3" { "SourcePath" = "8:..\\AlmToolkit\\Images\\BismNormalizerBanner.png" @@ -7062,37 +7259,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E383BB200512FE4411F5848C4C7AD9AD" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:CefSharp.Core, Version=63.0.3.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86" - "ScatterAssemblies" - { - "_E383BB200512FE4411F5848C4C7AD9AD" - { - "Name" = "8:CefSharp.Core.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:CefSharp.Core.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" - "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:TRUE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E3A372072C6E49FA844C6B6159862BAB" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x86\\swiftshader\\libGLESv2.dll" @@ -7173,37 +7339,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E4C2BEB281075EBC25D1BEB26525D550" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices, Version=19.67.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_E4C2BEB281075EBC25D1BEB26525D550" - { - "Name" = "8:Microsoft.AnalysisServices.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Microsoft.AnalysisServices.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" - "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}:_E5675B1E103A46029D1ABC3AA133081C" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\x64\\cef.pak" @@ -7615,37 +7750,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F873E4A058ECBACDF0763357A8761EBC" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.AnalysisServices.Tabular, Version=19.67.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_F873E4A058ECBACDF0763357A8761EBC" - { - "Name" = "8:Microsoft.AnalysisServices.Tabular.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Microsoft.AnalysisServices.Tabular.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_C8670E11D011446AA28D0CEE146CA002" - "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}:_FCA912825A97469DB76BA5883B5B70D2" { "SourcePath" = "8:..\\AlmToolkit\\bin\\Release\\html-resources\\dist\\12.chunk.js" @@ -8054,15 +8158,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Power BI ALM Toolkit" - "ProductCode" = "8:{489328A5-159B-4F16-B761-8D1E3D185DDF}" - "PackageCode" = "8:{3B9DB6FE-B728-4A00-90DB-7F86840B746E}" + "ProductCode" = "8:{BBA11760-B3AA-47AC-A324-895FACC7BCDA}" + "PackageCode" = "8:{86CEAD68-5A79-4D6E-9F7A-B3177E645506}" "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.65" + "ProductVersion" = "8:5.0.69" "Manufacturer" = "8:Power BI ALM Toolkit" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/AlmToolkit/BismNormalizer.CommandLine/App.config b/AlmToolkit/BismNormalizer.CommandLine/App.config index c5af8dd..dd9c613 100644 --- a/AlmToolkit/BismNormalizer.CommandLine/App.config +++ b/AlmToolkit/BismNormalizer.CommandLine/App.config @@ -5,10 +5,6 @@ - - - - diff --git a/AlmToolkit/BismNormalizer.CommandLine/Program.cs b/AlmToolkit/BismNormalizer.CommandLine/Program.cs index 2ca33b5..dc06241 100644 --- a/AlmToolkit/BismNormalizer.CommandLine/Program.cs +++ b/AlmToolkit/BismNormalizer.CommandLine/Program.cs @@ -22,6 +22,7 @@ namespace BismNormalizer.CommandLine string scriptFile = null; List skipOptions = null; bool credsProvided = false; + bool upgradeCompatLevel = false; string sourceUsername = ""; string sourcePassword = ""; string targetUsername = ""; @@ -61,6 +62,8 @@ namespace BismNormalizer.CommandLine Console.WriteLine(""); Console.WriteLine(" /CredsProvided:True|False : User credentials from the command line to connect to Analysis Services."); Console.WriteLine(""); + Console.WriteLine(" /UpgradeCompatLevel:True|False : Automatically upgrade target compat level if it's less than the source one."); + Console.WriteLine(""); Console.WriteLine(" /SourceUsername:SourceUsername : Source database username."); Console.WriteLine(""); Console.WriteLine(" /SourcePassword:SourcePassword : Source database password."); @@ -81,6 +84,7 @@ namespace BismNormalizer.CommandLine const string scriptPrefix = "/script:"; const string skipPrefix = "/skip:"; const string credsProvidedPrefix = "/credsprovided:"; + const string upgradeCompatLevelPrefix = "/upgradecompatlevel:"; const string sourceUsernamePrefix = "/sourceusername:"; const string sourcePasswordPrefix = "/sourcepassword:"; const string targetUsernamePrefix = "/targetusername:"; @@ -126,6 +130,23 @@ namespace BismNormalizer.CommandLine return ERROR_BAD_ARGUMENTS; } } + else if (args[i].Length >= upgradeCompatLevelPrefix.Length && args[i].Substring(0, upgradeCompatLevelPrefix.Length).ToLower() == upgradeCompatLevelPrefix) + { + string upgradeCompatLevelString = args[i].Substring(upgradeCompatLevelPrefix.Length, args[i].Length - upgradeCompatLevelPrefix.Length); + if (upgradeCompatLevelString == "True") + { + upgradeCompatLevel = true; + } + else if (upgradeCompatLevelString == "False") + { + upgradeCompatLevel = false; + } + else + { + Console.WriteLine($"'{args[i]}' is not a valid argument."); + return ERROR_BAD_ARGUMENTS; + } + } else if (args[i].Length >= sourceUsernamePrefix.Length && args[i].Substring(0, sourceUsernamePrefix.Length).ToLower() == sourceUsernamePrefix) { sourceUsername = args[i].Substring(sourceUsernamePrefix.Length, args[i].Length - sourceUsernamePrefix.Length); @@ -169,6 +190,7 @@ namespace BismNormalizer.CommandLine } Console.WriteLine($"About to deserialize {bsmnFile}"); ComparisonInfo comparisonInfo = ComparisonInfo.DeserializeBsmnFile(bsmnFile, "BISM Normalizer Command Line"); + comparisonInfo.Interactive = false; Console.WriteLine(); if (comparisonInfo.ConnectionInfoSource.UseProject) @@ -210,6 +232,7 @@ namespace BismNormalizer.CommandLine comparisonInfo.WorkspaceServer = workspaceServer; } } + comparisonInfo.UpgradeCompatLevel = upgradeCompatLevel; _comparison = ComparisonFactory.CreateComparison(comparisonInfo); _comparison.ValidationMessage += HandleValidationMessage; diff --git a/AlmToolkit/BismNormalizer.Tests/BismNormalizer.Tests.csproj b/AlmToolkit/BismNormalizer.Tests/BismNormalizer.Tests.csproj index a793692..12aa3fd 100644 --- a/AlmToolkit/BismNormalizer.Tests/BismNormalizer.Tests.csproj +++ b/AlmToolkit/BismNormalizer.Tests/BismNormalizer.Tests.csproj @@ -40,20 +40,20 @@ 4 - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.69.2.1\lib\net45\Microsoft.AnalysisServices.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.74.2\lib\net45\Microsoft.AnalysisServices.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.69.2.1\lib\net45\Microsoft.AnalysisServices.Core.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.74.2\lib\net45\Microsoft.AnalysisServices.Core.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.69.2.1\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.74.2\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.69.2.1\lib\net45\Microsoft.AnalysisServices.Tabular.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.74.2\lib\net45\Microsoft.AnalysisServices.Tabular.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.69.2.1\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.74.2\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll diff --git a/AlmToolkit/BismNormalizer.Tests/packages.config b/AlmToolkit/BismNormalizer.Tests/packages.config index 56ad68b..a70286e 100644 --- a/AlmToolkit/BismNormalizer.Tests/packages.config +++ b/AlmToolkit/BismNormalizer.Tests/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/AlmToolkit/BismNormalizer/BismNormalizer.csproj b/AlmToolkit/BismNormalizer/BismNormalizer.csproj index f0ea90c..fcae2f2 100644 --- a/AlmToolkit/BismNormalizer/BismNormalizer.csproj +++ b/AlmToolkit/BismNormalizer/BismNormalizer.csproj @@ -43,23 +43,20 @@ prompt - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.67.0\lib\net45\Microsoft.AnalysisServices.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.74.2\lib\net45\Microsoft.AnalysisServices.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.67.0\lib\net45\Microsoft.AnalysisServices.Core.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.74.2\lib\net45\Microsoft.AnalysisServices.Core.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.67.0\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.74.2\lib\net45\Microsoft.AnalysisServices.SPClient.Interfaces.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.67.0\lib\net45\Microsoft.AnalysisServices.Tabular.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.74.2\lib\net45\Microsoft.AnalysisServices.Tabular.dll - - ..\packages\Microsoft.AnalysisServices.retail.amd64.19.67.0\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll - - - ..\packages\Microsoft.AnalysisServices.Tabular.Tmdl.retail.amd64.19.67.0-TmdlPreview\lib\net45\Microsoft.AnalysisServices.Tabular.Tmdl.dll + + ..\packages\Microsoft.AnalysisServices.retail.amd64.19.74.2\lib\net45\Microsoft.AnalysisServices.Tabular.Json.dll ..\packages\Microsoft.Identity.Client.4.43.0\lib\net461\Microsoft.Identity.Client.dll diff --git a/AlmToolkit/BismNormalizer/TabularCompare/ComparisonFactory.cs b/AlmToolkit/BismNormalizer/TabularCompare/ComparisonFactory.cs index 228fc70..a9b7f28 100644 --- a/AlmToolkit/BismNormalizer/TabularCompare/ComparisonFactory.cs +++ b/AlmToolkit/BismNormalizer/TabularCompare/ComparisonFactory.cs @@ -168,17 +168,25 @@ namespace BismNormalizer.TabularCompare { string message = $"Source compatibility level { Convert.ToString(comparisonInfo.SourceCompatibilityLevel) } is higher than the target { Convert.ToString(comparisonInfo.TargetCompatibilityLevel) }, which is not supported for comparison.\n"; - if (comparisonInfo.Interactive && - !comparisonInfo.ConnectionInfoTarget.UseProject && //Upgrade in SSDT not supported - !comparisonInfo.ConnectionInfoTarget.UseDesktop && //Upgrade via port number to Desktop or SSDT not supported - !comparisonInfo.ConnectionInfoTarget.UseBimFile && //Upgrade to offline file not (currently) supported - System.Windows.Forms.MessageBox.Show( - message + $"\nDo you want to upgrade the target to {Convert.ToString(comparisonInfo.SourceCompatibilityLevel)} and allow the comparison?", comparisonInfo.AppName, System.Windows.Forms.MessageBoxButtons.YesNo, System.Windows.Forms.MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.Yes) + if ( + ( !comparisonInfo.ConnectionInfoTarget.UseProject && //Upgrade in SSDT not supported + !comparisonInfo.ConnectionInfoTarget.UseDesktop && //Upgrade via port number to Desktop or SSDT not supported + !comparisonInfo.ConnectionInfoTarget.UseBimFile //Upgrade to offline file not (currently) supported + ) && + ( + ( comparisonInfo.Interactive && + System.Windows.Forms.MessageBox.Show(message + $"\nDo you want to upgrade the target to {Convert.ToString(comparisonInfo.SourceCompatibilityLevel)} and allow the comparison?", comparisonInfo.AppName, System.Windows.Forms.MessageBoxButtons.YesNo, System.Windows.Forms.MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.Yes + ) || + ( !comparisonInfo.Interactive && + comparisonInfo.UpgradeCompatLevel + ) + ) + ) { returnTabularComparison.TargetTabularModel.Connect(); returnTabularComparison.TargetTabularModel.TomDatabase.CompatibilityLevel = comparisonInfo.SourceCompatibilityLevel; returnTabularComparison.TargetTabularModel.TomDatabase.Update(); - returnTabularComparison.Disconnect(); + returnTabularComparison.MetadataResyncRequired = true; } else { diff --git a/AlmToolkit/BismNormalizer/TabularCompare/ComparisonInfo.cs b/AlmToolkit/BismNormalizer/TabularCompare/ComparisonInfo.cs index 2149282..71bd6bf 100644 --- a/AlmToolkit/BismNormalizer/TabularCompare/ComparisonInfo.cs +++ b/AlmToolkit/BismNormalizer/TabularCompare/ComparisonInfo.cs @@ -27,6 +27,7 @@ namespace BismNormalizer.TabularCompare private bool _interactive = true; private string _appName = Utils.AssemblyProduct; private bool _credsProvided = false; + private bool _upgradeCompatLevel = false; private string _sourceUsername; private string _sourcePassword; private string _targetUsername; @@ -160,6 +161,16 @@ namespace BismNormalizer.TabularCompare set { _credsProvided = value; } } + /// + /// Whether to automatically upgrade the compat level if target is less than source + /// + [XmlIgnore()] + public bool UpgradeCompatLevel + { + get { return _upgradeCompatLevel; } + set { _upgradeCompatLevel = value; } + } + /// /// Username for source model for when CredsProvided = true. /// diff --git a/AlmToolkit/BismNormalizer/TabularCompare/ConnectionInfo.cs b/AlmToolkit/BismNormalizer/TabularCompare/ConnectionInfo.cs index a2e4ac0..e74f069 100644 --- a/AlmToolkit/BismNormalizer/TabularCompare/ConnectionInfo.cs +++ b/AlmToolkit/BismNormalizer/TabularCompare/ConnectionInfo.cs @@ -577,7 +577,8 @@ namespace BismNormalizer.TabularCompare Microsoft.AnalysisServices.Server amoServer = new Microsoft.AnalysisServices.Server(); try { - amoServer.Connect(BuildConnectionString()); + string connectionString = BuildConnectionString(); + amoServer.Connect(connectionString); } catch (ConnectionException) when (UseProject) { @@ -836,19 +837,14 @@ $@"{{ /// public TOM.Database OpenDatabaseFromFolder() { - TOM.Model modelFromTmdl = TOM.TmdlSerializer.DeserializeModelFromFolder(_tmdlFolder); - string modelJson = TOM.JsonSerializer.SerializeObject(modelFromTmdl); - + TOM.Database tomDatabase = TOM.TmdlSerializer.DeserializeDatabaseFromFolder(_tmdlFolder); + + string modelJson = TOM.JsonSerializer.SerializeObject(tomDatabase.Model); _compatibilityMode = CompatibilityMode.AnalysisServices; _compatibilityMode = IsPbiCompatibilityMode(modelJson) ? CompatibilityMode.PowerBI : CompatibilityMode.AnalysisServices; - - //TODOTMDL: compat level is in the model.tmdl file, but it's a Database property, so not being read??? - //also how get db name? - TOM.Database tomDatabase = new TOM.Database(modelFromTmdl.Name); - tomDatabase.Model = modelFromTmdl.Clone(); return tomDatabase; } diff --git a/AlmToolkit/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs b/AlmToolkit/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs index fb08b8b..6e12c48 100644 --- a/AlmToolkit/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs +++ b/AlmToolkit/BismNormalizer/TabularCompare/TabularMetadata/Comparison.cs @@ -15,6 +15,7 @@ namespace BismNormalizer.TabularCompare.TabularMetadata private TabularModel _sourceTabularModel; private TabularModel _targetTabularModel; private bool _uncommitedChanges = false; + private bool _metadataResyncRequired = false; private DateTime _lastSourceSchemaUpdate = DateTime.MinValue; private DateTime _lastTargetSchemaUpdate = DateTime.MinValue; private bool _disposed = false; @@ -41,6 +42,15 @@ namespace BismNormalizer.TabularCompare.TabularMetadata set { _targetTabularModel = value; } } + /// + /// Sometimes need to resync metadata to avoid validation errors. For example if a compat level upgrade just happened. + /// + public bool MetadataResyncRequired + { + get { return _metadataResyncRequired; } + set { _metadataResyncRequired = value; } + } + #endregion public Comparison(ComparisonInfo comparisonInfo) @@ -654,7 +664,7 @@ namespace BismNormalizer.TabularCompare.TabularMetadata reconnect = true; } - if (reconnect || _uncommitedChanges) + if (reconnect || _uncommitedChanges || _metadataResyncRequired) { // Reconnect to re-initialize _sourceTabularModel = new TabularModel(this, _comparisonInfo.ConnectionInfoSource, _comparisonInfo); @@ -662,6 +672,8 @@ namespace BismNormalizer.TabularCompare.TabularMetadata _targetTabularModel = new TabularModel(this, _comparisonInfo.ConnectionInfoTarget, _comparisonInfo); _targetTabularModel.Connect(); + + _metadataResyncRequired = false; } if (!_sourceTabularModel.ConnectionInfo.UseProject && _sourceTabularModel.TomDatabase.LastSchemaUpdate > _lastSourceSchemaUpdate) diff --git a/AlmToolkit/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs b/AlmToolkit/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs index 5d1d57e..e54b073 100644 --- a/AlmToolkit/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs +++ b/AlmToolkit/BismNormalizer/TabularCompare/TabularMetadata/TabularModel.cs @@ -2037,7 +2037,7 @@ namespace BismNormalizer.TabularCompare.TabularMetadata private void SaveToTmdlFolder() { - TmdlSerializer.SerializeModelToFolder(_database.Model, _connectionInfo.TmdlFolder); + TmdlSerializer.SerializeDatabaseToFolder(_database, _connectionInfo.TmdlFolder); } private void SaveBimFile() diff --git a/AlmToolkit/BismNormalizer/app.config b/AlmToolkit/BismNormalizer/app.config index e17bb5d..ea14b19 100644 --- a/AlmToolkit/BismNormalizer/app.config +++ b/AlmToolkit/BismNormalizer/app.config @@ -111,6 +111,18 @@ + + + + + + + + + + + + diff --git a/AlmToolkit/BismNormalizer/packages.config b/AlmToolkit/BismNormalizer/packages.config index 35e8bc9..de0f8c0 100644 --- a/AlmToolkit/BismNormalizer/packages.config +++ b/AlmToolkit/BismNormalizer/packages.config @@ -1,7 +1,6 @@  - - + diff --git a/AlmToolkit/VersionInfo.cs b/AlmToolkit/VersionInfo.cs index 76c836a..cc6d7e2 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.0.65.0")] -[assembly: AssemblyFileVersion("5.0.65.0")] +[assembly: AssemblyVersion("5.0.69.0")] +[assembly: AssemblyFileVersion("5.0.69.0")]