diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72b69e51698..14bb6810de6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/installer - dc43d363d284c26cb1b463683d6ebb2c88ab0b58 + 0bfd2dd757482b30745b799ee0a92cad3d8f5b50 - + https://github.com/dotnet/runtime - 17f8138a726b8af269bffc59e9baa12dcb7abca5 + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/runtime - 17f8138a726b8af269bffc59e9baa12dcb7abca5 + ffb257818db89672d84d538964cec1b54fb2a094 - + https://github.com/dotnet/emsdk - 5dd0620274178dd73cac5049e5187c00e07ecf0c + bd79d3dd7ed2db36b3c3d4fa807c21a06d2024ec https://github.com/dotnet/cecil diff --git a/eng/Versions.props b/eng/Versions.props index 7fc8a8bc1e4..9dedef002ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,12 +1,12 @@ - 9.0.100-preview.4.24175.5 - 9.0.0-preview.4.24173.6 - 9.0.0-preview.4.24173.6 + 9.0.100-preview.4.24208.2 + 9.0.0-preview.4.24204.3 + 9.0.0-preview.4.24204.3 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 9.0.0-preview.3.24160.1 + 9.0.0-preview.4.24201.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 7.0.100-rc.1.22410.7 0.11.4-alpha.24168.1 diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs index 1f5cff5a437..9cba6164287 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs @@ -260,12 +260,7 @@ public void BuildHasNoWarnings (bool isRelease, bool xamarinForms, bool multidex proj.SetProperty ("TrimmerSingleWarn", "false"); using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) { Assert.IsTrue (b.Build (proj), "Build should have succeeded."); - // FIXME: https://github.com/dotnet/runtime/issues/100256 - if (!xamarinForms && isRelease) { - Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 4 Warning(s)"), $"{b.BuildLogFile} should have 4 MSBuild warnings."); - } else { - b.AssertHasNoWarnings (); - } + b.AssertHasNoWarnings (); Assert.IsFalse (StringAssertEx.ContainsText (b.LastBuildOutput, "Warning: end of file not at end of a line"), "Should not get a warning from the task."); var lockFile = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, ".__lock"); diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs index 54fb5b35130..f0d0cecf12b 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs @@ -42,12 +42,7 @@ public void DotNetNew ([Values ("android", "androidlib", "android-bindinglib", " // Release build Assert.IsTrue (dotnet.Build (parameters: new [] { "Configuration=Release", "TrimmerSingleWarn=false" }), "`dotnet build` should succeed"); - // FIXME: https://github.com/dotnet/runtime/issues/100256 - if (template.Contains ("lib")) { - dotnet.AssertHasNoWarnings (); - } else { - Assert.IsTrue (StringAssertEx.ContainsText (dotnet.LastBuildOutput, " 4 Warning(s)"), $"{dotnet.BuildLogFile} should have 4 MSBuild warnings."); - } + dotnet.AssertHasNoWarnings (); } static readonly object[] DotNetPackTargetFrameworks = new object[] {