Skip to content

Commit 287f27d

Browse files
dotnet-maestro[bot]jonathanpeppers
dotnet-maestro[bot]
and
jonathanpeppers
authored
Bump to dotnet/dotnet@5ff448a642 11.0.100-preview.3.26165.107 (#10944)
Changes: dotnet/dotnet@ee56b9a...5ff448a - **Dependency Updates**: - From [11.0.0-preview.3.26157.103 to 11.0.0-preview.3.26165.107][1] - Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-11.0.100-preview.3 - Microsoft.NET.ILLink - Microsoft.NETCore.App.Ref - From [11.0.0-beta.26157.103 to 11.0.0-beta.26165.107][1] - Microsoft.DotNet.Build.Tasks.Feed - From [0.11.5-preview.26157.103 to 0.11.5-preview.26165.107][1] - Microsoft.DotNet.Cecil - From [11.0.100-preview.3.26157.103 to 11.0.100-preview.3.26165.107][1] - Microsoft.NET.Sdk - Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100-preview.3 - Microsoft.TemplateEngine.Authoring.Tasks [1]: dotnet/dotnet@ee56b9a...5ff448a * [build] Remove TaskHostFactory from XAVersionInfo.targets MSBuild 18+ (dotnet/msbuild#13175) added app host support that changed how TaskHostFactory with Runtime="NET" spawns task host processes. The MetadataLoadContext used to inspect task assemblies is disposed before output validation completes, causing MSB4027/MSB4216 on macOS and Linux when running from a local/xcopy SDK. Remove TaskHostFactory and Runtime="NET" from the git prep task UsingTask declarations in XAVersionInfo.targets. These tasks only shell out to git and don't need out-of-proc isolation. * [build] Set DOTNET_HOST_PATH for MSBuild TaskHostFactory app host The new MSBuild app host (dotnet/msbuild#13175) requires DOTNET_HOST_PATH to bootstrap the .NET runtime when spawning out-of-proc task hosts. Without this, tasks using TaskHostFactory (like ILLink's ComputeManagedAssemblies) fail with MSB4221 when using a locally-installed SDK. Set DOTNET_HOST_PATH in: - DotNetCLI.cs: for test-driven dotnet invocations Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
1 parent cb32807 commit 287f27d

File tree

5 files changed

+40
-31
lines changed

5 files changed

+40
-31
lines changed

‎NuGet.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<!-- Begin: Package sources from dotnet-runtime -->
99
<!-- End: Package sources from dotnet-runtime -->
1010
<!-- Begin: Package sources from dotnet-android -->
11-
<add key="darc-pub-dotnet-android-350a375-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-350a375f-1/nuget/v3/index.json" />
1211
<!-- End: Package sources from dotnet-android -->
1312
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1413
<!-- ensure only the sources defined below are used -->

‎build-tools/scripts/XAVersionInfo.targets‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitBlame" TaskFactory="TaskHostFactory" Runtime="NET" />
4-
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitBranch" TaskFactory="TaskHostFactory" Runtime="NET" />
5-
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitHash" TaskFactory="TaskHostFactory" Runtime="NET" />
6-
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitsInRange" TaskFactory="TaskHostFactory" Runtime="NET" />
7-
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitTime" TaskFactory="TaskHostFactory" Runtime="NET" />
8-
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitInfo" TaskFactory="TaskHostFactory" Runtime="NET" />
3+
<!-- NOTE: Do NOT use TaskFactory="TaskHostFactory" Runtime="NET" on these UsingTask elements.
4+
MSBuild 18+ (dotnet/msbuild#13175) added app host support which changed how TaskHostFactory
5+
spawns .NET task hosts. The MetadataLoadContext used to inspect task assemblies is disposed
6+
before output validation completes, causing MSB4027. TaskHostFactory without Runtime="NET"
7+
still infers .NET on .NET Core MSBuild, so it must be removed entirely. These tasks only
8+
run git commands and don't need out-of-proc isolation. -->
9+
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitBlame" />
10+
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitBranch" />
11+
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitHash" />
12+
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitsInRange" />
13+
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitTime" />
14+
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitInfo" />
915
<Target Name="_GetSubmodulesVersionInfo">
1016
<ItemGroup>
1117
<!-- If anything changes in this list, make sure to update:

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.3.26157.103">
3+
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.3.26165.107">
44
<Uri>https://github.com/dotnet/dotnet</Uri>
5-
<Sha>ee56b9a0106c983775a0691bde4a4a988f4351d3</Sha>
5+
<Sha>5ff448a6425ec6980e08b5c9a35e454c8a843c35</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.3.26157.103">
7+
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.3.26165.107">
88
<Uri>https://github.com/dotnet/dotnet</Uri>
9-
<Sha>ee56b9a0106c983775a0691bde4a4a988f4351d3</Sha>
9+
<Sha>5ff448a6425ec6980e08b5c9a35e454c8a843c35</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.3.26157.103">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.3.26165.107">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>ee56b9a0106c983775a0691bde4a4a988f4351d3</Sha>
13+
<Sha>5ff448a6425ec6980e08b5c9a35e454c8a843c35</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26157.103">
15+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26165.107">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>ee56b9a0106c983775a0691bde4a4a988f4351d3</Sha>
17+
<Sha>5ff448a6425ec6980e08b5c9a35e454c8a843c35</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-11.0.100-preview.3" Version="11.0.0-preview.3.26157.103">
19+
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-11.0.100-preview.3" Version="11.0.0-preview.3.26165.107">
2020
<Uri>https://github.com/dotnet/dotnet</Uri>
21-
<Sha>ee56b9a0106c983775a0691bde4a4a988f4351d3</Sha>
21+
<Sha>5ff448a6425ec6980e08b5c9a35e454c8a843c35</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100-preview.3" Version="11.0.100-preview.3.26157.103">
23+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100-preview.3" Version="11.0.100-preview.3.26165.107">
2424
<Uri>https://github.com/dotnet/dotnet</Uri>
25-
<Sha>ee56b9a0106c983775a0691bde4a4a988f4351d3</Sha>
25+
<Sha>5ff448a6425ec6980e08b5c9a35e454c8a843c35</Sha>
2626
</Dependency>
2727
<!-- Previous .NET version -->
2828
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-9.0.100" Version="9.0.12">
@@ -36,13 +36,13 @@
3636
</Dependency>
3737
</ProductDependencies>
3838
<ToolsetDependencies>
39-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26157.103">
39+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26165.107">
4040
<Uri>https://github.com/dotnet/dotnet</Uri>
41-
<Sha>ee56b9a0106c983775a0691bde4a4a988f4351d3</Sha>
41+
<Sha>5ff448a6425ec6980e08b5c9a35e454c8a843c35</Sha>
4242
</Dependency>
43-
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.3.26157.103">
43+
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.3.26165.107">
4444
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>ee56b9a0106c983775a0691bde4a4a988f4351d3</Sha>
45+
<Sha>5ff448a6425ec6980e08b5c9a35e454c8a843c35</Sha>
4646
</Dependency>
4747
</ToolsetDependencies>
4848
</Dependencies>

‎eng/Versions.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftNETSdkPackageVersion>11.0.100-preview.3.26157.103</MicrosoftNETSdkPackageVersion>
4+
<MicrosoftNETSdkPackageVersion>11.0.100-preview.3.26165.107</MicrosoftNETSdkPackageVersion>
55
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
6-
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.3.26157.103</MicrosoftNETILLinkPackageVersion>
7-
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.3.26157.103</MicrosoftNETCoreAppRefPackageVersion>
6+
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.3.26165.107</MicrosoftNETILLinkPackageVersion>
7+
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.3.26165.107</MicrosoftNETCoreAppRefPackageVersion>
88
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
99
<!-- Last version built for net10.0, needed for CI steps that only have the .NET 10 SDK installed (e.g., BAR manifest publishing) -->
1010
<MicrosoftDotNetBuildTasksFeedPackageVersionNet10>11.0.0-beta.26060.102</MicrosoftDotNetBuildTasksFeedPackageVersionNet10>
11-
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26157.103</MicrosoftDotNetBuildTasksFeedPackageVersion>
12-
<MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion>11.0.0-preview.3.26157.103</MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion>
13-
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion>11.0.100-preview.3.26157.103</MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion>
11+
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26165.107</MicrosoftDotNetBuildTasksFeedPackageVersion>
12+
<MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion>11.0.0-preview.3.26165.107</MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion>
13+
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion>11.0.100-preview.3.26165.107</MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion>
1414
<MicrosoftNETWorkloadMonoToolChainPackageVersion>$(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion)</MicrosoftNETWorkloadMonoToolChainPackageVersion>
1515
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
16-
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.3.26157.103</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
17-
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26157.103</MicrosoftDotNetCecilPackageVersion>
16+
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.3.26165.107</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
17+
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26165.107</MicrosoftDotNetCecilPackageVersion>
1818
<SystemIOHashingPackageVersion>9.0.4</SystemIOHashingPackageVersion>
1919
<SystemReflectionMetadataPackageVersion>11.0.0-preview.1.26104.118</SystemReflectionMetadataPackageVersion>
2020
<!-- Previous .NET Android version -->

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ protected Process ExecuteProcess (params string [] args)
4242
p.StartInfo.RedirectStandardOutput = true;
4343
p.StartInfo.RedirectStandardError = true;
4444
p.StartInfo.SetEnvironmentVariable ("DOTNET_MULTILEVEL_LOOKUP", "0");
45+
// Workaround for dotnet/msbuild#13175: the MSBuild app host needs DOTNET_HOST_PATH
46+
// to bootstrap the .NET runtime when spawning TaskHostFactory task hosts (e.g. ILLink).
47+
// Without this, builds fail with MSB4221 when using a locally-installed SDK.
48+
p.StartInfo.SetEnvironmentVariable ("DOTNET_HOST_PATH", p.StartInfo.FileName);
4549
p.StartInfo.SetEnvironmentVariable ("PATH", TestEnvironment.DotNetPreviewDirectory + Path.PathSeparator + Environment.GetEnvironmentVariable ("PATH"));
4650
if (TestEnvironment.UseLocalBuildOutput) {
4751
p.StartInfo.SetEnvironmentVariable ("DOTNETSDK_WORKLOAD_MANIFEST_ROOTS", TestEnvironment.WorkloadManifestOverridePath);

0 commit comments

Comments
 (0)