From 027d108a92a92e58071cdc18ec66f51edc761c00 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Jul 2022 13:24:36 +0000 Subject: [PATCH 1/9] Update dependencies from https://github.com/dotnet/installer build 20220719.1 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-preview.7.22362.31 -> To Version 7.0.100-preview.7.22369.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.22354.1 -> To Version 7.0.100-1.22362.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 7796851d3a1..16c3fee40e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/installer - d2fff6df585efa03cbe883b4fb6ce41be8d61342 + 172efb8772f8e8f04b27780e9607c6df2f18311f - + https://github.com/dotnet/linker - ef2d0f25b72469b55925251a79f12bcbf98644bf + 33a76b856466b96dd3d179e599a7fc0118389641 - + https://github.com/dotnet/runtime - 206dccb7945aaa3f26599fbe742de9022ca7ef91 + 3b0a07539792515b4fc4dc8b1b41c47ea594a0bb - + https://github.com/dotnet/emsdk - 40e7c6226711ec616ee07e725563eda708630fe1 + 7d277787570614a3dd99e1d6022375d9ae43e6af diff --git a/eng/Versions.props b/eng/Versions.props index 8a820cc3db4..28f58b89316 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,12 +1,12 @@ - 7.0.100-preview.7.22362.31 - 7.0.100-1.22354.1 - 7.0.0-preview.6.22356.1 + 7.0.100-preview.7.22369.1 + 7.0.100-1.22362.1 + 7.0.0-preview.7.22364.6 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 7.0.0-preview.7.22330.1 + 7.0.0-preview.7.22361.2 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) From a3196e0c5942664338524e562ae2c29b35477a97 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 19 Jul 2022 13:19:28 -0500 Subject: [PATCH 2/9] Update .apkdesc files --- .../BuildReleaseArm64SimpleDotNet.apkdesc | 24 ++-- .../BuildReleaseArm64XFormsDotNet.apkdesc | 131 ++++++------------ 2 files changed, 52 insertions(+), 103 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 d22c1b133d5..613384bbc20 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,28 +5,28 @@ "Size": 3032 }, "assemblies/Java.Interop.dll": { - "Size": 59419 + "Size": 59530 }, "assemblies/Mono.Android.dll": { - "Size": 89327 + "Size": 90693 }, "assemblies/rc.bin": { "Size": 1083 }, "assemblies/System.Console.dll": { - "Size": 6484 + "Size": 6497 }, "assemblies/System.Linq.dll": { - "Size": 9980 + "Size": 9978 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 532428 + "Size": 533390 }, "assemblies/System.Runtime.dll": { - "Size": 2417 + "Size": 2423 }, "assemblies/UnnamedProject.dll": { - "Size": 3560 + "Size": 3601 }, "classes.dex": { "Size": 360744 @@ -35,19 +35,19 @@ "Size": 512520 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3083112 + "Size": 3084536 }, "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": 9528 + "Size": 9552 }, "META-INF/BNDLTOOL.RSA": { "Size": 1213 @@ -83,5 +83,5 @@ "Size": 1904 } }, - "PackageSize": 2738143 + "PackageSize": 2746335 } \ 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 3677b930c36..17d1a57044e 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,140 +5,95 @@ "Size": 3568 }, "assemblies/FormsViewGroup.dll": { - "Size": 7114 + "Size": 5127 }, "assemblies/Java.Interop.dll": { - "Size": 66763 + "Size": 66349 }, "assemblies/Mono.Android.dll": { - "Size": 447517 - }, - "assemblies/mscorlib.dll": { - "Size": 3899 + "Size": 392598 }, "assemblies/netstandard.dll": { - "Size": 5621 + "Size": 2152 }, "assemblies/rc.bin": { "Size": 1083 }, "assemblies/System.Collections.Concurrent.dll": { - "Size": 10861 + "Size": 10220 }, "assemblies/System.Collections.dll": { - "Size": 16170 + "Size": 14528 }, "assemblies/System.Collections.NonGeneric.dll": { - "Size": 7955 + "Size": 7392 }, "assemblies/System.ComponentModel.dll": { - "Size": 2021 - }, - "assemblies/System.ComponentModel.Primitives.dll": { - "Size": 2636 - }, - "assemblies/System.ComponentModel.TypeConverter.dll": { - "Size": 6114 + "Size": 2020 }, "assemblies/System.Console.dll": { - "Size": 6683 - }, - "assemblies/System.Core.dll": { - "Size": 2063 + "Size": 7358 }, "assemblies/System.Diagnostics.TraceSource.dll": { - "Size": 6579 - }, - "assemblies/System.dll": { - "Size": 2417 - }, - "assemblies/System.Drawing.dll": { - "Size": 2103 - }, - "assemblies/System.Drawing.Primitives.dll": { - "Size": 12188 + "Size": 6417 }, "assemblies/System.IO.Compression.dll": { - "Size": 16867 + "Size": 16368 }, "assemblies/System.IO.IsolatedStorage.dll": { - "Size": 10055 + "Size": 9556 }, "assemblies/System.Linq.dll": { - "Size": 19806 + "Size": 17100 }, "assemblies/System.Linq.Expressions.dll": { - "Size": 177416 + "Size": 2089 }, "assemblies/System.Net.Http.dll": { - "Size": 66486 + "Size": 66090 }, "assemblies/System.Net.Primitives.dll": { - "Size": 22061 + "Size": 21249 }, "assemblies/System.Net.Requests.dll": { - "Size": 3675 + "Size": 3527 }, "assemblies/System.ObjectModel.dll": { - "Size": 8552 + "Size": 7926 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 815279 - }, - "assemblies/System.Private.DataContractSerialization.dll": { - "Size": 185005 + "Size": 680782 }, "assemblies/System.Private.Uri.dll": { - "Size": 42683 + "Size": 37592 }, "assemblies/System.Private.Xml.dll": { - "Size": 216493 - }, - "assemblies/System.Private.Xml.Linq.dll": { - "Size": 16709 + "Size": 135692 }, "assemblies/System.Runtime.dll": { - "Size": 2613 - }, - "assemblies/System.Runtime.Serialization.dll": { - "Size": 2027 - }, - "assemblies/System.Runtime.Serialization.Formatters.dll": { - "Size": 2564 - }, - "assemblies/System.Runtime.Serialization.Primitives.dll": { - "Size": 3840 + "Size": 2611 }, "assemblies/System.Security.Cryptography.dll": { - "Size": 7799 + "Size": 7800 }, "assemblies/System.Text.RegularExpressions.dll": { - "Size": 152582 - }, - "assemblies/System.Xml.dll": { - "Size": 1918 - }, - "assemblies/System.Xml.Linq.dll": { - "Size": 1939 + "Size": 146578 }, "assemblies/UnnamedProject.dll": { - "Size": 117250 + "Size": 117277 }, "assemblies/Xamarin.AndroidX.Activity.dll": { "Size": 5941 }, "assemblies/Xamarin.AndroidX.AppCompat.AppCompatResources.dll": { - "Size": 5964 + "Size": 3410 }, "assemblies/Xamarin.AndroidX.AppCompat.dll": { - "Size": 112443 + "Size": 107844 }, "assemblies/Xamarin.AndroidX.CardView.dll": { "Size": 6681 }, - "assemblies/Xamarin.AndroidX.CoordinatorLayout.dll": { - "Size": 16474 - }, "assemblies/Xamarin.AndroidX.Core.dll": { "Size": 96576 }, @@ -163,53 +118,47 @@ "assemblies/Xamarin.AndroidX.Loader.dll": { "Size": 12541 }, - "assemblies/Xamarin.AndroidX.RecyclerView.dll": { - "Size": 84554 - }, "assemblies/Xamarin.AndroidX.SavedState.dll": { "Size": 4945 }, - "assemblies/Xamarin.AndroidX.SwipeRefreshLayout.dll": { - "Size": 10254 - }, "assemblies/Xamarin.AndroidX.ViewPager.dll": { "Size": 17854 }, "assemblies/Xamarin.Forms.Core.dll": { - "Size": 528450 + "Size": 167972 }, "assemblies/Xamarin.Forms.Platform.Android.dll": { - "Size": 384799 + "Size": 238531 }, "assemblies/Xamarin.Forms.Platform.dll": { - "Size": 56878 + "Size": 55469 }, "assemblies/Xamarin.Forms.Xaml.dll": { - "Size": 60774 + "Size": 37106 }, "assemblies/Xamarin.Google.Android.Material.dll": { - "Size": 40004 + "Size": 33303 }, "classes.dex": { - "Size": 3473216 + "Size": 3359708 }, "lib/arm64-v8a/libmonodroid.so": { "Size": 512520 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3083112 + "Size": 3084536 }, "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": 98952 + "Size": 68568 }, "META-INF/android.support.design_material.version": { "Size": 12 @@ -323,13 +272,13 @@ "Size": 1213 }, "META-INF/BNDLTOOL.SF": { - "Size": 78859 + "Size": 76957 }, "META-INF/com.google.android.material_material.version": { "Size": 10 }, "META-INF/MANIFEST.MF": { - "Size": 78732 + "Size": 76830 }, "META-INF/proguard/androidx-annotations.pro": { "Size": 339 @@ -1964,5 +1913,5 @@ "Size": 341228 } }, - "PackageSize": 8073625 + "PackageSize": 6663141 } \ No newline at end of file From c9cce4a6f53658443e167d0779e9ab8bc4691e60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Jul 2022 13:28:42 +0000 Subject: [PATCH 3/9] Update dependencies from https://github.com/dotnet/installer build 20220720.1 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-preview.7.22362.31 -> To Version 7.0.100-preview.7.22370.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.22354.1 -> To Version 7.0.100-1.22362.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 16c3fee40e6..b90d49fb894 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 172efb8772f8e8f04b27780e9607c6df2f18311f + 80ff1248d6016920330827186a988c5e497bffa7 https://github.com/dotnet/linker 33a76b856466b96dd3d179e599a7fc0118389641 - + https://github.com/dotnet/runtime - 3b0a07539792515b4fc4dc8b1b41c47ea594a0bb + db5d4dfd16d2b56fd557b44d7b9e172372b43454 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 28f58b89316..e921d5413d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,9 +1,9 @@ - 7.0.100-preview.7.22369.1 + 7.0.100-preview.7.22370.1 7.0.100-1.22362.1 - 7.0.0-preview.7.22364.6 + 7.0.0-preview.7.22369.4 7.0.0-beta.22103.1 7.0.0-beta.22103.1 7.0.0-preview.7.22361.2 From e8a4d4792e2a220971cc836af907a048c9c22c23 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Fri, 15 Jul 2022 10:00:33 -0700 Subject: [PATCH 4/9] 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 more usages of TrimMode * Update linker versions manually Co-authored-by: Jonathan Peppers --- .../targets/Microsoft.Android.Sdk.DefaultProperties.targets | 4 +++- .../targets/Microsoft.Android.Sdk.ILLink.targets | 6 ------ 2 files changed, 3 insertions(+), 7 deletions(-) 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..3a0ac1aa7d8 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" /> - - From deb55a8e5a64fecf6a2083f10c33d5fad4487a11 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 20 Jul 2022 16:33:56 -0500 Subject: [PATCH 5/9] Update BuildReleaseArm64XFormsDotNet.apkdesc --- .../BuildReleaseArm64XFormsDotNet.apkdesc | 123 +++++++++++++----- 1 file changed, 87 insertions(+), 36 deletions(-) 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 17d1a57044e..7594e6ab480 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,79 +5,121 @@ "Size": 3568 }, "assemblies/FormsViewGroup.dll": { - "Size": 5127 + "Size": 7114 }, "assemblies/Java.Interop.dll": { - "Size": 66349 + "Size": 66873 }, "assemblies/Mono.Android.dll": { - "Size": 392598 + "Size": 477047 + }, + "assemblies/mscorlib.dll": { + "Size": 3888 }, "assemblies/netstandard.dll": { - "Size": 2152 + "Size": 5610 }, "assemblies/rc.bin": { "Size": 1083 }, "assemblies/System.Collections.Concurrent.dll": { - "Size": 10220 + "Size": 10855 }, "assemblies/System.Collections.dll": { - "Size": 14528 + "Size": 16165 }, "assemblies/System.Collections.NonGeneric.dll": { - "Size": 7392 + "Size": 7949 }, "assemblies/System.ComponentModel.dll": { - "Size": 2020 + "Size": 2013 + }, + "assemblies/System.ComponentModel.Primitives.dll": { + "Size": 2628 + }, + "assemblies/System.ComponentModel.TypeConverter.dll": { + "Size": 6106 }, "assemblies/System.Console.dll": { - "Size": 7358 + "Size": 7375 + }, + "assemblies/System.Core.dll": { + "Size": 2052 }, "assemblies/System.Diagnostics.TraceSource.dll": { - "Size": 6417 + "Size": 6576 + }, + "assemblies/System.dll": { + "Size": 2406 + }, + "assemblies/System.Drawing.dll": { + "Size": 2093 + }, + "assemblies/System.Drawing.Primitives.dll": { + "Size": 12187 }, "assemblies/System.IO.Compression.dll": { - "Size": 16368 + "Size": 16857 }, "assemblies/System.IO.IsolatedStorage.dll": { - "Size": 9556 + "Size": 10056 }, "assemblies/System.Linq.dll": { - "Size": 17100 + "Size": 20029 }, "assemblies/System.Linq.Expressions.dll": { - "Size": 2089 + "Size": 177417 }, "assemblies/System.Net.Http.dll": { - "Size": 66090 + "Size": 66469 }, "assemblies/System.Net.Primitives.dll": { - "Size": 21249 + "Size": 22055 }, "assemblies/System.Net.Requests.dll": { - "Size": 3527 + "Size": 3665 }, "assemblies/System.ObjectModel.dll": { - "Size": 7926 + "Size": 8545 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 680782 + "Size": 823756 + }, + "assemblies/System.Private.DataContractSerialization.dll": { + "Size": 184961 }, "assemblies/System.Private.Uri.dll": { - "Size": 37592 + "Size": 42651 }, "assemblies/System.Private.Xml.dll": { - "Size": 135692 + "Size": 216481 + }, + "assemblies/System.Private.Xml.Linq.dll": { + "Size": 16712 }, "assemblies/System.Runtime.dll": { - "Size": 2611 + "Size": 2606 + }, + "assemblies/System.Runtime.Serialization.dll": { + "Size": 2016 + }, + "assemblies/System.Runtime.Serialization.Formatters.dll": { + "Size": 2554 + }, + "assemblies/System.Runtime.Serialization.Primitives.dll": { + "Size": 3833 }, "assemblies/System.Security.Cryptography.dll": { - "Size": 7800 + "Size": 7795 }, "assemblies/System.Text.RegularExpressions.dll": { - "Size": 146578 + "Size": 154177 + }, + "assemblies/System.Xml.dll": { + "Size": 1907 + }, + "assemblies/System.Xml.Linq.dll": { + "Size": 1928 }, "assemblies/UnnamedProject.dll": { "Size": 117277 @@ -86,14 +128,17 @@ "Size": 5941 }, "assemblies/Xamarin.AndroidX.AppCompat.AppCompatResources.dll": { - "Size": 3410 + "Size": 5964 }, "assemblies/Xamarin.AndroidX.AppCompat.dll": { - "Size": 107844 + "Size": 112443 }, "assemblies/Xamarin.AndroidX.CardView.dll": { "Size": 6681 }, + "assemblies/Xamarin.AndroidX.CoordinatorLayout.dll": { + "Size": 16474 + }, "assemblies/Xamarin.AndroidX.Core.dll": { "Size": 96576 }, @@ -118,29 +163,35 @@ "assemblies/Xamarin.AndroidX.Loader.dll": { "Size": 12541 }, + "assemblies/Xamarin.AndroidX.RecyclerView.dll": { + "Size": 84554 + }, "assemblies/Xamarin.AndroidX.SavedState.dll": { "Size": 4945 }, + "assemblies/Xamarin.AndroidX.SwipeRefreshLayout.dll": { + "Size": 10254 + }, "assemblies/Xamarin.AndroidX.ViewPager.dll": { "Size": 17854 }, "assemblies/Xamarin.Forms.Core.dll": { - "Size": 167972 + "Size": 528450 }, "assemblies/Xamarin.Forms.Platform.Android.dll": { - "Size": 238531 + "Size": 384799 }, "assemblies/Xamarin.Forms.Platform.dll": { - "Size": 55469 + "Size": 56878 }, "assemblies/Xamarin.Forms.Xaml.dll": { - "Size": 37106 + "Size": 60774 }, "assemblies/Xamarin.Google.Android.Material.dll": { - "Size": 33303 + "Size": 40004 }, "classes.dex": { - "Size": 3359708 + "Size": 3473216 }, "lib/arm64-v8a/libmonodroid.so": { "Size": 512520 @@ -158,7 +209,7 @@ "Size": 148696 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 68568 + "Size": 98976 }, "META-INF/android.support.design_material.version": { "Size": 12 @@ -272,13 +323,13 @@ "Size": 1213 }, "META-INF/BNDLTOOL.SF": { - "Size": 76957 + "Size": 78859 }, "META-INF/com.google.android.material_material.version": { "Size": 10 }, "META-INF/MANIFEST.MF": { - "Size": 76830 + "Size": 78732 }, "META-INF/proguard/androidx-annotations.pro": { "Size": 339 @@ -1913,5 +1964,5 @@ "Size": 341228 } }, - "PackageSize": 6663141 + "PackageSize": 8114585 } \ No newline at end of file From 7585b5972efec9eb48340ea5b46a9ab43232d3c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Jul 2022 13:26:57 +0000 Subject: [PATCH 6/9] Update dependencies from https://github.com/dotnet/installer build 20220720.3 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-preview.7.22362.31 -> To Version 7.0.100-preview.7.22370.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.22354.1 -> To Version 7.0.100-1.22362.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 b90d49fb894..fc80639e685 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 80ff1248d6016920330827186a988c5e497bffa7 + dbdda951424aa9b4d299d60f161f040af56d9886 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index e921d5413d3..ee3680421a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 7.0.100-preview.7.22370.1 + 7.0.100-preview.7.22370.3 7.0.100-1.22362.1 7.0.0-preview.7.22369.4 7.0.0-beta.22103.1 From 279f0da8dd482a4eaef7773208d29ebe77f52947 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 20 Jul 2022 16:34:33 -0500 Subject: [PATCH 7/9] Update BuildReleaseArm64SimpleDotNet.apkdesc --- .../Base/BuildReleaseArm64SimpleDotNet.apkdesc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 613384bbc20..1d345873eac 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,25 +5,25 @@ "Size": 3032 }, "assemblies/Java.Interop.dll": { - "Size": 59530 + "Size": 59531 }, "assemblies/Mono.Android.dll": { - "Size": 90693 + "Size": 90696 }, "assemblies/rc.bin": { "Size": 1083 }, "assemblies/System.Console.dll": { - "Size": 6497 + "Size": 6492 }, "assemblies/System.Linq.dll": { - "Size": 9978 + "Size": 9973 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 533390 + "Size": 533387 }, "assemblies/System.Runtime.dll": { - "Size": 2423 + "Size": 2416 }, "assemblies/UnnamedProject.dll": { "Size": 3601 From 1de4d07f52024701d6f363f8b106f4e0e16f1e33 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 21 Jul 2022 11:10:14 -0500 Subject: [PATCH 8/9] Set `$(LangVersion)` to 10 in Mono.Android.csproj --- src/Mono.Android/Mono.Android.csproj | 2 ++ 1 file changed, 2 insertions(+) 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 From a265c4b71532ea49df2ad5630f8b5616867b5ce2 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 21 Jul 2022 14:49:42 -0500 Subject: [PATCH 9/9] Update .apkdesc files for Mono.Android.dll --- .../Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc | 6 +++--- .../Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc | 6 +++--- 2 files changed, 6 insertions(+), 6 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 1d345873eac..288fa33586b 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,10 +5,10 @@ "Size": 3032 }, "assemblies/Java.Interop.dll": { - "Size": 59531 + "Size": 59536 }, "assemblies/Mono.Android.dll": { - "Size": 90696 + "Size": 89397 }, "assemblies/rc.bin": { "Size": 1083 @@ -83,5 +83,5 @@ "Size": 1904 } }, - "PackageSize": 2746335 + "PackageSize": 2742239 } \ 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 7594e6ab480..1aab91df882 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": 66873 + "Size": 66879 }, "assemblies/Mono.Android.dll": { - "Size": 477047 + "Size": 447679 }, "assemblies/mscorlib.dll": { "Size": 3888 @@ -1964,5 +1964,5 @@ "Size": 341228 } }, - "PackageSize": 8114585 + "PackageSize": 8085913 } \ No newline at end of file