From 333b2c097213af3866058705cd28436c7ea207c7 Mon Sep 17 00:00:00 2001
From: Charles Zablit <c_zablit@apple.com>
Date: Fri, 31 Oct 2025 17:56:58 +0000
Subject: [PATCH 1/2] [windows] add an option to install Embeddable Python
 3.10.1 in the toolchain installer

---
 platforms/Windows/Directory.Build.props       |   1 +
 .../Windows/SideBySideUpgradeStrategy.props   |   2 +
 platforms/Windows/bundle/installer.wixproj    |   1 +
 platforms/Windows/bundle/installer.wxs        |   8 +
 platforms/Windows/bundle/theme.xml            |  44 +++---
 platforms/Windows/python/python.wixproj       |   5 +
 platforms/Windows/python/python.wxs           | 140 ++++++++++++++++++
 platforms/Windows/readme.md                   |   7 +-
 platforms/Windows/shared/shared.wxs           |   1 +
 platforms/Windows/shared/swift.en-us.wxl      |   1 +
 10 files changed, 189 insertions(+), 21 deletions(-)
 create mode 100644 platforms/Windows/python/python.wixproj
 create mode 100644 platforms/Windows/python/python.wxs

diff --git a/platforms/Windows/Directory.Build.props b/platforms/Windows/Directory.Build.props
index a59bce70..06e16b51 100644
--- a/platforms/Windows/Directory.Build.props
+++ b/platforms/Windows/Directory.Build.props
@@ -81,6 +81,7 @@
       ArePackageCabsEmbedded=$(ArePackageCabsEmbedded);
       BaseReleaseDownloadUrl=$(BaseReleaseDownloadUrl);
       ImageRoot=$(ImageRoot);
+      PythonVersion=$(PythonVersion);
       WindowsRuntimeARM64=$(WindowsRuntimeARM64);
       WindowsRuntimeX64=$(WindowsRuntimeX64);
       WindowsRuntimeX86=$(WindowsRuntimeX86);
diff --git a/platforms/Windows/SideBySideUpgradeStrategy.props b/platforms/Windows/SideBySideUpgradeStrategy.props
index ae79f273..5320ae94 100644
--- a/platforms/Windows/SideBySideUpgradeStrategy.props
+++ b/platforms/Windows/SideBySideUpgradeStrategy.props
@@ -24,6 +24,7 @@
     <RtlUpgradeCode>{BEA8C6DC-F73E-445B-9486-2333D1CF2886}</RtlUpgradeCode>
     <AndroidPlatformUpgradeCode>{313B9C1F-D5B5-4FED-B7E0-138F1EE6B26A}</AndroidPlatformUpgradeCode>
     <WindowsPlatformUpgradeCode>{01AFF1CF-A025-41B6-BCBC-728D794353FD}</WindowsPlatformUpgradeCode>
+    <PythonUpgradeCode>{5FC42BA9-ABF5-4CCD-B93B-BDFED936BA37}</PythonUpgradeCode>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(MajorMinorProductVersion)' == '0.0'">
@@ -61,6 +62,7 @@
       RtlUpgradeCode=$(RtlUpgradeCode);
       AndroidPlatformUpgradeCode=$(AndroidPlatformUpgradeCode);
       WindowsPlatformUpgradeCode=$(WindowsPlatformUpgradeCode);
+      PythonUpgradeCode=$(PythonUpgradeCode);
     </DefineConstants>
   </PropertyGroup>
 </Project>
diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
index b62f1e58..8737d9d2 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -21,6 +21,7 @@
     <ProjectReference Include="..\dbg\dbg.wixproj" BindName="dbg" />
     <ProjectReference Include="..\ide\ide.wixproj" BindName="ide" />
     <ProjectReference Include="..\rtl\msi\rtlmsi.wixproj" BindName="rtl" />
+    <ProjectReference Include="..\python\python.wixproj" BindName="python" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(Platforms.Contains('android')) ">
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index 717a719b..e833e565 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -31,6 +31,7 @@
     <Variable Name="OptionsInstallBLD" Value="1" />
     <Variable Name="OptionsInstallCLI" bal:Overridable="yes" Persisted="yes" Value="1" />
     <Variable Name="OptionsInstallDBG" bal:Overridable="yes" Persisted="yes" Value="1" />
