From 74822061c94b0b4bd5bc5b3f0c96dc615003cb34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Jul 2026 05:04:56 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/dotnet build 20260710.11 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed From Version 11.0.0-beta.26355.102 -> To Version 11.0.0-beta.26360.111 Microsoft.DotNet.Cecil From Version 0.11.5-preview.26355.102 -> To Version 0.11.5-preview.26360.111 Microsoft.NET.ILLink , Microsoft.NETCore.App.Ref From Version 11.0.0-preview.7.26355.102 -> To Version 11.0.0-preview.7.26360.111 Microsoft.NET.Sdk , Microsoft.TemplateEngine.Authoring.Tasks From Version 11.0.100-preview.7.26355.102 -> To Version 11.0.100-preview.7.26360.111 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ global.json | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15fa92708b6..ca2b1bd8e25 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/dotnet - b4b350a66ea5dcf13420747036d8b263cdf6cbef + 50dbab4de210e882172b07934e9666313b7065f1 - + https://github.com/dotnet/dotnet - b4b350a66ea5dcf13420747036d8b263cdf6cbef + 50dbab4de210e882172b07934e9666313b7065f1 - + https://github.com/dotnet/dotnet - b4b350a66ea5dcf13420747036d8b263cdf6cbef + 50dbab4de210e882172b07934e9666313b7065f1 - + https://github.com/dotnet/dotnet - b4b350a66ea5dcf13420747036d8b263cdf6cbef + 50dbab4de210e882172b07934e9666313b7065f1 https://github.com/dotnet/dotnet @@ -36,17 +36,17 @@ - + https://github.com/dotnet/dotnet - b4b350a66ea5dcf13420747036d8b263cdf6cbef + 50dbab4de210e882172b07934e9666313b7065f1 - + https://github.com/dotnet/dotnet - b4b350a66ea5dcf13420747036d8b263cdf6cbef + 50dbab4de210e882172b07934e9666313b7065f1 - + https://github.com/dotnet/dotnet - b4b350a66ea5dcf13420747036d8b263cdf6cbef + 50dbab4de210e882172b07934e9666313b7065f1 https://github.com/microsoft/testfx diff --git a/eng/Versions.props b/eng/Versions.props index 7323919cabd..23db5e256e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,20 +1,20 @@ - 11.0.100-preview.7.26355.102 + 11.0.100-preview.7.26360.111 $(MicrosoftNETSdkPackageVersion) - 11.0.0-preview.7.26355.102 - 11.0.0-preview.7.26355.102 + 11.0.0-preview.7.26360.111 + 11.0.0-preview.7.26360.111 7.0.0-beta.22103.1 11.0.0-beta.26060.102 - 11.0.0-beta.26355.102 + 11.0.0-beta.26360.111 11.0.100-preview.4.26215.121 11.0.100-preview.4.26215.121 $(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview4PackageVersion) $(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion) - 11.0.100-preview.7.26355.102 - 0.11.5-preview.26355.102 + 11.0.100-preview.7.26360.111 + 0.11.5-preview.26360.111 4.3.0-preview.26355.11 10.0.9 11.0.0-preview.1.26104.118 diff --git a/global.json b/global.json index 04333540172..d6f5a6f1e8f 100644 --- a/global.json +++ b/global.json @@ -4,6 +4,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.134", - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26355.102" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26360.111" } } From 54c91c107a18adc06788f3e125287f104595f2cb Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 13 Jul 2026 19:47:46 -0500 Subject: [PATCH 2/2] Fix restore regressions in dependency update Correct invalid test project references and retain the previous .NET SDK build until the missing ProjectReference restore regression is fixed upstream. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: cdefff9b-d42a-4354-8e8a-a0ea9f9afbb1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- .../Tests/Xamarin.Android.Build.Tests/BuildAssetsTest.cs | 3 --- .../Tests/Xamarin.Android.Build.Tests/BuildTest.cs | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3535d88cc22..007e3034471 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/dotnet - 50dbab4de210e882172b07934e9666313b7065f1 + b4b350a66ea5dcf13420747036d8b263cdf6cbef https://github.com/dotnet/dotnet diff --git a/eng/Versions.props b/eng/Versions.props index b0f4e8925c8..48b4abd3d1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 11.0.100-preview.7.26360.111 + 11.0.100-preview.7.26355.102 $(MicrosoftNETSdkPackageVersion) 11.0.0-preview.7.26360.111 11.0.0-preview.7.26360.111 diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildAssetsTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildAssetsTest.cs index 091dfa4a33e..646a1592c27 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildAssetsTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildAssetsTest.cs @@ -193,9 +193,6 @@ public void FullPrefixRaisesError(string prefix) }, }; var app = new XamarinAndroidApplicationProject { - References = { - new BuildItem ("ProjectReference", "..\\Library1\\Library1.csproj"), - }, OtherBuildItems = { new AndroidItem.AndroidAsset ("Assets\\asset2.txt") { TextContent = () => "foo", diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs index fabd888d41e..09b459c8835 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs @@ -655,7 +655,7 @@ public void BuildApplicationWithSpacesInPath ([Values (true, false)] bool enable IsRelease = isRelease, AotAssemblies = aotAssemblies, LinkTool = linkTool, - References = { new BuildItem ("ProjectReference", $"..\\{folderName}Library1\\Library1.csproj") }, + References = { new BuildItem ("ProjectReference", $"..\\{TestName}Library1\\Library1.csproj") }, }; proj.SetRuntime (runtime); proj.OtherBuildItems.Add (new BuildItem ("AndroidJavaLibrary", "Hello (World).jar") { BinaryContent = () => Convert.FromBase64String (@"