From 91159fcf94f97661e450dd01b1e363e6c24cf92c Mon Sep 17 00:00:00 2001
From: Charles Zablit <c_zablit@apple.com>
Date: Mon, 4 Aug 2025 15:38:05 +0100
Subject: [PATCH 1/3] [windows] add Python 3.10.1 to the installer

---
 .../Windows/SideBySideUpgradeStrategy.props   |   2 +
 platforms/Windows/bundle/installer.wixproj    |   1 +
 platforms/Windows/bundle/installer.wxs        |   7 +
 platforms/Windows/bundle/theme.xml            |   2 +-
 .../Windows/python/asserts/python.wixproj     |   5 +
 platforms/Windows/python/asserts/python.wxs   |  11 ++
 platforms/Windows/python/python.wxi           | 159 ++++++++++++++++++
 platforms/Windows/readme.md                   |   3 +-
 platforms/Windows/shared/swift.en-us.wxl      |   1 +
 9 files changed, 189 insertions(+), 2 deletions(-)
 create mode 100644 platforms/Windows/python/asserts/python.wixproj
 create mode 100644 platforms/Windows/python/asserts/python.wxs
 create mode 100644 platforms/Windows/python/python.wxi

diff --git a/platforms/Windows/SideBySideUpgradeStrategy.props b/platforms/Windows/SideBySideUpgradeStrategy.props
index 2fcf6fb8..be317a4c 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 693c07a2..0d038c25 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -20,6 +20,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\asserts\python.wixproj" BindName="python" />
     <ProjectReference Include="..\rtl\msi\rtlmsi.wixproj" BindName="rtl" />
   </ItemGroup>
 
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index cf0912a7..c341c053 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -101,6 +101,13 @@
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
+      <MsiPackage
+        SourceFile="!(bindpath.python)\python.msi"
+        InstallCondition="OptionsInstallEmbeddedPython = 1"
+        DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
+        <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+      </MsiPackage>
+
       <MsiPackage
         SourceFile="!(bindpath.ide.asserts)\ide.asserts.msi"
         InstallCondition="OptionsInstallIDE = 1"
diff --git a/platforms/Windows/bundle/theme.xml b/platforms/Windows/bundle/theme.xml
index 5c042120..345636e3 100644
--- a/platforms/Windows/bundle/theme.xml
+++ b/platforms/Windows/bundle/theme.xml
@@ -73,7 +73,7 @@
             <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="OptionsInstallEmbeddedPython" X="192" Y="417" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.EmbeddedPython_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/asserts/python.wixproj b/platforms/Windows/python/asserts/python.wixproj
new file mode 100644
index 00000000..0ffd3fdb
--- /dev/null
+++ b/platforms/Windows/python/asserts/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/asserts/python.wxs b/platforms/Windows/python/asserts/python.wxs
new file mode 100644
index 00000000..1f417512
--- /dev/null
+++ b/platforms/Windows/python/asserts/python.wxs
@@ -0,0 +1,11 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <?define VariantName = asserts ?>
+  <?define VariantUpgradeCode = $(PythonUpgradeCode)?>
+  <?define VariantProductName = !(loc.EmbeddedPython_ProductName)?>
+  <?define VariantCabinetName = python.asserts.cab?>
+  <?define ToolchainVersionedVariantDirectory = ToolchainVersionedAsserts ?>
+  <?define VariantEnvironmentComponentGUID = 30629e0c-b376-47bc-bedf-fefb7d4ca61d?>
+  <?define PythonRoot = "$(ImageRoot)\Python"?>
+
+  <?include ../python.wxi ?>
+</Wix>
\ No newline at end of file
diff --git a/platforms/Windows/python/python.wxi b/platforms/Windows/python/python.wxi
new file mode 100644
index 00000000..50b6aaac
--- /dev/null
+++ b/platforms/Windows/python/python.wxi
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+  <Package
+      Language="1033"
+      Manufacturer="!(loc.ManufacturerName)"
+      Name="$(VariantProductName)"
+      UpgradeCode="$(VariantUpgradeCode)"
+      Version="$(NonSemVerProductVersion)"
+      Scope="$(PackageScope)">
+
+    <Media Id="1" Cabinet="$(VariantCabinetName)" EmbedCab="$(ArePackageCabsEmbedded)" />
+
+    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
+    <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
+
+    <ComponentGroup Id="EmbeddedPython">
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\libcrypto-1_1-arm64.dll" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\libffi-7.dll" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\libssl-1_1-arm64.dll" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\LICENSE.txt" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\pyexpat.pyd" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\python.cat" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\python.exe" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\python3.dll" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\python310.dll" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\python310.zip" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\python310._pth" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\pythonw.exe" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\select.pyd" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\sqlite3.dll" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\unicodedata.pyd" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\vcruntime140.dll" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\vcruntime140_1.dll" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\winsound.pyd" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\_asyncio.pyd" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\_bz2.pyd" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\_ctypes.pyd" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\_decimal.pyd" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\_elementtree.pyd" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\_hashlib.pyd" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\_lzma.pyd" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\_msi.pyd" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\_multiprocessing.pyd" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\_overlapped.pyd" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\_queue.pyd" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\_socket.pyd" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\_sqlite3.pyd" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\_ssl.pyd" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\_uuid.pyd" />
+      </Component>
+
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
+        <File Source="$(PythonRoot)\_zoneinfo.pyd" />
+      </Component>
+    </ComponentGroup>
+
+    <Feature Id="EmbeddedPython" AllowAbsent="yes" Title="$(VariantProductName)">
+      <ComponentGroupRef Id="EmbeddedPython" />
+    </Feature>
+  </Package>
+</Include>
diff --git a/platforms/Windows/readme.md b/platforms/Windows/readme.md
index d3783e11..663482df 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. |
+| OptionsInstallEmbeddedPython | 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. |
@@ -216,7 +217,7 @@ Note that these GUIDs are substituted at bind time so they skip the normal valid
 
 | Property | Description |
 | -------- | ----------- |
