From ae673878c133ffa46dd8317b4c9be90db56c6e69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Feb 2023 13:27:50 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/installer build 20230217.18 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.2.23107.13 -> To Version 8.0.100-preview.2.23117.18 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-preview.2 From Version 8.0.0-preview.2.23106.6 -> To Version 8.0.0-preview.2.23116.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 0533ad38c2d..abebead347c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/installer - f05478ba9a4026e95306d3f8de59c70cfc0e60ce + a66c6515bf3b84027dc88255de4f8a01fbf69b6a - + https://github.com/dotnet/runtime - fe4760cf04dee615948848955978e6d7430982a7 + f2f734a7e4f95d22a56994c127fe63d6aa97c780 - + https://github.com/dotnet/runtime - fe4760cf04dee615948848955978e6d7430982a7 + f2f734a7e4f95d22a56994c127fe63d6aa97c780 - + https://github.com/dotnet/emsdk - fd5a0d1b19bf0a96f6b4423150921542b0b9a90d + d7ff0aa47c680be543905cc1410e2f62b54dfefe diff --git a/eng/Versions.props b/eng/Versions.props index febf67713f4..d8e1ca0a6c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,12 +1,12 @@ - 8.0.100-preview.2.23107.13 - 8.0.0-preview.2.23106.6 - 8.0.0-preview.2.23106.6 + 8.0.100-preview.2.23117.18 + 8.0.0-preview.2.23116.1 + 8.0.0-preview.2.23116.1 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 8.0.0-preview.2.23081.1 + 8.0.0-preview.2.23113.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version) 7.0.100-rc.1.22410.7 From bd0e129a609f292d6a5bc58768ce9995e0cd7d52 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 21 Feb 2023 08:40:02 -0600 Subject: [PATCH 2/5] Revert "[Microsoft.Android.Sdk.ILLink] target `net7.0` temporarily (#7803)" This reverts commit 7ba7dd499b8e03c68838d33a008583ed51caad53. --- .../Microsoft.Android.Sdk.ILLink.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj b/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj index 81a86470d19..aa8694c7a3c 100644 --- a/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj +++ b/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj @@ -1,7 +1,7 @@  - $(DotNetStableTargetFramework) + $(DotNetTargetFramework) ILLINK false $(MicrosoftAndroidSdkOutDir) From b8110a34f7ed5a308b51f919b6fdbbc1058f26f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 15:45:39 +0000 Subject: [PATCH 3/5] Update dependencies from https://github.com/dotnet/installer build 20230223.10 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.2.23107.13 -> To Version 8.0.100-preview.2.23123.10 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-preview.2 From Version 8.0.0-preview.2.23106.6 -> To Version 8.0.0-preview.2.23123.4 (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 abebead347c..548edd16819 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - a66c6515bf3b84027dc88255de4f8a01fbf69b6a + e3ab0b5b8c29d8d882ab1bfe6a5a99a703622c7e - + https://github.com/dotnet/runtime - f2f734a7e4f95d22a56994c127fe63d6aa97c780 + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 - + https://github.com/dotnet/runtime - f2f734a7e4f95d22a56994c127fe63d6aa97c780 + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index d8e1ca0a6c3..c8776a79cd2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,9 +1,9 @@ - 8.0.100-preview.2.23117.18 - 8.0.0-preview.2.23116.1 - 8.0.0-preview.2.23116.1 + 8.0.100-preview.2.23123.10 + 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.4 7.0.0-beta.22103.1 7.0.0-beta.22103.1 8.0.0-preview.2.23113.1 From f2b5de3356842cd7cbf36a3610690ee749692714 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 27 Feb 2023 09:19:51 -0600 Subject: [PATCH 4/5] Add @(PackageReference) to Mono.Cecil Context: https://github.com/dotnet/runtime/blob/fb13c2cf6eaf69b53773e94674772f217fa39416/src/coreclr/tools/aot/Mono.Linker.Tests/Mono.Linker.Tests.csproj#L22 --- .../Microsoft.Android.Sdk.ILLink.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj b/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj index aa8694c7a3c..fcb1091f3da 100644 --- a/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj +++ b/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj @@ -7,6 +7,7 @@ $(MicrosoftAndroidSdkOutDir) + From 7a66cf07d7f02ecb3dea96cb14fc80ad22255a21 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 27 Feb 2023 12:01:10 -0600 Subject: [PATCH 5/5] Update BuildReleaseArm64XFormsDotNet.apkdesc Fixes the failure: apkdiff: File 'assemblies/System.Collections.Concurrent.dll' has changed by 1,032 bytes (8.93 %). This exceeds the threshold of 5.00 % --- .../BuildReleaseArm64XFormsDotNet.apkdesc | 110 +++++++++--------- 1 file changed, 55 insertions(+), 55 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 afcd83a9d39..b3fc11fd0e4 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,136 +5,136 @@ "Size": 3568 }, "assemblies/_Microsoft.Android.Resource.Designer.dll": { - "Size": 1942 + "Size": 1940 }, "assemblies/FormsViewGroup.dll": { "Size": 7313 }, "assemblies/Java.Interop.dll": { - "Size": 66786 + "Size": 66563 }, "assemblies/Mono.Android.dll": { - "Size": 444703 + "Size": 444617 }, "assemblies/Mono.Android.Runtime.dll": { - "Size": 5895 + "Size": 5897 }, "assemblies/mscorlib.dll": { - "Size": 3857 + "Size": 3866 }, "assemblies/netstandard.dll": { - "Size": 5567 + "Size": 5579 }, "assemblies/rc.bin": { "Size": 1182 }, "assemblies/System.Collections.Concurrent.dll": { - "Size": 10529 + "Size": 11561 }, "assemblies/System.Collections.dll": { - "Size": 15258 + "Size": 15271 }, "assemblies/System.Collections.NonGeneric.dll": { - "Size": 7487 + "Size": 7499 }, "assemblies/System.ComponentModel.dll": { - "Size": 1964 + "Size": 1973 }, "assemblies/System.ComponentModel.Primitives.dll": { - "Size": 2579 + "Size": 2595 }, "assemblies/System.ComponentModel.TypeConverter.dll": { - "Size": 6069 + "Size": 6081 }, "assemblies/System.Console.dll": { - "Size": 6610 + "Size": 6623 }, "assemblies/System.Core.dll": { - "Size": 1982 + "Size": 1992 }, "assemblies/System.Diagnostics.TraceSource.dll": { - "Size": 6580 + "Size": 6591 }, "assemblies/System.dll": { - "Size": 2338 + "Size": 2347 }, "assemblies/System.Drawing.dll": { - "Size": 2023 + "Size": 2032 }, "assemblies/System.Drawing.Primitives.dll": { - "Size": 11996 + "Size": 12010 }, "assemblies/System.IO.Compression.dll": { - "Size": 16847 + "Size": 16858 }, "assemblies/System.IO.IsolatedStorage.dll": { - "Size": 9957 + "Size": 10011 }, "assemblies/System.Linq.dll": { - "Size": 19441 + "Size": 19453 }, "assemblies/System.Linq.Expressions.dll": { - "Size": 164128 + "Size": 164141 }, "assemblies/System.Net.Http.dll": { - "Size": 65982 + "Size": 66153 }, "assemblies/System.Net.Primitives.dll": { - "Size": 22441 + "Size": 22487 }, "assemblies/System.Net.Requests.dll": { - "Size": 3620 + "Size": 3630 }, "assemblies/System.ObjectModel.dll": { - "Size": 8144 + "Size": 8154 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 808708 + "Size": 814216 }, "assemblies/System.Private.DataContractSerialization.dll": { - "Size": 192356 + "Size": 192370 }, "assemblies/System.Private.Uri.dll": { - "Size": 42878 + "Size": 42897 }, "assemblies/System.Private.Xml.dll": { - "Size": 216193 + "Size": 216180 }, "assemblies/System.Private.Xml.Linq.dll": { - "Size": 16662 + "Size": 16673 }, "assemblies/System.Runtime.dll": { - "Size": 2763 + "Size": 2774 }, "assemblies/System.Runtime.InteropServices.dll": { - "Size": 3753 + "Size": 3760 }, "assemblies/System.Runtime.Serialization.dll": { - "Size": 1943 + "Size": 1950 }, "assemblies/System.Runtime.Serialization.Formatters.dll": { - "Size": 2509 + "Size": 2517 }, "assemblies/System.Runtime.Serialization.Primitives.dll": { - "Size": 3791 + "Size": 3802 }, "assemblies/System.Security.Cryptography.dll": { - "Size": 7766 + "Size": 7781 }, "assemblies/System.Text.RegularExpressions.dll": { - "Size": 156677 + "Size": 157123 }, "assemblies/System.Xml.dll": { - "Size": 1833 + "Size": 1839 }, "assemblies/System.Xml.Linq.dll": { - "Size": 1856 + "Size": 1864 }, "assemblies/UnnamedProject.dll": { "Size": 5294 }, "assemblies/Xamarin.AndroidX.Activity.dll": { - "Size": 5870 + "Size": 5867 }, "assemblies/Xamarin.AndroidX.AppCompat.AppCompatResources.dll": { "Size": 6117 @@ -146,7 +146,7 @@ "Size": 6592 }, "assemblies/Xamarin.AndroidX.CoordinatorLayout.dll": { - "Size": 16404 + "Size": 16408 }, "assemblies/Xamarin.AndroidX.Core.dll": { "Size": 96738 @@ -158,16 +158,16 @@ "Size": 39951 }, "assemblies/Xamarin.AndroidX.Legacy.Support.Core.UI.dll": { - "Size": 5923 + "Size": 5924 }, "assemblies/Xamarin.AndroidX.Lifecycle.Common.dll": { "Size": 6391 }, "assemblies/Xamarin.AndroidX.Lifecycle.LiveData.Core.dll": { - "Size": 6459 + "Size": 6462 }, "assemblies/Xamarin.AndroidX.Lifecycle.ViewModel.dll": { - "Size": 3067 + "Size": 3068 }, "assemblies/Xamarin.AndroidX.Loader.dll": { "Size": 12473 @@ -176,7 +176,7 @@ "Size": 84804 }, "assemblies/Xamarin.AndroidX.SavedState.dll": { - "Size": 4866 + "Size": 4870 }, "assemblies/Xamarin.AndroidX.SwipeRefreshLayout.dll": { "Size": 10389 @@ -188,10 +188,10 @@ "Size": 528450 }, "assemblies/Xamarin.Forms.Platform.Android.dll": { - "Size": 337828 + "Size": 337831 }, "assemblies/Xamarin.Forms.Platform.dll": { - "Size": 11084 + "Size": 11080 }, "assemblies/Xamarin.Forms.Xaml.dll": { "Size": 60774 @@ -200,28 +200,28 @@ "Size": 40158 }, "classes.dex": { - "Size": 3141008 + "Size": 3127152 }, "lib/arm64-v8a/libmono-component-marshal-ilgen.so": { "Size": 93552 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 379320 + "Size": 379152 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3090760 + "Size": 3106808 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 723840 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 94328 + "Size": 94280 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { - "Size": 155056 + "Size": 154904 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 333720 + "Size": 333760 }, "META-INF/android.support.design_material.version": { "Size": 12 @@ -1976,5 +1976,5 @@ "Size": 341228 } }, - "PackageSize": 7828228 + "PackageSize": 7820036 } \ No newline at end of file