From 0d227c16602dbf61126101a8e8ee3735df9136b6 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] [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            |  40 +-
 platforms/Windows/python/python.wixproj       |   5 +
 platforms/Windows/python/python.wxs           | 132 ++++++
 platforms/Windows/readme.md                   |   7 +-
 platforms/Windows/shared/shared.wxs           | 383 ++++++++++++++++++
 platforms/Windows/shared/swift.en-us.wxl      |   1 +
 10 files changed, 558 insertions(+), 22 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 72b72d1f..382ce242 100644
--- a/platforms/Windows/Directory.Build.props
+++ b/platforms/Windows/Directory.Build.props
@@ -84,6 +84,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 6cf3935e..54d4727c 100644
--- a/platforms/Windows/SideBySideUpgradeStrategy.props
+++ b/platforms/Windows/SideBySideUpgradeStrategy.props
@@ -29,6 +29,7 @@
     <ExperimentalRTLUpgradeCode>{F9BA01C7-0C7C-4898-90BD-9D6BB308F0B3}</ExperimentalRTLUpgradeCode>
     <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'">
@@ -71,6 +72,7 @@
       ExperimentalRTLUpgradeCode=$(ExperimentalRTLUpgradeCode);
       AndroidPlatformUpgradeCode=$(AndroidPlatformUpgradeCode);
       WindowsPlatformUpgradeCode=$(WindowsPlatformUpgradeCode);
+      PythonUpgradeCode=$(PythonUpgradeCode);
     </DefineConstants>
   </PropertyGroup>
 </Project>
diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
index 9a3d53ae..4cfe3236 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -21,6 +21,7 @@
     <ProjectReference Include="..\cli\asserts\cli.asserts.wixproj" BindName="cli.asserts" />
     <ProjectReference Include="..\dbg\asserts\dbg.asserts.wixproj" BindName="dbg.asserts" />
     <ProjectReference Include="..\ide\asserts\ide.asserts.wixproj" BindName="ide.asserts" />
+    <ProjectReference Include="..\python\python.wixproj" BindName="python" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(ToolchainVariants.Contains('noasserts')) ">
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index 194300e8..7c92d20d 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" />
 
@@ -134,6 +135,13 @@
         </MsiPackage>
       <?endif?>
 
+      <MsiPackage
+        SourceFile="!(bindpath.python)\python.msi"
+        InstallCondition="OptionsInstallPy = 1 and OptionsInstallDBG = 1"
+        DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
+        <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+      </MsiPackage>
+
       <MsiPackage
         SourceFile="!(bindpath.ide.asserts)\ide.asserts.msi"
         InstallCondition="OptionsInstallIDE = 1 and OptionsInstallAssertsToolchain = 1"
diff --git a/platforms/Windows/bundle/theme.xml b/platforms/Windows/bundle/theme.xml
index 2b280c14..97d94318 100644
--- a/platforms/Windows/bundle/theme.xml
+++ b/platforms/Windows/bundle/theme.xml
@@ -9,8 +9,8 @@
     <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>
 
-    <Window Width="630" Height="500" HexStyle="100a0000" FontId="0" Caption="#(loc.Caption)">
-        <ImageControl X="0" Y="0" Width="181" Height="500" ImageFile="swift_side.png"/>
+    <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>
 
         <Page Name="Help">
@@ -59,24 +59,24 @@
             <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="OptionsInstallIDE" X="192" Y="165" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Ide_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallRTL" X="192" Y="183" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Rtl_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsPlatform" X="192" Y="201" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Plt_ProductName_Windows)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsSDKAMD64" X="210" Y="219" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_amd64)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsRedistAMD64" X="228" Y="237" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKAMD64">#(loc.Redist_amd64)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsSDKARM64" X="210" Y="255" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_arm64)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsRedistARM64" X="228" Y="273" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKARM64">#(loc.Redist_arm64)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsSDKX86" X="210" Y="291" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_x86)</Checkbox>
