From 55700f570acbf964b482702e87efe80d063bfc89 Mon Sep 17 00:00:00 2001
From: Nick Randolph <nick@builttoroam.com>
Date: Mon, 10 Oct 2022 17:02:25 +1100
Subject: [PATCH] fix: Adjusting macos build fix to work with old-style csproj

---
 samples/Playground/Directory.Build.targets  | 2 +-
 src/Directory.Build.targets                 | 2 +-
 src/xamarinmac-workaround.targets           | 2 +-
 testing/TestHarness/Directory.Build.targets | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/Playground/Directory.Build.targets b/samples/Playground/Directory.Build.targets
index fdc1efc0e3..703830020d 100644
--- a/samples/Playground/Directory.Build.targets
+++ b/samples/Playground/Directory.Build.targets
@@ -33,5 +33,5 @@
     </When>
   </Choose>
 
-	<Import Project="..\..\src\xamarinmac-workaround.targets" Condition="exists('..\..\src\xamarinmac-workaround.targets')" />
+	<Import Project="..\..\src\xamarinmac-workaround.targets" Condition="exists('..\..\src\xamarinmac-workaround.targets') and $(TargetFramework.ToLower().StartsWith('xamarin')) and $(TargetFramework.ToLower().Contains('mac'))" />
 </Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index cd6caf6fd3..127dda0155 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -50,5 +50,5 @@
 		Project="$(MSBuildThisFileDirectory)\Uno.Extensions.Core.Generators\buildTransitive\Uno.Extensions.Core.props" />
 
 	<Import Project="winappsdk-workaround.targets" Condition="exists('winappsdk-workaround.targets')" />
-	<Import Project="xamarinmac-workaround.targets" Condition="exists('xamarinmac-workaround.targets')" />
+	<Import Project="xamarinmac-workaround.targets" Condition="exists('xamarinmac-workaround.targets') and $(TargetFramework.ToLower().StartsWith('xamarin')) and $(TargetFramework.ToLower().Contains('mac'))" />
 </Project>
diff --git a/src/xamarinmac-workaround.targets b/src/xamarinmac-workaround.targets
index d1fcd73e1d..2c05b2708f 100644
--- a/src/xamarinmac-workaround.targets
+++ b/src/xamarinmac-workaround.targets
@@ -1,5 +1,5 @@
 <Project>
-	<ItemGroup Condition="$(TargetFramework.ToLower().StartsWith('xamarin')) and $(TargetFramework.ToLower().Contains('mac')) and '$(Configuration)' == 'Release'">
+	<ItemGroup>
 		<Reference Include="Xamarin.Mac">
 			<HintPath Condition="Exists('C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\Extensions\Xamarin.VisualStudio')">C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
 			<HintPath Condition="Exists('C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\Extensions\Xamarin.VisualStudio')">C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
diff --git a/testing/TestHarness/Directory.Build.targets b/testing/TestHarness/Directory.Build.targets
index fdc1efc0e3..703830020d 100644
--- a/testing/TestHarness/Directory.Build.targets
+++ b/testing/TestHarness/Directory.Build.targets
@@ -33,5 +33,5 @@
     </When>
   </Choose>
 
-	<Import Project="..\..\src\xamarinmac-workaround.targets" Condition="exists('..\..\src\xamarinmac-workaround.targets')" />
+	<Import Project="..\..\src\xamarinmac-workaround.targets" Condition="exists('..\..\src\xamarinmac-workaround.targets') and $(TargetFramework.ToLower().StartsWith('xamarin')) and $(TargetFramework.ToLower().Contains('mac'))" />
 </Project>