From 7db0a423329404c2c7cabc8affb3f7c2a1151d77 Mon Sep 17 00:00:00 2001
From: Owen Voorhees <ovoorhees@apple.com>
Date: Mon, 5 May 2025 17:20:10 -0700
Subject: [PATCH] Harvest the SwiftPM/Swift Build resources in /usr/share/pm

---
 platforms/Windows/cli/cli.wixproj   | 12 ++++++++++++
 platforms/Windows/cli/cli.wxs       |  1 +
 platforms/Windows/shared/shared.wxs |  1 +
 3 files changed, 14 insertions(+)

diff --git a/platforms/Windows/cli/cli.wixproj b/platforms/Windows/cli/cli.wixproj
index 5dda6e00..5e998c3e 100644
--- a/platforms/Windows/cli/cli.wixproj
+++ b/platforms/Windows/cli/cli.wixproj
@@ -6,6 +6,7 @@
       INCLUDE_SWIFT_DOCC=$(INCLUDE_SWIFT_DOCC);
       SWIFT_FORMAT_BUILD=$(SWIFT_FORMAT_BUILD);
       SWIFT_DOCC_RENDER_ARTIFACT_ROOT_DIST=$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist;
+      _USR_SHARE_PM=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\share\pm;
     </DefineConstants>
   </PropertyGroup>
 
@@ -13,6 +14,17 @@
     <PackageReference Include="WixToolset.Heat" Version="4.0.5" />
   </ItemGroup>
 
+  <ItemGroup>
+    <HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\share\pm">
+      <ComponentGroupName>PackageManagerResources</ComponentGroupName>
+      <DirectoryRefId>_usr_share_pm</DirectoryRefId>
+      <PreprocessorVariable>var._USR_SHARE_PM</PreprocessorVariable>
+      <SuppressCom>true</SuppressCom>
+      <SuppressRegistry>true</SuppressRegistry>
+      <SuppressRootDirectory>true</SuppressRootDirectory>
+    </HarvestDirectory>
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(INCLUDE_SWIFT_DOCC)' == 'True' ">
     <HarvestDirectory Include="$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist">
       <ComponentGroupName>DocCRender</ComponentGroupName>
diff --git a/platforms/Windows/cli/cli.wxs b/platforms/Windows/cli/cli.wxs
index ea4ff84b..59433056 100644
--- a/platforms/Windows/cli/cli.wxs
+++ b/platforms/Windows/cli/cli.wxs
@@ -344,6 +344,7 @@
       <ComponentGroupRef Id="llbuild" />
       <ComponentGroupRef Id="SwiftBuild" />
       <ComponentGroupRef Id="package_manager" />
+      <ComponentGroupRef Id="PackageManagerResources" />
 
       <ComponentGroupRef Id="DocC" />
       <?if $(INCLUDE_SWIFT_DOCC) = True?>
diff --git a/platforms/Windows/shared/shared.wxs b/platforms/Windows/shared/shared.wxs
index b1dd1330..1b81f9ab 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_pm" Name="pm" />
               </Directory>
             </Directory>
           </Directory>