This commit is contained in:
Nick Banks 2022-08-01 11:01:08 -04:00 коммит произвёл GitHub
Родитель 494dc8c427
Коммит 754cea4eaa
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 15 добавлений и 15 удалений

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

@ -418,7 +418,7 @@ stages:
jobs:
- template: ./templates/build-config-user.yml
parameters:
image: macOS-10.15
image: macOS-12
platform: macos
arch: x64
tls: openssl
@ -430,7 +430,7 @@ stages:
jobs:
- template: ./templates/build-config-user.yml
parameters:
image: macOS-10.15
image: macOS-12
platform: macos
arch: x64
tls: openssl
@ -442,14 +442,14 @@ stages:
jobs:
- template: ./templates/build-config-user.yml
parameters:
image: macOS-10.15
image: macOS-12
platform: macos
arch: arm64
tls: openssl
- template: ./templates/build-config-user.yml
parameters:
image: macOS-10.15
image: macOS-12
platform: macos
arch: x64
tls: openssl
@ -458,7 +458,7 @@ stages:
- template: ./templates/build-config-user.yml
parameters:
image: macOS-10.15
image: macOS-12
platform: macos
arch: arm64
tls: openssl
@ -467,14 +467,14 @@ stages:
- template: ./templates/build-config-user.yml
parameters:
image: macOS-10.15
image: macOS-12
platform: ios
arch: arm64
tls: openssl
- template: ./templates/build-config-user.yml
parameters:
image: macOS-10.15
image: macOS-12
platform: ios
arch: x64
tls: openssl
@ -488,7 +488,7 @@ stages:
jobs:
- template: ./templates/merge-darwin.yml
parameters:
image: macOS-10.15
image: macOS-12
- stage: darwin_frameworks
displayName: Darwin Frameworks
@ -497,7 +497,7 @@ stages:
jobs:
- template: ./templates/build-darwin-framework.yml
parameters:
image: macOS-10.15
image: macOS-12
#
# Release BVTs
@ -648,7 +648,7 @@ stages:
extraTestArgs: -Filter -*CredValidation*:TlsTest.InProc* -ExtraArtifactDir Sanitize
- template: ./templates/run-bvt.yml
parameters:
image: macOS-10.15
image: macOS-12
platform: macos
tls: openssl
logProfile: None
@ -737,7 +737,7 @@ stages:
extraTestArgs: -ExtraArtifactDir shared_ec
- template: ./templates/run-spinquic.yml
parameters:
image: macOS-10.15
image: macOS-12
platform: macos
tls: openssl
allocFail: 100
@ -764,7 +764,7 @@ stages:
tls: openssl
- template: ./templates/run-dotnet.yml
parameters:
image: macOS-10.15
image: macOS-12
platform: macos
arch: universal
tls: openssl
@ -830,7 +830,7 @@ stages:
tls: openssl
- template: ./templates/run-quicinterop.yml
parameters:
image: macOS-10.15
image: macOS-12
platform: macos
tls: openssl

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

@ -451,7 +451,7 @@ if(CMAKE_GENERATOR MATCHES "Xcode" AND PLATFORM_INT MATCHES "MAC_CATALYST_.*")
set(CMAKE_XCODE_ATTRIBUTE_SUPPORTED_PLATFORMS "macosx")
set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-maccatalyst")
if(NOT DEFINED MACOSX_DEPLOYMENT_TARGET)
set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET "10.15")
set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET "12")
else()
set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET "${MACOSX_DEPLOYMENT_TARGET}")
endif()

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

@ -337,7 +337,7 @@ function CMake-Generate {
}
if ($Platform -eq "macos") {
switch ($Arch) {
"x64" { $Arguments += " -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=""10.15"""}
"x64" { $Arguments += " -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=""12"""}
"arm64" { $Arguments += " -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=""11.0"""}
}
}