Merge branch 'main' into wsu-20240412

This commit is contained in:
moljac 2024-04-15 19:43:04 +02:00 коммит произвёл GitHub
Родитель 3502b32b4f 9938d6b19b
Коммит b384ca7296
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
5 изменённых файлов: 15 добавлений и 15 удалений

Просмотреть файл

@ -19,12 +19,12 @@ variables:
# Windows specific variables
windowsAgentPoolName: Maui-1ESPT # Windows VM pool name
windowsImage: 1ESPT-Windows2022 # Windows VM image name
windowsClassicInstaller: https://aka.ms/xamarin-android-commercial-d17-4-windows # Windows Classic XA installer URL
windowsClassicInstaller: https://aka.ms/xamarin-android-commercial-d17-8-windows # Windows Classic XA installer URL
# macOS specific variables
macosAgentPoolName: Azure Pipelines # macOS VM pool name
macosImage: internal-macos12 # macOS VM image name
macosClassicInstaller: https://aka.ms/xamarin-android-commercial-d17-4-macos # macOS Classic XA installer URL
macosClassicInstaller: https://aka.ms/xamarin-android-commercial-d17-8-macos # macOS Classic XA installer URL
resources:
repositories:

Просмотреть файл

@ -8,7 +8,7 @@
#addin nuget:?package=Cake.FileHelpers&version=7.0.0
#addin nuget:?package=Newtonsoft.Json&version=13.0.3
#addin nuget:?package=Cake.MonoApiTools&version=3.0.5
#addin nuget:?package=CsvHelper&version=30.1.0
#addin nuget:?package=CsvHelper&version=31.0.3
#addin nuget:?package=SharpZipLib&version=1.4.2
// #addin nuget:?package=NuGet.Protocol&loaddependencies=true&version=5.6.0

Просмотреть файл

@ -12,7 +12,7 @@ parameters:
runAPIScan: false # Run APIScan analysis
# Tool Parameters
dotnetVersion: '7.0.406' # .NET version to install on agent
dotnetVersion: '7.0.408' # .NET version to install on agent
dotnetWorkloadRollbackFile: 'workloads.json' # Rollback file specifying workload versions to install
dotnetNuGetOrgSource: 'https://api.nuget.org/v3/index.json' # NuGet.org URL to find workloads
dotnetWorkloadSource: 'https://aka.ms/dotnet6/nuget/index.json' # .NET engineering URL to find workloads
@ -21,7 +21,7 @@ parameters:
tools: # Additional .NET global tools to install
- 'xamarin.androidbinderator.tool': '0.5.7'
- 'Cake.Tool': '4.0.0'
- 'boots': '1.1.0.712-preview2'
- 'boots': '1.1.0.36'
- 'private-api-tools': '1.0.3'
# Reporting/Analysis Parameters

Просмотреть файл

@ -1,7 +1,7 @@
{
"sdk":
{
"version": "7.0.405",
"version": "7.0.408",
"rollForward": "patch"
},
"msbuild-sdks":

Просмотреть файл

@ -1,12 +1,12 @@
{
"microsoft.net.sdk.android": "33.0.95/7.0.100",
"microsoft.net.sdk.ios": "16.4.7090/7.0.100",
"microsoft.net.sdk.maccatalyst": "16.4.7090/7.0.100",
"microsoft.net.sdk.macos": "13.3.7090/7.0.100",
"microsoft.net.sdk.maui": "7.0.92/7.0.100",
"microsoft.net.sdk.tvos": "16.4.7090/7.0.100",
"microsoft.net.workload.mono.toolchain.net6": "7.0.10/7.0.100",
"microsoft.net.workload.mono.toolchain.net7": "7.0.10/7.0.100",
"microsoft.net.workload.emscripten.net6": "7.0.10/7.0.100",
"microsoft.net.workload.emscripten.net7": "7.0.10/7.0.100"
"microsoft.net.sdk.ios": "16.4.7142/7.0.100",
"microsoft.net.sdk.maccatalyst": "16.4.7142/7.0.100",
"microsoft.net.sdk.macos": "13.3.7142/7.0.100",
"microsoft.net.sdk.maui": "7.0.101/7.0.100",
"microsoft.net.sdk.tvos": "16.4.7142/7.0.100",
"microsoft.net.workload.mono.toolchain.net6": "7.0.18/7.0.100",
"microsoft.net.workload.mono.toolchain.net7": "7.0.18/7.0.100",
"microsoft.net.workload.emscripten.net6": "7.0.18/7.0.100",
"microsoft.net.workload.emscripten.net7": "7.0.18/7.0.100"
}