From a19256140ea81b5b2dc7487bfa469290a2e7f0e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Sep 2022 21:10:04 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/installer build 20220916.11 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.2.22459.2 -> To Version 7.0.100-rtm.22466.11 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22451.11 -> To Version 7.0.0-rtm.22465.3 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13ad1cd3254..d0ae0dadf56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/installer - 11f6b8f7129e34d5317f47ccbc110b2b11c05749 + ed261f1c1ae9a9619cdb72b1c0734d7a43df6f9a https://github.com/dotnet/linker 5f9bfd94d9c687207872ae03f751ea19704381c0 - + https://github.com/dotnet/runtime - 6d10e4c8bcd9f96ccd73748ff827561afa09af57 + ee6cde5defb8d697d4a28602d072a3784890728f - + https://github.com/dotnet/emsdk - 8d8d2122b16c81df4b158fe43995f958e8fe115e + 76e6b338e87093ddc9b3b650f027706aba65d388 - + https://github.com/dotnet/emsdk - 8d8d2122b16c81df4b158fe43995f958e8fe115e + 76e6b338e87093ddc9b3b650f027706aba65d388 diff --git a/eng/Versions.props b/eng/Versions.props index aee1064345c..e0741f7589b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,12 +1,12 @@ - 7.0.100-rc.2.22459.2 + 7.0.100-rtm.22466.11 7.0.100-1.22452.1 - 7.0.0-rc.2.22451.11 + 7.0.0-rtm.22465.3 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 7.0.0-rc.2.22430.5 + 7.0.0-rc.2.22459.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) 7.0.100-rc.1.22410.7 From 4cc46d552a4fbbb93b57a4cb9a9f1695d21e3002 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 17 Sep 2022 12:57:15 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/installer build 20220916.29 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.2.22459.2 -> To Version 7.0.100-rtm.22466.29 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22451.11 -> To Version 7.0.0-rtm.22465.3 (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 d0ae0dadf56..da5b1e2ce25 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - ed261f1c1ae9a9619cdb72b1c0734d7a43df6f9a + e60f1ae17fcdb5261eb479f5878ecbf48f81fd70 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index e0741f7589b..c01738c4bca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 7.0.100-rtm.22466.11 + 7.0.100-rtm.22466.29 7.0.100-1.22452.1 7.0.0-rtm.22465.3 7.0.0-beta.22103.1 From 45ed0600f5d92f834cc703a06a760577b95b9b4c Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Sun, 18 Sep 2022 22:41:18 -0500 Subject: [PATCH 3/5] Update PackagingTest.cs --- .../Tests/Xamarin.Android.Build.Tests/PackagingTest.cs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs index e78f6267066..b3460935a88 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs @@ -94,14 +94,6 @@ public void CheckIncludedAssemblies ([Values (false, true)] bool usesAssemblySto "System.Runtime.InteropServices.dll", "System.Linq.dll", "UnnamedProject.dll", - //NOTE: appeared in .NET 7.0.100-rc.1.22423.7 - "System.Diagnostics.Tracing.dll", - "System.Memory.dll", - "System.Runtime.InteropServices.dll", - "System.Threading.Thread.dll", - "System.Threading.ThreadPool.dll", - "System.Threading.dll", - "System.Transactions.Local.dll", } : new [] { "Java.Interop.dll", From bf52faf4544b9bdc30cc43d7436fbd147704169b Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Sun, 18 Sep 2022 22:44:14 -0500 Subject: [PATCH 4/5] Update .apkdesc files --- .../BuildReleaseArm64SimpleDotNet.apkdesc | 48 +++----- .../BuildReleaseArm64XFormsDotNet.apkdesc | 110 ++++++++---------- 2 files changed, 61 insertions(+), 97 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 880a58bb615..2e3cf4d166b 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,58 +5,40 @@ "Size": 3032 }, "assemblies/Java.Interop.dll": { - "Size": 59188 + "Size": 58888 }, "assemblies/Mono.Android.dll": { - "Size": 88549 + "Size": 88068 }, "assemblies/rc.bin": { "Size": 1182 }, "assemblies/System.Console.dll": { - "Size": 6408 - }, - "assemblies/System.Diagnostics.Tracing.dll": { - "Size": 2089 + "Size": 6591 }, "assemblies/System.Linq.dll": { - "Size": 9096 - }, - "assemblies/System.Memory.dll": { - "Size": 3388 + "Size": 9250 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 533485 + "Size": 462205 }, "assemblies/System.Runtime.dll": { - "Size": 3498 + "Size": 2373 }, "assemblies/System.Runtime.InteropServices.dll": { - "Size": 3770 - }, - "assemblies/System.Threading.dll": { - "Size": 5486 - }, - "assemblies/System.Threading.Thread.dll": { - "Size": 1978 - }, - "assemblies/System.Threading.ThreadPool.dll": { - "Size": 2008 - }, - "assemblies/System.Transactions.Local.dll": { - "Size": 62998 + "Size": 2262 }, "assemblies/UnnamedProject.dll": { - "Size": 3560 + "Size": 3561 }, "classes.dex": { - "Size": 360720 + "Size": 368288 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 425416 + "Size": 425432 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3073392 + "Size": 3073360 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 723840 @@ -68,16 +50,16 @@ "Size": 148696 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 10216 + "Size": 9640 }, "META-INF/BNDLTOOL.RSA": { "Size": 1213 }, "META-INF/BNDLTOOL.SF": { - "Size": 3339 + "Size": 2687 }, "META-INF/MANIFEST.MF": { - "Size": 3212 + "Size": 2560 }, "res/drawable-hdpi-v4/icon.png": { "Size": 4762 @@ -104,5 +86,5 @@ "Size": 1904 } }, - "PackageSize": 2791978 + "PackageSize": 2639930 } \ 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 692414a6c1e..6061e04aaaa 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,139 +8,121 @@ "Size": 7114 }, "assemblies/Java.Interop.dll": { - "Size": 66767 + "Size": 66755 }, "assemblies/Mono.Android.dll": { - "Size": 442556 + "Size": 445298 }, "assemblies/mscorlib.dll": { - "Size": 3859 + "Size": 3855 }, "assemblies/netstandard.dll": { - "Size": 5573 + "Size": 5571 }, "assemblies/rc.bin": { "Size": 1182 }, "assemblies/System.Collections.Concurrent.dll": { - "Size": 10484 + "Size": 10639 }, "assemblies/System.Collections.dll": { - "Size": 15299 + "Size": 15470 }, "assemblies/System.Collections.NonGeneric.dll": { - "Size": 7434 + "Size": 7426 }, "assemblies/System.ComponentModel.dll": { - "Size": 1940 + "Size": 1933 }, "assemblies/System.ComponentModel.Primitives.dll": { - "Size": 2554 + "Size": 2545 }, "assemblies/System.ComponentModel.TypeConverter.dll": { - "Size": 6032 + "Size": 6192 }, "assemblies/System.Console.dll": { - "Size": 7268 + "Size": 7428 }, "assemblies/System.Core.dll": { - "Size": 1986 + "Size": 1980 }, "assemblies/System.Diagnostics.TraceSource.dll": { - "Size": 6551 - }, - "assemblies/System.Diagnostics.Tracing.dll": { - "Size": 2089 + "Size": 6542 }, "assemblies/System.dll": { - "Size": 2341 + "Size": 2336 }, "assemblies/System.Drawing.dll": { - "Size": 2026 + "Size": 2022 }, "assemblies/System.Drawing.Primitives.dll": { - "Size": 11973 + "Size": 12153 }, "assemblies/System.IO.Compression.dll": { - "Size": 16675 + "Size": 16789 }, "assemblies/System.IO.IsolatedStorage.dll": { - "Size": 9988 + "Size": 10143 }, "assemblies/System.Linq.dll": { - "Size": 19139 + "Size": 19315 }, "assemblies/System.Linq.Expressions.dll": { - "Size": 163894 - }, - "assemblies/System.Memory.dll": { - "Size": 3388 + "Size": 164040 }, "assemblies/System.Net.Http.dll": { - "Size": 66840 + "Size": 66998 }, "assemblies/System.Net.Primitives.dll": { - "Size": 21879 + "Size": 22006 }, "assemblies/System.Net.Requests.dll": { - "Size": 3602 + "Size": 3738 }, "assemblies/System.ObjectModel.dll": { - "Size": 8106 + "Size": 8157 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 786299 + "Size": 770540 }, "assemblies/System.Private.DataContractSerialization.dll": { - "Size": 192243 + "Size": 192415 }, "assemblies/System.Private.Uri.dll": { - "Size": 42217 + "Size": 42367 }, "assemblies/System.Private.Xml.dll": { - "Size": 215338 + "Size": 215474 }, "assemblies/System.Private.Xml.Linq.dll": { - "Size": 16635 + "Size": 16796 }, "assemblies/System.Runtime.dll": { - "Size": 3647 + "Size": 2575 }, "assemblies/System.Runtime.InteropServices.dll": { - "Size": 3770 + "Size": 2262 }, "assemblies/System.Runtime.Serialization.dll": { - "Size": 1950 + "Size": 1946 }, "assemblies/System.Runtime.Serialization.Formatters.dll": { - "Size": 2480 + "Size": 2677 }, "assemblies/System.Runtime.Serialization.Primitives.dll": { - "Size": 3759 + "Size": 3754 }, "assemblies/System.Security.Cryptography.dll": { - "Size": 7783 + "Size": 7946 }, "assemblies/System.Text.RegularExpressions.dll": { - "Size": 154181 - }, - "assemblies/System.Threading.dll": { - "Size": 5486 - }, - "assemblies/System.Threading.Thread.dll": { - "Size": 1978 - }, - "assemblies/System.Threading.ThreadPool.dll": { - "Size": 2008 - }, - "assemblies/System.Transactions.Local.dll": { - "Size": 62998 + "Size": 154202 }, "assemblies/System.Xml.dll": { - "Size": 1838 + "Size": 1834 }, "assemblies/System.Xml.Linq.dll": { - "Size": 1860 + "Size": 1853 }, "assemblies/UnnamedProject.dll": { "Size": 117252 @@ -161,7 +143,7 @@ "Size": 16407 }, "assemblies/Xamarin.AndroidX.Core.dll": { - "Size": 96515 + "Size": 96539 }, "assemblies/Xamarin.AndroidX.DrawerLayout.dll": { "Size": 14065 @@ -212,13 +194,13 @@ "Size": 39911 }, "classes.dex": { - "Size": 3473196 + "Size": 3480644 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 425416 + "Size": 425432 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3073392 + "Size": 3073360 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 723840 @@ -230,7 +212,7 @@ "Size": 148696 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 99640 + "Size": 99232 }, "META-INF/android.support.design_material.version": { "Size": 12 @@ -344,13 +326,13 @@ "Size": 1213 }, "META-INF/BNDLTOOL.SF": { - "Size": 79628 + "Size": 78976 }, "META-INF/com.google.android.material_material.version": { "Size": 10 }, "META-INF/MANIFEST.MF": { - "Size": 79501 + "Size": 78849 }, "META-INF/proguard/androidx-annotations.pro": { "Size": 339 @@ -1985,5 +1967,5 @@ "Size": 341228 } }, - "PackageSize": 8078308 + "PackageSize": 7987700 } \ No newline at end of file From 7a3af5307f612e5c7462f7d7b4459f05862229f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 19 Sep 2022 12:44:08 +0000 Subject: [PATCH 5/5] Update dependencies from https://github.com/dotnet/installer build 20220918.5 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-rc.2.22459.2 -> To Version 7.0.100-rtm.22468.5 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rc.2.22451.11 -> To Version 7.0.0-rtm.22465.3 (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 da5b1e2ce25..84765bdc054 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - e60f1ae17fcdb5261eb479f5878ecbf48f81fd70 + 0c5c5d3bc4d21cfeb345781e69a33b30e124334d https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index c01738c4bca..85ac58fd197 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 7.0.100-rtm.22466.29 + 7.0.100-rtm.22468.5 7.0.100-1.22452.1 7.0.0-rtm.22465.3 7.0.0-beta.22103.1