[dotnet] Fix _DetectSdkLocations from Windows. (#11469)

This task ends up setting as env variable the Xamarin Sdk root directory on the Mac, but when building from Windows it was setting the Windows path, so instead we need to override it with the proper value on macOS. This should not change the original behavior when building from macOS. Backport of #11451. Co-authored-by: Emanuel Fernandez Dell'Oca <[email protected]>
xamarin · May 6, 2021 · 05cf7f7 · 05cf7f7 · vs-mobiletools-engineering-service2 · May 7, 2021
1 parent 86487bb
commit 05cf7f7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/dotnet/WindowsTargets/Xamarin.Shared.Sdk.Before.targets b/dotnet/WindowsTargets/Xamarin.Shared.Sdk.Before.targets
@@ -5,6 +5,8 @@
 		<_DotNetRootRemoteDirectory Condition="$(_DotNetRootRemoteDirectory) == ''">/usr/local/share/dotnet/</_DotNetRootRemoteDirectory>
 		<_XamarinSdkRemoteRootDirectory Condition="'$(_XamarinSdkRemoteRootDirectory)' == ''">$(_XamarinSdkRootDirectory.Replace('$(NetCoreRoot)', '$(_DotNetRootRemoteDirectory)'))</_XamarinSdkRemoteRootDirectory>
 		<_MlaunchPath Condition="'$(_MlaunchPath)' == ''">$(_XamarinSdkRemoteRootDirectory)tools/bin/mlaunch</_MlaunchPath>
+
+		<_XamarinSdkRootOnMac Condition="'$(_XamarinSdkRoot)' != ''">$(_XamarinSdkRoot.Replace('$(NetCoreRoot)', '$(_DotNetRootRemoteDirectory)'))</_XamarinSdkRootOnMac>
 	</PropertyGroup>
 
 </Project>
diff --git a/dotnet/targets/Xamarin.Shared.Sdk.props b/dotnet/targets/Xamarin.Shared.Sdk.props
@@ -14,5 +14,7 @@
 
 		<!-- _XamarinSdkRoot is used by the existing MSBuild targets files -->
 		<_XamarinSdkRoot Condition="'$(_XamarinSdkRoot)' == ''">$(_XamarinSdkRootDirectory)</_XamarinSdkRoot>
+		<!-- _XamarinSdkRootOnMac this should be passed to tasks that need to access the Xamarin Sdk dir on the Mac, this value will be overriden from Windows -->
+		<_XamarinSdkRootOnMac>$(_XamarinSdkRoot)</_XamarinSdkRootOnMac>
 	</PropertyGroup>
 </Project>
diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.targets b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
@@ -895,7 +895,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 			SdkVersion="$(_SdkVersion)"
 			TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
 			TargetArchitectures="$(TargetArchitectures)"
-			XamarinSdkRoot="$(_XamarinSdkRoot)"
+			XamarinSdkRoot="$(_XamarinSdkRootOnMac)"
 			>
 
 			<Output TaskParameter="SdkVersion" PropertyName="_SdkVersion" />