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..4cf08f63b86 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,29 +1,29 @@ - + https://github.com/dotnet/sdk - 5b9d9d4677ea31d954533e9de2f95a3ea638135d + a93a592ce99414d94dafbd0ef0a6f51b6fbcdaf4 - + https://github.com/dotnet/runtime - 226c0347b92c4f9649bcc7ad580f74cb0409580e + 4b02c51f7158ca9abc68b331ac5ad64d716a0e2a - + https://github.com/dotnet/runtime - 226c0347b92c4f9649bcc7ad580f74cb0409580e + 4b02c51f7158ca9abc68b331ac5ad64d716a0e2a - + https://github.com/dotnet/emsdk - 8e660ff41e91879977e3a9d837e068bd72234c26 + 953fd74cd26884432eee21244ff4b031ebbdde32 - + https://github.com/dotnet/cecil - 9c9443396f8deacceb8edb169890e52aac25f311 + 9e8bd520939ddfee686261267a1646c1b113d9e1 - + https://github.com/dotnet/android - a8cd27e430e55df3e3c1e3a43d35c11d9512a2db + 4b20432d95ea8965a41cc73997e459d7fa561233 diff --git a/eng/Versions.props b/eng/Versions.props index d022e90686d..b2840bbc4e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,19 +1,19 @@ - 9.0.100-rtm.24512.1 + 10.0.100-alpha.1.25056.1 $(MicrosoftNETSdkPackageVersion) - 9.0.0-rtm.24510.3 - 9.0.0-rtm.24510.3 + 10.0.0-alpha.1.25056.1 + 10.0.0-alpha.1.25056.1 7.0.0-beta.22103.1 10.0.0-beta.24476.2 - 9.0.0-rtm.24469.1 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) + 10.0.0-alpha.1.24628.1 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.5-alpha.24480.1 + 0.11.5-alpha.24627.1 $(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/.gitignore b/src/Xamarin.Android.Build.Tasks/.gitignore index e608e030ae4..decdd165801 100644 --- a/src/Xamarin.Android.Build.Tasks/.gitignore +++ b/src/Xamarin.Android.Build.Tasks/.gitignore @@ -1,3 +1,4 @@ +/Microsoft.Android.Sdk/Sdk/AutoImport.props /Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.BundledVersions.targets /Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.SupportedPlatforms.targets /Xamarin.Android.Common.props 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.in.props similarity index 88% rename from src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/AutoImport.props rename to src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/AutoImport.in.props index cfded66acde..9552f4f6d3d 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/AutoImport.props +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/AutoImport.in.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), '@DOTNET_TARGET_FRAMEWORK_VERSION@')) "> @@ -41,13 +41,13 @@ https://github.com/dotnet/designs/blob/4703666296f5e59964961464c25807c727282cae/ + $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '@DOTNET_TARGET_FRAMEWORK_VERSION@')) "> + and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '@DOTNET_TARGET_FRAMEWORK_VERSION@')) "> @@ -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/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs index b515cf32649..47f6c3dbff5 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 @@ -651,7 +651,8 @@ public interface OnFooListener [NonParallelizable] public void BuildApplicationWithSpacesInPath ([Values (true, false)] bool enableMultiDex, [Values ("", "r8")] string linkTool) { - var folderName = $"BuildReleaseApp AndÜmläüts({enableMultiDex}{linkTool})"; + // FIXME: https://github.com/dotnet/msbuild/issues/11237, removed `(` and `)` characters + var folderName = $"BuildReleaseApp AndÜmläüts{enableMultiDex}{linkTool}"; var lib = new XamarinAndroidLibraryProject { IsRelease = true, ProjectName = "Library1" 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 983a35ff35d..59f618eb39c 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 @@ -1124,7 +1124,8 @@ public void BuildProguardEnabledProject (string rid) if (!string.IsNullOrEmpty (rid)) { proj.SetProperty ("RuntimeIdentifier", rid); } - using (var b = CreateApkBuilder (Path.Combine ("temp", $"BuildProguard Enabled(1){rid}"))) { + // FIXME: https://github.com/dotnet/msbuild/issues/11237, removed `(` and `)` characters + using (var b = CreateApkBuilder (Path.Combine ("temp", $"BuildProguard Enabled1{rid}"))) { Assert.IsTrue (b.Build (proj), "Build should have succeeded."); // warning XA4304: ProGuard configuration file 'XYZ' was not found. StringAssertEx.DoesNotContain ("XA4304", b.LastBuildOutput, "Output should *not* contain XA4304 warnings"); diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs index b54406422bc..75f45a1d833 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs @@ -1298,7 +1298,7 @@ public void MissingProjectReference () // Build app before library is built Assert.IsFalse (appBuilder.Build (app), "app build should have failed."); - Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, $"The referenced project '{reference.Replace ('\\', Path.DirectorySeparatorChar)}' does not exist.")); + Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, "warning MSB9008"), "Should receive MSB9008"); Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, " 1 Warning(s)"), "Should receive 1 Warning"); Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, "error CS0246"), "Should receive CS0246"); Assert.IsTrue (StringAssertEx.ContainsText (appBuilder.LastBuildOutput, " 1 Error(s)"), "Should receive 1 Error"); diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs index 2164f147f8f..6c6fb7db2a0 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/ManifestTest.cs @@ -1068,6 +1068,7 @@ public void SupportedOSPlatformVersion (string minSdkVersion, bool removeUsesSdk var minSdkVersionInt = MonoAndroidHelper.ConvertSupportedOSPlatformVersionToApiLevel (minSdkVersion); if (minSdkVersionInt < 22) { + Assert.Ignore ("https://github.com/dotnet/roslyn-analyzers/issues/7525"); StringAssertEx.Contains ("warning CA1416", builder.LastBuildOutput, "Should get warning about Android 22 API"); } else { builder.AssertHasNoWarnings (); 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..c8d302467d3 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, }, @@ -200,7 +200,7 @@ public void DotNetPublish ([Values (false, true)] bool isRelease, [ValueSource(n var apiLevel = (int)data[2]; //FIXME: will revisit this in a future PR - if (dotnetVersion == "net8.0") { + if (dotnetVersion == "net9.0") { Assert.Ignore ("error NETSDK1185: The Runtime Pack for FrameworkReference 'Microsoft.Android.Runtime.34.android-arm' was not available. This may be because DisableTransitiveFrameworkReferenceDownloads was set to true."); } @@ -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/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets index f002c237b6c..4ce99eb4493 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets @@ -342,6 +342,11 @@ DestinationFile="$(MSBuildThisFileDirectory)\Microsoft.Android.Sdk\targets\Microsoft.Android.Sdk.BundledVersions.targets" Replacements="@ANDROID_PACK_VERSION_LONG@=$(AndroidPackVersionLong);@ANDROID_LATEST_STABLE_API_LEVEL@=$(AndroidLatestStableApiLevel);@ANDROID_LATEST_UNSTABLE_API_LEVEL@=$(AndroidLatestUnstableApiLevel);@DOTNET_TARGET_FRAMEWORK@=$(DotNetTargetFramework)" > + + 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..24badd0933b 100644 --- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs +++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs @@ -872,10 +872,12 @@ public void CheckResouceIsOverridden () public void DotNetInstallAndRunPreviousSdk ([Values (false, true)] bool isRelease) { var proj = new XamarinFormsAndroidApplicationProject () { - TargetFramework = "net8.0-android", + TargetFramework = "net9.0-android", IsRelease = isRelease, EnableDefaultItems = true, }; + // Requires 32-bit ABIs + proj.SetAndroidSupportedAbis (["armeabi-v7a", "arm64-v8a", "x86", "x86_64"]); var builder = CreateApkBuilder (); Assert.IsTrue (builder.Build (proj), "`dotnet build` should succeed"); @@ -1067,7 +1069,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/MSBuildDeviceIntegration/Tests/PerformanceTest.cs b/tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs index feb2c394006..6cc7378c5c2 100644 --- a/tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs +++ b/tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs @@ -313,7 +313,7 @@ public void Build_XAML_Change ([Values (true, false)] bool install) var lib = new DotNetStandard { ProjectName = "MyLibrary", Sdk = "Microsoft.NET.Sdk", - TargetFramework = "net8.0", // Vanilla project + TargetFramework = "net10.0", // Vanilla project Sources = { new BuildItem.Source ("Bar.cs") { TextContent = () => "public class Bar { public Bar () { System.Console.WriteLine (" + count++ + "); } }" 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