Skip to content

Commit 9d09838

Browse files
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: dotnet/java-interop@2d5431f 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'
1 parent 01c28e5 commit 9d09838

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

azure-pipelines.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ pr:
88
variables:
99
AndroidBinderatorVersion: 0.5.0
1010
AndroidXMigrationVersion: 1.0.8
11-
DotNetVersion: 6.0.100-rc.1.21463.6
11+
DotNetVersion: 6.0.100-rc.2.21505.57
12+
DotNet6Source: https://aka.ms/dotnet6/nuget/index.json
13+
NuGetOrgSource: https://api.nuget.org/v3/index.json
1214
# NOTE: there wasn't a public release of 16.11 for macOS
1315
LegacyXamarinAndroidPkg: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/4941337/d16-11/7776c9f1c8fac303c3aa57867825990850be0384/xamarin.android-11.4.0.5.pkg
1416
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:
4244
inputs:
4345
version: $(DotNetVersion)
4446
- pwsh: |
45-
dotnet workload install android
47+
dotnet workload update --verbosity diag --from-rollback-file workload.json --source $(Dotnet6Source) --source $(NuGetOrgSource)
48+
dotnet workload install android --verbosity diag --skip-manifest-update --source $(Dotnet6Source) --source $(NuGetOrgSource)
4649
- task: JavaToolInstaller@0
4750
inputs:
4851
versionSpec: '11'

workload.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"microsoft.net.sdk.android": "31.0.101-preview.10.59",
3+
"microsoft.net.sdk.ios": "15.0.101-preview.9.31",
4+
"microsoft.net.sdk.maccatalyst": "15.0.101-preview.9.31",
5+
"microsoft.net.sdk.macos": "12.0.101-preview.9.31",
6+
"microsoft.net.sdk.maui": "6.0.101-preview.9.1843",
7+
"microsoft.net.sdk.tvos": "15.0.101-preview.9.31",
8+
"microsoft.net.workload.emscripten": "6.0.0-rc.2.21474.1",
9+
"microsoft.net.workload.mono.toolchain": "6.0.0-rc.2.21480.5"
10+
}

0 commit comments

Comments
 (0)