diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a4b12d0f5d..1956e695a78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 8d515d2a57e0c45a81795d7b133300fd8944f3f9 + a348b98de61f6ba4739d75563a82af14706f3042 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2f06b7c9c1e..9c9844a801d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 9.0.105-servicing.25164.42 + 9.0.300-rtm.25252.5 $(MicrosoftNETSdkPackageVersion) 9.0.5-servicing.25211.5 9.0.5 @@ -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 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; 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");