From 6dbe443251b6414f1aed5be1417e7160deb8aebe Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 13 Jul 2022 19:40:48 +0200 Subject: [PATCH 1/2] initial commit --- azure-pipelines.yaml | 3 ++- workload.json | 10 ---------- 2 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 workload.json diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index 582680f34..9a167880c 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -14,6 +14,7 @@ variables: DotNetVersion: 6.0.300 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-2-macos LegacyXamarinAndroidVsix: https://aka.ms/xamarin-android-commercial-d17-2-windows BUILD_NUMBER: $(Build.BuildNumber) @@ -52,7 +53,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 From 1cd71f16a5d6213fa63242567ed16408c2ab8c0d Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 13 Jul 2022 19:43:27 +0200 Subject: [PATCH 2/2] maui rc3 --- azure-pipelines.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index 9a167880c..54e72c56e 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -14,7 +14,7 @@ variables: DotNetVersion: 6.0.300 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 + XamarinDotNetWorkloadSource: https://aka.ms/dotnet/maui/rc.3.json LegacyXamarinAndroidPkg: https://aka.ms/xamarin-android-commercial-d17-2-macos LegacyXamarinAndroidVsix: https://aka.ms/xamarin-android-commercial-d17-2-windows BUILD_NUMBER: $(Build.BuildNumber)