[Installer]Ship Windows App SDK runtime self contained (#18644)

* [Installer]Ship Windows App SDK as self-contained * Include windows app sdk localization files * fix spellcheck * Upgrade Win3.14 version * Add RunWixToolsOutOfProc to try fixing wix hang * fix spellcheck * Try to get more information from wix build * Remove unneeded flags * Fix spellchecker * Add version check exception for dll with 1.0.0.0
microsoft · Jun 7, 2022 · 65df140 · 65df140
1 parent 97be8db
commit 65df140
Show file tree

Hide file tree

Showing 9 changed files with 382 additions and 31 deletions.
diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
@@ -366,6 +366,7 @@ CXSMICON
 CXVIRTUALSCREEN
 cxxopts
 cyberrex
+Cyrl
 CYSMICON
 CYVIRTUALSCREEN
 cziplib
@@ -386,6 +387,7 @@ DBLCLKS
 DBLEPSILON
 DCOM
 dcomp
+dcompi
 DComposition
 ddf
 DDLM
@@ -431,6 +433,7 @@ devblogs
 devdocs
 devenum
 DEVMON
+devops
 devpkey
 DEVSOURCE
 dhcp
@@ -488,6 +491,7 @@ DVTARGETDEVICE
 DWINRT
 dwm
 dwmapi
+dwmcorei
 DWMCOLORIZATIONCOLORCHANGED
 DWMCOMPOSITIONCHANGED
 DWMNCRENDERINGCHANGED
@@ -1043,6 +1047,7 @@ Lambson
 lamotile
 langword
 Lastdevice
+Latn
 Laute
 laviusmotileng
 LAYOUTRTL
@@ -1252,6 +1257,7 @@ MOVESIZESTART
 MOVEWINDOWS
 mozilla
 mpmc
+MRM
 mru
 msbuild
 msc
@@ -1732,6 +1738,7 @@ Rsp
 rst
 Rstrtmgr
 RTB
+RTCS
 RTLREADING
 ruleset
 RUNACTIVEXCTLS
@@ -2091,6 +2098,7 @@ UAC
 UAL
 uap
 udit
+Udk
 Udmurtia
 Udp
 uefi
@@ -2345,6 +2353,7 @@ WTS
 wtsapi
 WTSAT
 Wubi
+wuceffectsi
 WVC
 Wwan
 Wwanpp

diff --git a/.pipelines/installWiX.ps1 b/.pipelines/installWiX.ps1
@@ -1,19 +1,19 @@
 $ProgressPreference = 'SilentlyContinue'
 
-$WixDownloadUrl = "https://wixtoolset.org/downloads/v3.14.0.5722/wix314.exe"
-$WixBinariesDownloadUrl = "https://wixtoolset.org/downloads/v3.14.0.5722/wix314-binaries.zip"
+$WixDownloadUrl = "https://wixtoolset.org/downloads/v3.14.0.6526/wix314.exe"
+$WixBinariesDownloadUrl = "https://wixtoolset.org/downloads/v3.14.0.6526/wix314-binaries.zip"
 
 # Download WiX binaries and verify their hash sums
 Invoke-WebRequest -Uri $WixDownloadUrl -OutFile "$($ENV:Temp)\wix314.exe"
 $Hash = (Get-FileHash -Algorithm SHA256 "$($ENV:Temp)\wix314.exe").Hash
-if ($Hash -ne 'B74ED29F1377AA759E764EDEF43B1E4C4312A7A4CED77108D2446F7117EF5D3B')
+if ($Hash -ne 'FADEB00B1FCCD9BB2FDD6CE28D4C3ECDA339C8906A72586515C14A93CEADB6FE')
 {
     Write-Error "$WixHash"
     throw "wix314.exe has unexpected SHA256 hash: $Hash"
 }
 Invoke-WebRequest -Uri $WixBinariesDownloadUrl -OutFile "$($ENV:Temp)\wix314-binaries.zip"
 $Hash = (Get-FileHash -Algorithm SHA256 "$($ENV:Temp)\wix314-binaries.zip").Hash
-if($Hash -ne 'FCBE136AB3D616B983C5BE19B46521745F842B7327BF2BC7011FD26DBE277F93')
+if($Hash -ne '4C89898DF3BCAB13E12F7CA54399C35AD273475AD2CB6284611D00AE2D063C2C')
 {
     throw "wix314-binaries.zip has unexpected SHA256 hash: $Hash"
 }

diff --git a/.pipelines/versionAndSignCheck.ps1 b/.pipelines/versionAndSignCheck.ps1
@@ -36,7 +36,8 @@ $items | ForEach-Object {
 			(-not $_.Name.EndsWith("Microsoft.Windows.System.Power.Projection.dll")) -and
 			(-not $_.Name.EndsWith("Microsoft.WindowsAppRuntime.Bootstrap.Net.dll")) -and
 			(-not $_.Name.EndsWith("Microsoft.Xaml.Interactions.dll")) -and
-			(-not $_.Name.EndsWith("Microsoft.Xaml.Interactivity.dll"))
+			(-not $_.Name.EndsWith("Microsoft.Xaml.Interactivity.dll")) -and
+			(-not $_.Name.EndsWith("Microsoft.WindowsAppRuntime.Release.Net.dll"))
 		)
 		{
 			Write-Host "Version not set: " + $_.FullName

diff --git a/installer/PowerToysSetup/PowerToys.wxs b/installer/PowerToysSetup/PowerToys.wxs
@@ -10,9 +10,6 @@
     <?define Dotnet6PayloadSize="57791288"?>
     <?define Dotnet6PayloadHash="B5B1819CCA753B070181F50411375B80412860A3"?>
 
-    <?define WinAppSDKPayloadSize="59625472"?>
-    <?define WinAppSDKPayloadHash="8696DA7FE75464E8729FFB487A6E3A6247BC53D0"?>
-
     <?define VCRedistDownloadUrl="https://download.visualstudio.microsoft.com/download/pr/6b6923b0-3045-4379-a96f-ef5506a65d5b/426A34C6F10EA8F7DA58A8C976B586AD84DD4BAB42A0CFDBE941F1763B7755E5/VC_redist.x64.exe"?>
     <?define VCRedistPayloadSize="25337776"?>
     <?define VCRedistPayloadHash="47996AAB6A20DBBA69969C4B36F8FC718877751F"?>
@@ -27,9 +24,6 @@
     <?define Dotnet6PayloadSize="51774400"?>
     <?define Dotnet6PayloadHash="62C15858951B123AFD4D3E14F8BE4829A7CAFF18"?>
 
-    <?define WinAppSDKPayloadSize="59625472"?>
-    <?define WinAppSDKPayloadHash="29F1CD6782CF840C652343C9C718DFE9D155D2F3"?>
-
     <?define VCRedistDownloadUrl="https://download.visualstudio.microsoft.com/download/pr/6b6923b0-3045-4379-a96f-ef5506a65d5b/6114C0A7A526EA47D9ADD78C718BEA0BA32EEF0826AA5610AF76877CC5FEB7F3/VC_redist.arm64.exe"?>
     <?define VCRedistPayloadSize="11596400"?>
     <?define VCRedistPayloadHash="DEF8E16367DE4BDDE0399614B7E358629A959942"?>
@@ -109,22 +103,6 @@
                 PerMachine="yes"
                 UninstallCommand="/silent /uninstall">
             </ExePackage>
-            <ExePackage
-                Name="WindowsAppRuntimeInstall-1.1.0.exe"
-                Compressed="no"
-                Id="WinAppSDK110"
-                DownloadUrl="https://aka.ms/windowsappsdk/1.1/1.1.0/windowsappruntimeinstall-1.1.0-$(var.PowerToysPlatform).exe"
-                InstallCommand="--force"
-                RepairCommand=""
-                Permanent="yes">
-                <ExitCode Value="-2147009274" Behavior="success"/>
-                <RemotePayload
-                    Description="Windows App SDK 1.1.0 Runtime Install"
-                    ProductName="Windows App SDK 1.1.0 Runtime Install"
-                    Size="$(var.WinAppSDKPayloadSize)"
-                    Version="1.1.0.0"
-                    Hash="$(var.WinAppSDKPayloadHash)" />
-            </ExePackage>            
             <ExePackage
                 Name="VCRedist-14.32.31326.exe"
                 DetectCondition="DetectedVCRedistVersion >= 32"

diff --git a/installer/PowerToysSetup/PowerToysInstaller.wixproj b/installer/PowerToysSetup/PowerToysInstaller.wixproj
@@ -44,8 +44,12 @@ call "..\..\publish.cmd" arm64
   <PropertyGroup>
     <OutputPath>$(Platform)\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
-    <SuppressIces>ICE91</SuppressIces>
-    <SuppressValidation>True</SuppressValidation>
+    <SuppressIces>ICE40</SuppressIces>
+  </PropertyGroup>
+  <PropertyGroup>
+    <!-- suppress warning 1108 regarding -sh being deprecated -->
+    <!-- -sh suppresses file file information which was causing wix build to hang in CI -->
+    <LinkerAdditionalOptions>-v -sh -sw1108</LinkerAdditionalOptions>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CustomDialogs\PTInstallDirDlg.wxs" />