diff --git a/Directory.Build.props b/Directory.Build.props index cd7e2a3b5de..557b0f07777 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ true - 9.0 + 10.0 net$(DotNetTargetFrameworkVersion) $(DotNetTargetFramework)-android diff --git a/NuGet.config b/NuGet.config index 2a96db7dc5f..1a0f14021c0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -12,10 +11,10 @@ - - + + diff --git a/build-tools/automation/yaml-templates/variables.yaml b/build-tools/automation/yaml-templates/variables.yaml index 1b632c0f1e0..1d8b14a9779 100644 --- a/build-tools/automation/yaml-templates/variables.yaml +++ b/build-tools/automation/yaml-templates/variables.yaml @@ -48,7 +48,7 @@ variables: - name: TeamName value: XamarinAndroid - name: DotNetTargetFramework - value: net9.0 + value: net10.0 - name: DotNetStableTargetFramework value: net9.0 # Workaround: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1585820 diff --git a/build-tools/scripts/DotNet.targets b/build-tools/scripts/DotNet.targets index cda033d1108..1185fae2a5d 100644 --- a/build-tools/scripts/DotNet.targets +++ b/build-tools/scripts/DotNet.targets @@ -62,7 +62,7 @@ Query="/Project/ItemGroup/PackageDownload[contains(@Include,'Microsoft.NET.Sdk.Android.Manifest-')]/@Include" /> + Query="/configuration/packageSources/add[starts-with(@key,'darc-pub-')]"> 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/eng/Version.Details.xml b/eng/Version.Details.xml index 083f73d552e..81c21505aa1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,29 +1,29 @@ - + https://github.com/dotnet/sdk - 5b9d9d4677ea31d954533e9de2f95a3ea638135d + bf452b9e2c47b6cb09c54ff0f44bc90d2a24636b - + https://github.com/dotnet/runtime - 226c0347b92c4f9649bcc7ad580f74cb0409580e + 208b974f93c0ee35a171eba374ca36aa9a78e930 - + https://github.com/dotnet/runtime - 226c0347b92c4f9649bcc7ad580f74cb0409580e + 208b974f93c0ee35a171eba374ca36aa9a78e930 - + https://github.com/dotnet/emsdk - 8e660ff41e91879977e3a9d837e068bd72234c26 + 11e2cd6f4b4bd65b10692fbdc17f597fa79793c8 - + https://github.com/dotnet/cecil - 9c9443396f8deacceb8edb169890e52aac25f311 + 7f4a1466b958a6ac42953d72ae6ddaabb1149a78 - + https://github.com/dotnet/android - a8cd27e430e55df3e3c1e3a43d35c11d9512a2db + 4b20432d95ea8965a41cc73997e459d7fa561233 diff --git a/eng/Versions.props b/eng/Versions.props index d022e90686d..244b8b7f098 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,19 +1,19 @@ - 9.0.100-rtm.24512.1 + 10.0.100-alpha.1.24620.2 $(MicrosoftNETSdkPackageVersion) - 9.0.0-rtm.24510.3 - 9.0.0-rtm.24510.3 + 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 - 9.0.0-rtm.24469.1 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) + 10.0.0-alpha.1.24613.1 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.5-alpha.24480.1 + 0.11.5-alpha.24569.4 $(MicrosoftNETCoreAppRefPackageVersion) - 34.0.147 + 35.0.24 $(MicrosoftAndroidSdkWindowsPackageVersion) 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 cfded66acde..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 @@ -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')) "> @@ -62,7 +62,7 @@ https://github.com/dotnet/designs/blob/4703666296f5e59964961464c25807c727282cae/ - + 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 aa9aa664e88..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 @@ -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.Mono.35.android-arm", "Microsoft.Android.Runtime.Mono.35.android-arm64", @@ -15,8 +15,8 @@ ], "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" ] @@ -35,7 +35,7 @@ } }, "packs": { - "Microsoft.Android.Sdk.net9": { + "Microsoft.Android.Sdk.net10": { "kind": "sdk", "version": "@WORKLOAD_VERSION@", "alias-to": { @@ -48,7 +48,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/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; 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 54998e3319a..f5d0773367c 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 6ac736b3fbc..104b4fcbd42 100644 --- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs +++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs @@ -1067,7 +1067,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", 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 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