fix: Adjusting macos build fix to work with old-style csproj

unoplatform · Oct 10, 2022 · 55700f5 · 55700f5
1 parent 7d6cc7d
commit 55700f5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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>