From 9d0983832c797c22ec8ae89fdb2f97b36f8c15d5 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 27 Oct 2021 08:41:40 -0500 Subject: [PATCH] Bump to xamarin/xamarin-android/release/6.0.1xx-preview10@d794ab2c (#413) Context: https://github.com/xamarin/xamarin-android/commits/release/6.0.1xx-preview10 Context: https://github.com/dotnet/maui/wiki/Installing-.NET-6 We need to build with a version of the .NET 6 `android` workload that contains the fix: https://github.com/xamarin/java.interop/commit/2d5431f765928e5377288d3284ace3c5d871755a For .NET 6, we should: 1. Install the latest public .NET 6 RC 2 release. 2. Use a `workload.json` file to pin to a specific build of the `android` workload. 3. Use the `dotnet6` feed when installing the workload. I used the `workload.json` file currently reported by running: dotnet workload update --print-rollback I adjusted the version number to match the appropriate build of: "microsoft.net.sdk.android": "31.0.101-preview.10.59", Additionally, use Xcode 13.0 to fix the error: xcode-select: error: invalid developer directory '/Applications/Xcode_12.3.app/Contents/Developer' --- azure-pipelines.yml | 7 +++++-- workload.json | 10 ++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 workload.json diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a51a3a1ea..d0685dbcc 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -8,7 +8,9 @@ pr: variables: AndroidBinderatorVersion: 0.5.0 AndroidXMigrationVersion: 1.0.8 - DotNetVersion: 6.0.100-rc.1.21463.6 + DotNetVersion: 6.0.100-rc.2.21505.57 + DotNet6Source: https://aka.ms/dotnet6/nuget/index.json + NuGetOrgSource: https://api.nuget.org/v3/index.json # NOTE: there wasn't a public release of 16.11 for macOS LegacyXamarinAndroidPkg: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/4941337/d16-11/7776c9f1c8fac303c3aa57867825990850be0384/xamarin.android-11.4.0.5.pkg LegacyXamarinAndroidVsix: https://download.visualstudio.microsoft.com/download/pr/7372b89a-b719-426c-9916-c33cbc6c7a61/45c38957fdcacfbee95be95ee40c4f5a4cc9ace69416625ad26e2da83b176941/Xamarin.Android.Sdk-11.4.0.5.vsix @@ -42,7 +44,8 @@ jobs: inputs: version: $(DotNetVersion) - pwsh: | - dotnet workload install android + dotnet workload update --verbosity diag --from-rollback-file workload.json --source $(Dotnet6Source) --source $(NuGetOrgSource) + dotnet workload install android --verbosity diag --skip-manifest-update --source $(Dotnet6Source) --source $(NuGetOrgSource) - task: JavaToolInstaller@0 inputs: versionSpec: '11' diff --git a/workload.json b/workload.json new file mode 100644 index 000000000..4e7bb98a6 --- /dev/null +++ b/workload.json @@ -0,0 +1,10 @@ +{ + "microsoft.net.sdk.android": "31.0.101-preview.10.59", + "microsoft.net.sdk.ios": "15.0.101-preview.9.31", + "microsoft.net.sdk.maccatalyst": "15.0.101-preview.9.31", + "microsoft.net.sdk.macos": "12.0.101-preview.9.31", + "microsoft.net.sdk.maui": "6.0.101-preview.9.1843", + "microsoft.net.sdk.tvos": "15.0.101-preview.9.31", + "microsoft.net.workload.emscripten": "6.0.0-rc.2.21474.1", + "microsoft.net.workload.mono.toolchain": "6.0.0-rc.2.21480.5" +} \ No newline at end of file