From 924748b19fb0ac12f783cb06fa9352583a1bfb25 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 May 2022 21:09:34 +0000 Subject: [PATCH 01/10] Update dependencies from https://github.com/dotnet/installer build 20220505.6 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-preview.4.22174.1 -> To Version 7.0.100-preview.5.22255.6 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100 From Version 7.0.100-1.22173.2 -> To Version 7.0.100-1.22228.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e1e8c0bc5b..5cef4efa398 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/installer - c7afae6936bf80239aa93bfd3b6f68513d9876d4 + 17080554951c7357675257cb176b97ce106649a0 - + https://github.com/dotnet/linker - 04c49c9d7c244d7c73d6dbb438c4885fa72e830b + 848f9d48961945b9a0236ae7ff7b687c7d4abe42 - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + 39a7960c632b4c11bbb09f0430b3b3c2dcc03085 - + https://github.com/dotnet/emsdk - b8e71431b3eaa024afad7886699f8ac6bca2ba01 + f41e658e85769eef222f5f7571038edbd2d1d9d8 diff --git a/eng/Versions.props b/eng/Versions.props index 7feef038fa6..2d6b02a363d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,12 +1,12 @@ - 7.0.100-preview.4.22174.1 - 7.0.100-1.22173.2 - 7.0.0-preview.4.22172.7 + 7.0.100-preview.5.22255.6 + 7.0.100-1.22228.1 + 7.0.0-preview.5.22254.1 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 7.0.0-preview.3.22121.1 + 7.0.0-preview.4.22215.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) From d07a6400adc942a402376bdba5e3405e2bc1b761 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 6 May 2022 08:35:59 -0500 Subject: [PATCH 02/10] Use `mono_opt_aot_lazy_assembly_load` again Partially reverts 745214de, as this bump contains: https://github.com/dotnet/runtime/commit/0e1c91b603873c4012c26e88563c08d6031bd463 --- src/monodroid/jni/monodroid-glue.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/monodroid/jni/monodroid-glue.cc b/src/monodroid/jni/monodroid-glue.cc index bad6300f0d1..f1a9f9bde4f 100644 --- a/src/monodroid/jni/monodroid-glue.cc +++ b/src/monodroid/jni/monodroid-glue.cc @@ -2152,9 +2152,7 @@ MonodroidRuntime::Java_mono_android_Runtime_initInternal (JNIEnv *env, jclass kl jstring_wrapper &home = applicationDirs[SharedConstants::APP_DIRS_FILES_DIR_INDEX]; #if defined (NET6) - // TODO: re-enable when we get on a newer .NET 7. - // We downgraded .NET 7 to workaround: https://github.com/dotnet/runtime/pull/68701 - //mono_opt_aot_lazy_assembly_load = application_config.aot_lazy_load ? TRUE : FALSE; + mono_opt_aot_lazy_assembly_load = application_config.aot_lazy_load ? TRUE : FALSE; { MonoVMProperties monovm_props { home }; From 52b7e004f79d004e8ab41e86a37b7a0f5a44150b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 May 2022 13:40:30 +0000 Subject: [PATCH 03/10] Update dependencies from https://github.com/dotnet/installer build 20220506.2 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-preview.4.22174.1 -> To Version 7.0.100-preview.5.22256.2 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100 From Version 7.0.100-1.22173.2 -> To Version 7.0.100-1.22228.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5cef4efa398..827bf400d6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 17080554951c7357675257cb176b97ce106649a0 + 1fb83ccc5595272970bd6a9c3f5bdb40fc97df76 https://github.com/dotnet/linker 848f9d48961945b9a0236ae7ff7b687c7d4abe42 - + https://github.com/dotnet/runtime - 39a7960c632b4c11bbb09f0430b3b3c2dcc03085 + 874c6a937565eb286a60800aaeb0679dfaa8b01a https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 2d6b02a363d..479d3f7e5d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,9 +1,9 @@ - 7.0.100-preview.5.22255.6 + 7.0.100-preview.5.22256.2 7.0.100-1.22228.1 - 7.0.0-preview.5.22254.1 + 7.0.0-preview.5.22254.12 7.0.0-beta.22103.1 7.0.0-beta.22103.1 7.0.0-preview.4.22215.1 From 9b3fb6e096980fc887d38b177710ab2fa22f2b02 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 6 May 2022 14:10:08 -0500 Subject: [PATCH 04/10] Update .apkdesc files --- .../BuildReleaseArm64SimpleDotNet.apkdesc | 20 ++--- .../BuildReleaseArm64XFormsDotNet.apkdesc | 80 +++++++++---------- 2 files changed, 50 insertions(+), 50 deletions(-) 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 d99ea55ff7f..a42fcb69dac 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,40 +5,40 @@ "Size": 3032 }, "assemblies/Java.Interop.dll": { - "Size": 54979 + "Size": 54983 }, "assemblies/Mono.Android.dll": { - "Size": 88930 + "Size": 88910 }, "assemblies/rc.bin": { "Size": 1083 }, "assemblies/System.Linq.dll": { - "Size": 10111 + "Size": 9965 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 537771 + "Size": 514908 }, "assemblies/System.Runtime.dll": { - "Size": 2415 + "Size": 2408 }, "assemblies/UnnamedProject.dll": { - "Size": 3553 + "Size": 3552 }, "classes.dex": { "Size": 347336 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 382272 + "Size": 383056 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 4693664 + "Size": 4666544 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 767264 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 88288 + "Size": 90168 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { "Size": 146816 @@ -80,5 +80,5 @@ "Size": 1904 } }, - "PackageSize": 2987924 + "PackageSize": 2959252 } \ No newline at end of file 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 6aa7d9e3764..82639f8688a 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 @@ -8,13 +8,13 @@ "Size": 7114 }, "assemblies/Java.Interop.dll": { - "Size": 61933 + "Size": 61928 }, "assemblies/Mono.Android.dll": { - "Size": 445196 + "Size": 445108 }, "assemblies/mscorlib.dll": { - "Size": 3892 + "Size": 3884 }, "assemblies/netstandard.dll": { "Size": 5603 @@ -23,103 +23,103 @@ "Size": 1083 }, "assemblies/System.Collections.Concurrent.dll": { - "Size": 11440 + "Size": 10774 }, "assemblies/System.Collections.dll": { - "Size": 16972 + "Size": 16148 }, "assemblies/System.Collections.NonGeneric.dll": { - "Size": 8518 + "Size": 7926 }, "assemblies/System.ComponentModel.dll": { - "Size": 2018 + "Size": 2009 }, "assemblies/System.ComponentModel.Primitives.dll": { - "Size": 2729 + "Size": 2624 }, "assemblies/System.ComponentModel.TypeConverter.dll": { - "Size": 6183 + "Size": 6097 }, "assemblies/System.Console.dll": { - "Size": 6955 + "Size": 6575 }, "assemblies/System.Core.dll": { - "Size": 2059 + "Size": 2052 }, "assemblies/System.Diagnostics.TraceSource.dll": { - "Size": 6939 + "Size": 6572 }, "assemblies/System.dll": { - "Size": 2415 + "Size": 2408 }, "assemblies/System.Drawing.dll": { - "Size": 2097 + "Size": 2090 }, "assemblies/System.Drawing.Primitives.dll": { - "Size": 12257 + "Size": 12121 }, "assemblies/System.IO.Compression.dll": { - "Size": 17346 + "Size": 16637 }, "assemblies/System.IO.IsolatedStorage.dll": { - "Size": 10469 + "Size": 10043 }, "assemblies/System.Linq.dll": { - "Size": 19935 + "Size": 19774 }, "assemblies/System.Linq.Expressions.dll": { - "Size": 182164 + "Size": 177472 }, "assemblies/System.Net.Http.dll": { - "Size": 66181 + "Size": 65481 }, "assemblies/System.Net.Primitives.dll": { - "Size": 22518 + "Size": 22196 }, "assemblies/System.Net.Requests.dll": { - "Size": 3664 + "Size": 3656 }, "assemblies/System.ObjectModel.dll": { - "Size": 9137 + "Size": 8537 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 778570 + "Size": 752607 }, "assemblies/System.Private.DataContractSerialization.dll": { - "Size": 192732 + "Size": 185319 }, "assemblies/System.Private.Uri.dll": { - "Size": 43511 + "Size": 42813 }, "assemblies/System.Private.Xml.dll": { - "Size": 222925 + "Size": 216413 }, "assemblies/System.Private.Xml.Linq.dll": { - "Size": 17268 + "Size": 16687 }, "assemblies/System.Runtime.dll": { - "Size": 2605 + "Size": 2601 }, "assemblies/System.Runtime.Serialization.dll": { - "Size": 2024 + "Size": 2019 }, "assemblies/System.Runtime.Serialization.Formatters.dll": { - "Size": 2672 + "Size": 2548 }, "assemblies/System.Runtime.Serialization.Primitives.dll": { - "Size": 3988 + "Size": 3827 }, "assemblies/System.Security.Cryptography.dll": { - "Size": 8048 + "Size": 7788 }, "assemblies/System.Text.RegularExpressions.dll": { - "Size": 206070 + "Size": 157341 }, "assemblies/System.Xml.dll": { - "Size": 1914 + "Size": 1907 }, "assemblies/UnnamedProject.dll": { - "Size": 117242 + "Size": 117240 }, "assemblies/Xamarin.AndroidX.Activity.dll": { "Size": 5942 @@ -191,16 +191,16 @@ "Size": 3460008 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 382272 + "Size": 383056 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 4693664 + "Size": 4666544 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 767264 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 88288 + "Size": 90168 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { "Size": 146816 @@ -1961,5 +1961,5 @@ "Size": 341228 } }, - "PackageSize": 8360269 + "PackageSize": 8249677 } \ No newline at end of file From f086ec01c239ad3b66b8799b5b5772bbf685fef8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 May 2022 12:34:13 +0000 Subject: [PATCH 05/10] Update dependencies from https://github.com/dotnet/installer build 20220508.1 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-preview.4.22174.1 -> To Version 7.0.100-preview.5.22258.1 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100 From Version 7.0.100-1.22173.2 -> To Version 7.0.100-1.22228.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 827bf400d6e..1d5a0d513c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 1fb83ccc5595272970bd6a9c3f5bdb40fc97df76 + 8cea2d782a0576949ccbdbee3e055a384bbdd78d https://github.com/dotnet/linker 848f9d48961945b9a0236ae7ff7b687c7d4abe42 - + https://github.com/dotnet/runtime - 874c6a937565eb286a60800aaeb0679dfaa8b01a + dd74d3e529bad0da272a473eee48eb127accc15b https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 479d3f7e5d0..165d3aca47e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,9 +1,9 @@ - 7.0.100-preview.5.22256.2 + 7.0.100-preview.5.22258.1 7.0.100-1.22228.1 - 7.0.0-preview.5.22254.12 + 7.0.0-preview.5.22255.15 7.0.0-beta.22103.1 7.0.0-beta.22103.1 7.0.0-preview.4.22215.1 From bba69f4278930c2f1300dc4827e676492cdb6bfd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 May 2022 13:26:28 +0000 Subject: [PATCH 06/10] Update dependencies from https://github.com/dotnet/installer build 20220510.3 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-preview.4.22174.1 -> To Version 7.0.100-preview.5.22260.3 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100 From Version 7.0.100-1.22173.2 -> To Version 7.0.100-1.22259.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d5a0d513c5..b131f30da36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 8cea2d782a0576949ccbdbee3e055a384bbdd78d + da9dcce30671239a04a3de65c77a18ea77685334 - + https://github.com/dotnet/linker - 848f9d48961945b9a0236ae7ff7b687c7d4abe42 + b9c9da264c5bc24a8e32fc5d2bda239dffc01fdb - + https://github.com/dotnet/runtime - dd74d3e529bad0da272a473eee48eb127accc15b + 3e5517beb897faf4592d23f036446561da1e5c23 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 165d3aca47e..aa10d4e9714 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,9 +1,9 @@ - 7.0.100-preview.5.22258.1 - 7.0.100-1.22228.1 - 7.0.0-preview.5.22255.15 + 7.0.100-preview.5.22260.3 + 7.0.100-1.22259.1 + 7.0.0-preview.5.22258.4 7.0.0-beta.22103.1 7.0.0-beta.22103.1 7.0.0-preview.4.22215.1 From 16f1a1638f46cb6db6b938aacc08417fb6a605fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 May 2022 12:32:42 +0000 Subject: [PATCH 07/10] Update dependencies from https://github.com/dotnet/installer build 20220513.22 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-preview.4.22174.1 -> To Version 7.0.100-preview.5.22263.22 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100 From Version 7.0.100-1.22173.2 -> To Version 7.0.100-1.22259.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b131f30da36..a10255f2604 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - da9dcce30671239a04a3de65c77a18ea77685334 + 2071f2cdca14396b68b38d719f291e3767f70d46 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index aa10d4e9714..c0cb6426f6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 7.0.100-preview.5.22260.3 + 7.0.100-preview.5.22263.22 7.0.100-1.22259.1 7.0.0-preview.5.22258.4 7.0.0-beta.22103.1 From 5403e45e64618c12e6cb7a0235a743b0ec4b64c1 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 18 May 2022 11:24:14 -0500 Subject: [PATCH 08/10] Default InvariantGlobalization=true Works around: https://github.com/dotnet/linker/issues/2759 --- .../targets/Microsoft.Android.Sdk.DefaultProperties.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets index baa52a204bc..12ae0deebd6 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets @@ -89,7 +89,8 @@ false true false - false + + true false true <_AggressiveAttributeTrimming Condition="'$(_AggressiveAttributeTrimming)' == ''">true From 14ba785a913724637fc7c3047f053e80a2934036 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 18 May 2022 13:20:46 -0500 Subject: [PATCH 09/10] Update .apkdesc files Some of these were just from the merge conflicts in main --- .../BuildReleaseArm64SimpleDotNet.apkdesc | 26 ++-- .../BuildReleaseArm64XFormsDotNet.apkdesc | 112 +++++++++--------- 2 files changed, 69 insertions(+), 69 deletions(-) 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 e8f09da07b3..7f9de03e661 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,34 +5,34 @@ "Size": 3032 }, "assemblies/Java.Interop.dll": { - "Size": 54983 + "Size": 55100 }, "assemblies/Mono.Android.dll": { - "Size": 88763 + "Size": 88786 }, "assemblies/rc.bin": { - "Size": 1083 + "Size": 1131 }, "assemblies/System.Linq.dll": { - "Size": 9965 + "Size": 9970 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 514908 + "Size": 484888 }, "assemblies/System.Runtime.dll": { - "Size": 2408 + "Size": 2412 }, "assemblies/UnnamedProject.dll": { - "Size": 3550 + "Size": 3553 }, "classes.dex": { - "Size": 347628 + "Size": 347544 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 483840 + "Size": 483888 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 4666544 + "Size": 4667280 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 767264 @@ -44,7 +44,7 @@ "Size": 146816 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 9232 + "Size": 9272 }, "META-INF/BNDLTOOL.RSA": { "Size": 1213 @@ -56,7 +56,7 @@ "Size": 2342 }, "res/drawable-hdpi-v4/icon.png": { - "Size": 4762 + "Size": 4791 }, "res/drawable-mdpi-v4/icon.png": { "Size": 2200 @@ -80,5 +80,5 @@ "Size": 1904 } }, - "PackageSize": 3020692 + "PackageSize": 2959252 } \ No newline at end of file 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 2beac4814ea..35e3e7e2061 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 @@ -8,130 +8,130 @@ "Size": 7114 }, "assemblies/Java.Interop.dll": { - "Size": 61928 + "Size": 62071 }, "assemblies/Mono.Android.dll": { - "Size": 445015 + "Size": 445013 }, "assemblies/mscorlib.dll": { - "Size": 3884 + "Size": 3892 }, "assemblies/netstandard.dll": { "Size": 5603 }, "assemblies/rc.bin": { - "Size": 1083 + "Size": 1131 }, "assemblies/System.Collections.Concurrent.dll": { - "Size": 10774 + "Size": 10779 }, "assemblies/System.Collections.dll": { - "Size": 16148 + "Size": 16156 }, "assemblies/System.Collections.NonGeneric.dll": { - "Size": 7926 + "Size": 7933 }, "assemblies/System.ComponentModel.dll": { - "Size": 2009 + "Size": 2016 }, "assemblies/System.ComponentModel.Primitives.dll": { - "Size": 2624 + "Size": 2629 }, "assemblies/System.ComponentModel.TypeConverter.dll": { - "Size": 6097 + "Size": 6106 }, "assemblies/System.Console.dll": { - "Size": 6575 + "Size": 6578 }, "assemblies/System.Core.dll": { - "Size": 2052 + "Size": 2057 }, "assemblies/System.Diagnostics.TraceSource.dll": { - "Size": 6572 + "Size": 6575 }, "assemblies/System.dll": { - "Size": 2408 + "Size": 2412 }, "assemblies/System.Drawing.dll": { - "Size": 2090 + "Size": 2095 }, "assemblies/System.Drawing.Primitives.dll": { - "Size": 12121 + "Size": 12127 }, "assemblies/System.IO.Compression.dll": { - "Size": 16637 + "Size": 16646 }, "assemblies/System.IO.IsolatedStorage.dll": { - "Size": 10043 + "Size": 10050 }, "assemblies/System.Linq.dll": { - "Size": 19774 + "Size": 19780 }, "assemblies/System.Linq.Expressions.dll": { "Size": 177472 }, "assemblies/System.Net.Http.dll": { - "Size": 65481 + "Size": 65605 }, "assemblies/System.Net.Primitives.dll": { - "Size": 22196 + "Size": 22202 }, "assemblies/System.Net.Requests.dll": { - "Size": 3656 + "Size": 3663 }, "assemblies/System.ObjectModel.dll": { - "Size": 8537 + "Size": 8542 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 752607 + "Size": 731431 }, "assemblies/System.Private.DataContractSerialization.dll": { - "Size": 185319 + "Size": 185320 }, "assemblies/System.Private.Uri.dll": { - "Size": 42813 + "Size": 42820 }, "assemblies/System.Private.Xml.dll": { - "Size": 216413 + "Size": 216418 }, "assemblies/System.Private.Xml.Linq.dll": { - "Size": 16687 + "Size": 16697 }, "assemblies/System.Runtime.dll": { - "Size": 2601 + "Size": 2602 }, "assemblies/System.Runtime.Serialization.dll": { - "Size": 2019 + "Size": 2022 }, "assemblies/System.Runtime.Serialization.Formatters.dll": { - "Size": 2548 + "Size": 2552 }, "assemblies/System.Runtime.Serialization.Primitives.dll": { - "Size": 3827 + "Size": 3834 }, "assemblies/System.Security.Cryptography.dll": { - "Size": 7788 + "Size": 7795 }, "assemblies/System.Text.RegularExpressions.dll": { - "Size": 157341 + "Size": 158381 }, "assemblies/System.Xml.dll": { - "Size": 1907 + "Size": 1912 }, "assemblies/UnnamedProject.dll": { - "Size": 117240 + "Size": 117244 }, "assemblies/Xamarin.AndroidX.Activity.dll": { - "Size": 5942 + "Size": 5941 }, "assemblies/Xamarin.AndroidX.AppCompat.AppCompatResources.dll": { - "Size": 5965 + "Size": 5964 }, "assemblies/Xamarin.AndroidX.AppCompat.dll": { - "Size": 112444 + "Size": 112443 }, "assemblies/Xamarin.AndroidX.CardView.dll": { - "Size": 6683 + "Size": 6681 }, "assemblies/Xamarin.AndroidX.CoordinatorLayout.dll": { "Size": 16474 @@ -140,16 +140,16 @@ "Size": 96576 }, "assemblies/Xamarin.AndroidX.DrawerLayout.dll": { - "Size": 14137 + "Size": 14138 }, "assemblies/Xamarin.AndroidX.Fragment.dll": { - "Size": 39795 + "Size": 39794 }, "assemblies/Xamarin.AndroidX.Legacy.Support.Core.UI.dll": { - "Size": 5997 + "Size": 5996 }, "assemblies/Xamarin.AndroidX.Lifecycle.Common.dll": { - "Size": 6465 + "Size": 6464 }, "assemblies/Xamarin.AndroidX.Lifecycle.LiveData.Core.dll": { "Size": 6539 @@ -158,25 +158,25 @@ "Size": 3140 }, "assemblies/Xamarin.AndroidX.Loader.dll": { - "Size": 12540 + "Size": 12541 }, "assemblies/Xamarin.AndroidX.RecyclerView.dll": { - "Size": 84553 + "Size": 84554 }, "assemblies/Xamarin.AndroidX.SavedState.dll": { - "Size": 4944 + "Size": 4945 }, "assemblies/Xamarin.AndroidX.SwipeRefreshLayout.dll": { "Size": 10254 }, "assemblies/Xamarin.AndroidX.ViewPager.dll": { - "Size": 17853 + "Size": 17854 }, "assemblies/Xamarin.Forms.Core.dll": { "Size": 528450 }, "assemblies/Xamarin.Forms.Platform.Android.dll": { - "Size": 384800 + "Size": 384799 }, "assemblies/Xamarin.Forms.Platform.dll": { "Size": 56878 @@ -185,16 +185,16 @@ "Size": 60774 }, "assemblies/Xamarin.Google.Android.Material.dll": { - "Size": 40005 + "Size": 40004 }, "classes.dex": { - "Size": 3460300 + "Size": 3460156 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 483840 + "Size": 483888 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 4666544 + "Size": 4667280 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 767264 @@ -206,7 +206,7 @@ "Size": 146816 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 98440 + "Size": 98480 }, "META-INF/android.support.design_material.version": { "Size": 12 @@ -773,7 +773,7 @@ "Size": 470 }, "res/drawable-hdpi-v4/icon.png": { - "Size": 4762 + "Size": 4791 }, "res/drawable-hdpi-v4/notification_bg_low_normal.9.png": { "Size": 212 @@ -1961,5 +1961,5 @@ "Size": 341228 } }, - "PackageSize": 8393037 + "PackageSize": 8261965 } \ No newline at end of file From 515e540dad837981eccf6ef01904b1f37b91f0af Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 18 May 2022 15:42:08 -0500 Subject: [PATCH 10/10] DotNetIgnore 3 tests See: https://github.com/dotnet/linker/issues/2799 --- tests/Mono.Android-Tests/System.Net/ProxyTest.cs | 1 + tests/Mono.Android-Tests/System.Net/SslTest.cs | 2 ++ 2 files changed, 3 insertions(+) diff --git a/tests/Mono.Android-Tests/System.Net/ProxyTest.cs b/tests/Mono.Android-Tests/System.Net/ProxyTest.cs index efe746c7cee..619fa0e3467 100644 --- a/tests/Mono.Android-Tests/System.Net/ProxyTest.cs +++ b/tests/Mono.Android-Tests/System.Net/ProxyTest.cs @@ -11,6 +11,7 @@ public class ProxyTest { // https://bugzilla.xamarin.com/show_bug.cgi?id=14968 [Test] + [Category("DotNetIgnore")] // TODO: InvalidProgramException, see: https://github.com/dotnet/linker/issues/2799 public void QuoteInvalidQuoteUrlsShouldWork () { string url = "http://example.com/?query&foo|bar"; diff --git a/tests/Mono.Android-Tests/System.Net/SslTest.cs b/tests/Mono.Android-Tests/System.Net/SslTest.cs index a4ad35df116..ddff498a2b5 100644 --- a/tests/Mono.Android-Tests/System.Net/SslTest.cs +++ b/tests/Mono.Android-Tests/System.Net/SslTest.cs @@ -27,6 +27,7 @@ bool ShouldIgnoreException (WebException wex) // https://xamarin.desk.com/agent/case/35534 [Test] + [Category("DotNetIgnore")] // TODO: InvalidProgramException, see: https://github.com/dotnet/linker/issues/2799 public void SslWithinTasksShouldWork () { var cb = ServicePointManager.ServerCertificateValidationCallback; @@ -69,6 +70,7 @@ public void SslWithinTasksShouldWork () } [Test] + [Category("DotNetIgnore")] // TODO: InvalidProgramException, see: https://github.com/dotnet/linker/issues/2799 public void HttpsShouldWork () { RunIgnoringWebException (DoHttpsShouldWork);