-            <Checkbox Name="OptionsInstallWindowsRedistX86" X="228" Y="309" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKX86">#(loc.Redist_x86)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidPlatform" X="192" Y="327" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Plt_ProductName_Android)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSDKARM64" X="210" Y="345" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_arm64)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSDKAMD64" X="210" Y="363" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_amd64)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSDKARM" X="210" Y="381" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_armv7)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSDKX86" X="210" Y="399" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_x86)</Checkbox>
-            <Checkbox Name="OptionsInstallToolchain" X="192" Y="417" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Toolchain_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallAssertsToolchain" X="210" Y="435" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsIncludeNoAsserts and OptionsInstallNoAssertsToolchain">#(loc.Asserts_Toolchain_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallNoAssertsToolchain" X="210" Y="453" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsIncludeNoAsserts and OptionsInstallAssertsToolchain">#(loc.NoAsserts_Toolchain_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>
+            <Checkbox Name="OptionsInstallToolchain" X="192" Y="435" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Toolchain_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallAssertsToolchain" X="210" Y="453" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsIncludeNoAsserts and OptionsInstallNoAssertsToolchain">#(loc.Asserts_Toolchain_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallNoAssertsToolchain" X="210" Y="471" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsIncludeNoAsserts and OptionsInstallAssertsToolchain">#(loc.NoAsserts_Toolchain_ProductName)</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..e5dba34c
--- /dev/null
+++ b/platforms/Windows/python/python.wxs
@@ -0,0 +1,132 @@
+<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" />
+
+    <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)\LICENSE.txt" />
+      </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>
+
+    <Feature Id="EmbeddedPython" AllowAbsent="no" Title="$(VariantProductName)">
+      <ComponentGroupRef Id="EmbeddedPython" />
+    </Feature>
+  </Package>
+</Wix>
\ No newline at end of file
diff --git a/platforms/Windows/readme.md b/platforms/Windows/readme.md
index 6184ecf7..3ad967e1 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. |
@@ -177,6 +178,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) |
 | ToolchainVariants | Semicolon delimited list of toolchain variants to package (assert;noassert) |
@@ -194,10 +196,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
 ```
@@ -245,7 +248,7 @@ Note that these GUIDs are substituted at bind time so they skip the normal valid
 
 | Property | Description |
 | -------- | ----------- |
-| BldAssertsUpgradeCode, BldNoAssertsUpgradeCode, CliAssertsUpgradeCode, CliNoAssertsUpgradeCode, DbgAssertsUpgradeCode, DbgNoAssertsUpgradeCode, IdeUpgradeCode, IdeNoUpgradeCode, 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`. |
+| BldAssertsUpgradeCode, BldNoAssertsUpgradeCode, CliAssertsUpgradeCode, CliNoAssertsUpgradeCode, DbgAssertsUpgradeCode, DbgNoAssertsUpgradeCode, IdeUpgradeCode, IdeNoUpgradeCode, 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 b3554f10..a67c65e4 100644
--- a/platforms/Windows/shared/shared.wxs
+++ b/platforms/Windows/shared/shared.wxs
@@ -35,6 +35,389 @@
     </DirectoryRef>
   </Fragment>
 
