From 36244a4976d31e815fb960cb8aa46aa6c2734391 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Jun 2021 14:36:10 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/installer build 20210620.7 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.6.21313.2 -> To Version 6.0.100-preview.6.21320.7 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref From Version 6.0.100-preview.6.21304.2 -> To Version 6.0.100-preview.6.21314.2 (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 c7835202114..9271973d399 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - abb57b4610404b011c76ca8ea1d7ab40c58991d4 + e8b3bb2197079a30aa269e2b8101243b27259137 - + https://github.com/mono/linker - 21df7dbbf881507c98026c1b9e7532303b3c0a06 + f90f5c929054d4b4b69da0a21db4f69aa64d63af - + https://github.com/dotnet/runtime - 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 + 8bb087d5f77f133d74797b91bb539ec0e2eb3910 diff --git a/eng/Versions.props b/eng/Versions.props index ed89c262400..61cc983ee9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 6.0.100-preview.6.21313.2 - 6.0.100-preview.6.21304.2 + 6.0.100-preview.6.21320.7 + 6.0.100-preview.6.21314.2 5.0.0-beta.20181.7 6.0.0-beta.21212.6 - 6.0.0-preview.6.21306.1 + 6.0.0-preview.6.21317.12 From 028014c3f7c844295fec1d69590195cdf0d903ae Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 21 Jun 2021 10:17:55 -0500 Subject: [PATCH 2/7] Remove workarounds for Context: https://github.com/dotnet/runtime/issues/53811 dotnet/runtime#53811 is now solved, so we can remove the workaround. --- .../targets/Microsoft.Android.Sdk.RuntimeConfig.targets | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.RuntimeConfig.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.RuntimeConfig.targets index 80123bd04f2..dc187840226 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.RuntimeConfig.targets +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.RuntimeConfig.targets @@ -10,11 +10,7 @@ See: https://github.com/dotnet/runtime/blob/b13715b6984889a709ba29ea8a1961db469f --> - - - - $([System.IO.Path]::GetDirectoryName($(RuntimeConfigParserTasksAssemblyPath)))/net6.0/$([System.IO.Path]::GetFileName($(RuntimeConfigParserTasksAssemblyPath))) <_BinaryRuntimeConfigPath>$(IntermediateOutputPath)$(ProjectRuntimeConfigFileName).bin From 0fed569acb1eed59eb1bfb0830e7abfccf8f8282 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Jun 2021 12:30:16 +0000 Subject: [PATCH 3/7] Update dependencies from https://github.com/dotnet/installer build 20210621.13 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.6.21313.2 -> To Version 6.0.100-preview.6.21321.13 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref From Version 6.0.100-preview.6.21304.2 -> To Version 6.0.100-preview.6.21314.2 (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 9271973d399..f87017a9590 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - e8b3bb2197079a30aa269e2b8101243b27259137 + c026501c783895f277148f810583ca6e9919943f https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 61cc983ee9e..c03b76bb624 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.100-preview.6.21320.7 + 6.0.100-preview.6.21321.13 6.0.100-preview.6.21314.2 5.0.0-beta.20181.7 6.0.0-beta.21212.6 From 698a3381bb3978da792c8c3bc941784f644e2585 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 22 Jun 2021 09:39:32 -0500 Subject: [PATCH 4/7] Update .apkdesc files --- .../BuildReleaseArm64SimpleDotNet.apkdesc | 27 ++-- .../BuildReleaseArm64XFormsDotNet.apkdesc | 115 +++++++++--------- 2 files changed, 74 insertions(+), 68 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 49d3376dae1..e703447bc92 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 @@ -8,37 +8,40 @@ "Size": 54406 }, "assemblies/Mono.Android.dll": { - "Size": 78827 + "Size": 78836 + }, + "assemblies/rc.bin": { + "Size": 802 }, "assemblies/System.Linq.dll": { - "Size": 10163 + "Size": 10158 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 492821 + "Size": 495474 }, "assemblies/System.Runtime.dll": { - "Size": 2269 + "Size": 2267 }, "assemblies/UnnamedProject.dll": { - "Size": 3176 + "Size": 3174 }, "classes.dex": { "Size": 316792 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 336656 + "Size": 337816 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3959384 + "Size": 3257648 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 776216 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 75872 + "Size": 79968 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { - "Size": 162312 + "Size": 150024 }, "lib/arm64-v8a/libxamarin-app.so": { "Size": 11504 @@ -47,10 +50,10 @@ "Size": 1213 }, "META-INF/ANDROIDD.SF": { - "Size": 2289 + "Size": 2378 }, "META-INF/MANIFEST.MF": { - "Size": 2162 + "Size": 2251 }, "res/drawable-hdpi-v4/icon.png": { "Size": 4762 @@ -74,5 +77,5 @@ "Size": 1724 } }, - "PackageSize": 2873108 + "PackageSize": 2692947 } \ 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 de47a273b7e..6642e7d075b 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 @@ -11,154 +11,157 @@ "Size": 61256 }, "assemblies/Microsoft.Win32.Primitives.dll": { - "Size": 3655 + "Size": 3652 }, "assemblies/Mono.Android.dll": { - "Size": 398295 + "Size": 398304 }, "assemblies/mscorlib.dll": { - "Size": 3840 + "Size": 3834 }, "assemblies/netstandard.dll": { - "Size": 5528 + "Size": 5527 + }, + "assemblies/rc.bin": { + "Size": 802 }, "assemblies/System.Collections.Concurrent.dll": { - "Size": 11588 + "Size": 11585 }, "assemblies/System.Collections.dll": { - "Size": 19198 + "Size": 19190 }, "assemblies/System.Collections.NonGeneric.dll": { - "Size": 8485 + "Size": 8475 }, "assemblies/System.ComponentModel.dll": { - "Size": 2012 + "Size": 2008 }, "assemblies/System.ComponentModel.Primitives.dll": { - "Size": 2616 + "Size": 2615 }, "assemblies/System.ComponentModel.TypeConverter.dll": { "Size": 7004 }, "assemblies/System.Console.dll": { - "Size": 5847 + "Size": 5844 }, "assemblies/System.Core.dll": { - "Size": 1975 + "Size": 1973 }, "assemblies/System.Diagnostics.TraceSource.dll": { - "Size": 6811 + "Size": 6808 }, "assemblies/System.dll": { - "Size": 2322 + "Size": 2320 }, "assemblies/System.Drawing.dll": { - "Size": 2007 + "Size": 2005 }, "assemblies/System.Drawing.Primitives.dll": { - "Size": 12163 + "Size": 12158 }, "assemblies/System.Formats.Asn1.dll": { - "Size": 26859 + "Size": 26862 }, "assemblies/System.IO.Compression.Brotli.dll": { - "Size": 11580 + "Size": 11465 }, "assemblies/System.IO.Compression.dll": { - "Size": 18722 + "Size": 18819 }, "assemblies/System.IO.FileSystem.dll": { - "Size": 1971 + "Size": 1965 }, "assemblies/System.IO.IsolatedStorage.dll": { - "Size": 10639 + "Size": 10634 }, "assemblies/System.Linq.dll": { - "Size": 19517 + "Size": 19513 }, "assemblies/System.Linq.Expressions.dll": { - "Size": 181113 + "Size": 181325 }, "assemblies/System.Net.Http.dll": { - "Size": 211622 + "Size": 211174 }, "assemblies/System.Net.NameResolution.dll": { - "Size": 9936 + "Size": 9931 }, "assemblies/System.Net.NetworkInformation.dll": { - "Size": 17335 + "Size": 17341 }, "assemblies/System.Net.Primitives.dll": { - "Size": 41167 + "Size": 41159 }, "assemblies/System.Net.Quic.dll": { - "Size": 41235 + "Size": 43425 }, "assemblies/System.Net.Security.dll": { - "Size": 57243 + "Size": 57326 }, "assemblies/System.Net.Sockets.dll": { - "Size": 54645 + "Size": 54466 }, "assemblies/System.ObjectModel.dll": { - "Size": 11325 + "Size": 11321 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 693200 + "Size": 698478 }, "assemblies/System.Private.DataContractSerialization.dll": { - "Size": 193070 + "Size": 193072 }, "assemblies/System.Private.Uri.dll": { - "Size": 43190 + "Size": 43191 }, "assemblies/System.Private.Xml.dll": { - "Size": 251150 + "Size": 251157 }, "assemblies/System.Private.Xml.Linq.dll": { - "Size": 15073 + "Size": 15067 }, "assemblies/System.Runtime.CompilerServices.Unsafe.dll": { - "Size": 1342 + "Size": 1341 }, "assemblies/System.Runtime.dll": { - "Size": 2468 + "Size": 2466 }, "assemblies/System.Runtime.InteropServices.RuntimeInformation.dll": { - "Size": 2924 + "Size": 2919 }, "assemblies/System.Runtime.Numerics.dll": { - "Size": 21162 + "Size": 21159 }, "assemblies/System.Runtime.Serialization.dll": { - "Size": 1945 + "Size": 1943 }, "assemblies/System.Runtime.Serialization.Formatters.dll": { - "Size": 2684 + "Size": 2679 }, "assemblies/System.Runtime.Serialization.Primitives.dll": { - "Size": 3988 + "Size": 3986 }, "assemblies/System.Security.Cryptography.Algorithms.dll": { - "Size": 42175 + "Size": 42400 }, "assemblies/System.Security.Cryptography.Encoding.dll": { - "Size": 13821 + "Size": 13819 }, "assemblies/System.Security.Cryptography.Primitives.dll": { - "Size": 8855 + "Size": 8844 }, "assemblies/System.Security.Cryptography.X509Certificates.dll": { - "Size": 76445 + "Size": 76408 }, "assemblies/System.Text.RegularExpressions.dll": { - "Size": 76505 + "Size": 76513 }, "assemblies/System.Threading.Channels.dll": { - "Size": 15123 + "Size": 16788 }, "assemblies/System.Xml.dll": { - "Size": 1830 + "Size": 1827 }, "assemblies/UnnamedProject.dll": { "Size": 117076 @@ -233,19 +236,19 @@ "Size": 3455324 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 336656 + "Size": 337816 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3959384 + "Size": 3257648 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 776216 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 75872 + "Size": 79968 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { - "Size": 162312 + "Size": 150024 }, "lib/arm64-v8a/libxamarin-app.so": { "Size": 126744 @@ -257,7 +260,7 @@ "Size": 1213 }, "META-INF/ANDROIDD.SF": { - "Size": 80329 + "Size": 80418 }, "META-INF/androidx.activity_activity.version": { "Size": 6 @@ -368,7 +371,7 @@ "Size": 10 }, "META-INF/MANIFEST.MF": { - "Size": 80202 + "Size": 80291 }, "META-INF/proguard/androidx-annotations.pro": { "Size": 339 @@ -2000,5 +2003,5 @@ "Size": 341040 } }, - "PackageSize": 8631839 + "PackageSize": 8459870 } \ No newline at end of file From 17fd2d040943d4eb708cd08ce9a44891441b2adb Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 22 Jun 2021 15:30:48 -0500 Subject: [PATCH 5/7] [tests] temporarily skip asserts in BuildBasicBindingLibrary Context: https://github.com/dotnet/msbuild/issues/6609 It seems that properties are missing from MSBuild logs, ignoring part of this test for now. --- .../BindingBuildTest.cs | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs index 81d91ca5ece..c170055e1d8 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs @@ -56,15 +56,18 @@ public void BuildBasicBindingLibrary (string classParser) Assert.IsNotNull (type, $"{assemblyPath} should contain {typeName}"); } - //A list of properties we check exist in binding projects - var properties = new [] { - "AndroidSdkBuildToolsVersion", - "AndroidSdkPlatformToolsVersion", - "AndroidSdkToolsVersion", - "AndroidNdkVersion", - }; - foreach (var property in properties) { - Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, property + " = "), $"$({property}) should be set!"); + //TODO: see https://github.com/dotnet/msbuild/issues/6609 + if (!Builder.UseDotNet) { + //A list of properties we check exist in binding projects + var properties = new [] { + "AndroidSdkBuildToolsVersion", + "AndroidSdkPlatformToolsVersion", + "AndroidSdkToolsVersion", + "AndroidNdkVersion", + }; + foreach (var property in properties) { + Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, property + " = "), $"$({property}) should be set!"); + } } Assert.IsTrue (b.Build (proj, doNotCleanupOnUpdate: true, saveProject: false), "second build should succeed"); From 4d0111d927172e9301fd0ba68c1332e42c913d24 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Jun 2021 12:32:37 +0000 Subject: [PATCH 6/7] Update dependencies from https://github.com/dotnet/installer build 20210623.1 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.6.21313.2 -> To Version 6.0.100-preview.6.21323.1 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref From Version 6.0.100-preview.6.21304.2 -> To Version 6.0.100-preview.6.21314.2 (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 f87017a9590..db9e23ffc82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - c026501c783895f277148f810583ca6e9919943f + 12636f6fdf5aa015bc0a1183936e5458f9ae85e3 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index c03b76bb624..1f192e08763 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.100-preview.6.21321.13 + 6.0.100-preview.6.21323.1 6.0.100-preview.6.21314.2 5.0.0-beta.20181.7 6.0.0-beta.21212.6 From 7d30fec7c3972171650f55df60130ffb13923464 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 23 Jun 2021 08:27:05 -0500 Subject: [PATCH 7/7] [templates] set .png files to copyOnly Context: https://github.com/dotnet/templating/issues/3325 Context: https://github.com/dotnet/templating/wiki/Reference-for-template.json#content-manipulation In the current bump, `dotnet new android` + `dotnet build` fails with: Resources\mipmap-xxxhdpi\ic_launcher_round.png error APT2000: failed reading from input: PNG chunk type 49444154 is too large: chunk length is 10836 but chunk starts at byte 45/8187. The .NET templating system has a 'copyOnly' mode for files that do not need any text replaced. This is a performance feature, but it also happens to workaround this issue. We should be doing this on `.png` files *anyway*, as we don't need potential "text" to be replaced. I will probably need to make similar changes in xamarin/xamarin-macios and dotnet/maui. --- .../android/.template.config/template.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Microsoft.Android.Templates/android/.template.config/template.json b/src/Microsoft.Android.Templates/android/.template.config/template.json index 734cb956702..0945e22e66c 100644 --- a/src/Microsoft.Android.Templates/android/.template.config/template.json +++ b/src/Microsoft.Android.Templates/android/.template.config/template.json @@ -11,6 +11,13 @@ "type": "project" }, "sourceName": "AndroidApp1", + "sources": [ + { + "source": "./", + "target": "./", + "copyOnly": "**/Resources/**/*.png" + } + ], "preferNameDirectory": true, "primaryOutputs": [ { "path": "AndroidApp1.csproj" }