Skip to content

Commit 65df140

Browse files
jaimecbernardojaimecbernardo
authored
[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
1 parent 97be8db commit 65df140

File tree

9 files changed

+382
-31
lines changed

9 files changed

+382
-31
lines changed

‎.github/actions/spell-check/expect.txt

+9
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,7 @@ CXSMICON
366366
CXVIRTUALSCREEN
367367
cxxopts
368368
cyberrex
369+
Cyrl
369370
CYSMICON
370371
CYVIRTUALSCREEN
371372
cziplib
@@ -386,6 +387,7 @@ DBLCLKS
386387
DBLEPSILON
387388
DCOM
388389
dcomp
390+
dcompi
389391
DComposition
390392
ddf
391393
DDLM
@@ -431,6 +433,7 @@ devblogs
431433
devdocs
432434
devenum
433435
DEVMON
436+
devops
434437
devpkey
435438
DEVSOURCE
436439
dhcp
@@ -488,6 +491,7 @@ DVTARGETDEVICE
488491
DWINRT
489492
dwm
490493
dwmapi
494+
dwmcorei
491495
DWMCOLORIZATIONCOLORCHANGED
492496
DWMCOMPOSITIONCHANGED
493497
DWMNCRENDERINGCHANGED
@@ -1043,6 +1047,7 @@ Lambson
10431047
lamotile
10441048
langword
10451049
Lastdevice
1050+
Latn
10461051
Laute
10471052
laviusmotileng
10481053
LAYOUTRTL
@@ -1252,6 +1257,7 @@ MOVESIZESTART
12521257
MOVEWINDOWS
12531258
mozilla
12541259
mpmc
1260+
MRM
12551261
mru
12561262
msbuild
12571263
msc
@@ -1732,6 +1738,7 @@ Rsp
17321738
rst
17331739
Rstrtmgr
17341740
RTB
1741+
RTCS
17351742
RTLREADING
17361743
ruleset
17371744
RUNACTIVEXCTLS
@@ -2091,6 +2098,7 @@ UAC
20912098
UAL
20922099
uap
20932100
udit
2101+
Udk
20942102
Udmurtia
20952103
Udp
20962104
uefi
@@ -2345,6 +2353,7 @@ WTS
23452353
wtsapi
23462354
WTSAT
23472355
Wubi
2356+
wuceffectsi
23482357
WVC
23492358
Wwan
23502359
Wwanpp

‎.pipelines/installWiX.ps1

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
$ProgressPreference = 'SilentlyContinue'
22

3-
$WixDownloadUrl = "https://wixtoolset.org/downloads/v3.14.0.5722/wix314.exe"
4-
$WixBinariesDownloadUrl = "https://wixtoolset.org/downloads/v3.14.0.5722/wix314-binaries.zip"
3+
$WixDownloadUrl = "https://wixtoolset.org/downloads/v3.14.0.6526/wix314.exe"
4+
$WixBinariesDownloadUrl = "https://wixtoolset.org/downloads/v3.14.0.6526/wix314-binaries.zip"
55

66
# Download WiX binaries and verify their hash sums
77
Invoke-WebRequest -Uri $WixDownloadUrl -OutFile "$($ENV:Temp)\wix314.exe"
88
$Hash = (Get-FileHash -Algorithm SHA256 "$($ENV:Temp)\wix314.exe").Hash
9-
if ($Hash -ne 'B74ED29F1377AA759E764EDEF43B1E4C4312A7A4CED77108D2446F7117EF5D3B')
9+
if ($Hash -ne 'FADEB00B1FCCD9BB2FDD6CE28D4C3ECDA339C8906A72586515C14A93CEADB6FE')
1010
{
1111
Write-Error "$WixHash"
1212
throw "wix314.exe has unexpected SHA256 hash: $Hash"
1313
}
1414
Invoke-WebRequest -Uri $WixBinariesDownloadUrl -OutFile "$($ENV:Temp)\wix314-binaries.zip"
1515
$Hash = (Get-FileHash -Algorithm SHA256 "$($ENV:Temp)\wix314-binaries.zip").Hash
16-
if($Hash -ne 'FCBE136AB3D616B983C5BE19B46521745F842B7327BF2BC7011FD26DBE277F93')
16+
if($Hash -ne '4C89898DF3BCAB13E12F7CA54399C35AD273475AD2CB6284611D00AE2D063C2C')
1717
{
1818
throw "wix314-binaries.zip has unexpected SHA256 hash: $Hash"
1919
}

‎.pipelines/versionAndSignCheck.ps1

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ $items | ForEach-Object {
3636
(-not $_.Name.EndsWith("Microsoft.Windows.System.Power.Projection.dll")) -and
3737
(-not $_.Name.EndsWith("Microsoft.WindowsAppRuntime.Bootstrap.Net.dll")) -and
3838
(-not $_.Name.EndsWith("Microsoft.Xaml.Interactions.dll")) -and
39-
(-not $_.Name.EndsWith("Microsoft.Xaml.Interactivity.dll"))
39+
(-not $_.Name.EndsWith("Microsoft.Xaml.Interactivity.dll")) -and
40+
(-not $_.Name.EndsWith("Microsoft.WindowsAppRuntime.Release.Net.dll"))
4041
)
4142
{
4243
Write-Host "Version not set: " + $_.FullName

‎installer/PowerToysSetup/PowerToys.wxs

-22
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
<?define Dotnet6PayloadSize="57791288"?>
1111
<?define Dotnet6PayloadHash="B5B1819CCA753B070181F50411375B80412860A3"?>
1212

13-
<?define WinAppSDKPayloadSize="59625472"?>
14-
<?define WinAppSDKPayloadHash="8696DA7FE75464E8729FFB487A6E3A6247BC53D0"?>
15-
1613
<?define VCRedistDownloadUrl="https://download.visualstudio.microsoft.com/download/pr/6b6923b0-3045-4379-a96f-ef5506a65d5b/426A34C6F10EA8F7DA58A8C976B586AD84DD4BAB42A0CFDBE941F1763B7755E5/VC_redist.x64.exe"?>
1714
<?define VCRedistPayloadSize="25337776"?>
1815
<?define VCRedistPayloadHash="47996AAB6A20DBBA69969C4B36F8FC718877751F"?>
@@ -27,9 +24,6 @@
2724
<?define Dotnet6PayloadSize="51774400"?>
2825
<?define Dotnet6PayloadHash="62C15858951B123AFD4D3E14F8BE4829A7CAFF18"?>
2926

30-
<?define WinAppSDKPayloadSize="59625472"?>
31-
<?define WinAppSDKPayloadHash="29F1CD6782CF840C652343C9C718DFE9D155D2F3"?>
32-
3327
<?define VCRedistDownloadUrl="https://download.visualstudio.microsoft.com/download/pr/6b6923b0-3045-4379-a96f-ef5506a65d5b/6114C0A7A526EA47D9ADD78C718BEA0BA32EEF0826AA5610AF76877CC5FEB7F3/VC_redist.arm64.exe"?>
3428
<?define VCRedistPayloadSize="11596400"?>
3529
<?define VCRedistPayloadHash="DEF8E16367DE4BDDE0399614B7E358629A959942"?>
@@ -109,22 +103,6 @@
109103
PerMachine="yes"
110104
UninstallCommand="/silent /uninstall">
111105
</ExePackage>
112-
<ExePackage
113-
Name="WindowsAppRuntimeInstall-1.1.0.exe"
114-
Compressed="no"
115-
Id="WinAppSDK110"
116-
DownloadUrl="https://aka.ms/windowsappsdk/1.1/1.1.0/windowsappruntimeinstall-1.1.0-$(var.PowerToysPlatform).exe"
117-
InstallCommand="--force"
118-
RepairCommand=""
119-
Permanent="yes">
120-
<ExitCode Value="-2147009274" Behavior="success"/>
121-
<RemotePayload
122-
Description="Windows App SDK 1.1.0 Runtime Install"
123-
ProductName="Windows App SDK 1.1.0 Runtime Install"
124-
Size="$(var.WinAppSDKPayloadSize)"
125-
Version="1.1.0.0"
126-
Hash="$(var.WinAppSDKPayloadHash)" />
127-
</ExePackage>
128106
<ExePackage
129107
Name="VCRedist-14.32.31326.exe"
130108
DetectCondition="DetectedVCRedistVersion >= 32"

‎installer/PowerToysSetup/PowerToysInstaller.wixproj

+6-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,12 @@ call "..\..\publish.cmd" arm64
4444
<PropertyGroup>
4545
<OutputPath>$(Platform)\$(Configuration)\</OutputPath>
4646
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
47-
<SuppressIces>ICE91</SuppressIces>
48-
<SuppressValidation>True</SuppressValidation>
47+
<SuppressIces>ICE40</SuppressIces>
48+
</PropertyGroup>
49+
<PropertyGroup>
50+
<!-- suppress warning 1108 regarding -sh being deprecated -->
51+
<!-- -sh suppresses file file information which was causing wix build to hang in CI -->
52+
<LinkerAdditionalOptions>-v -sh -sw1108</LinkerAdditionalOptions>
4953
</PropertyGroup>
5054
<ItemGroup>
5155
<Compile Include="CustomDialogs\PTInstallDirDlg.wxs" />

0 commit comments

Comments
 (0)