From 8c137bde622bdb090a749106a9036c65a06050ce Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Thu, 24 Mar 2022 09:11:51 -0500 Subject: [PATCH] Bump from .NET 6 Android Preview 9 to 13. --- azure-pipelines.yml | 3 ++- workload.json | 10 ---------- 2 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 workload.json diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 542c194d9..5cf32b060 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,6 +12,7 @@ variables: DotNetVersion: 6.0.200 DotNet6Source: https://aka.ms/dotnet6/nuget/index.json NuGetOrgSource: https://api.nuget.org/v3/index.json + XamarinDotNetWorkloadSource: https://aka.ms/dotnet/maui/preview.13.json LegacyXamarinAndroidPkg: https://aka.ms/xamarin-android-commercial-d17-0-macos LegacyXamarinAndroidVsix: https://aka.ms/xamarin-android-commercial-d17-1-windows BUILD_NUMBER: $(Build.BuildNumber) @@ -48,7 +49,7 @@ jobs: inputs: version: $(DotNetVersion) - pwsh: | - dotnet workload update --verbosity diag --from-rollback-file workload.json --source $(Dotnet6Source) --source $(NuGetOrgSource) + dotnet workload update --verbosity diag --from-rollback-file $(XamarinDotNetWorkloadSource) --source $(Dotnet6Source) --source $(NuGetOrgSource) dotnet workload install android --verbosity diag --skip-manifest-update --source $(Dotnet6Source) --source $(NuGetOrgSource) - task: JavaToolInstaller@0 inputs: diff --git a/workload.json b/workload.json deleted file mode 100644 index 4e7bb98a6..000000000 --- a/workload.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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