From 6847d1a5863a306693ba417b3141d7f6aeee4df5 Mon Sep 17 00:00:00 2001
From: Sebastien Pouliot <sebastien.pouliot@gmail.com>
Date: Thu, 29 Feb 2024 21:26:38 -0500
Subject: [PATCH] fix: copy libUnoNativeMac.dylib into Sample.Skia.Generic app

---
 .../SamplesApp.Skia.Generic.csproj                        | 6 ++++++
 .../Uno.UI.Runtime.Skia.MacOS.csproj                      | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/SamplesApp/SamplesApp.Skia.Generic/SamplesApp.Skia.Generic.csproj b/src/SamplesApp/SamplesApp.Skia.Generic/SamplesApp.Skia.Generic.csproj
index 56019da326b4..a91f98cfde43 100644
--- a/src/SamplesApp/SamplesApp.Skia.Generic/SamplesApp.Skia.Generic.csproj
+++ b/src/SamplesApp/SamplesApp.Skia.Generic/SamplesApp.Skia.Generic.csproj
@@ -74,6 +74,12 @@
 	<Import Project="..\..\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" Condition="'$(SkipUnoResourceGeneration)' == '' " />
 	<Import Project="..\..\..\build\nuget\uno.winui.runtime-replace.targets" />
 
+	<Target Name="BuildUnoNativeMac" BeforeTargets="Compile" Condition="$([MSBuild]::IsOsPlatform('OSX'))">
+		<Copy
+			SourceFiles="$(MSBuildThisFileDirectory)../../Uno.UI.Runtime.Skia.MacOS/UnoNativeMac/build/$(Configuration)/libUnoNativeMac.dylib"
+			DestinationFolder="$(MSBuildThisFileDirectory)bin/$(Configuration)/$(TargetFramework)/runtimes/osx/native/" />
+	</Target>
+
 	<Target Name="_ValidatePublishedItems" AfterTargets="Publish">
 		<ItemGroup>
 			<_validationPath Include="Uno.Fonts.Fluent/Fonts/uno-fluentui-assets.ttf" />
diff --git a/src/Uno.UI.Runtime.Skia.MacOS/Uno.UI.Runtime.Skia.MacOS.csproj b/src/Uno.UI.Runtime.Skia.MacOS/Uno.UI.Runtime.Skia.MacOS.csproj
index 260793a767fa..744b3e63a4e0 100644
--- a/src/Uno.UI.Runtime.Skia.MacOS/Uno.UI.Runtime.Skia.MacOS.csproj
+++ b/src/Uno.UI.Runtime.Skia.MacOS/Uno.UI.Runtime.Skia.MacOS.csproj
@@ -37,12 +37,16 @@
 		<PackageReference Include="SkiaSharp" />
 	</ItemGroup>
 
+	<PropertyGroup>
+		<_XcodeBuildArgs Condition="'$(Configuration)'=='Debug'">build-for-testing -scheme UnoNativeMac</_XcodeBuildArgs>
+	</PropertyGroup>
+
 	<Target Name="BuildUnoNativeMac" BeforeTargets="CoreCompile" Condition="$([MSBuild]::IsOsPlatform('OSX'))">
-		<Exec Command="$(MSBuildThisFileDirectory)UnoNativeMac/build.sh" WorkingDirectory="$(MSBuildThisFileDirectory)UnoNativeMac/" />
+		<Exec Command="$(MSBuildThisFileDirectory)UnoNativeMac/build.sh $(_XcodeBuildArgs)" WorkingDirectory="$(MSBuildThisFileDirectory)UnoNativeMac/" />
 	</Target>
 
 	<ItemGroup>
-		 <None Include="$(MSBuildThisFileDirectory)runtimes/osx/native/libUnoNativeMac.*"
+		 <None Include="$(MSBuildThisFileDirectory)UnoNativeMac/build/$(Configuration)/libUnoNativeMac.*"
 				PackagePath="runtimes/osx/native"
 				Pack="true"
 				Visible="False" />