diff --git a/NuGet.config b/NuGet.config index 49a072a847f..dec1baffe92 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,6 @@ - diff --git a/build-tools/scripts/XAVersionInfo.targets b/build-tools/scripts/XAVersionInfo.targets index bfc6809bd32..e21107348e5 100644 --- a/build-tools/scripts/XAVersionInfo.targets +++ b/build-tools/scripts/XAVersionInfo.targets @@ -1,11 +1,17 @@ - - - - - - + + + + + + + @@ -36,13 +36,13 @@ - + https://github.com/dotnet/dotnet - ee56b9a0106c983775a0691bde4a4a988f4351d3 + 5ff448a6425ec6980e08b5c9a35e454c8a843c35 - + https://github.com/dotnet/dotnet - ee56b9a0106c983775a0691bde4a4a988f4351d3 + 5ff448a6425ec6980e08b5c9a35e454c8a843c35 diff --git a/eng/Versions.props b/eng/Versions.props index be91396aa21..36d64cc505f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,20 +1,20 @@ - 11.0.100-preview.3.26157.103 + 11.0.100-preview.3.26165.107 $(MicrosoftNETSdkPackageVersion) - 11.0.0-preview.3.26157.103 - 11.0.0-preview.3.26157.103 + 11.0.0-preview.3.26165.107 + 11.0.0-preview.3.26165.107 7.0.0-beta.22103.1 11.0.0-beta.26060.102 - 11.0.0-beta.26157.103 - 11.0.0-preview.3.26157.103 - 11.0.100-preview.3.26157.103 + 11.0.0-beta.26165.107 + 11.0.0-preview.3.26165.107 + 11.0.100-preview.3.26165.107 $(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion) $(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion) - 11.0.100-preview.3.26157.103 - 0.11.5-preview.26157.103 + 11.0.100-preview.3.26165.107 + 0.11.5-preview.26165.107 9.0.4 11.0.0-preview.1.26104.118 diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs index 32135f406c8..eec0361c108 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs @@ -42,6 +42,10 @@ protected Process ExecuteProcess (params string [] args) p.StartInfo.RedirectStandardOutput = true; p.StartInfo.RedirectStandardError = true; p.StartInfo.SetEnvironmentVariable ("DOTNET_MULTILEVEL_LOOKUP", "0"); + // Workaround for dotnet/msbuild#13175: the MSBuild app host needs DOTNET_HOST_PATH + // to bootstrap the .NET runtime when spawning TaskHostFactory task hosts (e.g. ILLink). + // Without this, builds fail with MSB4221 when using a locally-installed SDK. + p.StartInfo.SetEnvironmentVariable ("DOTNET_HOST_PATH", p.StartInfo.FileName); p.StartInfo.SetEnvironmentVariable ("PATH", TestEnvironment.DotNetPreviewDirectory + Path.PathSeparator + Environment.GetEnvironmentVariable ("PATH")); if (TestEnvironment.UseLocalBuildOutput) { p.StartInfo.SetEnvironmentVariable ("DOTNETSDK_WORKLOAD_MANIFEST_ROOTS", TestEnvironment.WorkloadManifestOverridePath);