From 938b2cbe2f64a0ec0e5984cb59321e05d9db7de7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 21 Jul 2022 19:19:31 -0500 Subject: [PATCH] Bump to dotnet/installer/main@a9c056c 7.0.100-rc.1.22368.2 (#7170) Changes: https://github.com/dotnet/installer/compare/85a0482...a9c056c Changes: https://github.com/dotnet/linker/compare/ef2d0f2...d27ff61 Changes: https://github.com/dotnet/runtime/compare/206dccb...072eda8 Changes: https://github.com/dotnet/emsdk/compare/40e7c62...11a9acf Updates: * Microsoft.Dotnet.Sdk.Internal: from 7.0.100-preview.7.22361.1 to 7.0.100-rc.1.22368.2 * Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22354.1 to 7.0.100-1.22365.1 * Microsoft.NETCore.App.Ref: from 7.0.0-preview.6.22356.1 to 7.0.0-rc.1.22366.5 * Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-preview.7.22330.1 to 7.0.0-rc.1.22362.2 ~~ Set `$(TrimMode)` `partial` by default (#7132) ~~ Companion to https://github.com/dotnet/linker/pull/2856 * Update src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets * Remove usages of `%(TrimMode)` for `$(AndroidLinkMode)` of `Full` * Update .apkdesc files ~~ Set `$(LangVersion)` to 10 in Mono.Android.csproj ~~ There appears to be a C# 11 IL size regression in: https://github.com/dotnet/roslyn/issues/62832 We can use C# 10 for now to avoid this. * Fixed `Mono.Android.dll` size in `.apkdesc` files Co-authored-by: Andy Gocke Co-authored-by: Jonathan Peppers --- eng/Version.Details.xml | 16 ++-- eng/Versions.props | 8 +- src/Mono.Android/Mono.Android.csproj | 2 + ...soft.Android.Sdk.DefaultProperties.targets | 4 +- .../Microsoft.Android.Sdk.ILLink.targets | 6 -- .../BuildReleaseArm64SimpleDotNet.apkdesc | 26 +++--- .../BuildReleaseArm64XFormsDotNet.apkdesc | 88 +++++++++---------- 7 files changed, 74 insertions(+), 76 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1fcd730b2a5..b669b4bb257 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/installer - 85a0482297aed0816aa8518bdfe3076716706ba3 + a9c056cd39d431a1b419f24de6d22d2ff24da7c1 - + https://github.com/dotnet/linker - ef2d0f25b72469b55925251a79f12bcbf98644bf + d27ff61b711aa685006d6d55057faf01b482114f - + https://github.com/dotnet/runtime - 206dccb7945aaa3f26599fbe742de9022ca7ef91 + 072eda8d6b2c24ba4c7691a780546a2d6691b1a4 - + https://github.com/dotnet/emsdk - 40e7c6226711ec616ee07e725563eda708630fe1 + 11a9acf5ab6fe5a20f0a7d4326c785bd51e9859c diff --git a/eng/Versions.props b/eng/Versions.props index 2deb23fa6be..e4cb99af37d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,12 +1,12 @@ - 7.0.100-preview.7.22361.1 - 7.0.100-1.22354.1 - 7.0.0-preview.6.22356.1 + 7.0.100-rc.1.22368.2 + 7.0.100-1.22365.1 + 7.0.0-rc.1.22366.5 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 7.0.0-preview.7.22330.1 + 7.0.0-rc.1.22362.2 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj index f1d9fff9e85..8aaf7d931fe 100644 --- a/src/Mono.Android/Mono.Android.csproj +++ b/src/Mono.Android/Mono.Android.csproj @@ -22,6 +22,8 @@ enable true true + + 10 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 ea5099e8ce2..3f8f516b880 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 @@ -64,7 +64,9 @@ true SdkOnly None - link + + link + partial true android-arm;android-arm64;android-x86;android-x64 diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets index 67d1bbba119..8faee03ab31 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets @@ -28,12 +28,6 @@ This file contains the .NET 5-specific targets to customize ILLink Condition="'$(VSAndroidDesigner)' != ''" Value="$(VSAndroidDesigner)" Trim="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 a719481874a..9904b1fe46d 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,49 +5,49 @@ "Size": 3032 }, "assemblies/Java.Interop.dll": { - "Size": 58642 + "Size": 58756 }, "assemblies/Mono.Android.dll": { - "Size": 87877 + "Size": 88005 }, "assemblies/rc.bin": { "Size": 1129 }, "assemblies/System.Console.dll": { - "Size": 6428 + "Size": 6401 }, "assemblies/System.Linq.dll": { - "Size": 9103 + "Size": 9083 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 472318 + "Size": 473327 }, "assemblies/System.Runtime.dll": { - "Size": 2388 + "Size": 2379 }, "assemblies/UnnamedProject.dll": { - "Size": 3559 + "Size": 3602 }, "classes.dex": { "Size": 360744 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 512520 + "Size": 512648 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3083112 + "Size": 3084552 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 723840 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 87768 + "Size": 92800 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { - "Size": 146128 + "Size": 148696 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 9488 + "Size": 9528 }, "META-INF/BNDLTOOL.RSA": { "Size": 1213 @@ -83,5 +83,5 @@ "Size": 1904 } }, - "PackageSize": 2676703 + "PackageSize": 2680799 } \ 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 124bd76cfbc..070b93eb68e 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,121 +8,121 @@ "Size": 7114 }, "assemblies/Java.Interop.dll": { - "Size": 66520 + "Size": 66630 }, "assemblies/Mono.Android.dll": { - "Size": 441845 + "Size": 442072 }, "assemblies/mscorlib.dll": { - "Size": 3871 + "Size": 3849 }, "assemblies/netstandard.dll": { - "Size": 5583 + "Size": 5565 }, "assemblies/rc.bin": { "Size": 1129 }, "assemblies/System.Collections.Concurrent.dll": { - "Size": 10498 + "Size": 10477 }, "assemblies/System.Collections.dll": { - "Size": 15316 + "Size": 15298 }, "assemblies/System.Collections.NonGeneric.dll": { - "Size": 7444 + "Size": 7426 }, "assemblies/System.ComponentModel.dll": { - "Size": 1949 + "Size": 1930 }, "assemblies/System.ComponentModel.Primitives.dll": { - "Size": 2561 + "Size": 2541 }, "assemblies/System.ComponentModel.TypeConverter.dll": { - "Size": 6043 + "Size": 6022 }, "assemblies/System.Console.dll": { - "Size": 6627 + "Size": 7290 }, "assemblies/System.Core.dll": { - "Size": 1996 + "Size": 1973 }, "assemblies/System.Diagnostics.TraceSource.dll": { - "Size": 6524 + "Size": 6512 }, "assemblies/System.dll": { - "Size": 2352 + "Size": 2331 }, "assemblies/System.Drawing.dll": { - "Size": 2037 + "Size": 2016 }, "assemblies/System.Drawing.Primitives.dll": { - "Size": 11982 + "Size": 11967 }, "assemblies/System.IO.Compression.dll": { - "Size": 16746 + "Size": 16804 }, "assemblies/System.IO.IsolatedStorage.dll": { - "Size": 9997 + "Size": 9985 }, "assemblies/System.Linq.dll": { - "Size": 18910 + "Size": 19131 }, "assemblies/System.Linq.Expressions.dll": { - "Size": 163896 + "Size": 163892 }, "assemblies/System.Net.Http.dll": { - "Size": 66049 + "Size": 66008 }, "assemblies/System.Net.Primitives.dll": { - "Size": 21962 + "Size": 21947 }, "assemblies/System.Net.Requests.dll": { - "Size": 3614 + "Size": 3593 }, "assemblies/System.ObjectModel.dll": { - "Size": 8114 + "Size": 8095 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 799614 + "Size": 808212 }, "assemblies/System.Private.DataContractSerialization.dll": { - "Size": 184941 + "Size": 184896 }, "assemblies/System.Private.Uri.dll": { - "Size": 42623 + "Size": 42577 }, "assemblies/System.Private.Xml.dll": { - "Size": 215538 + "Size": 215501 }, "assemblies/System.Private.Xml.Linq.dll": { - "Size": 16645 + "Size": 16627 }, "assemblies/System.Runtime.dll": { - "Size": 2589 + "Size": 2573 }, "assemblies/System.Runtime.Serialization.dll": { - "Size": 1955 + "Size": 1939 }, "assemblies/System.Runtime.Serialization.Formatters.dll": { - "Size": 2493 + "Size": 2473 }, "assemblies/System.Runtime.Serialization.Primitives.dll": { - "Size": 3770 + "Size": 3751 }, "assemblies/System.Security.Cryptography.dll": { - "Size": 7733 + "Size": 7741 }, "assemblies/System.Text.RegularExpressions.dll": { - "Size": 152038 + "Size": 153702 }, "assemblies/System.Xml.dll": { - "Size": 1845 + "Size": 1827 }, "assemblies/System.Xml.Linq.dll": { - "Size": 1870 + "Size": 1846 }, "assemblies/UnnamedProject.dll": { - "Size": 117251 + "Size": 117277 }, "assemblies/Xamarin.AndroidX.Activity.dll": { "Size": 5872 @@ -194,22 +194,22 @@ "Size": 3473216 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 512520 + "Size": 512648 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3083112 + "Size": 3084552 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 723840 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 87768 + "Size": 92800 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { - "Size": 146128 + "Size": 148696 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 98912 + "Size": 98952 }, "META-INF/android.support.design_material.version": { "Size": 12 @@ -1964,5 +1964,5 @@ "Size": 341228 } }, - "PackageSize": 8028569 + "PackageSize": 8040857 } \ No newline at end of file