From 0a92b4d176e7e4cdfef754602fd6be6ff3780340 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Jul 2021 15:34:12 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/installer build 20210727.8 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-rc.1.21376.3 -> To Version 6.0.100-rc.1.21377.8 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref From Version 6.0.100-preview.6.21370.1 -> To Version 6.0.100-preview.6.21376.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 df040fbbd73..18577f3cacd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - cc10fae58ef8f2b74de9b069a52348ba04f0d8a8 + f247377f4d7ae16bc8f520af2b98df7aa66b84e2 - + https://github.com/mono/linker - 6eae01980dc694107bdee0bc723d75a0dd601f0e + b888d672e11588e2bbca1cd3eeaee30d53416897 - + https://github.com/dotnet/runtime - d019e70d2b7c2f7cd1137fac084dbcdc3d2e05f5 + 95863758cd16c345d0b8fca067d5db5d6901e498 diff --git a/eng/Versions.props b/eng/Versions.props index 1a3bd89e119..ae60be74168 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 6.0.100-rc.1.21376.3 - 6.0.100-preview.6.21370.1 + 6.0.100-rc.1.21377.8 + 6.0.100-preview.6.21376.2 5.0.0-beta.20181.7 6.0.0-beta.21212.6 - 6.0.0-rc.1.21374.7 + 6.0.0-rc.1.21375.2 From b9fa43a7fba407bcc578b6a2ef591ed64c33ca9e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Jul 2021 22:02:23 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/installer build 20210727.14 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-rc.1.21376.3 -> To Version 6.0.100-rc.1.21377.14 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref From Version 6.0.100-preview.6.21370.1 -> To Version 6.0.100-preview.6.21376.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 18577f3cacd..1a7fa16625a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - f247377f4d7ae16bc8f520af2b98df7aa66b84e2 + 0588570946249fd92a935810b292423a660db4f1 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index ae60be74168..18e08b33cbe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.100-rc.1.21377.8 + 6.0.100-rc.1.21377.14 6.0.100-preview.6.21376.2 5.0.0-beta.20181.7 6.0.0-beta.21212.6 From fcb9ea3baf74a28601074d21c9590d17e1f6948c Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Tue, 27 Jul 2021 19:52:55 -0400 Subject: [PATCH 3/5] Bump to Mono.Cecil 0.11.4. Hopefully fixes a [build break][0]: CSC : error CS1705: Assembly 'illink' with identity 'illink, Version=6.0.100.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' uses 'Mono.Cecil, Version=0.11.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e' which has a higher version than referenced assembly 'Mono.Cecil' with identity 'Mono.Cecil, Version=0.11.3.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e' Bump `$(MonoCecilVersion)` to compensate? Note: an actual fix very likely requires a Java.Interop bump, as Java.Interop references Cecil 0.11.3 (same as the error message) while `$(MonoCecilVersion)` is 0.11.2 (not present in the error). [0]: https://github.com/xamarin/xamarin-android/pull/6131#pullrequestreview-716413727 --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 742eea99ee7..7b4ecb0e3c5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -28,7 +28,7 @@ 2.0.0-alpha7 0.4.1 - 0.11.2 + 0.11.4 13.0.1 5.4.0 1.1.11 From 75451b91daf87222f7df09f787ef93967c74dfdc Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Tue, 27 Jul 2021 22:05:54 -0400 Subject: [PATCH 4/5] Bump to xamarin/Java.Interop/main@dd1ef455 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Context: https://github.com/xamarin/xamarin-android/pull/6131#pullrequestreview-716413727 Context: fcb9ea3baf74a28601074d21c9590d17e1f6948c Changes: http://github.com/xamarin/Java.Interop/compare/4fb7c147f8c6eb9bf94d9bfb8305c7d2a7a9fb33...dd1ef455ee4fbfa7e17f34c51cbe2ef24459e2e6 * xamarin/Java.Interop@dd1ef455: Bump to mono/linker/main@b888d67 Mono.Cecil 0.11.4 (#861) Commit fcb9ea3b didn't fix the build breakage. Bump to xamarin/Java.Interop/main@dd1ef455 and set `$(_XamarinAndroidCecilVersion)`, which will override the Mono.Cecil NuGet package version within the Java.Interop build. This will hopefully ensure/allow everything to now use Cecil 0.11.4. TODO: This Quick-And-Dirty approach hardcodes `$(_XamarinAndroidCecilVersion)`=0.11.4, meaning we now have two different properties for the same thing: Directory.Build.props: 0.11.4 build-tools/scripts/Configuration.Java.Interop.Override.props: <_XamarinAndroidCecilVersion>0.11.4 This is "undesirable". Is there a way to update `xaprepare` so that we can generate `external/Java.Interop/Configuration.Override.props` so that `$(_XamarinAndroidCecilVersion)`=`$(MonoCecilVersion)`? (Assuming that this approach even works…) --- build-tools/scripts/Configuration.Java.Interop.Override.props | 2 ++ external/Java.Interop | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build-tools/scripts/Configuration.Java.Interop.Override.props b/build-tools/scripts/Configuration.Java.Interop.Override.props index 299041652cc..e99e4f7005a 100644 --- a/build-tools/scripts/Configuration.Java.Interop.Override.props +++ b/build-tools/scripts/Configuration.Java.Interop.Override.props @@ -1,6 +1,8 @@ + + <_XamarinAndroidCecilVersion>0.11.4 $(MSBuildThisFileDirectory)..\..\external\mono\external\cecil $(MSBuildThisFileDirectory)..\..\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\ $(MSBuildThisFileDirectory)..\..\bin\$(Configuration)-net6.0\ diff --git a/external/Java.Interop b/external/Java.Interop index 4fb7c147f8c..dd1ef455ee4 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 4fb7c147f8c6eb9bf94d9bfb8305c7d2a7a9fb33 +Subproject commit dd1ef455ee4fbfa7e17f34c51cbe2ef24459e2e6 From d78960c778efaaf2f6cdba23d38467435f61e2fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Jul 2021 20:41:05 +0000 Subject: [PATCH 5/5] Update dependencies from https://github.com/dotnet/installer build 20210729.2 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-rc.1.21376.3 -> To Version 6.0.100-rc.1.21379.2 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref From Version 6.0.100-preview.6.21370.1 -> To Version 6.0.100-preview.6.21378.1 (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 1a7fa16625a..10ab418e3cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 0588570946249fd92a935810b292423a660db4f1 + 3b433901a1bb025b3acb3ca2f73fc7c43ffd98b6 - + https://github.com/mono/linker - b888d672e11588e2bbca1cd3eeaee30d53416897 + 0cb9250a903cfc90cbac602ed79c0cbc588d8d3f - + https://github.com/dotnet/runtime - 95863758cd16c345d0b8fca067d5db5d6901e498 + cf52b7e38d28b7e28358cee052effe0ed47efb2e diff --git a/eng/Versions.props b/eng/Versions.props index 18e08b33cbe..8eb044d75c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 6.0.100-rc.1.21377.14 - 6.0.100-preview.6.21376.2 + 6.0.100-rc.1.21379.2 + 6.0.100-preview.6.21378.1 5.0.0-beta.20181.7 6.0.0-beta.21212.6 - 6.0.0-rc.1.21375.2 + 6.0.0-rc.1.21378.2