+    <Variable Name="OptionsInstallPy" bal:Overridable="yes" Persisted="yes" Value="1" />
     <Variable Name="OptionsInstallIDE" bal:Overridable="yes" Persisted="yes" Value="1" />
     <Variable Name="OptionsInstallRTL" Value="1" />
 
@@ -101,6 +102,13 @@
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
+      <MsiPackage
+        SourceFile="!(bindpath.python)\python.msi"
+        InstallCondition="OptionsInstallDBG = 1 and OptionsInstallPy = 1"
+        DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
+        <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+      </MsiPackage>
+
       <MsiPackage
         SourceFile="!(bindpath.ide)\ide.msi"
         InstallCondition="OptionsInstallIDE = 1"
diff --git a/platforms/Windows/bundle/theme.xml b/platforms/Windows/bundle/theme.xml
index 22100e47..2bbe26eb 100644
--- a/platforms/Windows/bundle/theme.xml
+++ b/platforms/Windows/bundle/theme.xml
@@ -9,9 +9,15 @@
     <Font Id="2" Height="-18" Weight="500" Foreground="graytext">Segoe UI</Font>
     <Font Id="3" Height="-12" Weight="500" Foreground="windowtext" Background="window">Segoe UI</Font>
 
+<<<<<<< HEAD
     <Window Width="614" Height="456" HexStyle="100a0000" FontId="0" Caption="#(loc.Caption)">
         <ImageControl X="0" Y="0" Width="165" Height="456" ImageFile="swift_side.png"/>
         <Label X="176" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Label>
+=======
+    <Window Width="630" Height="530" HexStyle="100a0000" FontId="0" Caption="#(loc.Caption)">
+        <ImageControl X="0" Y="0" Width="181" Height="530" ImageFile="swift_side.png"/>
+        <Label X="192" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Label>
+>>>>>>> 0eec7fd ([windows] add an option to install Embeddable Python 3.10.1 in the toolchain installer)
 
         <Page Name="Help">
             <Label X="176" Y="50" Width="-11" Height="32" FontId="2" DisablePrefix="yes">#(loc.HelpHeader)</Label>
@@ -55,25 +61,25 @@
                 <BrowseDirectoryAction VariableName="InstallRoot" />
             </Button>
 
-            <Label X="176" Y="88" Width="-11" Height="20" FontId="2" DisablePrefix="yes">#(loc.OptionsFeaturesLabel)</Label>
-            <Checkbox Name="OptionsInstallBLD" X="176" Y="111" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Bld_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallCLI" X="176" Y="129" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Cli_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallDBG" X="176" Y="147" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Dbg_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallIDE" X="176" Y="165" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Ide_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallRTL" X="176" Y="183" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Rtl_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsPlatform" X="176" Y="201" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Plt_ProductName_Windows)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsSDKAMD64" X="194" Y="219" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_amd64)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsRedistAMD64" X="212" Y="237" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKAMD64">#(loc.Redist_amd64)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsSDKARM64" X="194" Y="255" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_arm64)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsRedistARM64" X="212" Y="273" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKARM64">#(loc.Redist_arm64)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsSDKX86" X="194" Y="291" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_x86)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsRedistX86" X="212" Y="309" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKX86">#(loc.Redist_x86)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidPlatform" X="176" Y="327" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Plt_ProductName_Android)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSDKARM64" X="194" Y="345" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_arm64)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSDKAMD64" X="194" Y="363" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_amd64)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSDKARM" X="194" Y="381" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_armv7)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSDKX86" X="194" Y="399" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_x86)</Checkbox>
-
+            <Label X="192" Y="88" Width="-11" Height="20" FontId="2" DisablePrefix="yes">#(loc.OptionsFeaturesLabel)</Label>
+            <Checkbox Name="OptionsInstallBLD" X="192" Y="111" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Bld_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallCLI" X="192" Y="129" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Cli_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallDBG" X="192" Y="147" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Dbg_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallPy" X="210" Y="165" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallDBG">#(loc.EmbeddedPython_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallIDE" X="192" Y="183" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Ide_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallRTL" X="192" Y="201" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Rtl_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsPlatform" X="192" Y="219" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Plt_ProductName_Windows)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsSDKAMD64" X="210" Y="237" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_amd64)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsRedistAMD64" X="228" Y="255" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKAMD64">#(loc.Redist_amd64)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsSDKARM64" X="210" Y="273" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_arm64)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsRedistARM64" X="228" Y="291" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKARM64">#(loc.Redist_arm64)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsSDKX86" X="210" Y="309" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_x86)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsRedistX86" X="228" Y="327" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKX86">#(loc.Redist_x86)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidPlatform" X="192" Y="345" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Plt_ProductName_Android)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidSDKARM64" X="210" Y="363" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_arm64)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidSDKAMD64" X="210" Y="381" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_amd64)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidSDKARM" X="210" Y="399" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_armv7)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidSDKX86" X="210" Y="417" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_x86)</Checkbox>
             <Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
                 <Text>#(loc.OptionsOkButton)</Text>
                 <ChangePageAction Page="Install" />
