From b817c12565654f183d8a5748102b17e644279c26 Mon Sep 17 00:00:00 2001
From: Fabrice de Gans <fabrice@thebrowser.company>
Date: Fri, 16 May 2025 14:38:48 -0700
Subject: [PATCH 1/2] Add missing DLLs

`SwiftSDKCommand.dll` and `SystemPackage.dll` are now required by some
binaries to run.
---
 platforms/Windows/cli/cli.wxs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/platforms/Windows/cli/cli.wxs b/platforms/Windows/cli/cli.wxs
index 8c1a6679..23040dcc 100644
--- a/platforms/Windows/cli/cli.wxs
+++ b/platforms/Windows/cli/cli.wxs
@@ -654,6 +654,12 @@
       </Component>
     </ComponentGroup>
 
+    <ComponentGroup Id="System" Directory="_usr_bin">
+      <Component>
+        <File Source="$(ToolchainRoot)\usr\bin\SystemPackage.dll" />
+      </Component>
+    </ComponentGroup>
+
     <ComponentGroup Id="package_manager" Directory="_usr_bin">
       <ComponentGroupRef Id="CompilerPluginSupport" />
       <ComponentGroupRef Id="PackageDescription" />
@@ -708,6 +714,9 @@
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\SPMBuildCore.dll" />
       </Component>
+      <Component>
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftSDKCommand.dll" />
+      </Component>
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\Workspace.dll" />
       </Component>
@@ -742,6 +751,7 @@
       <ComponentGroupRef Id="collections" />
       <ComponentGroupRef Id="llbuild" />
       <ComponentGroupRef Id="SwiftBuild" />
+      <ComponentGroupRef Id="System" />
       <ComponentGroupRef Id="package_manager" />
 
       <ComponentGroupRef Id="DocC" />

From c16850604913e38cf36a403dab8b4ef0891fc2f5 Mon Sep 17 00:00:00 2001
From: Fabrice de Gans <fabrice@thebrowser.company>
Date: Mon, 19 May 2025 09:04:31 -0700
Subject: [PATCH 2/2] Remove `SystemPackage.dll`

`swift-system` is built statically.
---
 platforms/Windows/cli/cli.wxs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/platforms/Windows/cli/cli.wxs b/platforms/Windows/cli/cli.wxs
index 23040dcc..adbc496a 100644
--- a/platforms/Windows/cli/cli.wxs
+++ b/platforms/Windows/cli/cli.wxs
@@ -654,12 +654,6 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="System" Directory="_usr_bin">
-      <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\SystemPackage.dll" />
-      </Component>
-    </ComponentGroup>
-
     <ComponentGroup Id="package_manager" Directory="_usr_bin">
       <ComponentGroupRef Id="CompilerPluginSupport" />
       <ComponentGroupRef Id="PackageDescription" />
@@ -751,7 +745,6 @@
       <ComponentGroupRef Id="collections" />
       <ComponentGroupRef Id="llbuild" />
       <ComponentGroupRef Id="SwiftBuild" />
-      <ComponentGroupRef Id="System" />
       <ComponentGroupRef Id="package_manager" />
 
       <ComponentGroupRef Id="DocC" />