WiX: adjust features for shared content

Adjust the feature set to extract platform support from the SDK content.
This allows us to have the platform specific libraries (XCTest, Testing)
isolated from the SDK content. It also allows us to temporarily share
the features across the legacy and experimental SDKs.

Author: compnerd

platforms/Windows/platforms/windows/windows.wxs

@@ -4104,6 +4104,41 @@
     <?endif?>
 
     <!-- Features -->
+    <Feature Display="hidden" Id="PlatformSupport" Title="!(loc.Plt_ProductName_Windows)">
+      <ComponentGroupRef Id="Testing" />
+
+      <!-- MSI management Components -->
+      <ComponentGroupRef Id="EnvironmentVariables" />
+      <ComponentGroupRef Id="VersionedDirectoryCleanup" />
+    </Feature>
+
+    <?if $(IncludeARM64) = True?>
+      <Feature Display="hidden" Id="arm64.platform" Level="0" Title="!(loc.Plt_ProductName_Windows_arm64)">
+        <Level Condition="InstallARM64Platform = 1 OR InstallARM64ExperimentalSDK = 1" Value="1" />
+
+        <ComponentGroupRef Id="XCTest.arm64" />
+        <ComponentGroupRef Id="Testing.arm64" />
+      </Feature>
+    <?endif?>
+
+    <?if $(IncludeX64) = True?>
+      <Feature Display="hidden" Id="x64.platform" Level="0" Title="!(loc.Plt_ProductName_Windows_amd64)">
+        <Level Condition="InstallAMD64Platform = 1 OR InstallAMD64ExperimentalSDK = 1" Value="1" />
+
+        <ComponentGroupRef Id="XCTest.x64" />
+        <ComponentGroupRef Id="Testing.x64" />
+      </Feature>
+    <?endif?>
+
+    <?if $(IncludeX86) = True?>
+      <Feature Display="hidden" Id="x86.platform" Level="0" Title="!(loc.Plt_ProductName_Windows_x86)">
+        <Level Condition="InstallX86Platform = 1 OR InstallX86ExperimentalSDK = 1" Value="1" />
+
+        <ComponentGroupRef Id="XCTest.x86" />
+        <ComponentGroupRef Id="Testing.x86" />
+      </Feature>
+    <?endif?>
+
 <?if $(IncludeLegacySDK) = True?>
     <Feature Id="SDK" AllowAbsent="no" Title="!(loc.Plt_ProductName_Windows)">
       <ComponentGroupRef Id="LegacySwiftRemoteMirror" />
@@ -4112,26 +4147,17 @@
       <ComponentGroupRef Id="Legacy_FoundationUnicode" />
       <ComponentGroupRef Id="Legacy_FoundationCShims" />
 
-      <ComponentGroupRef Id="Testing" />
-
       <ComponentGroupRef Id="AuxiliaryFiles" />
       <ComponentGroupRef Id="Configuration" />
       <ComponentGroupRef Id="SwiftShims" />
       <ComponentGroupRef Id="apinotes" />
       <ComponentGroupRef Id="libcxxshim" />
-
-      <!-- MSI management Components -->
-      <ComponentGroupRef Id="EnvironmentVariables" />
-      <ComponentGroupRef Id="VersionedDirectoryCleanup" />
     </Feature>
 
     <?if $(IncludeARM64) = True?>
       <Feature Id="arm64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Windows_arm64)">
         <Level Condition="InstallARM64SDK = 0" Value="0" />
 
-        <ComponentGroupRef Id="XCTest.arm64" />
-        <ComponentGroupRef Id="Testing.arm64" />
-
         <ComponentGroupRef Id="LegacySwiftRemoteMirror.arm64" />
 
         <ComponentGroupRef Id="LegacyBlocksRuntime.arm64" />
@@ -4173,9 +4199,6 @@
       <Feature Id="x64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Windows_amd64)">
         <Level Condition="InstallAMD64SDK = 0" Value="0" />
 
-        <ComponentGroupRef Id="XCTest.x64" />
-        <ComponentGroupRef Id="Testing.x64" />
-
         <ComponentGroupRef Id="LegacySwiftRemoteMirror.x64" />
 
         <ComponentGroupRef Id="LegacyBlocksRuntime.x64" />
@@ -4217,9 +4240,6 @@
       <Feature Id="x86" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Windows_x86)">
         <Level Condition="InstallX86SDK = 0" Value="0" />
 
-        <ComponentGroupRef Id="XCTest.x86" />
-        <ComponentGroupRef Id="Testing.x86" />
-
         <ComponentGroupRef Id="LegacySwiftRemoteMirror.x86" />
 
         <ComponentGroupRef Id="LegacyBlocksRuntime.x86" />
@@ -4269,9 +4289,6 @@
       <ComponentGroupRef Id="ExperimentalSwiftShims" />
       <ComponentGroupRef Id="Experimental_FoundationCShims" />
       <ComponentGroupRef Id="Experimental_FoundationUnicode" />
-
-      <!-- MSI management Components -->
-      <ComponentGroupRef Id="VersionedDirectoryCleanup" />
     </Feature>
 
     <?if $(IncludeARM64) = True?>

platforms/Windows/shared/swift.en-us.wxl

@@ -31,6 +31,9 @@
   <String Id="Sdk_ProductName_Windows_arm64" Value="Swift Windows SDK (ARM64)" />
   <String Id="Sdk_ProductName_Windows_amd64" Value="Swift Windows SDK (AMD64)" />
   <String Id="Sdk_ProductName_Windows_x86" Value="Swift Windows SDK (X86)" />
+  <String Id="Plt_ProductName_Windows_arm64" Value="Swift Windows Platform Support (ARM64)" />
+  <String Id="Plt_ProductName_Windows_amd64" Value="Swift Windows Platform Support (AMD64)" />
+  <String Id="Plt_ProductName_Windows_x86" Value="Swift Windows Platform Support (X86)" />
   <String Id="Plt_ProductName_Windows_Experimental_arm64" Value="Swift Windows Platform Support (ARM64) [Experimental]" />
   <String Id="Plt_ProductName_Windows_Experimental_amd64" Value="Swift Windows Platform Support (AMD64) [Experimental]" />
   <String Id="Plt_ProductName_Windows_Experimental_x86" Value="Swift Windows Platform Support (X86) [Experimental]" />