diff --git a/platforms/Windows/python/python.wixproj b/platforms/Windows/python/python.wixproj
new file mode 100644
index 00000000..0ffd3fdb
--- /dev/null
+++ b/platforms/Windows/python/python.wixproj
@@ -0,0 +1,5 @@
+<Project Sdk="WixToolset.Sdk/4.0.5">
+  <PropertyGroup>
+    <OutputName>python</OutputName>
+  </PropertyGroup>
+</Project>
diff --git a/platforms/Windows/python/python.wxs b/platforms/Windows/python/python.wxs
new file mode 100644
index 00000000..bce6e9dc
--- /dev/null
+++ b/platforms/Windows/python/python.wxs
@@ -0,0 +1,140 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <?define PythonRoot = "$(ImageRoot)\Python-$(PythonVersion)"?>
+  <?if $(ProductArchitecture) = "arm64"?>
+  <?define ArchSuffix = "-arm64"?>
+  <?else?>
+  <?define ArchSuffix = ""?>
+  <?endif?>
+  <?define VariantProductName = !(loc.IdeAsserts_ProductName)?>
+
+  <Package
+    Language="1033"
+    Manufacturer="!(loc.ManufacturerName)"
+    Name="!(loc.EmbeddedPython_ProductName)"
+    UpgradeCode="$(PythonUpgradeCode)"
+    Version="$(NonSemVerProductVersion)"
+    Scope="$(PackageScope)">
+
+    <Media Id="1" Cabinet="python.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+
+    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(PythonUpgradeCode)" />
+    <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
+
+    <DirectoryRef Id="INSTALLROOT">
+      <Directory Id="python" Name="Python-$(PythonVersion)" />
+    </DirectoryRef>
+
+    <ComponentGroup Id="EmbeddedPython" Directory="python">
+      <Component>
+        <File Source="$(PythonRoot)\libcrypto-1_1$(ArchSuffix).dll" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\libffi-7.dll" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\libssl-1_1$(ArchSuffix).dll" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\pyexpat.pyd" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\python.cat" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\python.exe" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\python3.dll" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\python310.dll" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\python310.zip" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\python310._pth" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\pythonw.exe" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\select.pyd" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\sqlite3.dll" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\unicodedata.pyd" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\vcruntime140.dll" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\vcruntime140_1.dll" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\winsound.pyd" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\_asyncio.pyd" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\_bz2.pyd" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\_ctypes.pyd" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\_decimal.pyd" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\_elementtree.pyd" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\_hashlib.pyd" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\_lzma.pyd" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\_msi.pyd" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\_multiprocessing.pyd" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\_overlapped.pyd" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\_queue.pyd" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\_socket.pyd" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\_sqlite3.pyd" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\_ssl.pyd" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\_uuid.pyd" />
+      </Component>
+      <Component>
+        <File Source="$(PythonRoot)\_zoneinfo.pyd" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="EmbeddedPythonLicense">
+      <Component Directory="toolchain_asserts_usr_share_licenses">
+        <File Source="$(PythonRoot)\LICENSE.txt" />
+      </Component>
+    </ComponentGroup>
+
+    <Feature Id="EmbeddedPython" AllowAbsent="no" Title="$(VariantProductName)">
+      <ComponentGroupRef Id="EmbeddedPython" />
+      <ComponentGroupRef Id="EmbeddedPythonLicense" />
+    </Feature>
+  </Package>
+</Wix>
\ No newline at end of file
diff --git a/platforms/Windows/readme.md b/platforms/Windows/readme.md
index 80e8bd4f..b90ef55c 100644
--- a/platforms/Windows/readme.md
+++ b/platforms/Windows/readme.md
@@ -34,6 +34,7 @@ The bundle authoring (in `installer.wxs`) drives optional install directory and
 | InstallRoot | A formatted string variable that specifies the installation root directory. The default value specified in `installer.wxs` should match the equivalent `INSTALLROOT` authoring in `shared.wxs`. The bundle variable is passed to each `MsiPackage` so overwrites the default directory authored in the MSI packages -- but keeping them in sync avoids the confusion if the default directory should change. |
 | OptionsInstallCLI | Controls whether command-line tools will be installed. |
 | OptionsInstallDBG | Controls whether debugging tools will be installed. |