-| BldAssertsUpgradeCode, CliAssertsUpgradeCode, DbgAssertsUpgradeCode, 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`. |
+| BldAssertsUpgradeCode, CliAssertsUpgradeCode, DbgAssertsUpgradeCode, 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/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl
index cea243ca..5a898f70 100644
--- a/platforms/Windows/shared/swift.en-us.wxl
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -8,6 +8,7 @@
   <String Id="CliAsserts_ProductName" Value="Swift Command Line Tools (Asserts)" />
   <String Id="Dbg_ProductName" Value="Swift Debugging Tools" />
   <String Id="DbgAsserts_ProductName" Value="Swift Debugging Tools (Asserts)" />
+  <String Id="EmbeddedPython_ProductName" Value="Embedded Python 3.10.1" />
   <String Id="Ide_ProductName" Value="Swift IDE Integration Tools" />
   <String Id="IdeAsserts_ProductName" Value="Swift IDE Integration Tools (Asserts)" />
   <String Id="Rtl_ProductName" Value="Swift Windows Runtime" />

From 888fd5f8593f186d6813b5e6bc707777f0ac20f6 Mon Sep 17 00:00:00 2001
From: Charles Zablit <c_zablit@apple.com>
Date: Tue, 5 Aug 2025 15:00:16 +0100
Subject: [PATCH 2/3] switch to using the PythonRoot parameter

---
 platforms/Windows/python/asserts/python.wxs | 2 +-
 platforms/Windows/readme.md                 | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/platforms/Windows/python/asserts/python.wxs b/platforms/Windows/python/asserts/python.wxs
index 1f417512..6651703d 100644
--- a/platforms/Windows/python/asserts/python.wxs
+++ b/platforms/Windows/python/asserts/python.wxs
@@ -5,7 +5,7 @@
   <?define VariantCabinetName = python.asserts.cab?>
   <?define ToolchainVersionedVariantDirectory = ToolchainVersionedAsserts ?>
   <?define VariantEnvironmentComponentGUID = 30629e0c-b376-47bc-bedf-fefb7d4ca61d?>
-  <?define PythonRoot = "$(ImageRoot)\Python"?>
+  <?define PythonRoot = "$(PythonRoot)"?>
 
   <?include ../python.wxi ?>
 </Wix>
\ No newline at end of file
diff --git a/platforms/Windows/readme.md b/platforms/Windows/readme.md
index 663482df..aab927a1 100644
--- a/platforms/Windows/readme.md
+++ b/platforms/Windows/readme.md
@@ -150,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 |
+| PythonRoot | Path to the root of the Python distribution 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) |
@@ -166,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:PythonRoot=%ImageRoot%\Program Files\Python-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
 ```

From 796d69c00f3ce693d64597e1fd439f71de12f233 Mon Sep 17 00:00:00 2001
From: Charles Zablit <c_zablit@apple.com>
Date: Tue, 5 Aug 2025 16:28:32 +0100
Subject: [PATCH 3/3] address comments

---
 platforms/Windows/Directory.Build.props     |  1 +
 platforms/Windows/python/asserts/python.wxs |  9 ++-
 platforms/Windows/python/python.wxi         | 89 ++++++++++-----------
 platforms/Windows/shared/shared.wxs         |  1 +
 4 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/platforms/Windows/Directory.Build.props b/platforms/Windows/Directory.Build.props
