diff --git a/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json b/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json index a0ac2ef0c0..c6b27addaa 100644 --- a/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json +++ b/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json @@ -1,23 +1,23 @@ { - "matrix": { - "CmakeEnvArg": "", - "OSConfig": { - "Linux": { - "Pool": "azsdk-pool-mms-ubuntu-1804-general", - "OSVmImage": "MMSUbuntu18.04", - "AptDependencies": "libcurl4-openssl-dev", - "VCPKG_DEFAULT_TRIPLET": "x64-linux" - }, - "Windows": { - "Pool": "azsdk-pool-mms-win-2019-general", - "OSVmImage": "MMS2019", - "VCPKG_DEFAULT_TRIPLET": "x64-windows" - }, - "Mac": { - "Pool": "Azure Pipelines", - "OSVmImage": "macos-11", - "VCPKG_DEFAULT_TRIPLET": "x64-osx" - } - } + "matrix": { + "CmakeEnvArg": "", + "OSConfig": { + "Linux": { + "Pool": "azsdk-pool-mms-ubuntu-1804-general", + "OSVmImage": "MMSUbuntu18.04", + "AptDependencies": "libcurl4-openssl-dev", + "VCPKG_DEFAULT_TRIPLET": "x64-linux" + }, + "Windows": { + "Pool": "azsdk-pool-mms-win-2019-general", + "OSVmImage": "MMS2019", + "VCPKG_DEFAULT_TRIPLET": "x64-windows" + }, + "Mac": { + "Pool": "Azure Pipelines", + "OSVmImage": "macos-11", + "VCPKG_DEFAULT_TRIPLET": "x64-osx" + } } + } } diff --git a/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json b/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json index 49ac2e648a..07e9fbc210 100644 --- a/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json +++ b/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json @@ -1,23 +1,23 @@ { - "matrix": { - "OSConfig": { - "Windows": { - "Pool": "azsdk-pool-mms-win-2019-general", - "OSVmImage": "MMS2019", - "CmakeEnvArg": "" - }, - "Linux": { - "Pool": "azsdk-pool-mms-ubuntu-1804-general", - "OSVmImage": "MMSUbuntu18.04", - "CmakeEnvArg": "", - "AptDependencies": "libcurl4-openssl-dev" - }, - "Mac": { - "Pool": "Azure Pipelines", - "OSVmImage": "macos-11", - "CmakeEnvArg": "OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3 OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl@3/include ", - "BrewDependencies": "openssl" - } - } + "matrix": { + "OSConfig": { + "Windows": { + "Pool": "azsdk-pool-mms-win-2019-general", + "OSVmImage": "MMS2019", + "CmakeEnvArg": "" + }, + "Linux": { + "Pool": "azsdk-pool-mms-ubuntu-1804-general", + "OSVmImage": "MMSUbuntu18.04", + "CmakeEnvArg": "", + "AptDependencies": "libcurl4-openssl-dev" + }, + "Mac": { + "Pool": "Azure Pipelines", + "OSVmImage": "macos-11", + "CmakeEnvArg": "OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3 OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl@3/include ", + "BrewDependencies": "openssl" + } } + } } diff --git a/eng/scripts/Get-BinarySizes.ps1 b/eng/scripts/Get-BinarySizes.ps1 index 1cc164e4ee..bbe5be472f 100644 --- a/eng/scripts/Get-BinarySizes.ps1 +++ b/eng/scripts/Get-BinarySizes.ps1 @@ -41,7 +41,7 @@ function setEnvVar($key, $value) { } function getTargetOs { - if ($OsVMImage.StartsWith('macOS', $true, (Get-Culture).InvariantCulture)) { + if ($OsVMImage -like 'macOS*') { return $OsVMImage } @@ -64,7 +64,7 @@ function getTargetOs { } function getTargetArchitecture { - if ($OSVmImage.StartsWith('macOS', $true, (Get-Culture).InvariantCulture)) { + if ($OSVmImage -like 'macOS*') { return "x64" } @@ -81,7 +81,7 @@ function getTargetArchitecture { } function getToolChain { - if ($OSVmImage.StartsWith('macOS', $true, (Get-Culture).InvariantCulture)) { + if ($OSVmImage -like 'macOS*') { return "AppleClang 12" } @@ -109,7 +109,7 @@ function getToolChain { } function getTargetPlatform { - if ($OSVmImage.StartsWith('macOS', $true, (Get-Culture).InvariantCulture)) { + if ($OSVmImage -like 'macOS*') { return "macos" }