+  <Fragment>
+    <DirectoryRef Id="INSTALLROOT">
+      <Directory Id="python" Name="Python-$(PythonVersion)">
+        <Directory Id="python_lib" Name="Lib">
+          <Directory Id="python_lib_site_packages" Name="site-packages">
+            <Directory Id="python_lib_site_packages_pip" Name="pip">
+              <Directory Id="python_lib_site_packages_pip__internal" Name="_internal">
+                <Directory Id="python_lib_site_packages_pip__internal_cli" Name="cli" />
+                <Directory Id="python_lib_site_packages_pip__internal_commands" Name="commands" />
+                <Directory Id="python_lib_site_packages_pip__internal_distributions"
+                  Name="distributions" />
+                <Directory Id="python_lib_site_packages_pip__internal_index" Name="index" />
+                <Directory Id="python_lib_site_packages_pip__internal_locations"
+                  Name="locations" />
+                <Directory Id="python_lib_site_packages_pip__internal_metadata" Name="metadata">
+                  <Directory Id="python_lib_site_packages_pip__internal_metadata_importlib"
+                    Name="importlib" />
+                </Directory>
+                <Directory Id="python_lib_site_packages_pip__internal_models" Name="models" />
+                <Directory Id="python_lib_site_packages_pip__internal_network" Name="network" />
+                <Directory Id="python_lib_site_packages_pip__internal_operations"
+                  Name="operations">
+                  <Directory Id="python_lib_site_packages_pip__internal_operations_build"
+                    Name="build" />
+                  <Directory Id="python_lib_site_packages_pip__internal_operations_install"
+                    Name="install" />
+                </Directory>
+                <Directory Id="python_lib_site_packages_pip__internal_req" Name="req" />
+                <Directory Id="python_lib_site_packages_pip__internal_resolution"
+                  Name="resolution">
+                  <Directory Id="python_lib_site_packages_pip__internal_resolution_legacy"
+                    Name="legacy" />
+                  <Directory Id="python_lib_site_packages_pip__internal_resolution_resolvelib"
+                    Name="resolvelib" />
+                </Directory>
+                <Directory Id="python_lib_site_packages_pip__internal_utils" Name="utils" />
+                <Directory Id="python_lib_site_packages_pip__internal_vcs" Name="vcs" />
+              </Directory>
+              <Directory Id="python_lib_site_packages_pip__vendor" Name="_vendor">
+                <Directory Id="python_lib_site_packages_pip__vendor_cachecontrol"
+                  Name="cachecontrol">
+                  <Directory Id="python_lib_site_packages_pip__vendor_cachecontrol_caches"
+                    Name="caches" />
+                </Directory>
+                <Directory Id="python_lib_site_packages_pip__vendor_certifi" Name="certifi" />
+                <Directory Id="python_lib_site_packages_pip__vendor_dependency_groups"
+                  Name="dependency_groups" />
+                <Directory Id="python_lib_site_packages_pip__vendor_distlib" Name="distlib" />
+                <Directory Id="python_lib_site_packages_pip__vendor_distro" Name="distro" />
+                <Directory Id="python_lib_site_packages_pip__vendor_idna" Name="idna" />
+                <Directory Id="python_lib_site_packages_pip__vendor_msgpack" Name="msgpack" />
+                <Directory Id="python_lib_site_packages_pip__vendor_packaging" Name="packaging">
+                  <Directory Id="python_lib_site_packages_pip__vendor_packaging_licenses"
+                    Name="licenses" />
+                </Directory>
+                <Directory Id="python_lib_site_packages_pip__vendor_pkg_resources"
+                  Name="pkg_resources" />
+                <Directory Id="python_lib_site_packages_pip__vendor_platformdirs"
+                  Name="platformdirs" />
+                <Directory Id="python_lib_site_packages_pip__vendor_pygments" Name="pygments">
+                  <Directory Id="python_lib_site_packages_pip__vendor_pygments_filters"
+                    Name="filters" />
+                  <Directory Id="python_lib_site_packages_pip__vendor_pygments_formatters"
+                    Name="formatters" />
+                  <Directory Id="python_lib_site_packages_pip__vendor_pygments_lexers"
+                    Name="lexers" />
+                  <Directory Id="python_lib_site_packages_pip__vendor_pygments_styles"
+                    Name="styles" />
+                </Directory>
+                <Directory Id="python_lib_site_packages_pip__vendor_pyproject_hooks"
+                  Name="pyproject_hooks">
+                  <Directory
+                    Id="python_lib_site_packages_pip__vendor_pyproject_hooks__in_process"
+                    Name="_in_process" />
+                </Directory>
+                <Directory Id="python_lib_site_packages_pip__vendor_requests" Name="requests" />
+                <Directory Id="python_lib_site_packages_pip__vendor_resolvelib"
+                  Name="resolvelib">
+                  <Directory Id="python_lib_site_packages_pip__vendor_resolvelib_resolvers"
+                    Name="resolvers" />
+                </Directory>
+                <Directory Id="python_lib_site_packages_pip__vendor_rich" Name="rich" />
+                <Directory Id="python_lib_site_packages_pip__vendor_tomli" Name="tomli" />
+                <Directory Id="python_lib_site_packages_pip__vendor_tomli_w" Name="tomli_w" />
+                <Directory Id="python_lib_site_packages_pip__vendor_truststore"
+                  Name="truststore" />
+                <Directory Id="python_lib_site_packages_pip__vendor_urllib3" Name="urllib3">
+                  <Directory Id="python_lib_site_packages_pip__vendor_urllib3_contrib"
+                    Name="contrib">
+                    <Directory
+                      Id="python_lib_site_packages_pip__vendor_urllib3_contrib__securetransport"
+                      Name="_securetransport" />
+                  </Directory>
+                  <Directory Id="python_lib_site_packages_pip__vendor_urllib3_packages"
+                    Name="packages">
+                    <Directory
+                      Id="python_lib_site_packages_pip__vendor_urllib3_packages_backports"
+                      Name="backports" />
+                  </Directory>
+                  <Directory Id="python_lib_site_packages_pip__vendor_urllib3_util"
+                    Name="util" />
+                </Directory>
+              </Directory>
+            </Directory>
+            <Directory Id="python_lib_site_packages_pip_25.3.dist_info" Name="pip-25.3.dist-info">
+              <Directory Id="python_lib_site_packages_pip_25.3.dist_info_licenses" Name="licenses">
+                <Directory Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src"
+                  Name="src">
+                  <Directory Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip"
+                    Name="pip">
+                    <Directory
+                      Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip__vendor"
+                      Name="_vendor">
+                      <Directory
+                        Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip_v_c"
+                        Name="cachecontrol" />
+                      <Directory
+                        Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip_v_c1"
+                        Name="certifi" />
+                      <Directory
+                        Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip_v_d_g"
+                        Name="dependency_groups" />
+                      <Directory
+                        Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip_v_d"
+                        Name="distlib" />
+                      <Directory
+                        Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip_v_d1"
+                        Name="distro" />
+                      <Directory
+                        Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip_v_i"
+                        Name="idna" />
+                      <Directory
+                        Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip_v_m"
+                        Name="msgpack" />
+                      <Directory
+                        Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip_v_p"
+                        Name="packaging" />
+                      <Directory
+                        Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip_v_p_r"
+                        Name="pkg_resources" />
+                      <Directory
+                        Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip_v_p1"
+                        Name="platformdirs" />
+                      <Directory
+                        Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip_v_p2"
+                        Name="pygments" />
+                      <Directory
+                        Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip_v_p_h"
+                        Name="pyproject_hooks" />
+                      <Directory
+                        Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip_v_r"
+                        Name="requests" />
+                      <Directory
+                        Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip_v_r1"
+                        Name="resolvelib" />
+                      <Directory
+                        Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip_v_r2"
+                        Name="rich" />
+                      <Directory
+                        Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip_v_t"
+                        Name="tomli" />
+                      <Directory
+                        Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip_v_t_w"
+                        Name="tomli_w" />
+                      <Directory
+                        Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip_v_t1"
+                        Name="truststore" />
+                      <Directory
+                        Id="python_lib_site_packages_pip_25.3.dist_info_licenses_src_pip_v_u"
+                        Name="urllib3" />
+                    </Directory>
+                  </Directory>
+                </Directory>
+              </Directory>
+            </Directory>
+            <Directory Id="python_lib_site_packages_pkg_resources" Name="pkg_resources">
+              <Directory Id="python_lib_site_packages_pkg_resources_tests" Name="tests">
+                <Directory Id="python_lib_site_packages_pkg_resources_tests_data" Name="data">
+                  <Directory
+                    Id="python_lib_site_packages_pkg_resources_tests_data_my_test_package_source"
+                    Name="my-test-package-source" />
+                  <Directory
+                    Id="python_lib_site_packages_pkg_resources_tests_data_my_test_package_zip"
+                    Name="my-test-package-zip" />
+                  <Directory
+                    Id="python_lib_site_packages_pkg_resources_tests_data_my_test_package_u_e"
+                    Name="my-test-package_unpacked-egg">
+                    <Directory
+                      Id="python_lib_site_packages_pkg_resources_tests_data_m_t_p_u_e_m_t_p_1_p"
+                      Name="my_test_package-1.0-py3.7.egg">
+                      <Directory
+                        Id="python_lib_site_packages_pkg_resources_tests_d_m_t_p_u_e_m_t_p_1_p_e_i"
+                        Name="EGG-INFO" />
+                    </Directory>
+                  </Directory>
+                  <Directory
+                    Id="python_lib_site_packages_pkg_resources_tests_data_my_test_package_z_e"
+                    Name="my-test-package_zipped-egg" />
+                </Directory>
+              </Directory>
+            </Directory>
+            <Directory Id="python_lib_site_packages_setuptools" Name="setuptools">
+              <Directory Id="python_lib_site_packages_setuptools_command" Name="command" />
+              <Directory Id="python_lib_site_packages_setuptools_compat" Name="compat" />
+              <Directory Id="python_lib_site_packages_setuptools_config" Name="config">
+                <Directory Id="python_lib_site_packages_setuptools_config__validate_pyproject"
+                  Name="_validate_pyproject" />
+              </Directory>
+              <Directory Id="python_lib_site_packages_setuptools_tests" Name="tests">
+                <Directory Id="python_lib_site_packages_setuptools_tests_compat" Name="compat" />
+                <Directory Id="python_lib_site_packages_setuptools_tests_config" Name="config">
+                  <Directory Id="python_lib_site_packages_setuptools_tests_config_downloads"
+                    Name="downloads" />
+                </Directory>
+                <Directory Id="python_lib_site_packages_setuptools_tests_indexes" Name="indexes">
+                  <Directory
+                    Id="python_lib_site_packages_setuptools_tests_indexes_test_links_priority"
+                    Name="test_links_priority">
+                    <Directory
+                      Id="python_lib_site_packages_setuptools_tests_indexes_test_links_p_s"
+                      Name="simple">
+                      <Directory
+                        Id="python_lib_site_packages_setuptools_tests_indexes_test_links_p_s_f"
+                        Name="foobar" />
+                    </Directory>
+                  </Directory>
+                </Directory>
+                <Directory Id="python_lib_site_packages_setuptools_tests_integration"
+                  Name="integration" />
+              </Directory>
+              <Directory Id="python_lib_site_packages_setuptools__distutils" Name="_distutils">
+                <Directory Id="python_lib_site_packages_setuptools__distutils_command"
+                  Name="command" />
+                <Directory Id="python_lib_site_packages_setuptools__distutils_compat"
+                  Name="compat" />
+                <Directory Id="python_lib_site_packages_setuptools__distutils_compilers"
+                  Name="compilers">
+                  <Directory Id="python_lib_site_packages_setuptools__distutils_compilers_c"
+                    Name="C">
+                    <Directory
+                      Id="python_lib_site_packages_setuptools__distutils_compilers_c_tests"
+                      Name="tests" />
+                  </Directory>
+                </Directory>
+                <Directory Id="python_lib_site_packages_setuptools__distutils_tests"
+                  Name="tests">
+                  <Directory Id="python_lib_site_packages_setuptools__distutils_tests_compat"
+                    Name="compat" />
+                </Directory>
+              </Directory>
+              <Directory Id="python_lib_site_packages_setuptools__vendor" Name="_vendor">
+                <Directory Id="python_lib_site_packages_setuptools__vendor_autocommand"
+                  Name="autocommand" />
+                <Directory
+                  Id="python_lib_site_packages_setuptools__vendor_autocommand_2.2.2.dist_info"
+                  Name="autocommand-2.2.2.dist-info" />
+                <Directory Id="python_lib_site_packages_setuptools__vendor_backports"
+                  Name="backports">
+                  <Directory
+                    Id="python_lib_site_packages_setuptools__vendor_backports_tarfile"
+                    Name="tarfile">
+                    <Directory
+                      Id="python_lib_site_packages_setuptools__vendor_backports_tarfile_compat"
+                      Name="compat" />
+                  </Directory>
+                </Directory>
+                <Directory Id="python_lib_site_packages_setuptools_vendor_backports.tarfile_1_i"
+                  Name="backports.tarfile-1.2.0.dist-info" />
+                <Directory Id="python_lib_site_packages_setuptools__vendor_importlib_metadata"
+                  Name="importlib_metadata">
+                  <Directory
+                    Id="python_lib_site_packages_setuptools__vendor_importlib_metadata_compat"
+                    Name="compat" />
+                </Directory>
+                <Directory
+                  Id="python_lib_site_packages_setuptools_vendor_importlib_metadata_8_i"
+                  Name="importlib_metadata-8.0.0.dist-info" />
+                <Directory Id="python_lib_site_packages_setuptools__vendor_inflect"
+                  Name="inflect">
+                  <Directory Id="python_lib_site_packages_setuptools__vendor_inflect_compat"
+                    Name="compat" />
+                </Directory>
+                <Directory
+                  Id="python_lib_site_packages_setuptools__vendor_inflect_7.3.1.dist_info"
+                  Name="inflect-7.3.1.dist-info" />
+                <Directory Id="python_lib_site_packages_setuptools__vendor_jaraco" Name="jaraco">
+                  <Directory
+                    Id="python_lib_site_packages_setuptools__vendor_jaraco_collections"
+                    Name="collections" />
+                  <Directory Id="python_lib_site_packages_setuptools__vendor_jaraco_functools"
+                    Name="functools" />
+                  <Directory Id="python_lib_site_packages_setuptools__vendor_jaraco_text"
+                    Name="text" />
+                </Directory>
+                <Directory
+                  Id="python_lib_site_packages_setuptools_vendor_jaraco.collections_5_i"
+                  Name="jaraco.collections-5.1.0.dist-info" />
+                <Directory
+                  Id="python_lib_site_packages_setuptools_vendor_jaraco.context_5.3.0.dist_i"
+                  Name="jaraco.context-5.3.0.dist-info" />
+                <Directory Id="python_lib_site_packages_setuptools_vendor_jaraco.functools_4_i"
+                  Name="jaraco.functools-4.0.1.dist-info" />
+                <Directory
+                  Id="python_lib_site_packages_setuptools__vendor_jaraco.text_3.12.1.dist_info"
+                  Name="jaraco.text-3.12.1.dist-info" />
+                <Directory Id="python_lib_site_packages_setuptools__vendor_more_itertools"
+                  Name="more_itertools" />
+                <Directory
+                  Id="python_lib_site_packages_setuptools_vendor_more_itertools_10.3.0.dist_i"
+                  Name="more_itertools-10.3.0.dist-info" />
+                <Directory Id="python_lib_site_packages_setuptools__vendor_packaging"
+                  Name="packaging">
+                  <Directory
+                    Id="python_lib_site_packages_setuptools__vendor_packaging_licenses"
+                    Name="licenses" />
+                </Directory>
+                <Directory
+                  Id="python_lib_site_packages_setuptools__vendor_packaging_24.2.dist_info"
+                  Name="packaging-24.2.dist-info" />
+                <Directory Id="python_lib_site_packages_setuptools__vendor_platformdirs"
+                  Name="platformdirs" />
+                <Directory
+                  Id="python_lib_site_packages_setuptools__vendor_platformdirs_4.2.2.dist_info"
+                  Name="platformdirs-4.2.2.dist-info">
+                  <Directory
+                    Id="python_lib_site_packages_setuptools_vendor_platformdirs_4.2.2.dist_i_l"
+                    Name="licenses" />
+                </Directory>
+                <Directory Id="python_lib_site_packages_setuptools__vendor_tomli" Name="tomli" />
+                <Directory
+                  Id="python_lib_site_packages_setuptools__vendor_tomli_2.0.1.dist_info"
+                  Name="tomli-2.0.1.dist-info" />
+                <Directory Id="python_lib_site_packages_setuptools__vendor_typeguard"
+                  Name="typeguard" />
+                <Directory
+                  Id="python_lib_site_packages_setuptools__vendor_typeguard_4.3.0.dist_info"
+                  Name="typeguard-4.3.0.dist-info" />
+                <Directory Id="python_lib_site_packages_setuptools_vendor_typing_extensions_4_i"
+                  Name="typing_extensions-4.12.2.dist-info" />
+                <Directory Id="python_lib_site_packages_setuptools__vendor_wheel" Name="wheel">
+                  <Directory Id="python_lib_site_packages_setuptools__vendor_wheel_cli"
+                    Name="cli" />
+                  <Directory Id="python_lib_site_packages_setuptools__vendor_wheel_vendored"
+                    Name="vendored">
+                    <Directory
+                      Id="python_lib_site_packages_setuptools__vendor_wheel_vendored_packaging"
+                      Name="packaging" />
+                  </Directory>
+                </Directory>
+                <Directory
+                  Id="python_lib_site_packages_setuptools__vendor_wheel_0.45.1.dist_info"
+                  Name="wheel-0.45.1.dist-info" />
+                <Directory Id="python_lib_site_packages_setuptools__vendor_zipp" Name="zipp">
+                  <Directory Id="python_lib_site_packages_setuptools__vendor_zipp_compat"
+                    Name="compat" />
+                </Directory>
+                <Directory
+                  Id="python_lib_site_packages_setuptools__vendor_zipp_3.19.2.dist_info"
+                  Name="zipp-3.19.2.dist-info" />
+              </Directory>
+            </Directory>
+            <Directory Id="python_lib_site_packages_setuptools_80.9.0.dist_info"
+              Name="setuptools-80.9.0.dist-info">
+              <Directory Id="python_lib_site_packages_setuptools_80.9.0.dist_info_licenses"
+                Name="licenses" />
+            </Directory>
+            <Directory Id="python_lib_site_packages_wheel" Name="wheel">
+              <Directory Id="python_lib_site_packages_wheel_cli" Name="cli" />
+              <Directory Id="python_lib_site_packages_wheel_vendored" Name="vendored">
+                <Directory Id="python_lib_site_packages_wheel_vendored_packaging"
+                  Name="packaging" />
+              </Directory>
+            </Directory>
+            <Directory Id="python_lib_site_packages_wheel_0.45.1.dist_info"
+              Name="wheel-0.45.1.dist-info" />
+            <Directory Id="python_lib_site_packages__distutils_hack" Name="_distutils_hack" />
+          </Directory>
+        </Directory>
+        <Directory Id="python_scripts" Name="Scripts" />
+      </Directory>
+    </DirectoryRef>
+  </Fragment>
+
   <Fragment>
     <DirectoryRef Id="INSTALLROOT">
         <Directory Name="Toolchains">
diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl
index fa3960f9..e08941ad 100644
--- a/platforms/Windows/shared/swift.en-us.wxl
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -11,6 +11,7 @@
   <String Id="Dbg_ProductName" Value="Swift Debugging Tools" />
   <String Id="DbgAsserts_ProductName" Value="Swift Debugging Tools (Asserts)" />
   <String Id="DbgNoAsserts_ProductName" Value="Swift Debugging Tools (NoAsserts)" />
+  <String Id="EmbeddedPython_ProductName" Value="Embedded Python" />
   <String Id="Ide_ProductName" Value="Swift IDE Integration Tools" />
   <String Id="IdeAsserts_ProductName" Value="Swift IDE Integration Tools (Asserts)" />
   <String Id="IdeNoAsserts_ProductName" Value="Swift IDE Integration Tools (NoAsserts)" />