diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e1e8c0bc5b..a10255f2604 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/installer - c7afae6936bf80239aa93bfd3b6f68513d9876d4 + 2071f2cdca14396b68b38d719f291e3767f70d46 - + https://github.com/dotnet/linker - 04c49c9d7c244d7c73d6dbb438c4885fa72e830b + b9c9da264c5bc24a8e32fc5d2bda239dffc01fdb - + https://github.com/dotnet/runtime - c5d40c9e703fd257db1b26ef4fd1399bbae73ab0 + 3e5517beb897faf4592d23f036446561da1e5c23 - + https://github.com/dotnet/emsdk - b8e71431b3eaa024afad7886699f8ac6bca2ba01 + f41e658e85769eef222f5f7571038edbd2d1d9d8 diff --git a/eng/Versions.props b/eng/Versions.props index 7feef038fa6..c0cb6426f6b 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.22263.22 + 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.3.22121.1 + 7.0.0-preview.4.22215.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) 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 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 80bfa314c05..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,46 +5,46 @@ "Size": 3032 }, "assemblies/Java.Interop.dll": { - "Size": 54979 + "Size": 55100 }, "assemblies/Mono.Android.dll": { - "Size": 88763 + "Size": 88786 }, "assemblies/rc.bin": { - "Size": 1083 + "Size": 1131 }, "assemblies/System.Linq.dll": { - "Size": 10111 + "Size": 9970 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 537771 + "Size": 484888 }, "assemblies/System.Runtime.dll": { - "Size": 2415 + "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": 4693664 + "Size": 4667280 }, "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 }, "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 57e8739739b..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,10 +8,10 @@ "Size": 7114 }, "assemblies/Java.Interop.dll": { - "Size": 61933 + "Size": 62071 }, "assemblies/Mono.Android.dll": { - "Size": 445015 + "Size": 445013 }, "assemblies/mscorlib.dll": { "Size": 3892 @@ -20,118 +20,118 @@ "Size": 5603 }, "assemblies/rc.bin": { - "Size": 1083 + "Size": 1131 }, "assemblies/System.Collections.Concurrent.dll": { - "Size": 11440 + "Size": 10779 }, "assemblies/System.Collections.dll": { - "Size": 16972 + "Size": 16156 }, "assemblies/System.Collections.NonGeneric.dll": { - "Size": 8518 + "Size": 7933 }, "assemblies/System.ComponentModel.dll": { - "Size": 2018 + "Size": 2016 }, "assemblies/System.ComponentModel.Primitives.dll": { - "Size": 2729 + "Size": 2629 }, "assemblies/System.ComponentModel.TypeConverter.dll": { - "Size": 6183 + "Size": 6106 }, "assemblies/System.Console.dll": { - "Size": 6955 + "Size": 6578 }, "assemblies/System.Core.dll": { - "Size": 2059 + "Size": 2057 }, "assemblies/System.Diagnostics.TraceSource.dll": { - "Size": 6939 + "Size": 6575 }, "assemblies/System.dll": { - "Size": 2415 + "Size": 2412 }, "assemblies/System.Drawing.dll": { - "Size": 2097 + "Size": 2095 }, "assemblies/System.Drawing.Primitives.dll": { - "Size": 12257 + "Size": 12127 }, "assemblies/System.IO.Compression.dll": { - "Size": 17346 + "Size": 16646 }, "assemblies/System.IO.IsolatedStorage.dll": { - "Size": 10469 + "Size": 10050 }, "assemblies/System.Linq.dll": { - "Size": 19935 + "Size": 19780 }, "assemblies/System.Linq.Expressions.dll": { - "Size": 182164 + "Size": 177472 }, "assemblies/System.Net.Http.dll": { - "Size": 66181 + "Size": 65605 }, "assemblies/System.Net.Primitives.dll": { - "Size": 22518 + "Size": 22202 }, "assemblies/System.Net.Requests.dll": { - "Size": 3664 + "Size": 3663 }, "assemblies/System.ObjectModel.dll": { - "Size": 9137 + "Size": 8542 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 778570 + "Size": 731431 }, "assemblies/System.Private.DataContractSerialization.dll": { - "Size": 192732 + "Size": 185320 }, "assemblies/System.Private.Uri.dll": { - "Size": 43511 + "Size": 42820 }, "assemblies/System.Private.Xml.dll": { - "Size": 222925 + "Size": 216418 }, "assemblies/System.Private.Xml.Linq.dll": { - "Size": 17268 + "Size": 16697 }, "assemblies/System.Runtime.dll": { - "Size": 2605 + "Size": 2602 }, "assemblies/System.Runtime.Serialization.dll": { - "Size": 2024 + "Size": 2022 }, "assemblies/System.Runtime.Serialization.Formatters.dll": { - "Size": 2672 + "Size": 2552 }, "assemblies/System.Runtime.Serialization.Primitives.dll": { - "Size": 3988 + "Size": 3834 }, "assemblies/System.Security.Cryptography.dll": { - "Size": 8048 + "Size": 7795 }, "assemblies/System.Text.RegularExpressions.dll": { - "Size": 206070 + "Size": 158381 }, "assemblies/System.Xml.dll": { - "Size": 1914 + "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,28 +185,28 @@ "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": 4693664 + "Size": 4667280 }, "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 }, "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 diff --git a/src/monodroid/jni/monodroid-glue.cc b/src/monodroid/jni/monodroid-glue.cc index 7e4bc9ea719..cc1eb942dc2 100644 --- a/src/monodroid/jni/monodroid-glue.cc +++ b/src/monodroid/jni/monodroid-glue.cc @@ -2174,9 +2174,7 @@ MonodroidRuntime::Java_mono_android_Runtime_initInternal (JNIEnv *env, jclass kl jstring_wrapper &home = applicationDirs[SharedConstants::APP_DIRS_FILES_DIR_INDEX]; #if defined (NET) - // 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 }; 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);