diff --git a/Configuration.props b/Configuration.props index 011767689ee..50c66232889 100644 --- a/Configuration.props +++ b/Configuration.props @@ -42,7 +42,7 @@ portable True latest - 33.0.95 + 34.0.56 Windows diff --git a/Directory.Build.props b/Directory.Build.props index 0da7c849110..9a4a134146e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,11 +1,11 @@ - 8.0 + 9.0 net$(DotNetTargetFrameworkVersion) $(DotNetTargetFramework)-android - net7.0 + net8.0 netstandard2.0 Debug $(MSBuildThisFileDirectory)bin\$(Configuration)\ diff --git a/Directory.Build.targets b/Directory.Build.targets index 98c3dfd087a..8e03cb5cdf5 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -3,7 +3,7 @@ - + diff --git a/Makefile b/Makefile index b1c5fc1692c..2e52baddf1c 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 = net7.0 +PREPARE_NET_FX = net8.0 PREPARE_ARGS = PREPARE_PROJECT = build-tools/xaprepare/xaprepare/xaprepare.csproj PREPARE_MSBUILD_FLAGS = $(PREPARE_MSBUILD_ARGS) $(MSBUILD_ARGS) diff --git a/NuGet.config b/NuGet.config index 0b5f523bcf4..6a49e32ba4a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,10 @@ - + + diff --git a/build-tools/automation/yaml-templates/build-linux.yaml b/build-tools/automation/yaml-templates/build-linux.yaml index 859ab2b4b46..b091206be67 100644 --- a/build-tools/automation/yaml-templates/build-linux.yaml +++ b/build-tools/automation/yaml-templates/build-linux.yaml @@ -44,6 +44,8 @@ stages: # https://learn.microsoft.com/en-us/azure/devops/pipelines/repos/multi-repo-checkout?view=azure-devops#checkout-path - checkout: maui + - template: setup-ubuntu.yaml + - ${{ if ne(variables['System.PullRequest.IsFork'], 'True') }}: - checkout: monodroid clean: true @@ -59,8 +61,6 @@ stages: workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android displayName: make prepare-external-git-dependencies - - template: setup-ubuntu.yaml - - task: NuGetAuthenticate@0 displayName: authenticate with azure artifacts inputs: diff --git a/build-tools/automation/yaml-templates/variables.yaml b/build-tools/automation/yaml-templates/variables.yaml index e416520230a..77fd3128e75 100644 --- a/build-tools/automation/yaml-templates/variables.yaml +++ b/build-tools/automation/yaml-templates/variables.yaml @@ -16,7 +16,7 @@ variables: - name: ApkDiffToolVersion value: 0.0.15 - name: TestSlicerToolVersion - value: 0.1.0-alpha5 + value: 0.1.0-alpha7 - name: BootsToolVersion value: 1.1.0.36 - name: NUnitConsoleVersion @@ -24,7 +24,7 @@ variables: - name: NUnit.NumberOfTestWorkers value: 4 - name: DotNetSdkVersion - value: 7.0 + value: 8.0 - name: DotNetSdkQuality value: GA - name: GitHub.Token @@ -40,9 +40,9 @@ variables: - name: TeamName value: XamarinAndroid - name: DotNetTargetFramework - value: net8.0 + value: net9.0 - name: DotNetStableTargetFramework - value: net7.0 + value: net8.0 # Workaround: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1585820 - name: _WriteTelemetryProperties value: false diff --git a/build-tools/create-packs/Microsoft.NET.Sdk.Android.proj b/build-tools/create-packs/Microsoft.NET.Sdk.Android.proj index 292a7df0353..3d5dd76a499 100644 --- a/build-tools/create-packs/Microsoft.NET.Sdk.Android.proj +++ b/build-tools/create-packs/Microsoft.NET.Sdk.Android.proj @@ -35,12 +35,12 @@ about the various Microsoft.Android workloads. + Replacements="@WORKLOAD_VERSION@=$(WorkloadVersion);@NET_PREVIOUS_VERSION@=$(AndroidNetPreviousVersion)"> + Replacements="@NET_PREVIOUS_VERSION@=$(AndroidNetPreviousVersion)"> diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs index 8884a090c3a..2ed0adfb120 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs @@ -54,14 +54,16 @@ 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", "current" }; + var dotnets = new [] { "net6", "net7", "net8", "current" }; foreach (var dotnet in dotnets) { var destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand), $"microsoft.net.workload.mono.toolchain.{dotnet}"); - foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadMonoToolChainDir, dotnet), "WorkloadManifest.*")) { + Utilities.DeleteDirectory (destination, recurse: true); + foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadMonoToolChainDir, dotnet), "*")) { Utilities.CopyFileToDir (file, destination); } destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand), $"microsoft.net.workload.emscripten.{dotnet}"); - foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadEmscriptenDir, dotnet), "WorkloadManifest.*")) { + Utilities.DeleteDirectory (destination, recurse: true); + foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadEmscriptenDir, dotnet), "*")) { Utilities.CopyFileToDir (file, destination); } } diff --git a/build-tools/xaprepare/xaprepare/package-download.proj b/build-tools/xaprepare/xaprepare/package-download.proj index ec7b895af10..e46c99ba0c6 100644 --- a/build-tools/xaprepare/xaprepare/package-download.proj +++ b/build-tools/xaprepare/xaprepare/package-download.proj @@ -23,9 +23,11 @@ Otherwise, $(MicrosoftNETCoreAppRefPackageVersion) from eng/Versions.props will + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb02dc87077..d84ab02e6c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/installer - e1fd7d964980ed478fa30457cf750e81105caee1 + 42ace91ba7564936408c91a264484ff79bd00539 - + https://github.com/dotnet/runtime - 287c10d2539d47268a1083c4d533cf84124900cf + a26802aa5793060c512359c2be83e9a4c51964c1 - + https://github.com/dotnet/runtime - 287c10d2539d47268a1083c4d533cf84124900cf + a26802aa5793060c512359c2be83e9a4c51964c1 - + https://github.com/dotnet/emsdk - 1999c8c8ab7473a7e1c5b7bdf5ba6d9a985a69cc + 74e4868be8423562ba8ec2aac522f94a8c2c9f37 - + https://github.com/dotnet/cecil - a112f15aa032c029b7d9c77df3427111d93cf407 + 45dd3a73dd5b64b010c4251303b3664bb30df029 diff --git a/eng/Versions.props b/eng/Versions.props index 5099b035dd7..1e30fdf63d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,15 +1,15 @@ - 8.0.100-rc.2.23468.1 - 8.0.0-rc.2.23466.4 - 8.0.0-rc.2.23466.4 + 9.0.100-alpha.1.23603.1 + 9.0.0-alpha.1.23577.7 + 9.0.0-alpha.1.23577.7 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 8.0.0-rc.2.23463.1 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) + 9.0.0-alpha.1.23572.3 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.4-alpha.23461.1 + 0.11.4-alpha.23509.2 $(MicrosoftNETCoreAppRefPackageVersion) diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index 08a69900df2..21de3d731d0 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit 08a69900df23e9f95057f3cacae72bd40d640a27 +Subproject commit 21de3d731d0b0391f81f8b4397b7d6e2d3fecc74 diff --git a/src/Microsoft.Android.Templates/android-bindinglib/AndroidBinding1.csproj b/src/Microsoft.Android.Templates/android-bindinglib/AndroidBinding1.csproj index 1f8432a7d78..5f78e42ab48 100644 --- a/src/Microsoft.Android.Templates/android-bindinglib/AndroidBinding1.csproj +++ b/src/Microsoft.Android.Templates/android-bindinglib/AndroidBinding1.csproj @@ -1,6 +1,6 @@ - net8.0-android + net9.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 b5bc3138f82..9ad33577b79 100644 --- a/src/Microsoft.Android.Templates/android-wear/AndroidApp1.csproj +++ b/src/Microsoft.Android.Templates/android-wear/AndroidApp1.csproj @@ -1,6 +1,6 @@ - net8.0-android + net9.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 9935379ad52..5a71d2ab599 100644 --- a/src/Microsoft.Android.Templates/android/AndroidApp1.csproj +++ b/src/Microsoft.Android.Templates/android/AndroidApp1.csproj @@ -1,6 +1,6 @@ - net8.0-android + net9.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 4a6dd3eea38..3c076d5fd9d 100644 --- a/src/Microsoft.Android.Templates/androidlib/AndroidLib1.csproj +++ b/src/Microsoft.Android.Templates/androidlib/AndroidLib1.csproj @@ -1,6 +1,6 @@ - net8.0-android + net9.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 24e3ed08a61..a605f382513 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), '9.0')) "> @@ -41,13 +41,13 @@ https://github.com/dotnet/designs/blob/4703666296f5e59964961464c25807c727282cae/ + $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) "> + and $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '9.0')) "> diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Aot.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Aot.targets index 7e2c2fd97f8..40446704aff 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Aot.targets +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Aot.targets @@ -134,13 +134,14 @@ They run in a context of an inner build with a single $(RuntimeIdentifier). Condition=" '$(AndroidStripILAfterAOT)' == 'true' " TrimIndividualMethods="true" Assemblies="@(_MonoAOTCompiledAssemblies)" + IntermediateOutputPath="$(IntermediateOutputPath)" DisableParallelStripping="$(_DisableParallelAot)"> - + - true false $(AndroidGenerateResourceDesigner) + true false false false @@ -71,11 +72,6 @@ false true true - - false SdkOnly None 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 8ab0ca24494..ba3708bd123 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.net9", "Microsoft.Android.Sdk.net8", - "Microsoft.Android.Sdk.net7", "Microsoft.Android.Ref.34", "Microsoft.Android.Runtime.34.android-arm", "Microsoft.Android.Runtime.34.android-arm64", @@ -15,15 +15,15 @@ ], "platforms": [ "win-x64", "win-arm64", "linux-x64", "osx-x64", "osx-arm64" ], "extends" : [ - "microsoft-net-runtime-android-net7", - "microsoft-net-runtime-android-aot-net7", + "microsoft-net-runtime-android-net8", + "microsoft-net-runtime-android-aot-net8", "microsoft-net-runtime-android", "microsoft-net-runtime-android-aot" ] } }, "packs": { - "Microsoft.Android.Sdk.net8": { + "Microsoft.Android.Sdk.net9": { "kind": "sdk", "version": "@WORKLOAD_VERSION@", "alias-to": { @@ -35,9 +35,9 @@ "linux-x64": "Microsoft.Android.Sdk.Linux" } }, - "Microsoft.Android.Sdk.net7": { + "Microsoft.Android.Sdk.net8": { "kind": "sdk", - "version": "@NET7_VERSION@", + "version": "@NET_PREVIOUS_VERSION@", "alias-to": { "osx-x64": "Microsoft.Android.Sdk.Darwin", "osx-arm64": "Microsoft.Android.Sdk.Darwin", 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 81faa7725c6..6555182160b 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,22 +1,22 @@ + - - + - + - + 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 705facf3e99..8864d67f6a3 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[] { - "net7.0", + "net8.0", "android", - 33, // TODO: use XABuildConfig.AndroidDefaultTargetDotnetApiLevel when we add 34 to .NET 7 + 34, }, new object[] { - "net7.0", - "android33", - 33, // TODO: use XABuildConfig.AndroidDefaultTargetDotnetApiLevel when we add 34 to .NET 7 + "net8.0", + "android34", + 34, }, new object[] { - "net8.0", + "net9.0", "android", XABuildConfig.AndroidDefaultTargetDotnetApiLevel, }, new object[] { - "net8.0", + "net9.0", $"android{XABuildConfig.AndroidDefaultTargetDotnetApiLevel}", XABuildConfig.AndroidDefaultTargetDotnetApiLevel, }, @@ -146,29 +146,29 @@ public String Say (String quote) { static readonly object[] DotNetTargetFrameworks = new object[] { new object[] { - "net7.0", + "net8.0", "android", - 33, // TODO: use XABuildConfig.AndroidDefaultTargetDotnetApiLevel when we add 34 to .NET 7 + 34, }, new object[] { - "net8.0", + "net9.0", "android", XABuildConfig.AndroidDefaultTargetDotnetApiLevel, }, new object[] { - "net8.0", + "net9.0", $"android{XABuildConfig.AndroidDefaultTargetDotnetApiLevel}", XABuildConfig.AndroidDefaultTargetDotnetApiLevel, }, new object[] { - "net8.0", + "net9.0", XABuildConfig.AndroidLatestStableApiLevel == XABuildConfig.AndroidDefaultTargetDotnetApiLevel ? null : $"android{XABuildConfig.AndroidLatestStableApiLevel}.0", XABuildConfig.AndroidLatestStableApiLevel, }, new object[] { - "net8.0", + "net9.0", XABuildConfig.AndroidLatestUnstableApiLevel == XABuildConfig.AndroidLatestStableApiLevel ? null : $"android{XABuildConfig.AndroidLatestUnstableApiLevel}.0", XABuildConfig.AndroidLatestUnstableApiLevel, }, @@ -199,6 +199,11 @@ public void DotNetPublish ([Values (false, true)] bool isRelease, [ValueSource(n var platform = (string)data[1]; var apiLevel = (int)data[2]; + //FIXME: will revisit this in a future PR + if (dotnetVersion == "net8.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."); + } + if (string.IsNullOrEmpty (platform)) Assert.Ignore ($"Test for API level {apiLevel} was skipped as it matched the default or latest stable API level."); @@ -224,13 +229,11 @@ public void DotNetPublish ([Values (false, true)] bool isRelease, [ValueSource(n // NOTE: Preview API levels emit XA4211 if (!preview) { - // TODO: disabled in .NET 7 due to: https://github.com/dotnet/runtime/issues/77385 - if (dotnetVersion != "net7.0") - dotnet.AssertHasNoWarnings (); + dotnet.AssertHasNoWarnings (); } // Only check latest TFM, as previous will come from NuGet - if (dotnetVersion == "net8.0") { + if (dotnetVersion == "net9.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}"); @@ -260,7 +263,7 @@ public void DotNetPublish ([Values (false, true)] bool isRelease, [ValueSource(n } [Test] - public void XamarinLegacySdk ([Values ("net7.0-android33.0", "net8.0-android34.0")] string dotnetTargetFramework) + public void XamarinLegacySdk ([Values ("net8.0-android34.0", "net9.0-android34.0")] string dotnetTargetFramework) { var proj = new XamarinAndroidLibraryProject { Sdk = "Xamarin.Legacy.Sdk/0.2.0-alpha4", 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 b6a59cada54..32425e363c0 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 @@ -25,7 +25,7 @@ protected DotNetXamarinProject (string debugConfigurationName = "Debug", string SetProperty ("RootNamespace", () => RootNamespace ?? ProjectName); SetProperty ("AssemblyName", () => AssemblyName ?? ProjectName); - TargetFramework = "net8.0-android"; + TargetFramework = "net9.0-android"; EnableDefaultItems = false; AppendTargetFrameworkToOutputPath = false; diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs index d38addb60cc..ad00180380e 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs @@ -415,10 +415,10 @@ protected void AddNuGetConfigSources (string nugetConfigPath) ExtraNuGetConfigSources = new List (); } - if (TargetFramework?.IndexOf ("net7.0", StringComparison.OrdinalIgnoreCase) != -1 - || TargetFrameworks?.IndexOf ("net7.0", StringComparison.OrdinalIgnoreCase) != -1) { + if (TargetFramework?.IndexOf ("net8.0", StringComparison.OrdinalIgnoreCase) != -1 + || TargetFrameworks?.IndexOf ("net8.0", StringComparison.OrdinalIgnoreCase) != -1) { ExtraNuGetConfigSources.Add ("https://api.nuget.org/v3/index.json"); - ExtraNuGetConfigSources.Add ("https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json"); + ExtraNuGetConfigSources.Add ("https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json"); } int sourceIndex = 0; diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc index 1dbc7d0c32b..353fa1774d5 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc @@ -5,64 +5,64 @@ "Size": 3036 }, "assemblies/_Microsoft.Android.Resource.Designer.dll": { - "Size": 1024 + "Size": 1028 }, "assemblies/Java.Interop.dll": { - "Size": 61350 + "Size": 61348 }, "assemblies/Mono.Android.dll": { - "Size": 90818 + "Size": 90896 }, "assemblies/Mono.Android.Runtime.dll": { - "Size": 5514 + "Size": 5577 }, "assemblies/rc.bin": { "Size": 1512 }, "assemblies/System.Console.dll": { - "Size": 6536 + "Size": 6548 }, "assemblies/System.Linq.dll": { - "Size": 7118 + "Size": 7171 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 550324 + "Size": 553674 }, "assemblies/System.Runtime.dll": { - "Size": 2614 + "Size": 2630 }, "assemblies/System.Runtime.InteropServices.dll": { - "Size": 3851 + "Size": 4033 }, "assemblies/UnnamedProject.dll": { - "Size": 2932 + "Size": 2935 }, "classes.dex": { "Size": 377956 }, "lib/arm64-v8a/libmono-component-marshal-ilgen.so": { - "Size": 97080 + "Size": 86944 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 334784 + "Size": 334496 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3193200 + "Size": 3182072 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 723560 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 93952 + "Size": 94208 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { - "Size": 154904 + "Size": 155568 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 11648 + "Size": 11680 }, "META-INF/BNDLTOOL.RSA": { - "Size": 1221 + "Size": 1213 }, "META-INF/BNDLTOOL.SF": { "Size": 3037 diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc index 25f7dfca7a9..e92a694b67e 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc @@ -5,190 +5,190 @@ "Size": 3572 }, "assemblies/_Microsoft.Android.Resource.Designer.dll": { - "Size": 2102 + "Size": 2105 }, "assemblies/FormsViewGroup.dll": { - "Size": 7112 + "Size": 7113 }, "assemblies/Java.Interop.dll": { - "Size": 69472 + "Size": 69478 }, "assemblies/Mono.Android.dll": { - "Size": 447387 + "Size": 447443 }, "assemblies/Mono.Android.Runtime.dll": { - "Size": 5514 + "Size": 5577 }, "assemblies/mscorlib.dll": { - "Size": 3852 + "Size": 3863 }, "assemblies/netstandard.dll": { - "Size": 5565 + "Size": 5581 }, "assemblies/rc.bin": { "Size": 1512 }, "assemblies/System.Collections.Concurrent.dll": { - "Size": 11502 + "Size": 11516 }, "assemblies/System.Collections.dll": { - "Size": 15398 + "Size": 15409 }, "assemblies/System.Collections.NonGeneric.dll": { - "Size": 7442 + "Size": 7454 }, "assemblies/System.ComponentModel.dll": { - "Size": 1925 + "Size": 1939 }, "assemblies/System.ComponentModel.Primitives.dll": { - "Size": 2538 + "Size": 2553 }, "assemblies/System.ComponentModel.TypeConverter.dll": { - "Size": 6020 + "Size": 6037 }, "assemblies/System.Console.dll": { - "Size": 6565 + "Size": 6579 }, "assemblies/System.Core.dll": { - "Size": 1977 + "Size": 1993 }, "assemblies/System.Diagnostics.DiagnosticSource.dll": { - "Size": 9057 + "Size": 9071 }, "assemblies/System.Diagnostics.TraceSource.dll": { - "Size": 6540 + "Size": 6555 }, "assemblies/System.dll": { - "Size": 2332 + "Size": 2345 }, "assemblies/System.Drawing.dll": { - "Size": 1923 + "Size": 1940 }, "assemblies/System.Drawing.Primitives.dll": { - "Size": 11967 + "Size": 11975 }, "assemblies/System.IO.Compression.Brotli.dll": { - "Size": 11187 + "Size": 11194 }, "assemblies/System.IO.Compression.dll": { - "Size": 15856 + "Size": 15863 }, "assemblies/System.IO.IsolatedStorage.dll": { - "Size": 9862 + "Size": 9875 }, "assemblies/System.Linq.dll": { - "Size": 19555 + "Size": 19604 }, "assemblies/System.Linq.Expressions.dll": { - "Size": 165111 + "Size": 165118 }, "assemblies/System.Net.Http.dll": { - "Size": 67637 + "Size": 67636 }, "assemblies/System.Net.Primitives.dll": { - "Size": 22426 + "Size": 22437 }, "assemblies/System.Net.Requests.dll": { - "Size": 3589 + "Size": 3604 }, "assemblies/System.ObjectModel.dll": { - "Size": 8106 + "Size": 8119 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 845653 + "Size": 848850 }, "assemblies/System.Private.DataContractSerialization.dll": { - "Size": 193645 + "Size": 193994 }, "assemblies/System.Private.Uri.dll": { - "Size": 42849 + "Size": 42863 }, "assemblies/System.Private.Xml.dll": { - "Size": 215960 + "Size": 216250 }, "assemblies/System.Private.Xml.Linq.dll": { - "Size": 16631 + "Size": 16646 }, "assemblies/System.Runtime.dll": { - "Size": 2740 + "Size": 2755 }, "assemblies/System.Runtime.InteropServices.dll": { - "Size": 3851 + "Size": 4033 }, "assemblies/System.Runtime.Serialization.dll": { - "Size": 1850 + "Size": 1866 }, "assemblies/System.Runtime.Serialization.Formatters.dll": { - "Size": 2469 + "Size": 2485 }, "assemblies/System.Runtime.Serialization.Primitives.dll": { - "Size": 3747 + "Size": 3760 }, "assemblies/System.Security.Cryptography.dll": { - "Size": 8089 + "Size": 8109 }, "assemblies/System.Text.RegularExpressions.dll": { - "Size": 158950 + "Size": 159114 }, "assemblies/System.Xml.dll": { - "Size": 1741 + "Size": 1757 }, "assemblies/System.Xml.Linq.dll": { - "Size": 1761 + "Size": 1777 }, "assemblies/UnnamedProject.dll": { - "Size": 4987 + "Size": 4990 }, "assemblies/Xamarin.AndroidX.Activity.dll": { - "Size": 5942 + "Size": 5944 }, "assemblies/Xamarin.AndroidX.AppCompat.AppCompatResources.dll": { - "Size": 6033 + "Size": 6036 }, "assemblies/Xamarin.AndroidX.AppCompat.dll": { "Size": 119847 }, "assemblies/Xamarin.AndroidX.CardView.dll": { - "Size": 6799 + "Size": 6802 }, "assemblies/Xamarin.AndroidX.CoordinatorLayout.dll": { - "Size": 17257 + "Size": 17260 }, "assemblies/Xamarin.AndroidX.Core.dll": { - "Size": 100666 + "Size": 100665 }, "assemblies/Xamarin.AndroidX.DrawerLayout.dll": { "Size": 14631 }, "assemblies/Xamarin.AndroidX.Fragment.dll": { - "Size": 41733 + "Size": 41736 }, "assemblies/Xamarin.AndroidX.Legacy.Support.Core.UI.dll": { - "Size": 6080 + "Size": 6083 }, "assemblies/Xamarin.AndroidX.Lifecycle.Common.dll": { - "Size": 6469 + "Size": 6471 }, "assemblies/Xamarin.AndroidX.Lifecycle.LiveData.Core.dll": { - "Size": 6615 + "Size": 6618 }, "assemblies/Xamarin.AndroidX.Lifecycle.ViewModel.dll": { - "Size": 3068 + "Size": 3071 }, "assemblies/Xamarin.AndroidX.Loader.dll": { - "Size": 12923 + "Size": 12926 }, "assemblies/Xamarin.AndroidX.RecyclerView.dll": { "Size": 89997 }, "assemblies/Xamarin.AndroidX.SavedState.dll": { - "Size": 4906 + "Size": 4909 }, "assemblies/Xamarin.AndroidX.SwipeRefreshLayout.dll": { - "Size": 10572 + "Size": 10575 }, "assemblies/Xamarin.AndroidX.ViewPager.dll": { - "Size": 18593 + "Size": 18594 }, "assemblies/Xamarin.Forms.Core.dll": { "Size": 528450 @@ -197,37 +197,37 @@ "Size": 337925 }, "assemblies/Xamarin.Forms.Platform.dll": { - "Size": 11080 + "Size": 11083 }, "assemblies/Xamarin.Forms.Xaml.dll": { "Size": 60774 }, "assemblies/Xamarin.Google.Android.Material.dll": { - "Size": 42282 + "Size": 42285 }, "classes.dex": { "Size": 3514468 }, "lib/arm64-v8a/libmono-component-marshal-ilgen.so": { - "Size": 97080 + "Size": 86944 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 334784 + "Size": 334496 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3193200 + "Size": 3182072 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 723560 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 93952 + "Size": 94208 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { - "Size": 154904 + "Size": 155568 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 102888 + "Size": 102920 }, "META-INF/android.support.design_material.version": { "Size": 12 diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj index 257bcc1b8a5..5943aba404e 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/profiled-aot/dotnet.aotprofile b/src/profiled-aot/dotnet.aotprofile index 4aeb713f018..f73af739940 100644 Binary files a/src/profiled-aot/dotnet.aotprofile and b/src/profiled-aot/dotnet.aotprofile differ diff --git a/src/profiled-aot/dotnet.aotprofile.txt b/src/profiled-aot/dotnet.aotprofile.txt index 0104f27f01d..1a0369493a8 100644 --- a/src/profiled-aot/dotnet.aotprofile.txt +++ b/src/profiled-aot/dotnet.aotprofile.txt @@ -21,19 +21,18 @@ Methods: bool Android.Runtime.JavaDictionary:Contains (object) bool Android.Runtime.JNIEnv:CallBooleanMethod (intptr,intptr,Android.Runtime.JValue[]) bool Android.Runtime.JNIEnv:CallBooleanMethod (intptr,intptr,Android.Runtime.JValue*) - bool Android.Runtime.JNIEnv:CallBooleanMethod (intptr,intptr) bool Android.Runtime.JNIEnv:IsGCUserPeer (intptr) bool Android.Runtime.JNIEnv:IsInstanceOf (intptr,intptr) bool Android.Runtime.Logger:get_LogGlobalRef () bool Android.Runtime.XAPeerMembers:UsesVirtualDispatch (Java.Interop.IJavaPeerable,System.Type) bool Java.Interop.JavaConvert:WithLocalJniHandle (object,System.Func`2) bool Java.Interop.JniEnvironment/InstanceMethods:CallBooleanMethod (Java.Interop.JniObjectReference,Java.Interop.JniMethodInfo,Java.Interop.JniArgumentValue*) - bool Java.Interop.JniEnvironment/InstanceMethods:CallBooleanMethod (Java.Interop.JniObjectReference,Java.Interop.JniMethodInfo) bool Java.Interop.JniEnvironment/InstanceMethods:CallNonvirtualBooleanMethod (Java.Interop.JniObjectReference,Java.Interop.JniObjectReference,Java.Interop.JniMethodInfo,Java.Interop.JniArgumentValue*) bool Java.Interop.JniEnvironment/Types:IsInstanceOf (Java.Interop.JniObjectReference,Java.Interop.JniObjectReference) bool Java.Interop.JniEnvironment/Types:IsSameObject (Java.Interop.JniObjectReference,Java.Interop.JniObjectReference) bool Java.Interop.JniEnvironment/Types:TryRawFindClass (intptr,string,intptr&,intptr&) bool Java.Interop.JniEnvironmentInfo:get_IsValid () + bool Java.Interop.JniPeerMembers/JniInstanceMethods:InvokeAbstractBooleanMethod (string,Java.Interop.IJavaPeerable,Java.Interop.JniArgumentValue*) bool Java.Interop.JniPeerMembers/JniInstanceMethods:InvokeNonvirtualBooleanMethod (string,Java.Interop.IJavaPeerable,Java.Interop.JniArgumentValue*) bool Java.Interop.JniPeerMembers/JniInstanceMethods:InvokeVirtualBooleanMethod (string,Java.Interop.IJavaPeerable,Java.Interop.JniArgumentValue*) bool Java.Interop.JniPeerMembers/JniInstanceMethods:TryInvokeBooleanStaticRedirect (Java.Interop.JniMethodInfo,Java.Interop.IJavaPeerable,Java.Interop.JniArgumentValue*,bool&) @@ -141,7 +140,7 @@ Methods: bool System.Globalization.GlobalizationMode:TryGetStringValue (string,string,string&) bool System.Globalization.GlobalizationMode/Settings:get_Invariant () bool System.Globalization.Ordinal:EqualsIgnoreCase_Scalar (char&,char&,int) - bool System.Globalization.Ordinal:EqualsIgnoreCase_Vector128 (char&,char&,int) + bool System.Globalization.Ordinal:EqualsIgnoreCase_Vector (char&,char&,int) bool System.Globalization.TimeSpanFormat:TryFormat (System.TimeSpan,System.Span`1,int&,System.ReadOnlySpan`1,System.IFormatProvider) bool System.Guid:TryWriteBytes (System.Span`1) bool System.Int32:TryFormat (System.Span`1,int&,System.ReadOnlySpan`1,System.IFormatProvider) @@ -244,6 +243,7 @@ Methods: bool System.RuntimeType:FilterApplyMethodBase (System.Reflection.MethodBase,System.Reflection.BindingFlags,System.Reflection.CallingConventions,System.Type[]) bool System.RuntimeType:FilterApplyMethodInfo (System.Reflection.RuntimeMethodInfo,System.Reflection.BindingFlags,System.Reflection.CallingConventions,System.Type[]) bool System.RuntimeType:get_ContainsGenericParameters () + bool System.RuntimeType:get_IsActualValueType () bool System.RuntimeType:get_IsByRefLike () bool System.RuntimeType:get_IsEnum () bool System.RuntimeType:get_IsFunctionPointer () @@ -276,7 +276,6 @@ Methods: bool System.RuntimeTypeHandle:IsGenericVariable (System.RuntimeType) bool System.RuntimeTypeHandle:IsInstanceOfType (System.Runtime.CompilerServices.QCallTypeHandle,object) bool System.RuntimeTypeHandle:IsInstanceOfType (System.RuntimeType,object) - bool System.RuntimeTypeHandle:IsInterface (System.RuntimeType) bool System.RuntimeTypeHandle:IsPointer (System.RuntimeType) bool System.RuntimeTypeHandle:IsPrimitive (System.RuntimeType) bool System.RuntimeTypeHandle:IsSubclassOf (System.RuntimeType,System.RuntimeType) @@ -309,7 +308,6 @@ Methods: bool System.Threading.LowLevelLifoSemaphore:WaitCore (int) bool System.Threading.LowLevelLifoSemaphore:WaitForSignal (int) bool System.Threading.LowLevelLock:TryAcquire () - bool System.Threading.LowLevelLock:TryAcquire_NoFastPath (int) bool System.Threading.LowLevelMonitor:Wait (int) bool System.Threading.LowLevelMonitor:WaitCore (int) bool System.Threading.PortableThreadPool:get_HasForcedMaxThreads () @@ -347,8 +345,6 @@ Methods: bool System.Threading.WaitSubsystem/ThreadWaitInfo:TrySignalToSatisfyWait (System.Threading.WaitSubsystem/ThreadWaitInfo/WaitedListNode,bool) bool System.Threading.WaitSubsystem/WaitableObject:get_IsAbandonedMutex () bool System.TimeSpan:TryFormat (System.Span`1,int&,System.ReadOnlySpan`1,System.IFormatProvider) - bool System.TimeZoneInfo:CheckIsDst (System.DateTime,System.DateTime,System.DateTime,bool,System.TimeZoneInfo/AdjustmentRule) - bool System.TimeZoneInfo:GetIsDaylightSavingsFromUtc (System.DateTime,int,System.TimeSpan,System.TimeZoneInfo/AdjustmentRule,System.Nullable`1,bool&,System.TimeZoneInfo) bool System.TimeZoneInfo:IsUtcAlias (string) bool System.TimeZoneInfo:IsValidAdjustmentRuleOffset (System.TimeSpan,System.TimeZoneInfo/AdjustmentRule) bool System.TimeZoneInfo:StringArrayContains (string,string[],System.StringComparison) @@ -360,8 +356,6 @@ Methods: bool System.TimeZoneInfo/<>c:b__153_0 (char) bool System.TimeZoneInfo/<>c:b__154_0 (char) bool System.TimeZoneInfo/AdjustmentRule:get_HasDaylightSaving () - bool System.TimeZoneInfo/AdjustmentRule:IsEndDateMarkerForEndOfYear () - bool System.TimeZoneInfo/AdjustmentRule:IsStartDateMarkerForBeginningOfYear () bool System.TimeZoneInfo/AndroidTzData:LoadData (string,string) bool System.TimeZoneInfo/TransitionTime:Equals (System.TimeZoneInfo/TransitionTime) bool System.TimeZoneInfo/TransitionTime:op_Inequality (System.TimeZoneInfo/TransitionTime,System.TimeZoneInfo/TransitionTime) @@ -461,6 +455,7 @@ Methods: int System.Collections.Generic.HashSet`1:Initialize (int) int System.Collections.Generic.List`1:EnsureCapacity (int) int System.Collections.Generic.List`1:get_Count () + int System.Collections.Generic.List`1:GetNewCapacity (int) int System.Collections.Generic.NonRandomizedStringEqualityComparer/OrdinalComparer:GetHashCode (string) int System.Collections.Generic.NonRandomizedStringEqualityComparer/OrdinalIgnoreCaseComparer:GetHashCode (string) int System.Collections.Generic.ObjectEqualityComparer`1:GetHashCode (System.Type) @@ -580,7 +575,6 @@ Methods: int System.Resources.ResourceReader:GetNamePosition (int) int System.Resources.ResourceReader:ReadUnalignedI4 (int*) int System.Runtime.CompilerServices.RuntimeHelpers:InternalGetHashCode (object) - int System.Runtime.CompilerServices.RuntimeHelpers:InternalTryGetHashCode (object) int System.Runtime.InteropServices.Marshal:GetLastPInvokeError () int System.Runtime.InteropServices.Marshal:GetLastSystemError () int System.RuntimeType:GetHashCode () @@ -612,7 +606,6 @@ Methods: int System.Text.ASCIIEncoding:GetBytes (System.ReadOnlySpan`1,System.Span`1) int System.Text.ASCIIEncoding:GetBytesFast (char*,int,byte*,int,int&) int System.Text.DecoderNLS:GetChars (byte[],int,int,char[],int,bool) - int System.Text.DecoderNLS:GetChars (byte[],int,int,char[],int) int System.Text.DecoderNLS:GetChars (byte*,int,char*,int,bool) int System.Text.Encoding:GetChars (byte*,int,char*,int,System.Text.DecoderNLS) int System.Text.UTF8Encoding:GetBytes (System.ReadOnlySpan`1,System.Span`1) @@ -707,8 +700,6 @@ Methods: intptr Java.Interop.JniType:RawGetStaticMethodID (intptr,string,string,intptr&) intptr Java.Lang.Object:get_Handle () intptr Java.Lang.Object:Java.Interop.IJavaObjectEx.ToLocalJniHandle () - intptr Java.Util.IIteratorInvoker:get_java_class_ref () - intptr Java.Util.IIteratorInvoker:Validate (intptr) intptr Mono.RuntimeGPtrArrayHandle:get_Item (int) intptr Mono.RuntimeGPtrArrayHandle:Lookup (int) intptr Mono.SafeGPtrArrayHandle:get_Item (int) @@ -826,6 +817,7 @@ Methods: long System.Diagnostics.Stopwatch:QueryPerformanceCounter () long System.Environment:get_TickCount64 () long System.IO.MemoryStream:Seek (long,System.IO.SeekOrigin) + long System.IO.MemoryStream:SeekCore (long,int) long System.IO.Strategies.BufferedFileStreamStrategy:get_Position () long System.IO.Strategies.BufferedFileStreamStrategy:Seek (long,System.IO.SeekOrigin) long System.IO.Strategies.FileStreamHelpers:CheckFileCall (long,string,bool) @@ -900,7 +892,6 @@ Methods: object System.Threading.ThreadPool:GetOrCreateThreadLocalCompletionCountObject () object System.Threading.ThreadPoolWorkQueue:Dequeue (System.Threading.ThreadPoolWorkQueueThreadLocals,bool&) object System.Threading.ThreadPoolWorkQueue/WorkStealingQueue:LocalPop () - object System.Threading.ThreadPoolWorkQueue/WorkStealingQueue:LocalPopCore () object System.Threading.ThreadPoolWorkQueue/WorkStealingQueue:TrySteal (bool&) object[] Android.Runtime.JNIEnv:GetObjectArray (intptr,System.Type[]) object[] System.Reflection.CustomAttribute:GetCustomAttributes (System.Reflection.ICustomAttributeProvider,System.Type,bool) @@ -1019,7 +1010,6 @@ Methods: string System.String:Create (System.IFormatProvider,System.Span`1,System.Runtime.CompilerServices.DefaultInterpolatedStringHandler&) string System.String:CreateStringForSByteConstructor (byte*,int) string System.String:CreateStringFromEncoding (byte*,int,System.Text.Encoding) - string System.String:Ctor (char[],int,int) string System.String:Ctor (char*,int,int) string System.String:Ctor (char*) string System.String:Ctor (sbyte*) @@ -1093,6 +1083,7 @@ Methods: System.Attribute[] System.Reflection.CustomAttribute:GetCustomAttributesInternal (System.Reflection.ICustomAttributeProvider,System.Type,bool) System.Buffers.ArrayPool`1 System.Buffers.ArrayPool`1:get_Shared () System.Buffers.ArrayPool`1 System.Buffers.ArrayPool`1:get_Shared () + System.Buffers.OperationStatus System.Text.Ascii:ChangeCase (System.ReadOnlySpan`1,System.Span`1,int&) System.Buffers.OperationStatus System.Text.Ascii:ChangeCase (System.ReadOnlySpan`1,System.Span`1,int&) System.Buffers.OperationStatus System.Text.Unicode.Utf8Utility:TranscodeToUtf16 (byte*,int,char*,int,byte*&,char*&) System.Buffers.OperationStatus System.Text.Unicode.Utf8Utility:TranscodeToUtf8 (char*,int,byte*,int,char*&,byte*&) @@ -1130,12 +1121,9 @@ Methods: System.DateTime System.DateTime:get_Now () System.DateTime System.DateTime:get_UtcNow () System.DateTime System.DateTime:op_Addition (System.DateTime,System.TimeSpan) - System.DateTime System.DateTime:op_Subtraction (System.DateTime,System.TimeSpan) System.DateTime System.DateTime:SpecifyKind (System.DateTime,System.DateTimeKind) System.DateTime System.DateTimeOffset:get_UtcDateTime () System.DateTime System.DateTimeOffset:ValidateDate (System.DateTime,System.TimeSpan) - System.DateTime System.TimeZoneInfo:ConvertFromUtc (System.DateTime,System.TimeSpan,System.TimeSpan) - System.DateTime System.TimeZoneInfo:ConvertToFromUtc (System.DateTime,System.TimeSpan,System.TimeSpan,bool) System.DateTime System.TimeZoneInfo:ParseTimeOfDay (System.ReadOnlySpan`1) System.DateTime System.TimeZoneInfo:TZif_UnixTimeToDateTime (long) System.DateTime System.TimeZoneInfo/AdjustmentRule:get_DateEnd () @@ -1200,9 +1188,8 @@ Methods: System.Globalization.DateTimeFormatInfo System.Globalization.CultureInfo:get_DateTimeFormat () System.Globalization.DateTimeFormatInfo System.Globalization.DateTimeFormatInfo:get_CurrentInfo () System.Globalization.DateTimeFormatInfo System.Globalization.DateTimeFormatInfo:GetInstance (System.IFormatProvider) - System.Globalization.DaylightTimeStruct System.TimeZoneInfo:GetDaylightTime (int,System.TimeZoneInfo/AdjustmentRule,System.Nullable`1) System.Globalization.NumberFormatInfo System.Globalization.CultureInfo:get_NumberFormat () - System.Globalization.NumberFormatInfo System.Globalization.NumberFormatInfo:g__GetProviderNonNull|58_0 (System.IFormatProvider) + System.Globalization.NumberFormatInfo System.Globalization.NumberFormatInfo:g__GetProviderNonNull|59_0 (System.IFormatProvider) System.Globalization.NumberFormatInfo System.Globalization.NumberFormatInfo:get_CurrentInfo () System.Globalization.NumberFormatInfo System.Globalization.NumberFormatInfo:get_InvariantInfo () System.Globalization.NumberFormatInfo System.Globalization.NumberFormatInfo:GetInstance (System.IFormatProvider) @@ -1264,12 +1251,12 @@ Methods: System.ReadOnlySpan`1 System.Globalization.IcuLocaleData:get_LocalesNamesIndexes () System.ReadOnlySpan`1 System.Globalization.IcuLocaleData:get_NameIndexToNumericData () System.ReadOnlySpan`1 System.Globalization.IcuLocaleData:GetCultureName (int) - System.ReadOnlySpan`1 System.IO.BinaryReader:InternalRead (int) + System.ReadOnlySpan`1 System.IO.BinaryReader:InternalRead (System.Span`1) System.ReadOnlySpan`1 System.Text.UTF8Encoding:get_PreambleSpan () System.ReadOnlySpan`1 System.Text.UTF8Encoding/UTF8EncodingSealed:get_Preamble () System.ReadOnlySpan`1 System.IO.Path:TrimEndingDirectorySeparator (System.ReadOnlySpan`1) System.ReadOnlySpan`1 System.IO.PathInternal:TrimEndingDirectorySeparator (System.ReadOnlySpan`1) - System.ReadOnlySpan`1 System.MemoryExtensions:g__TrimFallback|219_0 (System.ReadOnlySpan`1) + System.ReadOnlySpan`1 System.MemoryExtensions:g__TrimFallback|223_0 (System.ReadOnlySpan`1) System.ReadOnlySpan`1 System.MemoryExtensions:TrimStart (System.ReadOnlySpan`1) System.ReadOnlySpan`1 System.Runtime.CompilerServices.DefaultInterpolatedStringHandler:get_Text () System.ReadOnlySpan`1 System.Runtime.InteropServices.MemoryMarshal:CreateReadOnlySpanFromNullTerminated (char*) @@ -1279,6 +1266,7 @@ Methods: System.ReadOnlySpan`1 System.TimeZoneInfo:TZif_ParsePosixOffset (System.ReadOnlySpan`1,int&) System.ReadOnlySpan`1 System.TimeZoneInfo:TZif_ParsePosixString (System.ReadOnlySpan`1,int&,System.Func`2) System.ReadOnlySpan`1 System.Collections.Generic.ValueListBuilder`1:AsSpan () + System.ReadOnlySpan`1 System.Reflection.MethodBase:GetParametersAsSpan () System.Reflection.Assembly System.Reflection.Assembly:InternalLoad (string,System.Threading.StackCrawlMark&,intptr) System.Reflection.Assembly System.Reflection.Assembly:Load (System.Reflection.AssemblyName,System.Threading.StackCrawlMark&,System.Runtime.Loader.AssemblyLoadContext) System.Reflection.Assembly System.Reflection.RuntimeAssembly:InternalGetSatelliteAssembly (System.Reflection.Assembly,System.Globalization.CultureInfo,System.Version,bool) @@ -1300,18 +1288,20 @@ Methods: System.Reflection.CallingConventions System.Reflection.MonoMethodInfo:GetCallingConvention (intptr) System.Reflection.CallingConventions System.Reflection.RuntimeConstructorInfo:get_CallingConvention () System.Reflection.CallingConventions System.Reflection.RuntimeMethodInfo:get_CallingConvention () + System.Reflection.ConstructorInfo System.Reflection.ListBuilder`1:get_Item (int) System.Reflection.ConstructorInfo System.RuntimeType:GetConstructorImpl (System.Reflection.BindingFlags,System.Reflection.Binder,System.Reflection.CallingConventions,System.Type[],System.Reflection.ParameterModifier[]) - System.Reflection.ConstructorInfo System.RuntimeType/ListBuilder`1:get_Item (int) System.Reflection.ConstructorInfo System.Type:GetConstructor (System.Reflection.BindingFlags,System.Reflection.Binder,System.Reflection.CallingConventions,System.Type[],System.Reflection.ParameterModifier[]) System.Reflection.ConstructorInfo System.Type:GetConstructor (System.Reflection.BindingFlags,System.Reflection.Binder,System.Type[],System.Reflection.ParameterModifier[]) System.Reflection.ConstructorInfo System.Type:GetConstructor (System.Type[]) - System.Reflection.ConstructorInfo[] System.RuntimeType/ListBuilder`1:ToArray () + System.Reflection.ConstructorInfo[] System.Reflection.ListBuilder`1:ToArray () System.Reflection.CorElementType System.RuntimeType:GetCorElementType () System.Reflection.CorElementType System.RuntimeTypeHandle:GetCorElementType (System.Runtime.CompilerServices.QCallTypeHandle) System.Reflection.CorElementType System.RuntimeTypeHandle:GetCorElementType (System.RuntimeType) System.Reflection.ICustomAttributeProvider System.Reflection.CustomAttribute:GetBase (System.Reflection.ICustomAttributeProvider) System.Reflection.InvocationFlags System.Reflection.RuntimeConstructorInfo:ComputeAndUpdateInvocationFlags () System.Reflection.InvocationFlags System.Reflection.RuntimeMethodInfo:ComputeAndUpdateInvocationFlags () + System.Reflection.ListBuilder`1 System.RuntimeType:GetConstructorCandidates (string,System.Reflection.BindingFlags,System.Reflection.CallingConventions,System.Type[],bool) + System.Reflection.ListBuilder`1 System.RuntimeType:GetMethodCandidates (string,System.Reflection.BindingFlags,System.Reflection.CallingConventions,System.Type[],int,bool) System.Reflection.MethodAttributes System.Reflection.MonoMethodInfo:GetAttributes (intptr) System.Reflection.MethodAttributes System.Reflection.RuntimeConstructorInfo:get_Attributes () System.Reflection.MethodAttributes System.Reflection.RuntimeMethodInfo:get_Attributes () @@ -1332,7 +1322,6 @@ Methods: System.Reflection.MethodInfo System.Type:GetMethod (string) System.Reflection.Module System.RuntimeType:get_Module () System.Reflection.MonoMethodInfo System.Reflection.MonoMethodInfo:GetMethodInfo (intptr) - System.Reflection.ParameterInfo[] System.Reflection.MethodBase:GetParametersNoCopy () System.Reflection.ParameterInfo[] System.Reflection.MonoMethodInfo:get_parameter_info (intptr,System.Reflection.MemberInfo) System.Reflection.ParameterInfo[] System.Reflection.MonoMethodInfo:GetParametersInfo (intptr,System.Reflection.MemberInfo) System.Reflection.ParameterInfo[] System.Reflection.RuntimeConstructorInfo:GetParametersInternal () @@ -1348,7 +1337,6 @@ Methods: System.Reflection.TypeAttributes System.RuntimeType:GetAttributes () System.Reflection.TypeAttributes System.RuntimeTypeHandle:GetAttributes (System.Runtime.CompilerServices.QCallTypeHandle) System.Reflection.TypeAttributes System.RuntimeTypeHandle:GetAttributes (System.RuntimeType) - System.Reflection.TypeAttributes System.Type:get_Attributes () System.Resources.NeutralResourcesLanguageAttribute System.Reflection.CustomAttributeExtensions:GetCustomAttribute (System.Reflection.Assembly) System.Resources.ResourceLocator& System.Collections.Generic.Dictionary`2:FindValue (string) System.Resources.ResourceSet System.Resources.ManifestBasedResourceGroveler:CreateResourceSet (System.IO.Stream,System.Reflection.Assembly) @@ -1378,8 +1366,6 @@ Methods: System.RuntimeType[] System.Reflection.RuntimeConstructorInfo:get_ArgumentTypes () System.RuntimeType[] System.Reflection.RuntimeMethodInfo:get_ArgumentTypes () System.RuntimeType[] System.RuntimeType:GetGenericArgumentsInternal () - System.RuntimeType/ListBuilder`1 System.RuntimeType:GetConstructorCandidates (string,System.Reflection.BindingFlags,System.Reflection.CallingConventions,System.Type[],bool) - System.RuntimeType/ListBuilder`1 System.RuntimeType:GetMethodCandidates (string,System.Reflection.BindingFlags,System.Reflection.CallingConventions,System.Type[],int,bool) System.RuntimeType/TypeCache System.RuntimeType:get_Cache () System.RuntimeTypeHandle System.RuntimeType:get_TypeHandle () System.Span`1 System.Text.ValueUtf8Converter:ConvertAndTerminateString (System.ReadOnlySpan`1) @@ -1487,7 +1473,6 @@ Methods: System.Threading.WaitSubsystem/WaitableObject System.Threading.WaitSubsystem/WaitableObject:NewEvent (bool,System.Threading.EventResetMode) System.Threading.WaitSubsystem/WaitableObject[] System.Threading.WaitSubsystem/ThreadWaitInfo:GetWaitedObjectArray (int) System.TimeProvider System.TimeProvider:get_System () - System.TimeSpan System.TimeSpan:Add (System.TimeSpan) System.TimeSpan System.TimeSpan:FromHours (double) System.TimeSpan System.TimeSpan:FromMilliseconds (double) System.TimeSpan System.TimeSpan:FromSeconds (double) @@ -1497,10 +1482,7 @@ Methods: System.TimeSpan System.TimeSpan:op_Addition (System.TimeSpan,System.TimeSpan) System.TimeSpan System.TimeSpan:op_Subtraction (System.TimeSpan,System.TimeSpan) System.TimeSpan System.TimeSpan:op_UnaryNegation (System.TimeSpan) - System.TimeSpan System.TimeSpan:Subtract (System.TimeSpan) System.TimeSpan System.TimeZoneInfo:GetDateTimeNowUtcOffsetFromUtc (System.DateTime,bool&) - System.TimeSpan System.TimeZoneInfo:GetDaylightSavingsEndOffsetFromUtc (System.TimeSpan,System.TimeZoneInfo/AdjustmentRule) - System.TimeSpan System.TimeZoneInfo:GetDaylightSavingsStartOffsetFromUtc (System.TimeSpan,System.TimeZoneInfo/AdjustmentRule,System.Nullable`1) System.TimeSpan System.TimeZoneInfo:GetUtcOffset (System.TimeSpan,System.TimeZoneInfo/AdjustmentRule) System.TimeSpan System.TimeZoneInfo:GetUtcOffsetFromUtc (System.DateTime,System.TimeZoneInfo,bool&,bool&) System.TimeSpan System.TimeZoneInfo:TZif_CalculateTransitionOffsetFromBase (System.TimeSpan,System.TimeSpan) @@ -1514,7 +1496,6 @@ Methods: System.TimeZoneInfo System.TimeZoneInfo/CachedData:CreateLocal () System.TimeZoneInfo System.TimeZoneInfo/CachedData:get_Local () System.TimeZoneInfo/AdjustmentRule System.TimeZoneInfo:GetAdjustmentRuleForTime (System.DateTime,bool,System.Nullable`1&) - System.TimeZoneInfo/AdjustmentRule System.TimeZoneInfo:GetPreviousAdjustmentRule (System.TimeZoneInfo/AdjustmentRule,System.Nullable`1) System.TimeZoneInfo/AdjustmentRule System.TimeZoneInfo:TZif_CreateAdjustmentRuleForPosixFormat (string,System.DateTime,System.TimeSpan) System.TimeZoneInfo/AdjustmentRule System.TimeZoneInfo/AdjustmentRule:CreateAdjustmentRule (System.DateTime,System.DateTime,System.TimeSpan,System.TimeZoneInfo/TransitionTime,System.TimeZoneInfo/TransitionTime,System.TimeSpan,bool) System.TimeZoneInfo/AdjustmentRule[] System.Collections.Generic.List`1:ToArray () @@ -1570,6 +1551,7 @@ Methods: uint System.Collections.Hashtable:InitHash (object,int,uint&,uint&) uint System.Private.CoreLib.GateThread/DelayHelper:GetNextDelay (int) uint System.Threading.TimerQueueTimer:GetMilliseconds (System.TimeSpan,string) + uintptr System.Text.Ascii:ChangeCase (uint16*,byte*,uintptr) uintptr System.Text.Ascii:ChangeCase (uint16*,uint16*,uintptr) uintptr System.Text.Ascii:GetIndexOfFirstNonAsciiByte_Vector (byte*,uintptr) uintptr System.Text.Ascii:NarrowUtf16ToAscii (char*,byte*,uintptr) @@ -1781,7 +1763,6 @@ Methods: void Java.Security.KeyStore:Load (System.IO.Stream,char[]) void Java.Util.IIteratorInvoker:.cctor () void Java.Util.IIteratorInvoker:.ctor (intptr,Android.Runtime.JniHandleOwnership) - void Java.Util.IIteratorInvoker:Dispose (bool) void Javax.Net.Ssl.HttpsURLConnection:.cctor () void Javax.Net.Ssl.HttpsURLConnection:.ctor (intptr,Android.Runtime.JniHandleOwnership) void Javax.Net.Ssl.HttpsURLConnectionInvoker:.cctor () @@ -1815,7 +1796,6 @@ Methods: void System.Array:CopySlow (System.Array,int,System.Array,int,int,bool) void System.Array:InternalCreate (System.Array&,intptr,int,int*,int*) void System.Array:Resize (System.Net.Http.Headers.HeaderEntry[]&,int) - void System.Array:Resize (System.Reflection.ConstructorInfo[]&,int) void System.Array/EmptyArray`1:.cctor () void System.Array/EmptyArray`1:.cctor () void System.Array/EmptyArray`1>>:.cctor () @@ -1840,7 +1820,8 @@ Methods: void System.Buffers.ArrayPoolEventSource:.cctor () void System.Buffers.ArrayPoolEventSource:.ctor () void System.Buffers.BitVector256:Set (int) - void System.Buffers.IndexOfAnyAsciiSearcher:ComputeBitmap256 (System.ReadOnlySpan`1,System.Runtime.Intrinsics.Vector256`1&,System.Runtime.Intrinsics.Vector256`1&,System.Buffers.BitVector256&) + void System.Buffers.IndexOfAnyAsciiSearcher:ComputeAnyByteState (System.ReadOnlySpan`1,System.Buffers.IndexOfAnyAsciiSearcher/AnyByteState&) + void System.Buffers.IndexOfAnyAsciiSearcher/AnyByteState:.ctor (System.Runtime.Intrinsics.Vector128`1,System.Runtime.Intrinsics.Vector128`1,System.Buffers.BitVector256) void System.Buffers.Latin1CharSearchValues:.ctor (System.ReadOnlySpan`1) void System.Buffers.SharedArrayPool`1/<>c:.cctor () void System.Buffers.SharedArrayPool`1/<>c:.ctor () @@ -2005,7 +1986,6 @@ Methods: void System.Globalization.CultureInfo:.ctor (System.Globalization.CultureData,bool) void System.Globalization.DateTimeFormatInfo:.ctor (System.Globalization.CultureData,System.Globalization.Calendar) void System.Globalization.DateTimeFormatInfo:InitializeOverridableProperties (System.Globalization.CultureData,System.Globalization.CalendarId) - void System.Globalization.DaylightTimeStruct:.ctor (System.DateTime,System.DateTime,System.TimeSpan) void System.Globalization.GlobalizationMode/Settings:.cctor () void System.Globalization.GregorianCalendar:.ctor () void System.Globalization.GregorianCalendar:.ctor (System.Globalization.GregorianCalendarTypes) @@ -2236,6 +2216,8 @@ Methods: void System.Reflection.ConstructorInfo:.cctor () void System.Reflection.CustomAttribute:.cctor () void System.Reflection.Emit.OpCodes:.cctor () + void System.Reflection.ListBuilder`1:.ctor (int) + void System.Reflection.ListBuilder`1:Add (System.Reflection.ConstructorInfo) void System.Reflection.MethodBaseInvoker:.ctor (System.Reflection.MethodBase,System.RuntimeType[]) void System.Reflection.MethodBaseInvoker:.ctor (System.Reflection.RuntimeConstructorInfo) void System.Reflection.MethodBaseInvoker:.ctor (System.Reflection.RuntimeMethodInfo) @@ -2312,13 +2294,13 @@ Methods: void System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1/AsyncStateMachineBox`1g__Core|27_0>d>:MoveNext (System.Threading.Thread) void System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1/AsyncStateMachineBox`1d__63>:.cctor () void System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1/AsyncStateMachineBox`1d__63>:.ctor () + void System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1/AsyncStateMachineBox`1d__63>:ExecuteFromThreadPool (System.Threading.Thread) void System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1/AsyncStateMachineBox`1d__63>:ExecutionContextCallback (object) - void System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1/AsyncStateMachineBox`1d__63>:MoveNext () void System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1/AsyncStateMachineBox`1d__63>:MoveNext (System.Threading.Thread) void System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1/AsyncStateMachineBox`1g__DisposeSourceAsync|1_0>d>:.cctor () void System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1/AsyncStateMachineBox`1g__DisposeSourceAsync|1_0>d>:.ctor () + void System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1/AsyncStateMachineBox`1g__DisposeSourceAsync|1_0>d>:ExecuteFromThreadPool (System.Threading.Thread) void System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1/AsyncStateMachineBox`1g__DisposeSourceAsync|1_0>d>:ExecutionContextCallback (object) - void System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1/AsyncStateMachineBox`1g__DisposeSourceAsync|1_0>d>:MoveNext () void System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1/AsyncStateMachineBox`1g__DisposeSourceAsync|1_0>d>:MoveNext (System.Threading.Thread) void System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1:SetResult (Java.Net.Proxy) void System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1:AwaitUnsafeOnCompleted (System.Runtime.CompilerServices.ConfiguredTaskAwaitable/ConfiguredTaskAwaiter&,System.Runtime.CompilerServices.IAsyncStateMachineBox) @@ -2385,8 +2367,6 @@ Methods: void System.RuntimeType:SanityCheckGenericArguments (System.RuntimeType[],System.RuntimeType[]) void System.RuntimeType:ThrowIfTypeNeverValidGenericArgument (System.RuntimeType) void System.RuntimeType:UpdateCached (System.RuntimeType/TypeCacheEntries) - void System.RuntimeType/ListBuilder`1:.ctor (int) - void System.RuntimeType/ListBuilder`1:Add (System.Reflection.ConstructorInfo) void System.RuntimeTypeHandle:GetAssembly (System.Runtime.CompilerServices.QCallTypeHandle,System.Runtime.CompilerServices.ObjectHandleOnStack) void System.RuntimeTypeHandle:GetBaseType (System.Runtime.CompilerServices.QCallTypeHandle,System.Runtime.CompilerServices.ObjectHandleOnStack) void System.RuntimeTypeHandle:GetElementType (System.Runtime.CompilerServices.QCallTypeHandle,System.Runtime.CompilerServices.ObjectHandleOnStack) @@ -2396,7 +2376,6 @@ Methods: void System.SpanHelpers:ClearWithoutReferences (byte&,uintptr) void System.SpanHelpers:ClearWithReferences (intptr&,uintptr) void System.StackOverflowException:.ctor (string) - void System.String:.ctor (char[],int,int) void System.String:.ctor (char*,int,int) void System.String:.ctor (char*) void System.String:.ctor (sbyte*) @@ -2492,7 +2471,7 @@ Methods: void System.Threading.LowLevelMonitor:Signal_ReleaseCore () void System.Threading.LowLevelMonitor:Wait () void System.Threading.LowLevelMonitor:WaitCore () - void System.Threading.LowLevelSpinWaiter:Wait (int,int,int) + void System.Threading.LowLevelSpinWaiter:Wait (int,int,bool) void System.Threading.Monitor:Exit (object) void System.Threading.Monitor:InternalExit (object) void System.Threading.PortableThreadPool:.cctor () diff --git a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj index 7e1edfc1f29..061478cdb82 100644 --- a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj +++ b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj @@ -39,7 +39,7 @@ - + diff --git a/tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs b/tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs index 41e8638e3cb..d4fdd38f9d1 100755 --- a/tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs +++ b/tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs @@ -427,8 +427,8 @@ public Foo () AndroidFastDeploymentType = fastDevType }; if (!useLatestSdk) { - lib.TargetFramework = "net7.0-android"; - app.TargetFramework = "net7.0-android"; + lib.TargetFramework = "net8.0-android"; + app.TargetFramework = "net8.0-android"; } app.SetProperty ("AndroidPackageFormat", packageFormat); @@ -441,7 +441,7 @@ public Foo () using (var appBuilder = CreateApkBuilder (Path.Combine (path, app.ProjectName))) { Assert.True (libBuilder.Build (lib), "Library should have built."); - SetTargetFrameworkAndManifest (app, appBuilder, app.TargetFramework == "net7.0-android" ? 33 : null); + SetTargetFrameworkAndManifest (app, appBuilder, app.TargetFramework == "net8.0-android" ? 34 : 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 d6adcf7366d..fb5f990eeee 100644 --- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs +++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs @@ -502,7 +502,7 @@ bool SeenFailedToLoad (string line) } [Test] - public void ResourceDesignerWithNuGetReference ([Values ("net8.0-android")] string dotnetTargetFramework) + public void ResourceDesignerWithNuGetReference ([Values ("net8.0-android", "net9.0-android")] string dotnetTargetFramework) { // Build a NuGet Package var nuget = new XamarinAndroidLibraryProject () { @@ -919,7 +919,7 @@ public void CheckResouceIsOverridden () public void DotNetInstallAndRunPreviousSdk ([Values (false, true)] bool isRelease) { var proj = new XamarinFormsAndroidApplicationProject () { - TargetFramework = "net7.0-android", + TargetFramework = "net8.0-android", IsRelease = isRelease, EnableDefaultItems = true, }; @@ -1056,7 +1056,7 @@ public void EnableAndroidStripILAfterAOT ([Values (false, true)] bool profiledAO [Test] public void FixLegacyResourceDesignerStep ([Values (true, false)] bool isRelease) { - string previousTargetFramework = "net7.0-android"; + string previousTargetFramework = "net8.0-android"; var library1 = new XamarinAndroidLibraryProject { IsRelease = isRelease, @@ -1110,6 +1110,8 @@ public void FixLegacyResourceDesignerStep ([Values (true, false)] bool isRelease [Test] public void MicrosoftIntune ([Values (false, true)] bool isRelease) { + Assert.Ignore ("https://github.com/xamarin/xamarin-android/issues/8548"); + proj = new XamarinAndroidApplicationProject { IsRelease = isRelease, PackageReferences = { diff --git a/tests/api-compatibility/acceptable-breakages-vReference-net8.0.txt b/tests/api-compatibility/acceptable-breakages-vReference-net9.0.txt similarity index 100% rename from tests/api-compatibility/acceptable-breakages-vReference-net8.0.txt rename to tests/api-compatibility/acceptable-breakages-vReference-net9.0.txt