+| OptionsInstallPy | Controls whether embeddable Python will be installed. |
 | OptionsInstallIDE | Controls whether IDE integration tools will be installed. |
 | OptionsInstallUtilties | Controls whether additional utilities will be installed. |
 | OptionsInstallAndroidPlatform | Controls whether the Android platform will be installed. |
@@ -149,6 +150,7 @@ To support the three architecture flavors of the SDK and RTL MSI packages, you n
 | MSBuild property | Description |
 | ---------------- | ----------- |
 | ImageRoot | Path to the root of the installed Swift image to package |
+| PythonVersion | Version of the Embeddable Python to package |
 | Platforms | Semicolon delimited list of platforms to package (android;windows) |
 | AndroidArchitectures | Semicolon delimited list of architectures the Android platform supports (aarch54;armv7;i686;x86_64) |
 | WindowsArchitectures | Semicolon delimited list of architectures the Windows platform supports (aarch64;i686;x86_64) |
@@ -165,10 +167,11 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\bundle\installer.
   -p:Configuration=Release ^
   -p:BaseOutputPath=%PackageRoot%\online\ ^
   -p:ImageRoot=%ImageRoot%\Program Files\Swift ^
+  -p:PythonVersion=3.10.1 ^
   -p:Platforms="android;windows" ^
   -p:AndroidArchitectures="aarch64;armv7;i686;x86_64" ^
   -p:WindowsArchitectures="aarch64;i686;x86_64" ^
-  -p:WindowsRuntimeARM64=%ImageRoot%\Prograam Files (Arm64)\Swift\Runtimes\0.0.0 ^
+  -p:WindowsRuntimeARM64=%ImageRoot%\Program Files (Arm64)\Swift\Runtimes\0.0.0 ^
   -p:WindowsRuntimeX64=%ImageRoot%\Program Files\Swift\Runtimes\0.0.0 ^
   -p:WindowsRuntimeX86=%ImageRoot%\Program Files (x86)\Swift\Runtimes\0.0.0
 ```
@@ -216,7 +219,7 @@ Note that these GUIDs are substituted at bind time so they skip the normal valid
 
 | Property | Description |
 | -------- | ----------- |
-| BldUpgradeCode, CliUpgradeCode, DbgUpgradeCode, IdeUpgradeCode, RtlUpgradeCode, WindowsSDKUpgradeCode, AndroidSDKUpgradeCode | Upgrade codes for individual packages. Packages keep the same upgrade codes "forever" because MSI lets you specify version ranges for upgrades, which you can find in `shared/shared.wxs`. |
+| BldUpgradeCode, CliUpgradeCode, DbgUpgradeCode, IdeUpgradeCode, RtlUpgradeCode, WindowsSDKUpgradeCode, AndroidSDKUpgradeCode, PythonUpgradeCode | Upgrade codes for individual packages. Packages keep the same upgrade codes "forever" because MSI lets you specify version ranges for upgrades, which you can find in `shared/shared.wxs`. |
 | BundleUpgradeCode | Upgrade codes for the bundle. Bundles don't support upgrade version ranges, so the bundle upgrade code must change for every minor version _and_ stay the same for the entire lifetime of that minor version (e.g., v5.10.0 through v5.10.9999). You can keep the history of upgrade codes using a condition like `Condition="'$(MajorMinorProductVersion)' == '5.10'` or just replace BundleUpgradeCode when forking to a new minor version. |
 
 
