From 3ca5c8049d03391f1a9130598c72bf63574f34ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Jul 2022 17:36:06 +0000 Subject: [PATCH 1/9] Update dependencies from https://github.com/dotnet/installer build 20220714.7 Microsoft.Dotnet.Sdk.Internal From Version 7.0.100-preview.7.22361.1 -> To Version 7.0.100-rc.1.22364.7 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.3 (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 1fcd730b2a5..24746b40293 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/installer - 85a0482297aed0816aa8518bdfe3076716706ba3 + 02c70fd8770705af4827c93623ecd6461876f3a8 - + https://github.com/dotnet/linker - ef2d0f25b72469b55925251a79f12bcbf98644bf + e2b3a925b1ee6c55f9b95540647ce8362fe9ee44 - + https://github.com/dotnet/runtime - 206dccb7945aaa3f26599fbe742de9022ca7ef91 + b7fca07f478739d9fd50bdf5d1467c02dc05b6b0 - + https://github.com/dotnet/emsdk - 40e7c6226711ec616ee07e725563eda708630fe1 + 7d277787570614a3dd99e1d6022375d9ae43e6af diff --git a/eng/Versions.props b/eng/Versions.props index 2deb23fa6be..8f334ba826d 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.22364.7 + 7.0.100-1.22362.3 + 7.0.0-preview.7.22362.12 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 e62dcb078ea23259ff16330dd68d2980a89d4ee7 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Fri, 15 Jul 2022 10:00:33 -0700 Subject: [PATCH 2/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 --- .../Microsoft.Android.Sdk.DefaultProperties.targets | 4 +++- .../targets/Microsoft.Android.Sdk.ILLink.targets | 11 ----------- 2 files changed, 3 insertions(+), 12 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..a671231ca9f 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,17 +28,6 @@ This file contains the .NET 5-specific targets to customize ILLink Condition="'$(VSAndroidDesigner)' != ''" Value="$(VSAndroidDesigner)" Trim="true" /> - - - - - link - + + link + - 7.0.100-rc.1.22364.7 - 7.0.100-1.22362.3 - 7.0.0-preview.7.22362.12 + 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.22361.2 + 7.0.0-rc.1.22362.2 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) From 6517358ca748130f249c4b3ea5f4f34509ebc616 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 18 Jul 2022 14:08:11 -0500 Subject: [PATCH 6/9] Weird merge conflict? GitHub desktop somehow messed this up, and didn't commit this file. --- .../automation/azure-pipelines-apidocs.yaml | 41 +++++++++++++++++-- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/build-tools/automation/azure-pipelines-apidocs.yaml b/build-tools/automation/azure-pipelines-apidocs.yaml index c336e36a4be..bc6eb50c329 100644 --- a/build-tools/automation/azure-pipelines-apidocs.yaml +++ b/build-tools/automation/azure-pipelines-apidocs.yaml @@ -12,21 +12,35 @@ parameters: - name: apiLevel displayName: AndroidApiLevel property value type: string - default: 31 + default: default - name: platformId displayName: AndroidPlatformId property value type: string - default: 31 + default: default - name: frameworkVersion displayName: AndroidFrameworkVersion property value type: string - default: v12.0 + default: default + +- name: mdocVersion + displayName: MdocPackageVersion property value + type: string + default: default # Global variables variables: - template: yaml-templates/variables.yaml +- name: DocsApiLevelArg + value: '' +- name: DocsPlatformIdArg + value: '' +- name: DocsFxVersionArg + value: '' +- name: MdocPackageVersionArg + value: '' + stages: - stage: mac_build @@ -48,6 +62,23 @@ stages: - script: echo "##vso[task.setvariable variable=JI_JAVA_HOME]$HOME/android-toolchain/jdk-11" displayName: set JI_JAVA_HOME + # Set MSBuild property overrides if parameters are set + - ${{ if ne(parameters.apiLevel, 'default') }}: + - script: echo "##vso[task.setvariable variable=DocsApiLevelArg]-p:DocsApiLevel=${{ parameters.apiLevel }}" + displayName: set DocsApiLevelArg + + - ${{ if ne(parameters.platformId, 'default') }}: + - script: echo "##vso[task.setvariable variable=DocsPlatformIdArg]-p:DocsPlatformId=${{ parameters.platformId }}" + displayName: set DocsPlatformIdArg + + - ${{ if ne(parameters.frameworkVersion, 'default') }}: + - script: echo "##vso[task.setvariable variable=DocsFxVersionArg]-p:DocsFxVersion=${{ parameters.frameworkVersion }}" + displayName: set DocsFxVersionArg + + - ${{ if ne(parameters.mdocVersion, 'default') }}: + - script: echo "##vso[task.setvariable variable=MdocPackageVersionArg]-p:MdocPackageVersion=${{ parameters.mdocVersion }}" + displayName: set MdocPackageVersionArg + - template: yaml-templates/use-dot-net.yaml - task: NuGetAuthenticate@0 @@ -64,7 +95,9 @@ stages: workingDirectory: $(Build.SourcesDirectory) displayName: make prepare - - script: make update-api-docs CONFIGURATION=$(XA.Build.Configuration) MSBUILD_ARGS='-p:DocsApiLevel=${{ parameters.apiLevel }} -p:DocsPlatformId=${{ parameters.platformId }} -p:DocsFxVersion=${{ parameters.frameworkVersion }}' + - script: >- + make update-api-docs CONFIGURATION=$(XA.Build.Configuration) + MSBUILD_ARGS='$(DocsApiLevelArg) $(DocsPlatformIdArg) $(DocsFxVersionArg) $(MdocPackageVersionArg)' workingDirectory: $(Build.SourcesDirectory) displayName: make update-api-docs From 1e33d9553665c65d3cf4164d37f1f3ee0215bb08 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 19 Jul 2022 13:20:55 -0500 Subject: [PATCH 7/9] Update .apkdesc files again (merge conflicts) --- .../BuildReleaseArm64SimpleDotNet.apkdesc | 22 ++--- .../BuildReleaseArm64XFormsDotNet.apkdesc | 84 +++++++++---------- 2 files changed, 53 insertions(+), 53 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 7076cad6bbe..7e82a2636eb 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,37 +5,37 @@ "Size": 3032 }, "assemblies/Java.Interop.dll": { - "Size": 58642 + "Size": 58753 }, "assemblies/Mono.Android.dll": { - "Size": 87877 + "Size": 89243 }, "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": 3603 }, "classes.dex": { "Size": 360744 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 512520 + "Size": 512648 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3084536 + "Size": 3084552 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 723840 @@ -47,7 +47,7 @@ "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 9562598cb42..beeb26e02be 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": 66628 }, "assemblies/Mono.Android.dll": { - "Size": 441845 + "Size": 471552 }, "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,10 +194,10 @@ "Size": 3473216 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 512520 + "Size": 512648 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3084536 + "Size": 3084552 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 723840 @@ -209,7 +209,7 @@ "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": 8073625 } \ No newline at end of file From b7af04f6c754e17c7579fda316de6c29f296eef0 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 c8ea7fea6a06aed63874d4ca8514972c48bde9c3 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 21 Jul 2022 14:46:25 -0500 Subject: [PATCH 9/9] Fixed Mono.Android.dll size --- .../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 7e82a2636eb..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,10 +5,10 @@ "Size": 3032 }, "assemblies/Java.Interop.dll": { - "Size": 58753 + "Size": 58756 }, "assemblies/Mono.Android.dll": { - "Size": 89243 + "Size": 88005 }, "assemblies/rc.bin": { "Size": 1129 @@ -26,7 +26,7 @@ "Size": 2379 }, "assemblies/UnnamedProject.dll": { - "Size": 3603 + "Size": 3602 }, "classes.dex": { "Size": 360744 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 beeb26e02be..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,10 +8,10 @@ "Size": 7114 }, "assemblies/Java.Interop.dll": { - "Size": 66628 + "Size": 66630 }, "assemblies/Mono.Android.dll": { - "Size": 471552 + "Size": 442072 }, "assemblies/mscorlib.dll": { "Size": 3849 @@ -1964,5 +1964,5 @@ "Size": 341228 } }, - "PackageSize": 8073625 + "PackageSize": 8040857 } \ No newline at end of file