From 34630dda4a2d95e00fd0899331110be961f1e5fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Jul 2021 21:56:50 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/installer build 20210721.2 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.7.21369.5 -> To Version 6.0.100-preview.7.21371.2 Dependency coherency updates Microsoft.NETCore.App.Ref From Version 6.0.0-preview.7.21368.2 -> To Version 6.0.0-preview.7.21370.18 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 691057819c5..1ba207ae09c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 808795cca8cfaa143ef556cac0dc40d15d2dc186 + d7eca4f35634e33c26df77ab4c27e483356b33ff https://github.com/mono/linker 9ecf5bd2809f93d98c1dbea640790ca5a88d35ec - + https://github.com/dotnet/runtime - 8d3afa3a4a42021be024ffa4a1dee77e35d33911 + ba08d9a305e2e0debeed1c96b3137b44305466b8 diff --git a/eng/Versions.props b/eng/Versions.props index f5e9a75e0e0..bb881b6ebe7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 6.0.100-preview.7.21369.5 + 6.0.100-preview.7.21371.2 6.0.100-preview.6.21365.1 5.0.0-beta.20181.7 6.0.0-beta.21212.6 - 6.0.0-preview.7.21368.2 + 6.0.0-preview.7.21370.18 From 42663530512f4d597deca52aefae49ba27ecefea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Jul 2021 12:26:51 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/installer build 20210721.16 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.7.21369.5 -> To Version 6.0.100-preview.7.21371.16 Dependency coherency updates Microsoft.NETCore.App.Ref From Version 6.0.0-preview.7.21368.2 -> To Version 6.0.0-preview.7.21370.18 (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 1ba207ae09c..fdb39c74b4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - d7eca4f35634e33c26df77ab4c27e483356b33ff + e04499326a189063b389185aad1f43580e9f2204 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index bb881b6ebe7..8ae26983465 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 6.0.100-preview.7.21371.2 + 6.0.100-preview.7.21371.16 6.0.100-preview.6.21365.1 5.0.0-beta.20181.7 6.0.0-beta.21212.6 From f13777b6ae0eef1b9aea9db66344e60e9b2d2475 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 22 Jul 2021 15:16:23 -0500 Subject: [PATCH 3/6] [xaprepare] don't install microsoft-net-runtime-android workload Context: https://github.com/xamarin/xamarin-android/pull/6112#pullrequestreview-712229556 The .NET Preview 7 bump is failing with: Running: /Users/builder/Library/Android/dotnet/dotnet "workload" "install" "microsoft-net-runtime-android" "--skip-manifest-update" "--verbosity" "diag" stderr | Workload with id microsoft-net-runtime-android is not recognized. However, it was a bug in the `dotnet workload install` command that we were even able to install this workload in the first place! The concept behind "abstract" workloads is they are not user visible in any way. They're meant to be an implementation detail. In 0150bbbc, I setup `xaprepare` to install `microsoft-net-runtime-android`, but we don't actually even need to do this. We can simply update the `sdk-manifest` for this pack, so the version matches `$(DotNetRuntimePacksVersion)`. `microsoft-net-runtime-android` will get installed later during the `ExtractWorkloadPacks` target: https://github.com/xamarin/xamarin-android/blob/c1a2ee70214e86757541b5759c9ed54941bd4680/build-tools/create-packs/Directory.Build.targets#L119-L122 Since `android` and `android-aot` extend `microsoft-net-runtime-android`, this step will install it. --- .../xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs index f75058b714c..540f38c817a 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs @@ -51,12 +51,6 @@ protected override async Task Execute (Context context) Utilities.CopyFileToDir (file, destination); } - // Install the microsoft-net-runtime-android workload - if (!Utilities.RunCommand (dotnetTool, BuildPaths.XamarinAndroidSourceRoot, ignoreEmptyArguments: false, new [] { "workload", "install", "microsoft-net-runtime-android", "--skip-manifest-update", "--verbosity", "diag" })) { - Log.ErrorLine ($"dotnet workload install failed."); - return false; - } - return true; } From 82984e8461b9860c8c12bbc7c1d5708e54954f1b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Jul 2021 01:59:38 +0000 Subject: [PATCH 4/6] Update dependencies from https://github.com/dotnet/installer build 20210722.19 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.7.21369.5 -> To Version 6.0.100-preview.7.21372.19 Dependency coherency updates Microsoft.NETCore.App.Ref From Version 6.0.0-preview.7.21368.2 -> To Version 6.0.0-preview.7.21371.11 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fdb39c74b4b..0b82229bdca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - e04499326a189063b389185aad1f43580e9f2204 + 456900dd18975ff48c3152248428a7c07e81c4ee https://github.com/mono/linker 9ecf5bd2809f93d98c1dbea640790ca5a88d35ec - + https://github.com/dotnet/runtime - ba08d9a305e2e0debeed1c96b3137b44305466b8 + 743bd894c40b00b93e805db9d62664c915e0c0ee diff --git a/eng/Versions.props b/eng/Versions.props index 8ae26983465..2690fde2282 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 6.0.100-preview.7.21371.16 + 6.0.100-preview.7.21372.19 6.0.100-preview.6.21365.1 5.0.0-beta.20181.7 6.0.0-beta.21212.6 - 6.0.0-preview.7.21370.18 + 6.0.0-preview.7.21371.11 From 45ce8908c7246f762a57f22a01c0ae234c4807f5 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 23 Jul 2021 07:04:22 -0500 Subject: [PATCH 5/6] [tests] fix test to ignore the refint directory Context: https://github.com/dotnet/sdk/pull/19114/commits/e424c0eae2dcbdb71ff60014c6bdad82ddb3175d Context: https://github.com/dotnet/msbuild/blob/9e576281e638d60701ca34411e2483bed01e35c7/src/Tasks/Microsoft.Common.CurrentVersion.targets#L397 --- .../Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 8fe7d132fda..3b20ee1185b 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 @@ -102,7 +102,10 @@ public void CleanBasicBindingLibrary (string classParser) .Where (x => Path.GetFileName (x) != "designtime") // .NET 5+ sets $(ProduceReferenceAssembly) by default // https://github.com/dotnet/sdk/blob/18ee4eac8b3abe6d554d2e0c39d8952da0f23ce5/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets#L242-L244 - .Where (x => Path.GetFileName (x) != "ref"); + .Where (x => Path.GetFileName (x) != "ref") + // Added in .NET 6: + // https://github.com/dotnet/msbuild/blob/9e576281e638d60701ca34411e2483bed01e35c7/src/Tasks/Microsoft.Common.CurrentVersion.targets#L397 + .Where (x => Path.GetFileName (x) != "refint"); CollectionAssert.IsEmpty (directories, $"{proj.IntermediateOutputPath} should have no directories."); CollectionAssert.IsEmpty (files, $"{proj.IntermediateOutputPath} should have no files."); } From d1074e38f8ce2e8dd3dce2710bdf135d101bb56b Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 23 Jul 2021 08:09:53 -0500 Subject: [PATCH 6/6] [tests] we don't need to check if Clean deletes directories Clean doesn't actually delete directories, no need to test for this. --- .../Xamarin.Android.Build.Tests/BindingBuildTest.cs | 10 ---------- 1 file changed, 10 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 3b20ee1185b..1135a2c95ff 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 @@ -97,16 +97,6 @@ public void CleanBasicBindingLibrary (string classParser) }; var files = Directory.GetFiles (Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath), "*", SearchOption.AllDirectories) .Where (x => !ignoreFiles.Any (i => !Path.GetFileName (x).Contains (i))); - var directories = Directory.GetDirectories (Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath), "*", SearchOption.AllDirectories) - // designtime folder is left behind, so Intellisense continues to work after a Clean - .Where (x => Path.GetFileName (x) != "designtime") - // .NET 5+ sets $(ProduceReferenceAssembly) by default - // https://github.com/dotnet/sdk/blob/18ee4eac8b3abe6d554d2e0c39d8952da0f23ce5/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets#L242-L244 - .Where (x => Path.GetFileName (x) != "ref") - // Added in .NET 6: - // https://github.com/dotnet/msbuild/blob/9e576281e638d60701ca34411e2483bed01e35c7/src/Tasks/Microsoft.Common.CurrentVersion.targets#L397 - .Where (x => Path.GetFileName (x) != "refint"); - CollectionAssert.IsEmpty (directories, $"{proj.IntermediateOutputPath} should have no directories."); CollectionAssert.IsEmpty (files, $"{proj.IntermediateOutputPath} should have no files."); } }