Skip to content

Commit e7779d1

Browse files
compnerdcompnerd
committed
WiX: remove support for packaging the legacy runtime
Clean up the legacy SDK packaging and remove support for it. Collapse all the various sites into the new layout only. Furthermore, rename the targets to remove the `Experimental` in the identifiers.
1 parent 7c722a7 commit e7779d1

File tree

16 files changed

+874
-2782
lines changed

16 files changed

+874
-2782
lines changed

‎platforms/Windows/Directory.Build.props‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
<PropertyGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
2626
<Platform>x86</Platform>
2727
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(IncludeLegacySDK)' == '' ">
29-
<IncludeLegacySDK>true</IncludeLegacySDK>
30-
</PropertyGroup>
3128

3229
<PropertyGroup>
3330
<RootBuildFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)build\))</RootBuildFolder>
@@ -87,10 +84,6 @@
8784
WindowsRuntimeARM64=$(WindowsRuntimeARM64);
8885
WindowsRuntimeX64=$(WindowsRuntimeX64);
8986
WindowsRuntimeX86=$(WindowsRuntimeX86);
90-
WindowsExperimentalRuntimeARM64=$(WindowsExperimentalRuntimeARM64);
91-
WindowsExperimentalRuntimeX64=$(WindowsExperimentalRuntimeX64);
92-
WindowsExperimentalRuntimeX86=$(WindowsExperimentalRuntimeX86);
93-
IncludeLegacySDK=$(IncludeLegacySDK);
9487
</DefineConstants>
9588
</PropertyGroup>
9689

‎platforms/Windows/SideBySideUpgradeStrategy.props‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
<DbgNoAssertsUpgradeCode>{6F26625B-7662-4631-8E0E-F2244339ED37}</DbgNoAssertsUpgradeCode>
2626
<IdeAssertsUpgradeCode>{8DD91C86-D13D-490B-B06B-9522A9CF504C}</IdeAssertsUpgradeCode>
2727
<IdeNoAssertsUpgradeCode>{C5519168-CF7B-4127-98B7-D886D9789B42}</IdeNoAssertsUpgradeCode>
28-
<RtlUpgradeCode>{BEA8C6DC-F73E-445B-9486-2333D1CF2886}</RtlUpgradeCode>
29-
<ExperimentalRTLUpgradeCode>{F9BA01C7-0C7C-4898-90BD-9D6BB308F0B3}</ExperimentalRTLUpgradeCode>
28+
<RTLUpgradeCode>{F9BA01C7-0C7C-4898-90BD-9D6BB308F0B3}</RTLUpgradeCode>
3029
<AndroidPlatformUpgradeCode>{313B9C1F-D5B5-4FED-B7E0-138F1EE6B26A}</AndroidPlatformUpgradeCode>
3130
<WindowsPlatformUpgradeCode>{01AFF1CF-A025-41B6-BCBC-728D794353FD}</WindowsPlatformUpgradeCode>
3231
</PropertyGroup>
@@ -67,8 +66,7 @@
6766
DbgNoAssertsUpgradeCode=$(DbgNoAssertsUpgradeCode);
6867
IdeAssertsUpgradeCode=$(IdeAssertsUpgradeCode);
6968
IdeNoAssertsUpgradeCode=$(IdeNoAssertsUpgradeCode);
70-
RtlUpgradeCode=$(RtlUpgradeCode);
71-
ExperimentalRTLUpgradeCode=$(ExperimentalRTLUpgradeCode);
69+
RTLUpgradeCode=$(RTLUpgradeCode);
7270
AndroidPlatformUpgradeCode=$(AndroidPlatformUpgradeCode);
7371
WindowsPlatformUpgradeCode=$(WindowsPlatformUpgradeCode);
7472
</DefineConstants>

‎platforms/Windows/bundle/installer.wixproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
<ProjectReference Include="..\ide\noasserts\ide.noasserts.wixproj" BindName="ide.noasserts" />
3131
</ItemGroup>
3232

33-
<ItemGroup Condition=" '$(IncludeLegacySDK)' == 'True' ">
34-
<ProjectReference Include="..\rtl\legacy\msi\rtlmsi.wixproj" BindName="rtl" />
35-
</ItemGroup>
36-
3733
<ItemGroup>
3834
<ProjectReference Include="..\rtl\shared\msi\rtl.shared.msi.wixproj" Properties="ProductArchitecture=$(ProductArchitecture)" BindName="rtl.shared" />
3935
</ItemGroup>

‎platforms/Windows/bundle/installer.wxs‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
1+
INSTALLARM64EXPERIMENTALSDK<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
22
<Bundle
33
Name="!(loc.BundleName) $(ProductVersion)"
44
Version="$(ProductVersion)"
@@ -150,21 +150,12 @@
150150
</MsiPackage>
151151
<?endif?>
152152

153-
<?if $(IncludeLegacySDK) == True?>
154-
<MsiPackage
155-
SourceFile="!(bindpath.rtl)\rtl.msi"
156-
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
157-
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
158-
<MsiProperty Name="INSTALLUTILITIES" Value="[OptionsInstallUtilities]" />
159-
</MsiPackage>
160-
<?else?>
161153
<MsiPackage
162154
SourceFile="!(bindpath.rtl.shared)\rtl.$(ProductArchitecture).msi"
163155
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
164156
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
165157
<MsiProperty Name="INSTALLUTILITIES" Value="[OptionsInstallUtilities]" />
166158
</MsiPackage>
167-
<?endif?>
168159

169160
<?if $(IncludeAndroid) == True?>
170161
<MsiPackage
@@ -188,15 +179,12 @@
188179
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
189180

