From ea9cc0d27db01d504b7e0d0280939fb847e52056 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Sun, 24 Mar 2024 08:07:40 -0600
Subject: [PATCH] chore: fixing output directory for Runtime Assets

---
 src/Resizetizer/src/Resizetizer.csproj | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Resizetizer/src/Resizetizer.csproj b/src/Resizetizer/src/Resizetizer.csproj
index 2e42b912..24100fa8 100644
--- a/src/Resizetizer/src/Resizetizer.csproj
+++ b/src/Resizetizer/src/Resizetizer.csproj
@@ -74,11 +74,20 @@
 
 	<Import Project="../Directory.UnoMetadata.targets" />
 
+	<Target Name="GatherRuntimeAssets"
+		BeforeTargets="PackNuGetLockFiles;CopyAssetsForSampleProject">
+		<ItemGroup>
+			<_RuntimeAssets Include="@(RuntimeTargetsCopyLocalItems)"
+				OutputDirectory="$([System.Text.RegularExpressions.Regex]::Replace(%(RuntimeTargetsCopyLocalItems.RuntimeIdentifier), '^(linux|win)-', ''))"
+				Condition="%(RuntimeTargetsCopyLocalItems.RuntimeIdentifier) != 'win' AND %(RuntimeTargetsCopyLocalItems.RuntimeIdentifier) != 'unix'" />
+		</ItemGroup>
+	</Target>
+
 	<Target Name="PackNuGetLockFiles"
 			BeforeTargets="DownloadAndSetPackageIcon;Pack;GenerateNuspec">
 		<ItemGroup>
 			<None Include="@(ReferenceCopyLocalPaths)" Pack="true" PackagePath="$(BuildOutputTargetFolder)/$(TargetFramework)" />
-			<None Include="@(RuntimeTargetsCopyLocalItems)" Pack="true" PackagePath="$(BuildOutputTargetFolder)/$(TargetFramework)/%(RuntimeTargetsCopyLocalItems.RuntimeIdentifier)" />
+			<None Include="@(_RuntimeAssets)" Pack="true" PackagePath="$(BuildOutputTargetFolder)/$(TargetFramework)/%(_RuntimeAssets.OutputDirectory)" />
 		</ItemGroup>
 	</Target>
 
@@ -86,8 +95,6 @@
 		AfterTargets="Build">
 		<ItemGroup>
 			<_OutputFile Include="$(OutDir)\**\*.*" Exclude="$(OutDir)\**\*.targets"/>
-			<_RuntimeLibrary Include="@(RuntimeTargetsCopyLocalItems)"
-				OutputDirectory="$([MSBuild]::NormalizeDirectory('$(UnoNuspecDirectory)', '$(TargetFramework)\%(RuntimeTargetsCopyLocalItems.RuntimeIdentifier)'))" />
 		</ItemGroup>
 
 		<Copy SourceFiles="@(_OutputFile)"
@@ -95,8 +102,8 @@
 			SkipUnchangedFiles="true"
 			OverwriteReadOnlyFiles="true" />
 
-		<Copy SourceFiles="@(_RuntimeLibrary)"
-			DestinationFiles="@(_RuntimeLibrary->'%(OutputDirectory)\%(Filename)%(Extension)')"
+		<Copy SourceFiles="@(_RuntimeAssets)"
+			DestinationFiles="@(_RuntimeAssets->'$(UnoNuspecDirectory)$(TargetFramework)\%(OutputDirectory)\%(Filename)%(Extension)')"
 			SkipUnchangedFiles="true"
 			OverwriteReadOnlyFiles="true" />
 	</Target>