From 1890caa85a070b035be7a56ca5d0b6d3154e5991 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Oct 2024 17:42:54 +0000 Subject: [PATCH 01/34] Update dependencies from https://github.com/dotnet/sdk build 20241010.13 Microsoft.NET.Sdk From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24510.13 --- 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 d536d9eeb02..17db450d5d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 5b9d9d4677ea31d954533e9de2f95a3ea638135d + 1f220e48e5bc666e992b24f118a17e01ca316819 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 22117fc0b16..09e1aa3f82e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 9.0.100-rtm.24512.1 + 10.0.100-alpha.1.24510.13 $(MicrosoftNETSdkPackageVersion) 9.0.0-rtm.24510.3 9.0.0-rtm.24510.3 From 28b45d4e48cd7caed7018f5cae2328a60d618042 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Oct 2024 19:47:45 +0000 Subject: [PATCH 02/34] Failed to perform coherency update for one or more dependencies. From 55f32de183c388bfc21581b657792aae40b9adcd Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 16 Oct 2024 14:49:24 -0500 Subject: [PATCH 03/34] Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17db450d5d9..df5a67d4655 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,7 +12,7 @@ https://github.com/dotnet/runtime 226c0347b92c4f9649bcc7ad580f74cb0409580e - + https://github.com/dotnet/emsdk 8e660ff41e91879977e3a9d837e068bd72234c26 diff --git a/eng/Versions.props b/eng/Versions.props index 09e1aa3f82e..1df81b866ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ 9.0.0-rtm.24510.3 7.0.0-beta.22103.1 10.0.0-beta.24476.2 - 9.0.0-rtm.24469.1 + 9.0.0-rtm.24469.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 7.0.100-rc.1.22410.7 0.11.5-alpha.24480.1 From 9b0be6d3716055edff54bd37ae54f3603e52b611 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 16 Oct 2024 14:49:50 -0500 Subject: [PATCH 04/34] darc update-dependencies --coherency-only --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df5a67d4655..5a6b4a502d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ https://github.com/dotnet/sdk 1f220e48e5bc666e992b24f118a17e01ca316819 - + https://github.com/dotnet/runtime - 226c0347b92c4f9649bcc7ad580f74cb0409580e + 43295bb5378453d2ec4d9272cb44c6f50b4faa1f - + https://github.com/dotnet/runtime - 226c0347b92c4f9649bcc7ad580f74cb0409580e + 43295bb5378453d2ec4d9272cb44c6f50b4faa1f - + https://github.com/dotnet/emsdk - 8e660ff41e91879977e3a9d837e068bd72234c26 + 4ea46baeaf74d5a99cb93593362b6d8263b10550 https://github.com/dotnet/cecil diff --git a/eng/Versions.props b/eng/Versions.props index 1df81b866ce..5245d652e00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,11 +3,11 @@ 10.0.100-alpha.1.24510.13 $(MicrosoftNETSdkPackageVersion) - 9.0.0-rtm.24510.3 - 9.0.0-rtm.24510.3 + 10.0.0-alpha.1.24507.22 + 10.0.0-alpha.1.24507.22 7.0.0-beta.22103.1 10.0.0-beta.24476.2 - 9.0.0-rtm.24469.1 + 10.0.0-alpha.1.24474.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 7.0.100-rc.1.22410.7 0.11.5-alpha.24480.1 From ce4e82c47f4ed8dc1452078f4053ff3942001cfc Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 16 Oct 2024 15:00:02 -0500 Subject: [PATCH 05/34] 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 5245d652e00..ee4f8842fb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7.0.0-beta.22103.1 10.0.0-beta.24476.2 10.0.0-alpha.1.24474.1 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) + $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion) 7.0.100-rc.1.22410.7 0.11.5-alpha.24480.1 $(MicrosoftNETCoreAppRefPackageVersion) From aa8af85642d9af7e650bf3accfcf0c6328a8293c Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 17 Oct 2024 16:58:22 -0500 Subject: [PATCH 06/34] dotnet10 feed --- NuGet.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index f86a77626ff..7b88df6acac 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,10 +12,10 @@ - - + + From 59111e4664c83076f862680fe36ba598ba001c62 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Oct 2024 17:40:02 +0000 Subject: [PATCH 07/34] Update dependencies from https://github.com/dotnet/sdk build 20241024.9 Microsoft.NET.Sdk From Version 10.0.100-alpha.1.24510.13 -> To Version 10.0.100-alpha.1.24524.9 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport,Microsoft.NET.ILLink.Tasks,Microsoft.DotNet.Cecil From Version 10.0.0-alpha.1.24507.22 -> To Version 10.0.0-alpha.1.24523.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 - eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7b88df6acac..1a0f14021c0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a6b4a502d0..9a25d1d45f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/sdk - 1f220e48e5bc666e992b24f118a17e01ca316819 + 49b4f57a1550e7722e25b339f658d009af46550d - + https://github.com/dotnet/runtime - 43295bb5378453d2ec4d9272cb44c6f50b4faa1f + edaa25e6942f3e8d9e2f078d99f34ed015658fbe - + https://github.com/dotnet/runtime - 43295bb5378453d2ec4d9272cb44c6f50b4faa1f + edaa25e6942f3e8d9e2f078d99f34ed015658fbe - + https://github.com/dotnet/emsdk - 4ea46baeaf74d5a99cb93593362b6d8263b10550 + e0a38f7136d6ddc035b3d0d81d8a61fd903c06fd - + https://github.com/dotnet/cecil - 9c9443396f8deacceb8edb169890e52aac25f311 + b897087e8b76481a9213ae422f5dc16f64a124b5 diff --git a/eng/Versions.props b/eng/Versions.props index ee4f8842fb4..01dda2d1e84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,16 +1,16 @@ - 10.0.100-alpha.1.24510.13 + 10.0.100-alpha.1.24524.9 $(MicrosoftNETSdkPackageVersion) - 10.0.0-alpha.1.24507.22 - 10.0.0-alpha.1.24507.22 + 10.0.0-alpha.1.24523.5 + 10.0.0-alpha.1.24523.5 7.0.0-beta.22103.1 10.0.0-beta.24476.2 - 10.0.0-alpha.1.24474.1 + 10.0.0-alpha.1.24515.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.5-alpha.24480.1 + 0.11.5-alpha.24521.1 $(MicrosoftNETCoreAppRefPackageVersion) 34.0.143 From 9a449d86de5d5b28a23ae366fbdc7332fc59cb9c Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 29 Oct 2024 08:23:13 -0500 Subject: [PATCH 08/34] darc update-dependencies --id 243767 Looking up build with BAR id 243767 Updating 'Microsoft.Android.Sdk.Windows': '34.0.145' => '35.0.7' (from build '9.0.1xx-278e101698269c9bc8840aa94d72e7f24066a96d-1' of 'https://github.com/dotnet/android') Checking for coherency updates... Local dependencies updated based on build with BAR id 243767 (9.0.1xx-278e101698269c9bc8840aa94d72e7f24066a96d-1 from https://github.com/dotnet/android@release/9.0.1xx) --- NuGet.config | 2 +- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index a68b37199e5..1d714975cf7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index abde6b3981d..263c3c907ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ b897087e8b76481a9213ae422f5dc16f64a124b5 - + https://github.com/dotnet/android - df9aaf29a52042a4fbf800daf2f3a38964b9e958 + 278e101698269c9bc8840aa94d72e7f24066a96d diff --git a/eng/Versions.props b/eng/Versions.props index 5c4db7403d6..02fc70f08c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ 0.11.5-alpha.24521.1 $(MicrosoftNETCoreAppRefPackageVersion) - 34.0.145 + 35.0.7 $(MicrosoftAndroidSdkWindowsPackageVersion) From fe288c0a3eadeabea8d2fedcde92a12de19d9d2a Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 29 Oct 2024 08:35:16 -0500 Subject: [PATCH 09/34] Took a pass, moving .NET 9 -> .NET 10 Based on: https://github.com/dotnet/android/commit/8fa5d99341b868795b54bfa9d087bda38151a4d2 --- Directory.Build.props | 4 +-- Makefile | 2 +- .../automation/yaml-templates/variables.yaml | 8 +++--- .../Steps/Step_InstallDotNetPreview.cs | 2 +- .../xaprepare/xaprepare/package-download.proj | 2 ++ .../android-bindinglib/AndroidBinding1.csproj | 2 +- .../android-wear/AndroidApp1.csproj | 2 +- .../android/AndroidApp1.csproj | 2 +- .../androidlib/AndroidLib1.csproj | 2 +- .../Sdk/AutoImport.props | 8 +++--- .../WorkloadManifest.in.json | 10 +++---- .../WorkloadManifest.in.targets | 12 ++++---- .../Xamarin.Android.Build.Tests/XASdkTests.cs | 28 +++++++++---------- .../Common/DotNetXamarinProject.cs | 2 +- .../Tests/DebuggingTest.cs | 6 ++-- .../Tests/InstallAndRunTests.cs | 2 +- .../Tests/MarshalMethodsGCHangTests.cs | 1 - 17 files changed, 48 insertions(+), 47 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 0db7296a9c8..557b0f07777 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,11 +2,11 @@ true - 9.0 + 10.0 net$(DotNetTargetFrameworkVersion) $(DotNetTargetFramework)-android - net8.0 + net9.0 netstandard2.0 Debug $(MSBuildThisFileDirectory)bin\$(Configuration)\ diff --git a/Makefile b/Makefile index 103e43b7468..85a0a28b92a 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ RUNTIME := $(shell which mono64 2> /dev/null && echo mono64 || echo mono) SOLUTION = Xamarin.Android.sln TEST_TARGETS = build-tools/scripts/RunTests.targets API_LEVEL ?= -PREPARE_NET_FX = net8.0 +PREPARE_NET_FX = net9.0 PREPARE_ARGS = PREPARE_PROJECT = build-tools/xaprepare/xaprepare/xaprepare.csproj PREPARE_MSBUILD_FLAGS = $(PREPARE_MSBUILD_ARGS) $(MSBUILD_ARGS) diff --git a/build-tools/automation/yaml-templates/variables.yaml b/build-tools/automation/yaml-templates/variables.yaml index 4a21510cb50..621f5f23e5c 100644 --- a/build-tools/automation/yaml-templates/variables.yaml +++ b/build-tools/automation/yaml-templates/variables.yaml @@ -24,9 +24,9 @@ variables: - name: NUnit.NumberOfTestWorkers value: 4 - name: DotNetSdkVersion - value: 8.0 + value: 9.0 - name: DotNetSdkQuality - value: GA + value: preview - name: GitHub.Token value: $(github--pat--vs-mobiletools-engineering-service2) - name: HostedMacImage @@ -42,9 +42,9 @@ variables: - name: TeamName value: XamarinAndroid - name: DotNetTargetFramework - value: net9.0 + value: net10.0 - name: DotNetStableTargetFramework - value: net8.0 + value: net9.0 # Workaround: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1585820 - name: _WriteTelemetryProperties value: false diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs index e1808adc328..b1bdc516e61 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs @@ -54,7 +54,7 @@ protected override async Task Execute (Context context) var sdk_manifests = Path.Combine (dotnetPath, "sdk-manifests"); // Copy the WorkloadManifest.* files from the latest Microsoft.NET.Workload.* listed in package-download.proj - var dotnets = new [] { "net6", "net7", "net8", "current" }; + var dotnets = new [] { "net6", "net7", "net8", "net9", "current" }; foreach (var dotnet in dotnets) { var destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand), diff --git a/build-tools/xaprepare/xaprepare/package-download.proj b/build-tools/xaprepare/xaprepare/package-download.proj index e46c99ba0c6..f68692ad0b9 100644 --- a/build-tools/xaprepare/xaprepare/package-download.proj +++ b/build-tools/xaprepare/xaprepare/package-download.proj @@ -24,10 +24,12 @@ Otherwise, $(MicrosoftNETCoreAppRefPackageVersion) from eng/Versions.props will + + diff --git a/src/Microsoft.Android.Templates/android-bindinglib/AndroidBinding1.csproj b/src/Microsoft.Android.Templates/android-bindinglib/AndroidBinding1.csproj index 56c74d9fc01..63795db62c2 100644 --- a/src/Microsoft.Android.Templates/android-bindinglib/AndroidBinding1.csproj +++ b/src/Microsoft.Android.Templates/android-bindinglib/AndroidBinding1.csproj @@ -1,6 +1,6 @@ - net9.0-android + net10.0-android SUPPORTED_OS_PLATFORM_VERSION AndroidBinding1 enable diff --git a/src/Microsoft.Android.Templates/android-wear/AndroidApp1.csproj b/src/Microsoft.Android.Templates/android-wear/AndroidApp1.csproj index 8d47e2d1eb0..19eab521a4d 100644 --- a/src/Microsoft.Android.Templates/android-wear/AndroidApp1.csproj +++ b/src/Microsoft.Android.Templates/android-wear/AndroidApp1.csproj @@ -1,6 +1,6 @@ - net9.0-android + net10.0-android SUPPORTED_OS_PLATFORM_VERSION AndroidApp1 Exe diff --git a/src/Microsoft.Android.Templates/android/AndroidApp1.csproj b/src/Microsoft.Android.Templates/android/AndroidApp1.csproj index 514d24bf1c9..cbdd3be77e0 100644 --- a/src/Microsoft.Android.Templates/android/AndroidApp1.csproj +++ b/src/Microsoft.Android.Templates/android/AndroidApp1.csproj @@ -1,6 +1,6 @@ - net9.0-android + net10.0-android SUPPORTED_OS_PLATFORM_VERSION AndroidApp1 Exe diff --git a/src/Microsoft.Android.Templates/androidlib/AndroidLib1.csproj b/src/Microsoft.Android.Templates/androidlib/AndroidLib1.csproj index d50d9b99196..b0d4286fe6a 100644 --- a/src/Microsoft.Android.Templates/androidlib/AndroidLib1.csproj +++ b/src/Microsoft.Android.Templates/androidlib/AndroidLib1.csproj @@ -1,6 +1,6 @@ - net9.0-android + net10.0-android SUPPORTED_OS_PLATFORM_VERSION AndroidLib1 enable diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/AutoImport.props b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/AutoImport.props index ea6eefd8dbc..ccd564d6343 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/AutoImport.props +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/AutoImport.props @@ -16,7 +16,7 @@ https://github.com/dotnet/designs/blob/4703666296f5e59964961464c25807c727282cae/ --> - + @@ -24,7 +24,7 @@ https://github.com/dotnet/designs/blob/4703666296f5e59964961464c25807c727282cae/ + $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '10.0')) "> @@ -41,13 +41,13 @@ https://github.com/dotnet/designs/blob/4703666296f5e59964961464c25807c727282cae/ + $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '10.0')) "> + and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '10.0')) "> diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json b/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json index dda3c79df31..319b7ba4a75 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json @@ -4,8 +4,8 @@ "android": { "description": ".NET SDK Workload for building Android applications.", "packs": [ + "Microsoft.Android.Sdk.net10", "Microsoft.Android.Sdk.net9", - "Microsoft.Android.Sdk.net8", "Microsoft.Android.Ref.35", "Microsoft.Android.Runtime.35.android-arm", "Microsoft.Android.Runtime.35.android-arm64", @@ -15,15 +15,15 @@ ], "platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "osx-x64", "osx-arm64" ], "extends" : [ - "microsoft-net-runtime-android-net8", - "microsoft-net-runtime-android-aot-net8", + "microsoft-net-runtime-android-net9", + "microsoft-net-runtime-android-aot-net9", "microsoft-net-runtime-android", "microsoft-net-runtime-android-aot" ] } }, "packs": { - "Microsoft.Android.Sdk.net9": { + "Microsoft.Android.Sdk.net10": { "kind": "sdk", "version": "@WORKLOAD_VERSION@", "alias-to": { @@ -36,7 +36,7 @@ "linux-arm64": "Microsoft.Android.Sdk.Linux" } }, - "Microsoft.Android.Sdk.net8": { + "Microsoft.Android.Sdk.net9": { "kind": "sdk", "version": "@NET_PREVIOUS_VERSION@", "alias-to": { diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.targets index 6555182160b..a738a9c1e70 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.targets +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.targets @@ -1,14 +1,14 @@ + - - + - + - + 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 4fbe5439758..150584d2c28 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 @@ -47,22 +47,22 @@ public void DotNetNew ([Values ("android", "androidlib", "android-bindinglib", " static readonly object[] DotNetPackTargetFrameworks = new object[] { new object[] { - "net8.0", + "net9.0", "android", - 34, + 35, }, new object[] { - "net8.0", - "android34", - 34, + "net9.0", + "android35", + 35, }, new object[] { - "net9.0", + "net10.0", "android", XABuildConfig.AndroidDefaultTargetDotnetApiLevel, }, new object[] { - "net9.0", + "net10.0", $"android{XABuildConfig.AndroidDefaultTargetDotnetApiLevel}", XABuildConfig.AndroidDefaultTargetDotnetApiLevel, }, @@ -146,29 +146,29 @@ public String Say (String quote) { static readonly object[] DotNetTargetFrameworks = new object[] { new object[] { - "net8.0", + "net9.0", "android", - 34, + 35, }, new object[] { - "net9.0", + "net10.0", "android", XABuildConfig.AndroidDefaultTargetDotnetApiLevel, }, new object[] { - "net9.0", + "net10.0", $"android{XABuildConfig.AndroidDefaultTargetDotnetApiLevel}", XABuildConfig.AndroidDefaultTargetDotnetApiLevel, }, new object[] { - "net9.0", + "net10.0", XABuildConfig.AndroidLatestStableApiLevel == XABuildConfig.AndroidDefaultTargetDotnetApiLevel ? null : $"android{XABuildConfig.AndroidLatestStableApiLevel}.0", XABuildConfig.AndroidLatestStableApiLevel, }, new object[] { - "net9.0", + "net10.0", XABuildConfig.AndroidLatestUnstableApiLevel == XABuildConfig.AndroidLatestStableApiLevel ? null : $"android{XABuildConfig.AndroidLatestUnstableApiLevel}.0", XABuildConfig.AndroidLatestUnstableApiLevel, }, @@ -234,7 +234,7 @@ public void DotNetPublish ([Values (false, true)] bool isRelease, [ValueSource(n } // Only check latest TFM, as previous will come from NuGet - if (dotnetVersion == "net9.0") { + if (dotnetVersion == "net10.0") { var refDirectory = Directory.GetDirectories (Path.Combine (TestEnvironment.DotNetPreviewPacksDirectory, $"Microsoft.Android.Ref.{apiLevel}")).LastOrDefault (); var expectedMonoAndroidRefPath = Path.Combine (refDirectory, "ref", dotnetVersion, "Mono.Android.dll"); Assert.IsTrue (dotnet.LastBuildOutput.ContainsText (expectedMonoAndroidRefPath), $"Build should be using {expectedMonoAndroidRefPath}"); diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetXamarinProject.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetXamarinProject.cs index 30ae44a3628..2f4554cc62d 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetXamarinProject.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetXamarinProject.cs @@ -27,7 +27,7 @@ protected DotNetXamarinProject (string debugConfigurationName = "Debug", string SetProperty ("RootNamespace", () => RootNamespace ?? ProjectName); SetProperty ("AssemblyName", () => AssemblyName ?? ProjectName); - TargetFramework = "net9.0-android"; + TargetFramework = "net10.0-android"; EnableDefaultItems = false; AppendTargetFrameworkToOutputPath = false; diff --git a/tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs b/tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs index b8b13c423f0..0508cc47627 100755 --- a/tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs +++ b/tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs @@ -400,8 +400,8 @@ public Foo () EmbedAssembliesIntoApk = embedAssemblies, }; if (!useLatestSdk) { - lib.TargetFramework = "net8.0-android"; - app.TargetFramework = "net8.0-android"; + lib.TargetFramework = "net9.0-android"; + app.TargetFramework = "net9.0-android"; } app.SetProperty ("AndroidPackageFormat", packageFormat); @@ -416,7 +416,7 @@ public Foo () appBuilder.Verbosity = LoggerVerbosity.Detailed; Assert.True (libBuilder.Build (lib), "Library should have built."); - SetTargetFrameworkAndManifest (app, appBuilder, app.TargetFramework == "net8.0-android" ? 34 : null); + SetTargetFrameworkAndManifest (app, appBuilder, app.TargetFramework == "net9.0-android" ? 35 : null); Assert.True (appBuilder.Install (app, parameters: parameters.ToArray ()), "App should have installed."); if (!embedAssemblies) { diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs index 6579abe21aa..f52a0e3f16b 100644 --- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs +++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs @@ -1049,7 +1049,7 @@ public void EnableAndroidStripILAfterAOT ([Values (false, true)] bool profiledAO [Test] public void FixLegacyResourceDesignerStep ([Values (true, false)] bool isRelease) { - string previousTargetFramework = "net8.0-android"; + string previousTargetFramework = "net9.0-android"; var library1 = new XamarinAndroidLibraryProject { IsRelease = isRelease, diff --git a/tests/MSBuildDeviceIntegration/Tests/MarshalMethodsGCHangTests.cs b/tests/MSBuildDeviceIntegration/Tests/MarshalMethodsGCHangTests.cs index c191bf4b3d9..3930dc3c28e 100644 --- a/tests/MSBuildDeviceIntegration/Tests/MarshalMethodsGCHangTests.cs +++ b/tests/MSBuildDeviceIntegration/Tests/MarshalMethodsGCHangTests.cs @@ -88,7 +88,6 @@ public void MarshalMethodsAppRuns () var proj = new XamarinAndroidApplicationProject (packageName: "marshal2") { IsRelease = true, EnableMarshalMethods = true, - TargetFramework = "net9.0-android", SupportedOSPlatformVersion = "23", TrimModeRelease = TrimMode.Full, ProjectName = "marshal2", From f78614cecf647cca5ffab9c0aac933d3a3b88c92 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 29 Oct 2024 08:47:15 -0500 Subject: [PATCH 10/34] Temporarily remove net9 manifests They are missing here: * https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet10 --- .../xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs | 3 ++- build-tools/xaprepare/xaprepare/package-download.proj | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs index b1bdc516e61..1de44dc0d0d 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs @@ -54,7 +54,8 @@ protected override async Task Execute (Context context) var sdk_manifests = Path.Combine (dotnetPath, "sdk-manifests"); // Copy the WorkloadManifest.* files from the latest Microsoft.NET.Workload.* listed in package-download.proj - var dotnets = new [] { "net6", "net7", "net8", "net9", "current" }; + // TODO: net9 missing from dotnet10 feed + var dotnets = new [] { "net6", "net7", "net8", "current" }; foreach (var dotnet in dotnets) { var destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand), diff --git a/build-tools/xaprepare/xaprepare/package-download.proj b/build-tools/xaprepare/xaprepare/package-download.proj index f68692ad0b9..c68556ac610 100644 --- a/build-tools/xaprepare/xaprepare/package-download.proj +++ b/build-tools/xaprepare/xaprepare/package-download.proj @@ -24,12 +24,14 @@ Otherwise, $(MicrosoftNETCoreAppRefPackageVersion) from eng/Versions.props will - + + - + + From b27003d2d5f5002742d25ec6f2949c2dbe57fc97 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 29 Oct 2024 08:57:40 -0500 Subject: [PATCH 11/34] [build] install .NET on Linux Fixes the error: error NETSDK1045: The current .NET SDK does not support targeting .NET 9.0. --- build-tools/automation/yaml-templates/build-linux.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-tools/automation/yaml-templates/build-linux.yaml b/build-tools/automation/yaml-templates/build-linux.yaml index f34a25ba776..1769a2e67ab 100644 --- a/build-tools/automation/yaml-templates/build-linux.yaml +++ b/build-tools/automation/yaml-templates/build-linux.yaml @@ -52,6 +52,10 @@ stages: # https://learn.microsoft.com/en-us/azure/devops/pipelines/repos/multi-repo-checkout?view=azure-devops#checkout-path - checkout: maui + - template: /build-tools/automation/yaml-templates/use-dot-net.yaml + parameters: + remove_dotnet: true + - ${{ if ne(variables['System.PullRequest.IsFork'], 'True') }}: - checkout: monodroid clean: true From 5a445d872687328a0849c0349349eb0b45622ada Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 29 Oct 2024 09:03:24 -0500 Subject: [PATCH 12/34] Rename file to net10.0 --- ...nce-net9.0.txt => acceptable-breakages-vReference-net10.0.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/api-compatibility/{acceptable-breakages-vReference-net9.0.txt => acceptable-breakages-vReference-net10.0.txt} (100%) diff --git a/tests/api-compatibility/acceptable-breakages-vReference-net9.0.txt b/tests/api-compatibility/acceptable-breakages-vReference-net10.0.txt similarity index 100% rename from tests/api-compatibility/acceptable-breakages-vReference-net9.0.txt rename to tests/api-compatibility/acceptable-breakages-vReference-net10.0.txt From bf6c92195f7424d620156de4fa21103cc3f688d5 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 29 Oct 2024 09:10:57 -0500 Subject: [PATCH 13/34] Temporarily remove microsoft-net-runtime-android-net9 --- .../Microsoft.NET.Sdk.Android/WorkloadManifest.in.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json b/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json index 319b7ba4a75..65af8c09d8f 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json @@ -14,9 +14,7 @@ "Microsoft.Android.Templates" ], "platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "osx-x64", "osx-arm64" ], - "extends" : [ - "microsoft-net-runtime-android-net9", - "microsoft-net-runtime-android-aot-net9", + "extends" : [ "microsoft-net-runtime-android", "microsoft-net-runtime-android-aot" ] From 219fc89037fb273693fc646d03b5a9773e0e09d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Nov 2024 14:02:03 +0000 Subject: [PATCH 14/34] Update dependencies from https://github.com/dotnet/sdk build 20241103.6 Microsoft.NET.Sdk From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24553.6 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport,Microsoft.NET.ILLink.Tasks From Version 9.0.0-rtm.24510.3 -> To Version 10.0.0-alpha.1.24552.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 263c3c907ca..6e3ba6b48a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/sdk - 49b4f57a1550e7722e25b339f658d009af46550d + 8e29df2c37578a31d6a23317afd4ba4504463783 - + https://github.com/dotnet/runtime - edaa25e6942f3e8d9e2f078d99f34ed015658fbe + 408caa4e28c74d95c2af00401615a0931de4facf - + https://github.com/dotnet/runtime - edaa25e6942f3e8d9e2f078d99f34ed015658fbe + 408caa4e28c74d95c2af00401615a0931de4facf - + https://github.com/dotnet/emsdk - e0a38f7136d6ddc035b3d0d81d8a61fd903c06fd + e965cbbf7eae80e2a62e46f0fcf68ab8f47792c4 https://github.com/dotnet/cecil diff --git a/eng/Versions.props b/eng/Versions.props index 02fc70f08c8..44964d49a7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,13 +1,13 @@ - 10.0.100-alpha.1.24524.9 + 10.0.100-alpha.1.24553.6 $(MicrosoftNETSdkPackageVersion) - 10.0.0-alpha.1.24523.5 - 10.0.0-alpha.1.24523.5 + 10.0.0-alpha.1.24552.2 + 10.0.0-alpha.1.24552.2 7.0.0-beta.22103.1 10.0.0-beta.24476.2 - 10.0.0-alpha.1.24515.3 + 10.0.0-alpha.1.24524.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion) 7.0.100-rc.1.22410.7 0.11.5-alpha.24521.1 From 64fd781a533c502a625c423f3d8d4c6fa3130005 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 8 Nov 2024 14:21:18 -0600 Subject: [PATCH 15/34] Update AutoImport.props --- .../Microsoft.Android.Sdk/Sdk/AutoImport.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/AutoImport.props b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/AutoImport.props index 47ffc813526..da880a20f8f 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/AutoImport.props +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/AutoImport.props @@ -62,7 +62,7 @@ https://github.com/dotnet/designs/blob/4703666296f5e59964961464c25807c727282cae/ - + From 8fa7de3960a89a0e01bd6d0946b6b034652f219c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Nov 2024 14:09:10 +0000 Subject: [PATCH 16/34] Update dependencies from https://github.com/dotnet/sdk build 20241110.6 Microsoft.NET.Sdk From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24560.6 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.ILLink.Tasks From Version 9.0.0-rtm.24510.3 -> To Version 10.0.0-alpha.1.24557.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e3ba6b48a7..049806c7394 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/sdk - 8e29df2c37578a31d6a23317afd4ba4504463783 + 32524ee69724c7797bc8beeb52c85aa0d6df97fc - + https://github.com/dotnet/runtime - 408caa4e28c74d95c2af00401615a0931de4facf + 9c1f53e39f48b09be71097f1b7a47e45331e4906 - + https://github.com/dotnet/runtime - 408caa4e28c74d95c2af00401615a0931de4facf + 9c1f53e39f48b09be71097f1b7a47e45331e4906 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 44964d49a7b..385a0041ae4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,10 +1,10 @@ - 10.0.100-alpha.1.24553.6 + 10.0.100-alpha.1.24560.6 $(MicrosoftNETSdkPackageVersion) - 10.0.0-alpha.1.24552.2 - 10.0.0-alpha.1.24552.2 + 10.0.0-alpha.1.24557.1 + 10.0.0-alpha.1.24557.1 7.0.0-beta.22103.1 10.0.0-beta.24476.2 10.0.0-alpha.1.24524.3 From cabc9ae4cefa9c0c7807049a6abbec4eaae72188 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Nov 2024 15:00:55 +0000 Subject: [PATCH 17/34] Update dependencies from https://github.com/dotnet/sdk build 20241118.3 Microsoft.NET.Sdk From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24568.3 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport,Microsoft.NET.ILLink.Tasks From Version 9.0.0-rtm.24510.3 -> To Version 10.0.0-alpha.1.24565.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 - eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1d714975cf7..1a0f14021c0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 049806c7394..0bf77a283ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/sdk - 32524ee69724c7797bc8beeb52c85aa0d6df97fc + eb4e0edaeaaa804a82d1f63d354efc2a04850586 - + https://github.com/dotnet/runtime - 9c1f53e39f48b09be71097f1b7a47e45331e4906 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 9c1f53e39f48b09be71097f1b7a47e45331e4906 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/emsdk - e965cbbf7eae80e2a62e46f0fcf68ab8f47792c4 + 8808f75f212bcec6a2050fe045a7e07ab8a5a8c1 https://github.com/dotnet/cecil diff --git a/eng/Versions.props b/eng/Versions.props index 385a0041ae4..bc8a58aa937 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,13 +1,13 @@ - 10.0.100-alpha.1.24560.6 + 10.0.100-alpha.1.24568.3 $(MicrosoftNETSdkPackageVersion) - 10.0.0-alpha.1.24557.1 - 10.0.0-alpha.1.24557.1 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 7.0.0-beta.22103.1 10.0.0-beta.24476.2 - 10.0.0-alpha.1.24524.3 + 10.0.0-alpha.1.24563.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion) 7.0.100-rc.1.22410.7 0.11.5-alpha.24521.1 From 0c94daed522b8c062c42c054a5e5e9d185b6c910 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 20 Nov 2024 09:09:58 -0600 Subject: [PATCH 18/34] Include all `darc-pub-` feeds Hopefully, avoids the error on `MAUI Integration` lane: error NU1102: Unable to find package Microsoft.NETCore.App.Ref with version (= 9.0.1) --- build-tools/scripts/DotNet.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/scripts/DotNet.targets b/build-tools/scripts/DotNet.targets index 7ccdef1f5e5..2a9f58c718d 100644 --- a/build-tools/scripts/DotNet.targets +++ b/build-tools/scripts/DotNet.targets @@ -58,7 +58,7 @@ Query="/Project/ItemGroup/PackageDownload[contains(@Include,'Microsoft.NET.Sdk.Android.Manifest-')]/@Include" /> + Query="/configuration/packageSources/add[starts-with(@key,'darc-pub-')]"> Date: Wed, 20 Nov 2024 09:47:44 -0600 Subject: [PATCH 19/34] Fix `BindPackLibrary()` test --- .../Xamarin.Android.Build.Tests/AndroidGradleProjectTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidGradleProjectTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidGradleProjectTests.cs index 90c28cd6c0f..dc75d4275b7 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidGradleProjectTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidGradleProjectTests.cs @@ -126,7 +126,7 @@ public void BindLibrary (bool bind, string configuration, bool refOutputs) [Test] public void BindPackLibrary ([Values (false, true)] bool packGradleRef) { - var dotnetVersion = "net9.0"; + var dotnetVersion = "net10.0"; var apiLevel = XABuildConfig.AndroidDefaultTargetDotnetApiLevel; var gradleProject = AndroidGradleProject.CreateDefault (GradleTestProjectDir); var moduleName = gradleProject.Modules.First ().Name; From b85c83cf5cf624321d9d6c91b1ad9297c2c61418 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 21 Nov 2024 14:17:07 -0600 Subject: [PATCH 20/34] .NET 9 is GA now --- build-tools/automation/yaml-templates/variables.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/automation/yaml-templates/variables.yaml b/build-tools/automation/yaml-templates/variables.yaml index b8874715fb9..ae831d1b30b 100644 --- a/build-tools/automation/yaml-templates/variables.yaml +++ b/build-tools/automation/yaml-templates/variables.yaml @@ -26,7 +26,7 @@ variables: - name: DotNetSdkVersion value: 9.0 - name: DotNetSdkQuality - value: preview + value: GA - name: GitHub.Token value: $(github--pat--vs-mobiletools-engineering-service2) - name: HostedMacImage From 93782988bf21ad8317e5ece0e5c5655c52e74cd9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Nov 2024 14:57:22 +0000 Subject: [PATCH 21/34] Update dependencies from https://github.com/dotnet/sdk build 20241123.1 Microsoft.NET.Sdk From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24573.1 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport,Microsoft.NET.ILLink.Tasks From Version 9.0.0-rtm.24510.3 -> To Version 10.0.0-alpha.1.24570.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0bf77a283ea..c558da17276 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/sdk - eb4e0edaeaaa804a82d1f63d354efc2a04850586 + f03cda3dfc01f724fee89760b978c37b749565f7 - + https://github.com/dotnet/runtime - 55eee324653e01cf28809d02b25a5b0894b58d22 + b66200e5448be50673b0387ca4632d3bfa25887b - + https://github.com/dotnet/runtime - 55eee324653e01cf28809d02b25a5b0894b58d22 + b66200e5448be50673b0387ca4632d3bfa25887b - + https://github.com/dotnet/emsdk - 8808f75f212bcec6a2050fe045a7e07ab8a5a8c1 + 6755ffefdb9899c08738941d7498d880bc25e52d https://github.com/dotnet/cecil diff --git a/eng/Versions.props b/eng/Versions.props index bc8a58aa937..2a97b3dc547 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,13 +1,13 @@ - 10.0.100-alpha.1.24568.3 + 10.0.100-alpha.1.24573.1 $(MicrosoftNETSdkPackageVersion) - 10.0.0-alpha.1.24565.3 - 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24570.9 + 10.0.0-alpha.1.24570.9 7.0.0-beta.22103.1 10.0.0-beta.24476.2 - 10.0.0-alpha.1.24563.1 + 10.0.0-alpha.1.24569.4 $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion) 7.0.100-rc.1.22410.7 0.11.5-alpha.24521.1 From 8843e9a27b876d4edc2769663ec1219dda5b720c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Dec 2024 09:03:24 +0000 Subject: [PATCH 22/34] Update dependencies from https://github.com/dotnet/sdk build 20241205.38 Microsoft.NET.Sdk From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24605.38 --- 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 c558da17276..3d4cadd2661 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - f03cda3dfc01f724fee89760b978c37b749565f7 + 1fb1a92a76a595401dcd82662426afeec5daf424 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2a97b3dc547..69e6c2005e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 10.0.100-alpha.1.24573.1 + 10.0.100-alpha.1.24605.38 $(MicrosoftNETSdkPackageVersion) 10.0.0-alpha.1.24570.9 10.0.0-alpha.1.24570.9 From 13a2cfc0fde63da69b536571f0f864bf242fc1c4 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 6 Dec 2024 08:27:00 -0600 Subject: [PATCH 23/34] Revert "Rename file to net10.0" This reverts commit 5a445d872687328a0849c0349349eb0b45622ada. --- ...nce-net10.0.txt => acceptable-breakages-vReference-net9.0.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/api-compatibility/{acceptable-breakages-vReference-net10.0.txt => acceptable-breakages-vReference-net9.0.txt} (100%) diff --git a/tests/api-compatibility/acceptable-breakages-vReference-net10.0.txt b/tests/api-compatibility/acceptable-breakages-vReference-net9.0.txt similarity index 100% rename from tests/api-compatibility/acceptable-breakages-vReference-net10.0.txt rename to tests/api-compatibility/acceptable-breakages-vReference-net9.0.txt From 7464778471c06d1ef59e707b1e330fb391ac7328 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 6 Dec 2024 08:27:50 -0600 Subject: [PATCH 24/34] Reapply "Rename file to net10.0" This reverts commit 13a2cfc0fde63da69b536571f0f864bf242fc1c4. --- ...nce-net9.0.txt => acceptable-breakages-vReference-net10.0.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/api-compatibility/{acceptable-breakages-vReference-net9.0.txt => acceptable-breakages-vReference-net10.0.txt} (100%) diff --git a/tests/api-compatibility/acceptable-breakages-vReference-net9.0.txt b/tests/api-compatibility/acceptable-breakages-vReference-net10.0.txt similarity index 100% rename from tests/api-compatibility/acceptable-breakages-vReference-net9.0.txt rename to tests/api-compatibility/acceptable-breakages-vReference-net10.0.txt From 6e4b66f96489ea81b8e1f8328718daebd5f683fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 Dec 2024 14:10:30 +0000 Subject: [PATCH 25/34] Update dependencies from https://github.com/dotnet/sdk build 20241209.2 Microsoft.NET.Sdk From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24609.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 3d4cadd2661..cdbad3d0b28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 1fb1a92a76a595401dcd82662426afeec5daf424 + 3f26c6e94d9bc3ee87b88bc81c0606f619579ec4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 69e6c2005e7..87bbee352e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 10.0.100-alpha.1.24605.38 + 10.0.100-alpha.1.24609.2 $(MicrosoftNETSdkPackageVersion) 10.0.0-alpha.1.24570.9 10.0.0-alpha.1.24570.9 From 1d4991983b1d3965206285db62e0bc04ba4e9c11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Dec 2024 15:17:33 +0000 Subject: [PATCH 26/34] Update dependencies from https://github.com/dotnet/sdk build 20241209.4 Microsoft.NET.Sdk From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24609.4 --- NuGet.config | 1 - eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1a2ecca9c18..1a0f14021c0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cdbad3d0b28..2d8f6bdf68f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 3f26c6e94d9bc3ee87b88bc81c0606f619579ec4 + 7361d854bbdb8681556ea579a5c1e2c4e1ffb051 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 87bbee352e3..294c22fbdcf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 10.0.100-alpha.1.24609.2 + 10.0.100-alpha.1.24609.4 $(MicrosoftNETSdkPackageVersion) 10.0.0-alpha.1.24570.9 10.0.0-alpha.1.24570.9 From 79c704d58d42e7e9a24fae086f6e0d0acbf3cddc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Dec 2024 21:49:24 +0000 Subject: [PATCH 27/34] Update dependencies from https://github.com/dotnet/sdk build 20241212.16 Microsoft.NET.Sdk From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24612.16 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport,Microsoft.NET.ILLink.Tasks,Microsoft.DotNet.Cecil From Version 9.0.0-rtm.24510.3 -> To Version 10.0.0-alpha.1.24610.2 (parent: Microsoft.NET.Sdk --- 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 2d8f6bdf68f..dc118edd405 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/sdk - 7361d854bbdb8681556ea579a5c1e2c4e1ffb051 + 12b05d2522cc2f776232de42c4292de6ef262612 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/emsdk - 6755ffefdb9899c08738941d7498d880bc25e52d + 235d38cd586eeed59513cf865f4771914d654e4a - + https://github.com/dotnet/cecil - b897087e8b76481a9213ae422f5dc16f64a124b5 + 7f4a1466b958a6ac42953d72ae6ddaabb1149a78 diff --git a/eng/Versions.props b/eng/Versions.props index 294c22fbdcf..66ee4e6df71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,16 +1,16 @@ - 10.0.100-alpha.1.24609.4 + 10.0.100-alpha.1.24612.16 $(MicrosoftNETSdkPackageVersion) - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 7.0.0-beta.22103.1 10.0.0-beta.24476.2 - 10.0.0-alpha.1.24569.4 + 10.0.0-alpha.1.24575.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.5-alpha.24521.1 + 0.11.5-alpha.24569.4 $(MicrosoftNETCoreAppRefPackageVersion) 35.0.7 From 02d0ea191cabfcbe073f5a5cda3e1757790b7eb2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 Dec 2024 14:09:54 +0000 Subject: [PATCH 28/34] Update dependencies from https://github.com/dotnet/sdk build 20241216.1 Microsoft.NET.Sdk From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24616.1 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.ILLink.Tasks From Version 9.0.0-rtm.24510.3 -> To Version 10.0.0-alpha.1.24613.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dc118edd405..131931d163c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/sdk - 12b05d2522cc2f776232de42c4292de6ef262612 + 14bb58e830dacafb644e2224c07965effeba6696 - + https://github.com/dotnet/runtime - 920a17ac91440abb5b34109104e72da77ec58b59 + 3aa1ec5bb1f50f0a1bed9cfcac8734f742bcf24b - + https://github.com/dotnet/runtime - 920a17ac91440abb5b34109104e72da77ec58b59 + 3aa1ec5bb1f50f0a1bed9cfcac8734f742bcf24b https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 66ee4e6df71..b60e7a8cab7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,10 +1,10 @@ - 10.0.100-alpha.1.24612.16 + 10.0.100-alpha.1.24616.1 $(MicrosoftNETSdkPackageVersion) - 10.0.0-alpha.1.24610.2 - 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24613.10 + 10.0.0-alpha.1.24613.10 7.0.0-beta.22103.1 10.0.0-beta.24476.2 10.0.0-alpha.1.24575.2 From 50242b944d6bfb5fb63e820eddecdf26af1598b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 Dec 2024 11:01:42 +0000 Subject: [PATCH 29/34] Update dependencies from https://github.com/dotnet/sdk build 20241220.1 Microsoft.NET.Sdk From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24620.1 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport,Microsoft.NET.ILLink.Tasks From Version 9.0.0-rtm.24510.3 -> To Version 10.0.0-alpha.1.24619.8 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 131931d163c..fc4cc4c400a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/sdk - 14bb58e830dacafb644e2224c07965effeba6696 + aa1e31e36426e20044c25b01bcd0d3cebd8e80bd - + https://github.com/dotnet/runtime - 3aa1ec5bb1f50f0a1bed9cfcac8734f742bcf24b + 208b974f93c0ee35a171eba374ca36aa9a78e930 - + https://github.com/dotnet/runtime - 3aa1ec5bb1f50f0a1bed9cfcac8734f742bcf24b + 208b974f93c0ee35a171eba374ca36aa9a78e930 - + https://github.com/dotnet/emsdk - 235d38cd586eeed59513cf865f4771914d654e4a + 11e2cd6f4b4bd65b10692fbdc17f597fa79793c8 https://github.com/dotnet/cecil diff --git a/eng/Versions.props b/eng/Versions.props index b60e7a8cab7..aced3fbc890 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,13 +1,13 @@ - 10.0.100-alpha.1.24616.1 + 10.0.100-alpha.1.24620.1 $(MicrosoftNETSdkPackageVersion) - 10.0.0-alpha.1.24613.10 - 10.0.0-alpha.1.24613.10 + 10.0.0-alpha.1.24619.8 + 10.0.0-alpha.1.24619.8 7.0.0-beta.22103.1 10.0.0-beta.24476.2 - 10.0.0-alpha.1.24575.2 + 10.0.0-alpha.1.24613.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion) 7.0.100-rc.1.22410.7 0.11.5-alpha.24569.4 From 61325c0cf1890ccce841919e481306d005bcffbb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 Dec 2024 17:03:13 +0000 Subject: [PATCH 30/34] Update dependencies from https://github.com/dotnet/sdk build 20241220.2 Microsoft.NET.Sdk From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24620.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 fc4cc4c400a..536ce8fa6d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - aa1e31e36426e20044c25b01bcd0d3cebd8e80bd + bf452b9e2c47b6cb09c54ff0f44bc90d2a24636b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index aced3fbc890..0eafc195f31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 10.0.100-alpha.1.24620.1 + 10.0.100-alpha.1.24620.2 $(MicrosoftNETSdkPackageVersion) 10.0.0-alpha.1.24619.8 10.0.0-alpha.1.24619.8 From cc11abd62e6e83313b5e513af85aa2a6cdd25d04 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 20 Dec 2024 11:05:14 -0600 Subject: [PATCH 31/34] Revert "Temporarily remove net9 manifests" This reverts commit f78614cecf647cca5ffab9c0aac933d3a3b88c92. --- .../xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs | 3 +-- build-tools/xaprepare/xaprepare/package-download.proj | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs index 1de44dc0d0d..b1bdc516e61 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs @@ -54,8 +54,7 @@ protected override async Task Execute (Context context) var sdk_manifests = Path.Combine (dotnetPath, "sdk-manifests"); // Copy the WorkloadManifest.* files from the latest Microsoft.NET.Workload.* listed in package-download.proj - // TODO: net9 missing from dotnet10 feed - var dotnets = new [] { "net6", "net7", "net8", "current" }; + var dotnets = new [] { "net6", "net7", "net8", "net9", "current" }; foreach (var dotnet in dotnets) { var destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand), diff --git a/build-tools/xaprepare/xaprepare/package-download.proj b/build-tools/xaprepare/xaprepare/package-download.proj index c68556ac610..f68692ad0b9 100644 --- a/build-tools/xaprepare/xaprepare/package-download.proj +++ b/build-tools/xaprepare/xaprepare/package-download.proj @@ -24,14 +24,12 @@ Otherwise, $(MicrosoftNETCoreAppRefPackageVersion) from eng/Versions.props will - - + - - + From 6ced2a349010173fa1c9905107bae684b1228060 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 20 Dec 2024 11:07:42 -0600 Subject: [PATCH 32/34] Revert "Temporarily remove microsoft-net-runtime-android-net9" This reverts commit bf6c92195f7424d620156de4fa21103cc3f688d5. --- .../Microsoft.NET.Sdk.Android/WorkloadManifest.in.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json b/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json index be7593788ec..f53db5109bc 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json @@ -14,7 +14,9 @@ "Microsoft.Android.Templates" ], "platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "osx-x64", "osx-arm64" ], - "extends" : [ + "extends" : [ + "microsoft-net-runtime-android-net9", + "microsoft-net-runtime-android-aot-net9", "microsoft-net-runtime-android", "microsoft-net-runtime-android-aot" ] From 2d55ef2ee6a5b7e28b553dbdaca5d3cae787632e Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 20 Dec 2024 11:10:48 -0600 Subject: [PATCH 33/34] Android 35.0.24 shipped Context: https://github.com/dotnet/android/releases/tag/35.0.24 --- 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 536ce8fa6d0..81c21505aa1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,9 +21,9 @@ 7f4a1466b958a6ac42953d72ae6ddaabb1149a78 - + https://github.com/dotnet/android - 278e101698269c9bc8840aa94d72e7f24066a96d + 4b20432d95ea8965a41cc73997e459d7fa561233 diff --git a/eng/Versions.props b/eng/Versions.props index 0eafc195f31..244b8b7f098 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ 0.11.5-alpha.24569.4 $(MicrosoftNETCoreAppRefPackageVersion) - 35.0.7 + 35.0.24 $(MicrosoftAndroidSdkWindowsPackageVersion) From 0d5222382d73e80550400123c0ac71a8eae04ac7 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 20 Dec 2024 15:30:34 -0600 Subject: [PATCH 34/34] Update workload-dependencies.csproj --- tools/workload-dependencies/workload-dependencies.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/workload-dependencies/workload-dependencies.csproj b/tools/workload-dependencies/workload-dependencies.csproj index 13a80e19fc3..59e20c367b6 100644 --- a/tools/workload-dependencies/workload-dependencies.csproj +++ b/tools/workload-dependencies/workload-dependencies.csproj @@ -6,6 +6,7 @@ release_json enable enable + Major