index a59bce70..d811a0ea 100644
--- a/platforms/Windows/Directory.Build.props
+++ b/platforms/Windows/Directory.Build.props
@@ -81,6 +81,7 @@
       ArePackageCabsEmbedded=$(ArePackageCabsEmbedded);
       BaseReleaseDownloadUrl=$(BaseReleaseDownloadUrl);
       ImageRoot=$(ImageRoot);
+      PythonRoot=$(PythonRoot);
       WindowsRuntimeARM64=$(WindowsRuntimeARM64);
       WindowsRuntimeX64=$(WindowsRuntimeX64);
       WindowsRuntimeX86=$(WindowsRuntimeX86);
diff --git a/platforms/Windows/python/asserts/python.wxs b/platforms/Windows/python/asserts/python.wxs
index 6651703d..14b35236 100644
--- a/platforms/Windows/python/asserts/python.wxs
+++ b/platforms/Windows/python/asserts/python.wxs
@@ -5,7 +5,10 @@
   <?define VariantCabinetName = python.asserts.cab?>
   <?define ToolchainVersionedVariantDirectory = ToolchainVersionedAsserts ?>
   <?define VariantEnvironmentComponentGUID = 30629e0c-b376-47bc-bedf-fefb7d4ca61d?>
-  <?define PythonRoot = "$(PythonRoot)"?>
-
+  <?if $(ProductArchitecture) = "arm64" ?>
+    <?define ArchSuffix = "-arm64" ?>
+  <?else?>
+    <?define ArchSuffix = "" ?>
+  <?endif?>
   <?include ../python.wxi ?>
-</Wix>
\ No newline at end of file
+</Wix>
diff --git a/platforms/Windows/python/python.wxi b/platforms/Windows/python/python.wxi
index 50b6aaac..a83815bd 100644
--- a/platforms/Windows/python/python.wxi
+++ b/platforms/Windows/python/python.wxi
@@ -14,146 +14,141 @@
     <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
-    <ComponentGroup Id="EmbeddedPython">
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
-        <File Source="$(PythonRoot)\libcrypto-1_1-arm64.dll" />
+    <ComponentGroup Id="EmbeddedPython" Directory="toolchain_$(VariantName)_usr_bin">
+      <Component >
+        <File Source="$(PythonRoot)\libcrypto-1_1$(ArchSuffix).dll" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\libffi-7.dll" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
-        <File Source="$(PythonRoot)\libssl-1_1-arm64.dll" />
+      <Component>
+        <File Source="$(PythonRoot)\libssl-1_1$(ArchSuffix).dll" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
-        <File Source="$(PythonRoot)\LICENSE.txt" />
-      </Component>
-
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\pyexpat.pyd" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\python.cat" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\python.exe" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\python3.dll" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\python310.dll" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\python310.zip" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\python310._pth" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\pythonw.exe" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\select.pyd" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\sqlite3.dll" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\unicodedata.pyd" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
-        <File Source="$(PythonRoot)\vcruntime140.dll" />
-      </Component>
-
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
-        <File Source="$(PythonRoot)\vcruntime140_1.dll" />
-      </Component>
-
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\winsound.pyd" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\_asyncio.pyd" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\_bz2.pyd" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\_ctypes.pyd" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\_decimal.pyd" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\_elementtree.pyd" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\_hashlib.pyd" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\_lzma.pyd" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\_msi.pyd" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\_multiprocessing.pyd" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\_overlapped.pyd" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\_queue.pyd" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\_socket.pyd" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\_sqlite3.pyd" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\_ssl.pyd" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\_uuid.pyd" />
       </Component>
 
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
+      <Component>
         <File Source="$(PythonRoot)\_zoneinfo.pyd" />
       </Component>
     </ComponentGroup>
 
-    <Feature Id="EmbeddedPython" AllowAbsent="yes" Title="$(VariantProductName)">
+    <ComponentGroup Id="EmbeddedPythonLicense">
+      <Component Directory="toolchain_$(VariantName)_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>
 </Include>
diff --git a/platforms/Windows/shared/shared.wxs b/platforms/Windows/shared/shared.wxs
index 31f95149..1a0066a8 100644
--- a/platforms/Windows/shared/shared.wxs
+++ b/platforms/Windows/shared/shared.wxs
@@ -55,6 +55,7 @@
                 <Directory Id="toolchain_asserts_usr_share_docc" Name="docc">
                   <Directory Id="toolchain_asserts_usr_share_docc_render" Name="render" />
                 </Directory>
+                <Directory Id="toolchain_asserts_usr_share_licenses" Name="licenses" />
               </Directory>
             </Directory>
           </Directory>