Skip to content

Commit d92438a

Browse files
committed
WiX: rework the SDK layout
Restore the components, move the install location, and enable the dual-purpose installer, and enable higher compression. The higher compression helps offset some of the associated costs for the split MSIs. The SDKs are now relocated to `%ProgramFiles%\Swift\Platforms` to co-locate the Platform SDKs with the toolchain and runtime. The conversion to a dual purpose MSI will relocate this to `%LocalAppData%\Programs\Swift\Platforms`. In most cases this should be a space free path which allows us to finally migrate away from `C:\Library` and fix the issue of incorrect permissions on directories.
1 parent cfa04fe commit d92438a

File tree

2 files changed

+485
-567
lines changed

2 files changed

+485
-567
lines changed

platforms/Windows/sdk.wixproj

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,21 @@
2727
<HarvestGenerateGuidsNow>true</HarvestGenerateGuidsNow>
2828
</PropertyGroup>
2929

30+
<PropertyGroup Condition=" '$(ProductArchitecture)' == 'amd64' ">
31+
<InstallerPlatform>x64</InstallerPlatform>
32+
</PropertyGroup>
33+
<PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm64' ">
34+
<InstallerPlatform>arm64</InstallerPlatform>
35+
<InstallerVersion>500</InstallerVersion>
36+
</PropertyGroup>
37+
<PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm' ">
38+
<InstallerPlatform>arm</InstallerPlatform>
39+
<InstallerVersion>500</InstallerVersion>
40+
</PropertyGroup>
41+
<PropertyGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
42+
<InstallerPlatform>x86</InstallerPlatform>
43+
</PropertyGroup>
44+
3045
<ItemGroup>
3146
<PackageReference Include="WixToolset.UI.wixext" Version="4.0.0" />
3247
<PackageReference Include="WixToolset.Heat" Version="4.0.0" />

0 commit comments

Comments
 (0)