From 80ff23ad599376695be28e81bcc2c8385c85c9a7 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Thu, 11 Mar 2021 20:47:45 +0200
Subject: [PATCH] Use the correct paths when copying to the build server

---
 .nuspec/Microsoft.Maui.Resizetizer.targets | 14 ++++++++++++--
 Microsoft.Maui.sln                         |  4 ++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.nuspec/Microsoft.Maui.Resizetizer.targets b/.nuspec/Microsoft.Maui.Resizetizer.targets
index 3947cc0358ef..cac35331c52a 100644
--- a/.nuspec/Microsoft.Maui.Resizetizer.targets
+++ b/.nuspec/Microsoft.Maui.Resizetizer.targets
@@ -296,10 +296,15 @@
 
         <!-- iOS Only -->
         <!-- If on Windows, using build host, copy the files over to build server host too -->
+        <ItemGroup Condition="'$(BuildSessionId)' != '' And '$(_ResizetizerIsiOSApp)' == 'True' And '$(IsMacEnabled)'=='true'">
+            <_SharedFontsToCopyToBuildServer Include="@(_SharedFontBundleResource);@(_SharedFontPListFiles)">
+                <TargetPath>%(Identity)</TargetPath>
+            </_SharedFontsToCopyToBuildServer>
+        </ItemGroup>
         <CopyFilesToBuildServer
             Condition="'$(BuildSessionId)' != '' And '$(_ResizetizerIsiOSApp)' == 'True' And '$(IsMacEnabled)'=='true'"
             SessionId="$(BuildSessionId)"
-            Files="@(_SharedFontBundleResource);@(_SharedFontPListFiles)" />
+            Files="@(_SharedFontsToCopyToBuildServer)" />
 
         <!-- Touch/create our stamp file for outputs -->
         <Touch Files="$(_SharedFontStampFile)" AlwaysCreate="True" />
@@ -367,10 +372,15 @@
 
         <!-- iOS Only -->
         <!-- If on Windows, using build host, copy the files over to build server host too -->
+        <ItemGroup Condition="'$(BuildSessionId)' != '' And '$(_ResizetizerIsiOSApp)' == 'True' And '$(IsMacEnabled)'=='true'">
+            <_SharedImagesToCopyToBuildServer Include="@(_ResizetizerCollectedBundleResourceImages)">
+                <TargetPath>%(Identity)</TargetPath>
+            </_SharedImagesToCopyToBuildServer>
+        </ItemGroup>
         <CopyFilesToBuildServer
             Condition="'$(BuildSessionId)' != '' And '$(_ResizetizerIsiOSApp)' == 'True' And '$(IsMacEnabled)'=='true'"
             SessionId="$(BuildSessionId)"
-            Files="@(_ResizetizerCollectedBundleResourceImages)" />
+            Files="@(_SharedImagesToCopyToBuildServer)" />
 
         <!-- Android -->
         <ItemGroup Condition="'$(_ResizetizerIsAndroidApp)' == 'True'">
diff --git a/Microsoft.Maui.sln b/Microsoft.Maui.sln
index 0cb9ad30deff..b7e682893999 100644
--- a/Microsoft.Maui.sln
+++ b/Microsoft.Maui.sln
@@ -25,7 +25,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuspec", ".nuspec", "{7E12
 		.nuspec\Microsoft.Maui.Controls.MultiTargeting.targets = .nuspec\Microsoft.Maui.Controls.MultiTargeting.targets
 		.nuspec\Microsoft.Maui.Controls.nuspec = .nuspec\Microsoft.Maui.Controls.nuspec
 		.nuspec\Microsoft.Maui.Controls.props = .nuspec\Microsoft.Maui.Controls.props
+		.nuspec\Microsoft.Maui.Controls.SingleProject.props = .nuspec\Microsoft.Maui.Controls.SingleProject.props
+		.nuspec\Microsoft.Maui.Controls.SingleProject.targets = .nuspec\Microsoft.Maui.Controls.SingleProject.targets
 		.nuspec\Microsoft.Maui.Controls.targets = .nuspec\Microsoft.Maui.Controls.targets
+		.nuspec\Microsoft.Maui.Resizetizer.targets = .nuspec\Microsoft.Maui.Resizetizer.targets
+		.nuspec\package.ps1 = .nuspec\package.ps1
 		.nuspec\proguard.cfg = .nuspec\proguard.cfg
 	EndProjectSection
 EndProject