From c4630da7a263d76c3fcb6012b0129e0864dcd961 Mon Sep 17 00:00:00 2001
From: Igor Velikorossov <igor.velikorossov@microsoft.com>
Date: Wed, 31 Jul 2024 13:04:38 +1000
Subject: [PATCH] Add PackageManager.UI.runtimeconfig.json to nupkg and zip
 artifacts

---
 .../GitExtensions.PluginManager.nuspec             |  1 +
 .../Project.Publish.targets                        | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec
index d6a7d5c..3e860f7 100644
--- a/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec
+++ b/src/GitExtensions.PluginManager/GitExtensions.PluginManager.nuspec
@@ -16,5 +16,6 @@
     <file src="../../LICENSE.md" target="/" />
     <file src="bin/$configuration$/net8.0-windows/GitExtensions.PluginManager.dll" target="lib/" />
     <file src="bin/$configuration$/net8.0-windows/PackageManager/PackageManager.UI.exe" target="lib/PackageManager/" />
+    <file src="bin/$configuration$/net8.0-windows/PackageManager.UI.runtimeconfig.json" target="lib/PackageManager/" />
   </files>
 </package>
\ No newline at end of file
diff --git a/src/GitExtensions.PluginManager/Project.Publish.targets b/src/GitExtensions.PluginManager/Project.Publish.targets
index 83b760a..59487da 100644
--- a/src/GitExtensions.PluginManager/Project.Publish.targets
+++ b/src/GitExtensions.PluginManager/Project.Publish.targets
@@ -13,17 +13,27 @@
     -->
   <Target Name="_CopyPackageManager">
     <PropertyGroup>
-      <_PackageManagerSourcePath>$([MSBuild]::NormalizePath('$(RepoRoot)', 'src', 'PackageManager.UI', 'bin', '$(Configuration)', '$(TargetFramework)', '$(PackageManagerUIRuntimeIdentifier)', 'publish', 'PackageManager.UI.exe'))</_PackageManagerSourcePath>
-      <_PackageManagerTargetPath>$(_PackageManagerFolder)\PackageManager.UI.exe</_PackageManagerTargetPath>
+      <!-- Determine where PackageManager.UI.exe and PackageManager.UI.runtimeconfig.json files are -->
+      <_PackageManagerSourceDir>$([MSBuild]::NormalizePath('$(RepoRoot)', 'src', 'PackageManager.UI', 'bin', '$(Configuration)', '$(TargetFramework)', '$(PackageManagerUIRuntimeIdentifier)', 'publish'))</_PackageManagerSourceDir>
+      <_PackageManagerSourcePath>$([MSBuild]::NormalizePath('$(_PackageManagerSourceDir)', 'PackageManager.UI.exe'))</_PackageManagerSourcePath>
+      <_PackageManagerRuntimeConfigSourcePath>$([MSBuild]::NormalizePath('$(_PackageManagerSourceDir)', '..', 'PackageManager.UI.runtimeconfig.json'))</_PackageManagerRuntimeConfigSourcePath>
+
+      <!-- Determine where PackageManager.UI.exe and PackageManager.UI.runtimeconfig.json files need to be copied to -->
+      <_PackageManagerTargetPath>$(_PackageManagerFolder)/PackageManager.UI.exe</_PackageManagerTargetPath>
+      <_PackageManagerRuntimeConfigTargetPath>$(_PackageManagerFolder)/PackageManager.UI.runtimeconfig.json</_PackageManagerRuntimeConfigTargetPath>
     </PropertyGroup>
 
     <!-- Copying to we can pack it -->
     <Copy SourceFiles="$(_PackageManagerSourcePath)"
           DestinationFiles="$(TargetDir)$(_PackageManagerTargetPath)" />
+    <Copy SourceFiles="$(_PackageManagerRuntimeConfigSourcePath)"
+          DestinationFiles="$(TargetDir)$(_PackageManagerRuntimeConfigTargetPath)" />
 
     <!-- Copying to Git Extensions shared installation so we can test it locally -->
     <Copy SourceFiles="$(_PackageManagerSourcePath)"
           DestinationFiles="$(GitExtensionsPluginsPath)\$(ProjectName)\$(_PackageManagerTargetPath)" />
+    <Copy SourceFiles="$(_PackageManagerRuntimeConfigSourcePath)"
+          DestinationFiles="$(GitExtensionsPluginsPath)\$(ProjectName)\$(_PackageManagerRuntimeConfigTargetPath)" />
   </Target>
 
   <!--