diff --git a/platforms/Windows/shared/shared.wxs b/platforms/Windows/shared/shared.wxs
index b1dd1330..296f1eb2 100644
--- a/platforms/Windows/shared/shared.wxs
+++ b/platforms/Windows/shared/shared.wxs
@@ -52,6 +52,7 @@
                 <Directory Id="_usr_share_docc" Name="docc">
                   <Directory Id="_usr_share_docc_render" Name="render" />
                 </Directory>
+                <Directory Id="_usr_share_licenses" Name="licenses" />
               </Directory>
             </Directory>
           </Directory>
diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl
index 7b6517ea..c8cb713f 100644
--- a/platforms/Windows/shared/swift.en-us.wxl
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -5,6 +5,7 @@
   <String Id="Bld_ProductName" Value="Swift Build Tools" />
   <String Id="Cli_ProductName" Value="Swift Command Line Tools" />
   <String Id="Dbg_ProductName" Value="Swift Debugging Tools" />
+  <String Id="EmbeddedPython_ProductName" Value="Embedded Python" />
   <String Id="Ide_ProductName" Value="Swift IDE Integration Tools" />
   <String Id="Rtl_ProductName" Value="Swift Windows Runtime" />
   <String Id="VCRuntime_ProductName_arm64" Value="Visual C++ Runtime (ARM64)" />

From 2a827631c0baeb23396347b1d6112aaf6ebe1370 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Thu, 20 Nov 2025 12:33:22 -0800
Subject: [PATCH 2/2] WiX: clean up the python packaging

Restructure the python installation to mimic the Unix style layout that
we use throughout the components. Specifically, migrate the .exe and
.dll files into a `/usr/bin` subdirectory under the installation and
move the license into the package itself.
---
 platforms/Windows/python/python.wxs | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/platforms/Windows/python/python.wxs b/platforms/Windows/python/python.wxs
index bce6e9dc..e2e52f08 100644
--- a/platforms/Windows/python/python.wxs
+++ b/platforms/Windows/python/python.wxs
@@ -21,10 +21,16 @@
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
     <DirectoryRef Id="INSTALLROOT">
-      <Directory Id="python" Name="Python-$(PythonVersion)" />
+      <Directory Id="python" Name="Python-$(PythonVersion)">
+        <Directory Id="_usr" Name="usr">
+          <Directory Id="_usr_bin" Name="bin" />
+          <Directory Id="_usr_share" Name="share">
+            <Directory Id="_usr_share_licenses" Name="licenses" />
+          </Directory>
+      </Directoctory>
     </DirectoryRef>
 
-    <ComponentGroup Id="EmbeddedPython" Directory="python">
+    <ComponentGroup Id="EmbeddedPython" Directory="_usr_bin">
       <Component>
         <File Source="$(PythonRoot)\libcrypto-1_1$(ArchSuffix).dll" />
       </Component>
@@ -124,17 +130,14 @@
       <Component>
         <File Source="$(PythonRoot)\_zoneinfo.pyd" />
       </Component>
-    </ComponentGroup>
 
-    <ComponentGroup Id="EmbeddedPythonLicense">
-      <Component Directory="toolchain_asserts_usr_share_licenses">
-        <File Source="$(PythonRoot)\LICENSE.txt" />
+      <Component Directory="_usr_share_licenses">
+        <File Name="python.txt" Source="$(PythonRoot)\LICENSE.txt" />
       </Component>
     </ComponentGroup>
 
     <Feature Id="EmbeddedPython" AllowAbsent="no" Title="$(VariantProductName)">
       <ComponentGroupRef Id="EmbeddedPython" />
-      <ComponentGroupRef Id="EmbeddedPythonLicense" />
     </Feature>
   </Package>
-</Wix>
\ No newline at end of file
+</Wix>