Skip to content

Commit 7962cf3

Browse files
authored
WiX: repair the x86 SDK packaging (swiftlang#212)
We cannot set the installer platform to the architecture being packaged as this is platform agnostic content which is always installed to a 64-bit platform. We can pass `-p:InstallerPlatform=[x64|arm64]` to enable building the SDK for installation on either of the hosts.
1 parent 508732e commit 7962cf3

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

Diff for: platforms/Windows/sdk.wixproj

-15
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,6 @@
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-
4530
<ItemGroup>
4631
<PackageReference Include="WixToolset.UI.wixext" Version="4.0.0" />
4732
<PackageReference Include="WixToolset.Heat" Version="4.0.0" />

0 commit comments

Comments
 (0)