diff --git a/build-tools/automation/yaml-templates/variables.yaml b/build-tools/automation/yaml-templates/variables.yaml index 8bfc8c49d59..ef6f3131c90 100644 --- a/build-tools/automation/yaml-templates/variables.yaml +++ b/build-tools/automation/yaml-templates/variables.yaml @@ -56,6 +56,3 @@ variables: value: 'cat != SystemApplication & cat != TimeZoneInfo & cat != Localization' - name: RunMAUITestJob value: true -# Workaround: https://github.com/dotnet/msbuild/issues/10378 -- name: MSBUILDDISABLEFEATURESFROMVERSION - value: 17.12 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6cbea078f9..b936cf9934c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/sdk - 2f14fea98bd6e87f8583f59495a8a664155f1c8a + 7ef0791037ef761b6767a843bbb8b63d4253a3ab - + https://github.com/dotnet/runtime - 1f70f0cc663b5d45f77840e9728386e5fa7944f9 + c86bcbb7a573bb09fcb1f4fcd7bc24323e9d6f44 - + https://github.com/dotnet/runtime - 1f70f0cc663b5d45f77840e9728386e5fa7944f9 + c86bcbb7a573bb09fcb1f4fcd7bc24323e9d6f44 - + https://github.com/dotnet/emsdk - 99ea0c06b84d3084d090da537080dd35d2a193cf + 40781ca2fc6be1dd81143d8773105a0f9f77d923 - + https://github.com/dotnet/cecil - 7e4af02521473d89d6144b3da58fef253e498974 + 085c55c477228926915f7cadfd28cee55a18850e diff --git a/eng/Versions.props b/eng/Versions.props index 67ebe5e27a5..63763b6a111 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,17 +1,16 @@ - - 9.0.100-preview.7.24367.21 - $(VSToolsNetCoreSDKResolverPackageVersion) - 9.0.0-preview.7.24366.18 - 9.0.0-preview.7.24366.18 + 9.0.100-rc.1.24381.10 + $(MicrosoftNETSdkPackageVersion) + 9.0.0-rc.1.24380.7 + 9.0.0-rc.1.24380.7 7.0.0-beta.22103.1 8.0.0-beta.24225.1 - 9.0.0-preview.7.24365.1 + 9.0.0-rc.1.24373.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.5-alpha.24324.1 + 0.11.5-alpha.24372.1 $(MicrosoftNETCoreAppRefPackageVersion) 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 08fa7fed2de..e42436ada2d 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 @@ -208,8 +208,7 @@ public void CheckMonoComponentsMask (bool enableProfiler, bool useInterpreter, b using (var b = CreateApkBuilder ()) { Assert.IsTrue (b.Build (proj), "Build should have succeeded."); - //FIXME: https://github.com/dotnet/runtime/issues/105044 - //b.AssertHasNoWarnings (); + b.AssertHasNoWarnings (); string objPath = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath); List envFiles = EnvironmentHelper.GatherEnvironmentFiles (objPath, String.Join (";", abis), true); 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 bef9c03607c..30b93598aa9 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 @@ -261,9 +261,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/105044 - if (!xamarinForms) - 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/CodeBehindTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs index c28e9b7be3a..da088199ffd 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs @@ -340,8 +340,7 @@ void SuccessfulBuild_AndroidX (TestProjectInfo testInfo, bool many, bool dtb, Lo CopyLogs (testInfo, true); Assert.That (success, Is.True, "Build should have succeeded"); - //FIXME: https://github.com/dotnet/runtime/issues/105044 - //Assert.IsTrue (StringAssertEx.ContainsText (builder.LastBuildOutput, " 0 Warning(s)"), $"{builder.BuildLogFile} should have no MSBuild warnings."); + Assert.IsTrue (StringAssertEx.ContainsText (builder.LastBuildOutput, " 0 Warning(s)"), $"{builder.BuildLogFile} should have no MSBuild warnings."); CopyGeneratedFiles (testInfo);