[msbuild] Fix computing the frameworks directory for Mac Catalyst.

This is part 2 of making framework-test build on Mac Catalyst. Contributes to dotnet#10440.
rolfbjarne · Feb 1, 2021 · 67dd71f · 67dd71f
1 parent 414ea13
commit 67dd71f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.targets b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
@@ -973,8 +973,9 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 
 	<Target Name="_CollectFrameworks" Condition="'$(_CanOutputAppBundle)' == 'true'" DependsOnTargets="$(_CollectFrameworksDependsOn)">
 		<PropertyGroup>
-			<_FrameworksDirectory Condition="'$(_PlatformName)' != 'macOS'">$(_AppBundlePath)/Frameworks</_FrameworksDirectory>
-			<_FrameworksDirectory Condition="'$(_PlatformName)' == 'macOS'">$(_AppBundlePath)/Contents/Frameworks</_FrameworksDirectory>
+			<_FrameworksDirectory Condition="'$(_FrameworksDirectory)' == '' And '$(_IsMacCatalyst)' == 'true'">$(_AppBundlePath)/Contents/Frameworks</_FrameworksDirectory>
+			<_FrameworksDirectory Condition="'$(_FrameworksDirectory)' == '' And '$(_PlatformName)' != 'macOS'">$(_AppBundlePath)/Frameworks</_FrameworksDirectory>
+			<_FrameworksDirectory Condition="'$(_FrameworksDirectory)' == '' And '$(_PlatformName)' == 'macOS'">$(_AppBundlePath)/Contents/Frameworks</_FrameworksDirectory>
 		</PropertyGroup>
 		<CollectFrameworks
 			SessionId="$(BuildSessionId)"