From b28877746bda698e74889e60726dac925dd7cf1b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Mar 2025 15:22:58 +0000 Subject: [PATCH 01/11] Update dependencies from https://github.com/dotnet/sdk build 20250327.5 Microsoft.NET.Sdk From Version 9.0.105-servicing.25164.42 -> To Version 9.0.300-preview.0.25177.5 --- NuGet.config | 1 + eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index e0c803a8eaa..d9c98b4b85b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60f92de7648..252a9415316 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 8d515d2a57e0c45a81795d7b133300fd8944f3f9 + 3d5b3963312a978ab303eeb63e620f0671522a83 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 603a33cb956..6e3f85627a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 9.0.105-servicing.25164.42 + 9.0.300-preview.0.25177.5 $(MicrosoftNETSdkPackageVersion) 9.0.4-servicing.25163.4 9.0.4 From 67d0832948f57e59164bac5d5f3aa54a577c821c Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 26 Mar 2025 16:13:47 -0500 Subject: [PATCH 02/11] 9.0.100 harcoded version band Solves the error: error NU1101: Unable to find package Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-9.0.200. No packages exist with this id in source(s):... We also don't want to change *our* version band to 9.0.200, so we hardcode the version band to 9.0.100. --- eng/Versions.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6e3f85627a2..f904256fe4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,9 +22,9 @@ \-(preview|rc|alpha).\d+ $(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), $(VersionSuffixRegex))) $(DotNetPreviewVersionBand) - $(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftNETCoreAppRefPackageVersion), $(VersionSuffixRegex))) - $(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftNETWorkloadEmscriptenPackageVersion), $(VersionSuffixRegex))) - - $(DotNetPreviewVersionBand) + + 9.0.100 + 9.0.100 + 9.0.100 From f28db806dc96d8cb8c8247a257c5b1dee60506d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 31 Mar 2025 05:02:35 +0000 Subject: [PATCH 03/11] Update dependencies from https://github.com/dotnet/sdk build 20250330.2 Microsoft.NET.Sdk From Version 9.0.105-servicing.25164.42 -> To Version 9.0.300-preview.0.25180.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 252a9415316..e38cef46fce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 3d5b3963312a978ab303eeb63e620f0671522a83 + a4cebebb93e7d0e2982642892cd4dac30e8e9d9e https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f904256fe4a..ca0464056c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 9.0.300-preview.0.25177.5 + 9.0.300-preview.0.25180.2 $(MicrosoftNETSdkPackageVersion) 9.0.4-servicing.25163.4 9.0.4 From c754dc5b1d5f364a215a98ba6ce3add8ebf999af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Apr 2025 05:02:42 +0000 Subject: [PATCH 04/11] Update dependencies from https://github.com/dotnet/sdk build 20250406.8 Microsoft.NET.Sdk From Version 9.0.105-servicing.25164.42 -> To Version 9.0.300-preview.0.25206.8 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e38cef46fce..067aa96581a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - a4cebebb93e7d0e2982642892cd4dac30e8e9d9e + 9e9ab2ab5f1255a96d7a86c4a8bd2092bec97781 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ca0464056c6..dfc89dd8a6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 9.0.300-preview.0.25180.2 + 9.0.300-preview.0.25206.8 $(MicrosoftNETSdkPackageVersion) 9.0.4-servicing.25163.4 9.0.4 From 9184b442643db9fa0fcf8de33e3353533dfe789f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Apr 2025 05:02:14 +0000 Subject: [PATCH 05/11] Update dependencies from https://github.com/dotnet/sdk build 20250411.10 Microsoft.NET.Sdk From Version 9.0.105-servicing.25164.42 -> To Version 9.0.300-preview.0.25211.10 --- NuGet.config | 5 ----- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index d9c98b4b85b..b1cd17f5ff8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,15 +4,10 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 067aa96581a..21d9afd1f89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 9e9ab2ab5f1255a96d7a86c4a8bd2092bec97781 + af408b3f18d4087ff6468d7602b72c75d341a0b0 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index dfc89dd8a6e..8085e5213c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 9.0.300-preview.0.25206.8 + 9.0.300-preview.0.25211.10 $(MicrosoftNETSdkPackageVersion) 9.0.4-servicing.25163.4 9.0.4 From 0595c553aa58940bc896fcff2cfc6045fb1e3b39 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Apr 2025 11:59:43 +0000 Subject: [PATCH 06/11] Update dependencies from https://github.com/dotnet/sdk build 20250417.2 Microsoft.NET.Sdk From Version 9.0.105-servicing.25164.42 -> To Version 9.0.300-rtm.25217.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21d9afd1f89..668706bc5aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - af408b3f18d4087ff6468d7602b72c75d341a0b0 + 08c43ad51058179e6da72f8676411583b2ebcfb7 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8085e5213c1..375367ba691 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 9.0.300-preview.0.25211.10 + 9.0.300-rtm.25217.2 $(MicrosoftNETSdkPackageVersion) 9.0.4-servicing.25163.4 9.0.4 From 1d2f494c5bf5c8a5eec5af1dda08a9590e7b51eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Apr 2025 05:02:41 +0000 Subject: [PATCH 07/11] Update dependencies from https://github.com/dotnet/sdk build 20250420.2 Microsoft.NET.Sdk From Version 9.0.105-servicing.25164.42 -> To Version 9.0.300-rtm.25220.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 668706bc5aa..12f00efb628 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 08c43ad51058179e6da72f8676411583b2ebcfb7 + 6e5cad9c56247852d106fec2390ed551e2d3a376 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 375367ba691..85e5a63bbba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 9.0.300-rtm.25217.2 + 9.0.300-rtm.25220.2 $(MicrosoftNETSdkPackageVersion) 9.0.4-servicing.25163.4 9.0.4 From 96f3f9d9151a163fd6e74e376cad1cbe6819a3b9 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 21 Apr 2025 09:56:06 -0500 Subject: [PATCH 08/11] dotnet/runtime 8.0.16 feeds --- external/Java.Interop.override.props | 2 +- external/debugger-libs.override.props | 2 +- external/monodroid.override.props | 2 +- external/xamarin-android-tools.override.props | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/external/Java.Interop.override.props b/external/Java.Interop.override.props index 25d0637c317..674b3a09f81 100644 --- a/external/Java.Interop.override.props +++ b/external/Java.Interop.override.props @@ -4,7 +4,7 @@ $(MSBuildThisFileDirectory)xamarin-android-tools True - https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-b17f0594/nuget/v3/index.json; + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-6cd8ef87/nuget/v3/index.json; diff --git a/external/debugger-libs.override.props b/external/debugger-libs.override.props index 7af09d9605d..08a6f5feb32 100644 --- a/external/debugger-libs.override.props +++ b/external/debugger-libs.override.props @@ -3,7 +3,7 @@ true - https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-b17f0594/nuget/v3/index.json; + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-6cd8ef87/nuget/v3/index.json; diff --git a/external/monodroid.override.props b/external/monodroid.override.props index c76efafd4e8..c0a1ad56f32 100644 --- a/external/monodroid.override.props +++ b/external/monodroid.override.props @@ -3,7 +3,7 @@ $(MSBuildThisFileDirectory)xamarin-android-tools - https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-b17f0594/nuget/v3/index.json; + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-6cd8ef87/nuget/v3/index.json; diff --git a/external/xamarin-android-tools.override.props b/external/xamarin-android-tools.override.props index 847f45a9aac..9319b0fd576 100644 --- a/external/xamarin-android-tools.override.props +++ b/external/xamarin-android-tools.override.props @@ -3,7 +3,7 @@ - https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-b17f0594/nuget/v3/index.json; + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-6cd8ef87/nuget/v3/index.json; From eebf4bcf875f5a0fe00859b64b56d421c73ff096 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 22 Apr 2025 08:25:40 -0500 Subject: [PATCH 09/11] Update IncrementalBuildTest.cs The warning message changed: dotnet/sdk/9.0.300/Microsoft.Common.CurrentVersion.targets(2190,5): warning MSB9008: The referenced project ../MyLibrary/MyLibrary.csproj does not exist. --- .../Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs index a06312f2fb3..a0b298f60c3 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs @@ -1275,7 +1275,7 @@ public void MissingProjectReference () // Build app before library is built Assert.IsFalse (appBuilder.Build (app), "app build should have failed."); - Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, $"The referenced project '{reference.Replace ('\\', Path.DirectorySeparatorChar)}' does not exist.")); + Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, $"The referenced project {reference.Replace ('\\', Path.DirectorySeparatorChar)} does not exist.")); Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, " 1 Warning(s)"), "Should receive 1 Warning"); Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, "error CS0246"), "Should receive CS0246"); Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, " 1 Error(s)"), "Should receive 1 Error"); From cf9cd286828cc9b3c91b8418d236bd399cecebb8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Apr 2025 05:32:58 +0000 Subject: [PATCH 10/11] Update dependencies from https://github.com/dotnet/sdk build 20250421.4 Microsoft.NET.Sdk From Version 9.0.105-servicing.25164.42 -> To Version 9.0.300-rtm.25221.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 346aed52aed..65300b55d88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 6e5cad9c56247852d106fec2390ed551e2d3a376 + d79ec021fd2c50e2e1240020ef2909808c201916 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index fee0b78b4f5..0d9ad6174c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 9.0.300-rtm.25220.2 + 9.0.300-rtm.25221.4 $(MicrosoftNETSdkPackageVersion) 9.0.5-servicing.25211.5 9.0.5 From d3969d7c1927fa7dbb17060ce13fdb6827c99c12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 5 May 2025 05:03:06 +0000 Subject: [PATCH 11/11] Update dependencies from https://github.com/dotnet/sdk build 20250502.5 Microsoft.NET.Sdk From Version 9.0.105-servicing.25164.42 -> To Version 9.0.300-rtm.25252.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65300b55d88..1956e695a78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - d79ec021fd2c50e2e1240020ef2909808c201916 + a348b98de61f6ba4739d75563a82af14706f3042 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0d9ad6174c3..9c9844a801d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 9.0.300-rtm.25221.4 + 9.0.300-rtm.25252.5 $(MicrosoftNETSdkPackageVersion) 9.0.5-servicing.25211.5 9.0.5