Skip to content

[main] Update dependencies from dotnet/dotnet #10944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonathanpeppers merged 7 commits into from
Mar 17, 2026
Merged

[main] Update dependencies from dotnet/dotnet #10944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
433ff8a
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Mar 16, 2026
c01a7b3
[build] Set DOTNET_HOST_PATH for BuildExternal target
jonathanpeppers Mar 16, 2026
b4c055f
[build] Set DOTNET_HOST_PATH globally in Makefile
jonathanpeppers Mar 16, 2026
b07bf9f
[build] Remove TaskHostFactory from XAVersionInfo.targets
jonathanpeppers Mar 16, 2026
ca0b14c
[build] Keep TaskHostFactory but remove Runtime="NET"
jonathanpeppers Mar 16, 2026
a90289b
[build] Remove TaskHostFactory entirely from git prep tasks
jonathanpeppers Mar 16, 2026
d9a69a9
[build] Set DOTNET_HOST_PATH for MSBuild TaskHostFactory app host
jonathanpeppers Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<!-- Begin: Package sources from dotnet-runtime -->
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-android -->
<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" />
<!-- End: Package sources from dotnet-android -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!-- ensure only the sources defined below are used -->
Expand Down
18 changes: 12 additions & 6 deletions build-tools/scripts/XAVersionInfo.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitBlame" TaskFactory="TaskHostFactory" Runtime="NET" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitBranch" TaskFactory="TaskHostFactory" Runtime="NET" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitHash" TaskFactory="TaskHostFactory" Runtime="NET" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitsInRange" TaskFactory="TaskHostFactory" Runtime="NET" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitTime" TaskFactory="TaskHostFactory" Runtime="NET" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitInfo" TaskFactory="TaskHostFactory" Runtime="NET" />
<!-- NOTE: Do NOT use TaskFactory="TaskHostFactory" Runtime="NET" on these UsingTask elements.
MSBuild 18+ (dotnet/msbuild#13175) added app host support which changed how TaskHostFactory
spawns .NET task hosts. The MetadataLoadContext used to inspect task assemblies is disposed
before output validation completes, causing MSB4027. TaskHostFactory without Runtime="NET"
still infers .NET on .NET Core MSBuild, so it must be removed entirely. These tasks only
run git commands and don't need out-of-proc isolation. -->
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitBlame" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitBranch" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitHash" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitsInRange" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitTime" />
<UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.GitCommitInfo" />
<Target Name="_GetSubmodulesVersionInfo">
<ItemGroup>
<!-- If anything changes in this list, make sure to update:
Expand Down
32 changes: 16 additions & 16 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.3.26157.103">
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.3.26165.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ee56b9a0106c983775a0691bde4a4a988f4351d3</Sha>
<Sha>5ff448a6425ec6980e08b5c9a35e454c8a843c35</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.3.26157.103">
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.3.26165.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ee56b9a0106c983775a0691bde4a4a988f4351d3</Sha>
<Sha>5ff448a6425ec6980e08b5c9a35e454c8a843c35</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.3.26157.103">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.3.26165.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ee56b9a0106c983775a0691bde4a4a988f4351d3</Sha>
<Sha>5ff448a6425ec6980e08b5c9a35e454c8a843c35</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26157.103">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26165.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ee56b9a0106c983775a0691bde4a4a988f4351d3</Sha>
<Sha>5ff448a6425ec6980e08b5c9a35e454c8a843c35</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-11.0.100-preview.3" Version="11.0.0-preview.3.26157.103">
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-11.0.100-preview.3" Version="11.0.0-preview.3.26165.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ee56b9a0106c983775a0691bde4a4a988f4351d3</Sha>
<Sha>5ff448a6425ec6980e08b5c9a35e454c8a843c35</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100-preview.3" Version="11.0.100-preview.3.26157.103">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100-preview.3" Version="11.0.100-preview.3.26165.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ee56b9a0106c983775a0691bde4a4a988f4351d3</Sha>
<Sha>5ff448a6425ec6980e08b5c9a35e454c8a843c35</Sha>
</Dependency>
<!-- Previous .NET version -->
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-9.0.100" Version="9.0.12">
Expand All @@ -36,13 +36,13 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26157.103">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26165.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ee56b9a0106c983775a0691bde4a4a988f4351d3</Sha>
<Sha>5ff448a6425ec6980e08b5c9a35e454c8a843c35</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.3.26157.103">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.3.26165.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ee56b9a0106c983775a0691bde4a4a988f4351d3</Sha>
<Sha>5ff448a6425ec6980e08b5c9a35e454c8a843c35</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
16 changes: 8 additions & 8 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.3.26157.103</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.3.26165.107</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.3.26157.103</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.3.26157.103</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.3.26165.107</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.3.26165.107</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<!-- Last version built for net10.0, needed for CI steps that only have the .NET 10 SDK installed (e.g., BAR manifest publishing) -->
<MicrosoftDotNetBuildTasksFeedPackageVersionNet10>11.0.0-beta.26060.102</MicrosoftDotNetBuildTasksFeedPackageVersionNet10>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26157.103</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion>11.0.0-preview.3.26157.103</MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion>11.0.100-preview.3.26157.103</MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26165.107</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion>11.0.0-preview.3.26165.107</MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion>11.0.100-preview.3.26165.107</MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion>
<MicrosoftNETWorkloadMonoToolChainPackageVersion>$(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion)</MicrosoftNETWorkloadMonoToolChainPackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.3.26157.103</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26157.103</MicrosoftDotNetCecilPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.3.26165.107</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26165.107</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>9.0.4</SystemIOHashingPackageVersion>
<SystemReflectionMetadataPackageVersion>11.0.0-preview.1.26104.118</SystemReflectionMetadataPackageVersion>
<!-- Previous .NET Android version -->
Expand Down
4 changes: 4 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down