From df29e1fe1db5a744f3f1336e8a888b87ecfbb159 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 28 Jul 2022 10:34:59 +0200 Subject: [PATCH 1/2] refreshed CI settings --- azure-pipelines.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5537fc916..24cd0cec9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,21 +20,22 @@ resources: variables: DotNet6Version: 6.0.300 - XamarinAndroidVsix: https://aka.ms/xamarin-android-commercial-d17-1-windows + # matching builds # NOTE: there wasn't a public release of 16.11 for macOS - XamarinAndroidPkg: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/5673868/d17-1/19b97b7614b275a84d9e38096bd1fe0e25a494d4/xamarin.android-12.2.0.4.pkg + LegacyXamarinAndroidPkg: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/6454390/6.0.4xx/0b8d593a61bb49120fdf817e8dfdbc4b33937772/xamarin.android-12.3.99.117.pkg + LegacyXamarinAndroidVsix: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/6454390/6.0.4xx/0b8d593a61bb49120fdf817e8dfdbc4b33937772/Xamarin.Android.Sdk-12.3.99.117.vsix jobs: - template: .ci/build.v1.yml@components parameters: timeoutInMinutes: 360 areaPath: 'DevDiv\Xamarin SDK\Android' - macosImage: 'macOS-11' # the name of the macOS VM image - # BigSur 20211120 + macosImage: 'macOS-12' # the name of the macOS VM image + # Monterey 20220728 windowsAgentPoolName: AzurePipelines-EO windowsImage: '' windowsImageOverride: AzurePipelinesWindows2019compliant - xcode: 13.2.1 + xcode: 13.3.1 buildType: 'manifest' linuxAgentPoolName: AzurePipelines-EO @@ -82,7 +83,7 @@ jobs: condition: ne(variables['System.JobName'], 'linux') tools: - 'xamarin.androidbinderator.tool': '0.5.4' - - 'xamarin.androidx.migration.tool': '1.0.9' + - 'xamarin.androidx.migration.tool': '1.0.10' - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}: - template: sign-artifacts/jobs/v2.yml@internal-templates parameters: From acafe9a685ec09a8a70320d7a4906ec4973212b5 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 29 Jul 2022 14:13:39 +0200 Subject: [PATCH 2/2] workloads installation/updates --- azure-pipelines.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 24cd0cec9..025afb449 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,6 +20,10 @@ resources: variables: DotNet6Version: 6.0.300 + DotNet6Source: https://aka.ms/dotnet6/nuget/index.json + NuGetOrgSource: https://api.nuget.org/v3/index.json + XamarinDotNetWorkloadSource: workloads.json # or url (check for recent versions - redth) + # https://aka.ms/dotnet/maui/6.0.400.json # matching builds # NOTE: there wasn't a public release of 16.11 for macOS LegacyXamarinAndroidPkg: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/6454390/6.0.4xx/0b8d593a61bb49120fdf817e8dfdbc4b33937772/xamarin.android-12.3.99.117.pkg @@ -78,7 +82,9 @@ jobs: condition: eq(variables['System.JobName'], 'windows') displayName: install Xamarin.Android - pwsh: | - dotnet workload install android + 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) + dotnet workload install maui --verbosity diag --skip-manifest-update --source $(Dotnet6Source) --source $(NuGetOrgSource) displayName: install .NET 6 Android Workload condition: ne(variables['System.JobName'], 'linux') tools: