From 997e9295dde40bdbe384747b23c1a4b749e1d8dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Jul 2024 16:42:55 +0000 Subject: [PATCH 01/11] Update dependencies from https://github.com/dotnet/sdk build 20240718.3 VS.Tools.Net.Core.SDK.Resolver From Version 9.0.100-preview.7.24367.21 -> To Version 9.0.100-preview.7.24368.3 --- 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 a6cbea078f9..86aa43defb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 2f14fea98bd6e87f8583f59495a8a664155f1c8a + ef5d32d5c89a04dda85d4510a0643165bc9f6e20 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 67ebe5e27a5..2ef61292ae8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 9.0.100-preview.7.24367.21 + 9.0.100-preview.7.24368.3 $(VSToolsNetCoreSDKResolverPackageVersion) 9.0.0-preview.7.24366.18 9.0.0-preview.7.24366.18 From 052871db6d54ce6b8d5b0b9d4088db5d4de47f1b Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 18 Jul 2024 12:00:50 -0500 Subject: [PATCH 02/11] Revert workarounds for trimming & MSbuild This partially reverts commit 580166e6f67c400c124aa98b1fbb855694724638. --- build-tools/automation/yaml-templates/variables.yaml | 3 --- .../Tests/Xamarin.Android.Build.Tests/BuildTest.cs | 3 +-- .../Tests/Xamarin.Android.Build.Tests/BuildTest2.cs | 4 +--- .../Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs | 3 +-- 4 files changed, 3 insertions(+), 10 deletions(-) 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/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); From a88fbb8fea587bb958d0730536021d2dfce7cf6e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Jul 2024 13:18:58 +0000 Subject: [PATCH 03/11] Update dependencies from https://github.com/dotnet/sdk build 20240718.5 VS.Tools.Net.Core.SDK.Resolver From Version 9.0.100-preview.7.24367.21 -> To Version 9.0.100-preview.7.24368.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 86aa43defb0..67a9d3bfdc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - ef5d32d5c89a04dda85d4510a0643165bc9f6e20 + a8758549c2c45b3eb553b9f9e3aef638eba6e770 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2ef61292ae8..3c3f40214c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 9.0.100-preview.7.24368.3 + 9.0.100-preview.7.24368.5 $(VSToolsNetCoreSDKResolverPackageVersion) 9.0.0-preview.7.24366.18 9.0.0-preview.7.24366.18 From 03ed2a0de09e47680410f86fb7eb32fc897924c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 Jul 2024 13:49:50 +0000 Subject: [PATCH 04/11] Update dependencies from https://github.com/dotnet/sdk build 20240721.4 VS.Tools.Net.Core.SDK.Resolver From Version 9.0.100-preview.7.24367.21 -> To Version 9.0.100-preview.7.24371.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 67a9d3bfdc6..495f6c857f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - a8758549c2c45b3eb553b9f9e3aef638eba6e770 + 29904b25a99c8984bacb86473df7d98735fb3207 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3c3f40214c3..fbdc02a83fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 9.0.100-preview.7.24368.5 + 9.0.100-preview.7.24371.4 $(VSToolsNetCoreSDKResolverPackageVersion) 9.0.0-preview.7.24366.18 9.0.0-preview.7.24366.18 From 0d0cfebe3e9e6e851cbb802132dff1a71a06dc97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Jul 2024 18:18:54 +0000 Subject: [PATCH 05/11] Update dependencies from https://github.com/dotnet/sdk build 20240723.6 VS.Tools.Net.Core.SDK.Resolver From Version 9.0.100-preview.7.24367.21 -> To Version 9.0.100-preview.7.24373.6 --- 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 495f6c857f4..38c9ae01aa0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 29904b25a99c8984bacb86473df7d98735fb3207 + 67b96df9997212e78c15ffc0813f76be19be40cd https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index fbdc02a83fa..02b8dc2f56c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 9.0.100-preview.7.24371.4 + 9.0.100-preview.7.24373.6 $(VSToolsNetCoreSDKResolverPackageVersion) 9.0.0-preview.7.24366.18 9.0.0-preview.7.24366.18 From a35d8219582d57fd91b675408443d2415376b353 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Jul 2024 14:06:46 +0000 Subject: [PATCH 06/11] Update dependencies from https://github.com/dotnet/sdk build 20240724.7 VS.Tools.Net.Core.SDK.Resolver From Version 9.0.100-preview.7.24367.21 -> To Version 9.0.100-preview.7.24374.7 --- 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 38c9ae01aa0..fe6c1fc8808 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 67b96df9997212e78c15ffc0813f76be19be40cd + 0d7a9fec222f4b9e4683f0345102de06fac4a023 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 02b8dc2f56c..53b6c8b645a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 9.0.100-preview.7.24373.6 + 9.0.100-preview.7.24374.7 $(VSToolsNetCoreSDKResolverPackageVersion) 9.0.0-preview.7.24366.18 9.0.0-preview.7.24366.18 From 9211d961870c8aea5b571b7d37be6ca3387cde6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Jul 2024 13:29:56 +0000 Subject: [PATCH 07/11] Update dependencies from https://github.com/dotnet/sdk build 20240725.4 VS.Tools.Net.Core.SDK.Resolver From Version 9.0.100-preview.7.24367.21 -> To Version 9.0.100-preview.7.24375.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 fe6c1fc8808..da9388e9651 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 0d7a9fec222f4b9e4683f0345102de06fac4a023 + 8fcbaac1e96fa740af46c9e766c5a4d54e59fe75 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 53b6c8b645a..5a5c4ec80f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 9.0.100-preview.7.24374.7 + 9.0.100-preview.7.24375.4 $(VSToolsNetCoreSDKResolverPackageVersion) 9.0.0-preview.7.24366.18 9.0.0-preview.7.24366.18 From a5ff76f26a0a611b0615bccfde2bb9157a6d768d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Jul 2024 14:17:27 +0000 Subject: [PATCH 08/11] Update dependencies from https://github.com/dotnet/sdk build 20240726.5 VS.Tools.Net.Core.SDK.Resolver From Version 9.0.100-preview.7.24367.21 -> To Version 9.0.100-preview.7.24376.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 da9388e9651..9166cc5d3a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 8fcbaac1e96fa740af46c9e766c5a4d54e59fe75 + ea13b1adbfbfe155ae242d42bff7febee0dbb27f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5a5c4ec80f6..bcbb087ef75 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 9.0.100-preview.7.24375.4 + 9.0.100-preview.7.24376.5 $(VSToolsNetCoreSDKResolverPackageVersion) 9.0.0-preview.7.24366.18 9.0.0-preview.7.24366.18 From 21c35f6fdf7abbe78be659d99da74a034b7e2566 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 1 Aug 2024 11:42:57 -0500 Subject: [PATCH 09/11] VS.Tools.Net.Core.SDK.Resolver -> Microsoft.NET.Sdk --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9166cc5d3a0..83b706e7472 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/sdk ea13b1adbfbfe155ae242d42bff7febee0dbb27f - + https://github.com/dotnet/runtime 1f70f0cc663b5d45f77840e9728386e5fa7944f9 - + https://github.com/dotnet/runtime 1f70f0cc663b5d45f77840e9728386e5fa7944f9 diff --git a/eng/Versions.props b/eng/Versions.props index bcbb087ef75..f9207e4df52 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,8 +1,7 @@ - - 9.0.100-preview.7.24376.5 + 9.0.100-preview.7.24376.5 $(VSToolsNetCoreSDKResolverPackageVersion) 9.0.0-preview.7.24366.18 9.0.0-preview.7.24366.18 From f777dae1ebdb762f1c82ccab9981db81c348ccb9 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 1 Aug 2024 11:43:36 -0500 Subject: [PATCH 10/11] darc update-dependencies --id 233463 > darc update-dependencies --id 233463 Looking up build with BAR id 233463 Updating 'Microsoft.NET.Sdk': '9.0.100-preview.7.24376.5' => '9.0.100-rc.1.24381.10' (from build '20240731.10' of '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/dotnet/sdk') Checking for coherency updates... Using 'Strict' coherency mode. If this fails, a second attempt utilizing 'Legacy' Coherency mode will be made. Updating 'Microsoft.NETCore.App.Ref': '9.0.0-preview.7.24366.18' => '9.0.0-rc.1.24380.7' to ensure coherency with Microsoft.NET.Sdk@9.0.100-rc.1.24381.10 Updating 'Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport': '9.0.0-preview.7.24365.1' => '9.0.0-rc.1.24373.3' to ensure coherency with Microsoft.NETCore.App.Ref@9.0.0-preview.7.24366.18 Updating 'Microsoft.NET.ILLink.Tasks': '9.0.0-preview.7.24366.18' => '9.0.0-rc.1.24380.7' to ensure coherency with Microsoft.NET.Sdk@9.0.100-rc.1.24381.10 Updating 'Microsoft.DotNet.Cecil': '0.11.5-alpha.24324.1' => '0.11.5-alpha.24372.1' to ensure coherency with Microsoft.NET.ILLink.Tasks@9.0.0-preview.7.24366.18 Local dependencies updated based on build with BAR id 233463 (20240731.10 from https://github.com/dotnet/sdk@main) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83b706e7472..b936cf9934c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/sdk - ea13b1adbfbfe155ae242d42bff7febee0dbb27f + 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 f9207e4df52..7ccc6c335eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,16 +1,16 @@ - 9.0.100-preview.7.24376.5 + 9.0.100-rc.1.24381.10 $(VSToolsNetCoreSDKResolverPackageVersion) - 9.0.0-preview.7.24366.18 - 9.0.0-preview.7.24366.18 + 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) From 5401b20e52a68e9e37b7e167ad539fd623e7d333 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 1 Aug 2024 11:56:31 -0500 Subject: [PATCH 11/11] Update Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7ccc6c335eb..63763b6a111 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ 9.0.100-rc.1.24381.10 - $(VSToolsNetCoreSDKResolverPackageVersion) + $(MicrosoftNETSdkPackageVersion) 9.0.0-rc.1.24380.7 9.0.0-rc.1.24380.7 7.0.0-beta.22103.1