From 31181fec6f523af5d9f5145f29432e9f55e2b0ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Apr 2021 12:13:29 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/installer build 20210426.1 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.4.21221.10 -> To Version 6.0.100-preview.5.21226.1 --- 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 35a4b0c43af..aae45913cd1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - d9bf0d661ba2e1ac065ae119585dc7f0e3c29703 + db05c9234ef185cf6163367f524a7d9a3eecc03f https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 0a978d33e0d..1dee733ad82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.100-preview.4.21221.10 + 6.0.100-preview.5.21226.1 6.0.100-preview.2.21217.1 5.0.0-beta.20181.7 6.0.0-beta.21212.6 From 967b036b4a9cbf13a329614f9a00bb77eec84bd9 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 27 Apr 2021 10:58:13 -0400 Subject: [PATCH 2/5] Track Microsoft.NET.ILLink.Tasks ID, make it a coherent dependency of Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- .../Microsoft.Android.Sdk.ILLink.csproj | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e45187eb179..61e86edaf50 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,12 +1,12 @@ - + https://github.com/dotnet/installer - db05c9234ef185cf6163367f524a7d9a3eecc03f + 91040a9eddef4fa5706bd604e07246cb2eb7a21f - + https://github.com/mono/linker - 1dfcf3077aca1ea77850f409d95c3192f03507b3 + bf37b2909bbfb2942173e7b383642c9b32ae0e79 diff --git a/eng/Versions.props b/eng/Versions.props index 2325ab028bd..03c912c2f38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,8 +1,8 @@ - 6.0.100-preview.5.21226.1 - 6.0.100-preview.2.21226.1 + 6.0.100-preview.5.21227.1 + 6.0.100-preview.5.21227.1 5.0.0-beta.20181.7 6.0.0-beta.21212.6 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 48d3eaf93de..f7ccc060b24 100644 --- a/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj +++ b/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj @@ -7,7 +7,7 @@ $(XAInstallPrefix)xbuild\Xamarin\Android\ - + From d213189a674ed4b1dccaa3b2eebed4f908b93ccc Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 27 Apr 2021 17:01:53 -0500 Subject: [PATCH 3/5] Update Microsoft.Android.Sdk.ILLink.csproj Latest ILLink appears to not support net5.0 anymore: error NU1202: Package Microsoft.NET.ILLink 6.0.100-preview.5.21227.1 is not compatible with net5.0 --- .../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 f7ccc060b24..8e12748a8f1 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 @@  - net5.0 + net6.0 NET5_LINKER false $(XAInstallPrefix)xbuild\Xamarin\Android\ From 2d885abeffb31681d2f146063a32ae357f7e61a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Apr 2021 10:57:03 +0000 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/installer build 20210429.1 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.4.21221.10 -> To Version 6.0.100-preview.5.21229.1 --- 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 61e86edaf50..db56b21bd80 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 91040a9eddef4fa5706bd604e07246cb2eb7a21f + 0b60950dad3cd50b07e130568454a33e058e2507 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 03c912c2f38..f9207da1faa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.100-preview.5.21227.1 + 6.0.100-preview.5.21229.1 6.0.100-preview.5.21227.1 5.0.0-beta.20181.7 6.0.0-beta.21212.6 From f106b344d9709ea66b29e2fd96994a386397550c Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 29 Apr 2021 11:01:39 -0500 Subject: [PATCH 5/5] [tests] fix AllResourcesInClassLibrary * Remove `$(OutputType)` from a class library project --- .../Tests/Xamarin.Android.Build.Tests/BuildTest.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs index 7e383db4456..c7e31927f33 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs @@ -3770,6 +3770,9 @@ public void AllResourcesInClassLibrary ([Values (true, false)] bool useAapt2) }; lib.SetProperty ("AndroidApplication", "False"); lib.AndroidUseAapt2 = useAapt2; + if (Builder.UseDotNet) { + lib.RemoveProperty ("OutputType"); + } // Create an "app" that is basically empty and references the library var app = new XamarinAndroidLibraryProject {