190181
<MsiProperty Name="INSTALLARM64SDK" Value="[OptionsInstallWindowsSDKARM64]" />
191-
<MsiProperty Name="INSTALLARM64EXPERIMENTALSDK" Value="[OptionsInstallWindowsSDKARM64]" />
192182
<MsiProperty Name="INSTALLARM64REDIST" Value="[OptionsInstallWindowsRedistARM64]" />
193183

194184
<MsiProperty Name="INSTALLAMD64SDK" Value="[OptionsInstallWindowsSDKAMD64]" />
195-
<MsiProperty Name="INSTALLAMD64EXPERIMENTALSDK" Value="[OptionsInstallWindowsSDKAMD64]" />
196185
<MsiProperty Name="INSTALLAMD64REDIST" Value="[OptionsInstallWindowsRedistAMD64]" />
197186

198187
<MsiProperty Name="INSTALLX86SDK" Value="[OptionsInstallWindowsSDKX86]" />
199-
<MsiProperty Name="INSTALLX86EXPERIMENTALSDK" Value="[OptionsInstallWindowsSDKX86]" />
200188
<MsiProperty Name="INSTALLX86REDIST" Value="[OptionsInstallWindowsRedistX86]" />
201189
</MsiPackage>
202190
<?endif?>

‎platforms/Windows/platforms/windows/windows.wixproj‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
<OutputName>windows</OutputName>
44

55
<SwiftShimsPath>$(ImageRoot)\Platforms\Windows.platform\Developer\SDKs\Windows.sdk\usr\lib\swift\shims</SwiftShimsPath>
6-
<ExperimentalSwiftShimsPath>$(ImageRoot)\Platforms\Windows.platform\Developer\SDKs\WindowsExperimental.sdk\usr\lib\swift\shims</ExperimentalSwiftShimsPath>
76

87
<DefineConstants>
98
$(DefineConstants);
109
SwiftShimsPath=$(SwiftShimsPath);
11-
ExperimentalSwiftShimsPath=$(ExperimentalSwiftShimsPath);
1210
IncludeARM64=$(WindowsArchitectures.Contains("aarch64"));
1311
IncludeX64=$(WindowsArchitectures.Contains("x86_64"));
1412
IncludeX86=$(WindowsArchitectures.Contains("i686"));
@@ -20,24 +18,21 @@
2018
</ItemGroup>
2119

2220
<ItemGroup Condition=" $(WindowsArchitectures.Contains('i686')) ">
23-
<ProjectReference Condition=" '$(IncludeLegacySDK)' == 'True' " Include="..\..\rtl\legacy\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=x86" BindName="rtl.x86.msm" />
2421
<ProjectReference Include="..\..\rtl\shared\msm\rtl.shared.msm.wixproj" Properties="Platform=x86;ProductArchitecture=x86" BindName="rtl.shared.x86.msm" />
2522
<ProjectReference Include="..\..\rtl\static\msm\rtl.static.msm.wixproj" Properties="Platform=x86;ProductArchitecture=x86" BindName="rtl.static.x86.msm" />
2623
</ItemGroup>
2724

2825
<ItemGroup Condition=" $(WindowsArchitectures.Contains('x86_64')) ">
29-
<ProjectReference Condition=" '$(IncludeLegacySDK)' == 'True' " Include="..\..\rtl\legacy\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=amd64" BindName="rtl.amd64.msm" />
3026
<ProjectReference Include="..\..\rtl\shared\msm\rtl.shared.msm.wixproj" Properties="Platform=x86;ProductArchitecture=amd64" BindName="rtl.shared.amd64.msm" />
3127
<ProjectReference Include="..\..\rtl\static\msm\rtl.static.msm.wixproj" Properties="Platform=x86;ProductArchitecture=amd64" BindName="rtl.static.amd64.msm" />
3228
</ItemGroup>
3329

3430
<ItemGroup Condition=" $(WindowsArchitectures.Contains('aarch64')) ">
35-
<ProjectReference Condition=" '$(IncludeLegacySDK)' == 'True' " Include="..\..\rtl\legacy\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=arm64" BindName="rtl.arm64.msm" />
3631
<ProjectReference Include="..\..\rtl\shared\msm\rtl.shared.msm.wixproj" Properties="Platform=x86;ProductArchitecture=arm64" BindName="rtl.shared.arm64.msm" />
3732
<ProjectReference Include="..\..\rtl\static\msm\rtl.static.msm.wixproj" Properties="Platform=x86;ProductArchitecture=arm64" BindName="rtl.static.arm64.msm" />
3833
</ItemGroup>
3934

40-
<ItemGroup Condition=" '$(IncludeLegacySDK)' == 'True' ">
35+
<ItemGroup>
4136
<HarvestDirectory Include="$(SwiftShimsPath)">
4237
<ComponentGroupName>SwiftShims</ComponentGroupName>
4338
<DirectoryRefId>WindowsSDK_usr_lib_swift_shims</DirectoryRefId>
@@ -47,15 +42,4 @@
4742
<SuppressRootDirectory>true</SuppressRootDirectory>
4843
</HarvestDirectory>
4944
</ItemGroup>
50-
51-
<ItemGroup>
52-
<HarvestDirectory Include="$(ExperimentalSwiftShimsPath)">
53-
<ComponentGroupName>ExperimentalSwiftShims</ComponentGroupName>
54-
<DirectoryRefId>WindowsExperimentalSDK_usr_lib_swift_shims</DirectoryRefId>
55-
<PreprocessorVariable>var.ExperimentalSwiftShimsPath</PreprocessorVariable>
56-
<SuppressCom>true</SuppressCom>
57-
<SuppressRegistry>true</SuppressRegistry>
58-
<SuppressRootDirectory>true</SuppressRootDirectory>
59-
</HarvestDirectory>
60-
</ItemGroup>
6145
</Project>

0 commit comments

Comments
 (0)