From: Viktor Hofer Date: Wed, 11 Jan 2023 16:58:32 +0000 (+0100) Subject: Lowercase TargetOS (#80164) X-Git-Tag: accepted/tizen/unified/riscv/20231226.055536~4693 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ca7cf7140ebfaa8e34732b529c194416b122e89;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Lowercase TargetOS (#80164) Follow-up on #32451 Follow-up on #80074 In #43651, the "Windows" OS name was lowercased to achieve target frameworks with RIDs in them. At that time, the original plan was to lowercase all TargetOS values but that had to be cut because of resources. This PR finishes that and updates build systems, YML, markdowns and managed components. To not break existing developer workflows, the passed-in -os value is automatically lower-cased in the script entry points and validated in the msbuild entry point. --- diff --git a/.devcontainer/scripts/onCreateCommand.sh b/.devcontainer/scripts/onCreateCommand.sh index f84c90b1878..09b7478bbac 100755 --- a/.devcontainer/scripts/onCreateCommand.sh +++ b/.devcontainer/scripts/onCreateCommand.sh @@ -16,7 +16,7 @@ case "$opt" in # prebuild for WASM, so it is ready for wasm development make -C src/mono/wasm provision-wasm export EMSDK_PATH=$PWD/src/mono/wasm/emsdk - ./build.sh mono+libs -os Browser -c Release + ./build.sh mono+libs -os browser -c Release # install dotnet-serve for running wasm samples ./dotnet.sh tool install dotnet-serve --tool-path ./.dotnet-tools-global diff --git a/Directory.Build.props b/Directory.Build.props index 2da3b59909e..327e8d65dff 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -10,18 +10,18 @@ - <_hostOS>Linux - <_hostOS Condition="$([MSBuild]::IsOSPlatform('OSX'))">OSX - <_hostOS Condition="$([MSBuild]::IsOSPlatform('FREEBSD'))">FreeBSD - <_hostOS Condition="$([MSBuild]::IsOSPlatform('NETBSD'))">NetBSD + <_hostOS>linux + <_hostOS Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx + <_hostOS Condition="$([MSBuild]::IsOSPlatform('FREEBSD'))">freebsd + <_hostOS Condition="$([MSBuild]::IsOSPlatform('NETBSD'))">netbsd <_hostOS Condition="$([MSBuild]::IsOSPlatform('ILLUMOS'))">illumos - <_hostOS Condition="$([MSBuild]::IsOSPlatform('SOLARIS'))">Solaris + <_hostOS Condition="$([MSBuild]::IsOSPlatform('SOLARIS'))">solaris <_hostOS Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">windows $(_hostOS) browser $(_hostOS) - true - true + true + true @@ -35,7 +35,7 @@ loongarch64 s390x ppc64le - wasm + wasm wasm x64 x64 @@ -166,38 +166,38 @@ <_portableOS>linux <_portableOS Condition="'$(_runtimeOS)' == 'linux-musl'">linux-musl <_portableOS Condition="'$(_runtimeOS)' == 'linux-bionic'">linux-bionic - <_portableOS Condition="'$(_hostOS)' == 'OSX'">osx + <_portableOS Condition="'$(_hostOS)' == 'osx'">osx <_portableOS Condition="'$(_runtimeOS)' == 'win' or '$(TargetOS)' == 'windows'">win - <_portableOS Condition="'$(_runtimeOS)' == 'FreeBSD' or '$(TargetOS)' == 'FreeBSD'">freebsd + <_portableOS Condition="'$(_runtimeOS)' == 'freebsd' or '$(TargetOS)' == 'freebsd'">freebsd <_portableOS Condition="'$(_runtimeOS)' == 'illumos' or '$(TargetOS)' == 'illumos'">illumos - <_portableOS Condition="'$(_runtimeOS)' == 'Solaris' or '$(TargetOS)' == 'Solaris'">solaris - <_portableOS Condition="'$(_runtimeOS)' == 'Browser'">browser + <_portableOS Condition="'$(_runtimeOS)' == 'solaris' or '$(TargetOS)' == 'solaris'">solaris + <_portableOS Condition="'$(_runtimeOS)' == 'browser'">browser <_portableOS Condition="'$(_runtimeOS)' == 'wasi'">wasi <_portableOS Condition="'$(_runtimeOS)' == 'maccatalyst'">maccatalyst <_portableOS Condition="'$(_runtimeOS)' == 'ios'">ios - <_portableOS Condition="'$(_runtimeOS)' == 'iOSSimulator'">iossimulator + <_portableOS Condition="'$(_runtimeOS)' == 'iossimulator'">iossimulator <_portableOS Condition="'$(_runtimeOS)' == 'tvos'">tvos - <_portableOS Condition="'$(_runtimeOS)' == 'tvOSSimulator'">tvossimulator + <_portableOS Condition="'$(_runtimeOS)' == 'tvossimulator'">tvossimulator <_portableOS Condition="'$(_runtimeOS)' == 'android'">android <_runtimeOS Condition="$(_runtimeOS.StartsWith('tizen'))">linux <_runtimeOS Condition="'$(PortableBuild)' == 'true'">$(_portableOS) <_packageLibc Condition="$(_runtimeOS.Contains('musl'))">-musl - <_packageOS Condition="'$(CrossBuild)' == 'true'">$(_hostOS.ToLowerInvariant)$(_packageLibc) + <_packageOS Condition="'$(CrossBuild)' == 'true'">$(_hostOS)$(_packageLibc) <_packageOS Condition="'$(_packageOS)' == '' and '$(PortableBuild)' == 'true'">$(_portableOS) <_packageOS Condition="'$(_packageOS)' == ''">$(_runtimeOS) - <_toolsRID Condition="'$(CrossBuild)' == 'true'">$(_hostOS.ToLowerInvariant)-$(_hostArch) + <_toolsRID Condition="'$(CrossBuild)' == 'true'">$(_hostOS)-$(_hostArch) <_toolsRID Condition="'$(BuildingInsideVisualStudio)' == 'true'">$(_runtimeOS)-x64 <_toolsRID Condition="'$(_toolsRID)' == ''">$(_runtimeOS)-$(_hostArch) - <_toolsRID Condition="'$(_runtimeOS)' == 'Browser'">linux-x64 - <_toolsRID Condition="'$(_runtimeOS)' == 'Browser' and '$(HostOS)' == 'windows'">win-x64 - <_toolsRID Condition="'$(_runtimeOS)' == 'Browser' and '$(HostOS)' == 'osx'">osx-x64 + <_toolsRID Condition="'$(_runtimeOS)' == 'browser'">linux-x64 + <_toolsRID Condition="'$(_runtimeOS)' == 'browser' and '$(HostOS)' == 'windows'">win-x64 + <_toolsRID Condition="'$(_runtimeOS)' == 'browser' and '$(HostOS)' == 'osx'">osx-x64 <_toolsRID Condition="'$(_runtimeOS)' == 'android' or '$(_runtimeOS)' == 'linux-bionic'">linux-x64 @@ -205,7 +205,7 @@ <_toolsRID Condition="('$(_runtimeOS)' == 'android' or '$(_runtimeOS)' == 'linux-bionic') and '$(HostOS)' == 'osx'">osx-x64 - <_toolsRID Condition="'$(_runtimeOS)' == 'maccatalyst' or '$(_runtimeOS)' == 'ios' or '$(_runtimeOS)' == 'iOSSimulator' or '$(_runtimeOS)' == 'tvos' or '$(_runtimeOS)' == 'tvOSSimulator'">osx-x64 + <_toolsRID Condition="'$(_runtimeOS)' == 'maccatalyst' or '$(_runtimeOS)' == 'ios' or '$(_runtimeOS)' == 'iossimulator' or '$(_runtimeOS)' == 'tvos' or '$(_runtimeOS)' == 'tvossimulator'">osx-x64 linux-$(_hostArch) @@ -220,19 +220,19 @@ - true + true true - true - true - true - true - true - true - true - true - true - true - true + true + true + true + true + true + true + true + true + true + true + true true true true diff --git a/Directory.Build.targets b/Directory.Build.targets index 471f5f44e66..5f92d5d4685 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,4 +1,4 @@ - + - true + true true @@ -289,7 +289,7 @@ HostArchitecture=$(CrossDacHostArch); PgoInstrument=false; NoPgoOptimize=true; - TargetOS=Linux; + TargetOS=linux; CMakeArgs=$(CMakeArgs) -DCLR_CROSS_COMPONENTS_BUILD=1" Category="clr" /> @@ -324,7 +324,7 @@ - + @@ -378,7 +378,7 @@ - + diff --git a/eng/build.ps1 b/eng/build.ps1 index e3e009d12da..5f49c0e01b7 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -6,7 +6,7 @@ Param( [string][Alias('f')]$framework, [string]$vs, [string][Alias('v')]$verbosity = "minimal", - [ValidateSet("windows","Linux","OSX","Android","Browser","wasi")][string]$os, + [ValidateSet("windows","linux","osx","android","browser","wasi")][string]$os, [switch]$allconfigurations, [switch]$coverage, [string]$testscope, @@ -40,7 +40,7 @@ function Get-Help() { Write-Host " [Default: Debug]" Write-Host " -librariesConfiguration (-lc) Libraries build configuration: Debug or Release." Write-Host " [Default: Debug]" - Write-Host " -os Target operating system: windows, Linux, OSX, Android, wasi or Browser." + Write-Host " -os Target operating system: windows, linux, osx, android, wasi or browser." Write-Host " [Default: Your machine's OS.]" Write-Host " -runtimeConfiguration (-rc) Runtime build configuration: Debug, Release or Checked." Write-Host " Checked is exclusive to the CLR runtime. It is the same as Debug, except code is" @@ -129,6 +129,9 @@ if ($subset -eq 'help') { exit 0 } +# Lower-case the passed in OS string. +$os = $os.ToLowerInvariant() + if ($vs) { $archToOpen = $arch[0] $configToOpen = $configuration[0] @@ -237,15 +240,6 @@ if (!$actionPassedIn) { $arguments = "-restore -build" } -if ($PSBoundParameters.ContainsKey('os') -and $PSBoundParameters['os'] -eq "Browser") { - # make sure it is capitalized - $PSBoundParameters['os'] = "Browser" -} -if ($PSBoundParameters.ContainsKey('os') -and $PSBoundParameters['os'] -eq "wasi") { - # make sure it is not capitalized - $PSBoundParameters['os'] = "wasi" -} - foreach ($argument in $PSBoundParameters.Keys) { switch($argument) @@ -277,7 +271,7 @@ $env:DOTNETSDK_ALLOW_TARGETING_PACK_CACHING=0 $failedBuilds = @() -if ($os -eq "Browser") { +if ($os -eq "browser") { # override default arch for Browser, we only support wasm $arch = "wasm" @@ -301,7 +295,7 @@ foreach ($config in $configuration) { $argumentsWithConfig = $arguments + " -configuration $((Get-Culture).TextInfo.ToTitleCase($config))"; foreach ($singleArch in $arch) { $argumentsWithArch = "/p:TargetArchitecture=$singleArch " + $argumentsWithConfig - if ($os -eq "Browser") { + if ($os -eq "browser") { $env:__DistroRid="browser-$singleArch" } elseif ($os -eq "wasi") { $env:__DistroRid="wasi-$singleArch" diff --git a/eng/build.sh b/eng/build.sh index 80fed9942f9..215d93fc195 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -30,8 +30,8 @@ usage() echo " [Default: Debug]" echo " --librariesConfiguration (-lc) Libraries build configuration: Debug or Release." echo " [Default: Debug]" - echo " --os Target operating system: windows, Linux, FreeBSD, OSX, MacCatalyst, tvOS," - echo " tvOSSimulator, iOS, iOSSimulator, Android, Browser, wasi, NetBSD, illumos or Solaris." + echo " --os Target operating system: windows, linux, freebsd, osx, maccatalyst, tvos," + echo " tvossimulator, ios, iossimulator, android, browser, wasi, netbsd, illumos or solaris." echo " [Default: Your machine's OS.]" echo " --outputrid Optional argument that overrides the target rid name." echo " --projects Project or solution file(s) to build." @@ -139,7 +139,7 @@ initDistroRid() local isPortableBuild="$4" # Only pass ROOTFS_DIR if __DoCrossArchBuild is specified and the current platform is not OSX that doesn't use rootfs - if [[ $isCrossBuild == 1 && "$targetOs" != "OSX" ]]; then + if [[ $isCrossBuild == 1 && "$targetOs" != "osx" ]]; then passedRootfsDir=${ROOTFS_DIR} fi initDistroRidGlobal ${targetOs} ${buildArch} ${isPortableBuild} ${passedRootfsDir} @@ -261,34 +261,34 @@ while [[ $# > 0 ]]; do windows) os="windows" ;; linux) - os="Linux" ;; + os="linux" ;; freebsd) - os="FreeBSD" ;; + os="freebsd" ;; osx) - os="OSX" ;; + os="osx" ;; maccatalyst) - os="MacCatalyst" ;; + os="maccatalyst" ;; tvos) - os="tvOS" ;; + os="tvos" ;; tvossimulator) - os="tvOSSimulator" ;; + os="tvossimulator" ;; ios) - os="iOS" ;; + os="ios" ;; iossimulator) - os="iOSSimulator" ;; + os="iossimulator" ;; android) - os="Android" ;; + os="android" ;; browser) - os="Browser" ;; + os="browser" ;; wasi) os="wasi" ;; illumos) os="illumos" ;; solaris) - os="Solaris" ;; + os="solaris" ;; *) echo "Unsupported target OS '$2'." - echo "The allowed values are windows, Linux, FreeBSD, OSX, MacCatalyst, tvOS, tvOSSimulator, iOS, iOSSimulator, Android, Browser, wasi, illumos and Solaris." + echo "The allowed values are windows, linux, freebsd, osx, maccatalyst, tvos, tvossimulator, ios, iossimulator, android, browser, wasi, illumos and solaris." exit 1 ;; esac @@ -503,7 +503,7 @@ if [ ${#actInt[@]} -eq 0 ]; then arguments="-restore -build $arguments" fi -if [[ "$os" == "Browser" ]]; then +if [[ "$os" == "browser" ]]; then # override default arch for Browser, we only support wasm arch=wasm fi diff --git a/eng/codeOptimization.targets b/eng/codeOptimization.targets index 83b7612b719..e1d81e46c0b 100644 --- a/eng/codeOptimization.targets +++ b/eng/codeOptimization.targets @@ -9,15 +9,15 @@ IBCMerge optimizations on Mac for now to unblock the official build. See issue https://github.com/dotnet/runtime/issues/33303 --> - false + false - $(IbcOptimizationDataDir)Linux\ - $(IbcOptimizationDataDir)Windows\ + $(IbcOptimizationDataDir)linux\ + $(IbcOptimizationDataDir)windows\ <_optimizationDataAssembly Include="$(IbcOptimizationDataDir)**\$(TargetFileName)" /> diff --git a/eng/common/native/common-library.sh b/eng/common/native/common-library.sh index 080c2c283ae..75740d4a65c 100755 --- a/eng/common/native/common-library.sh +++ b/eng/common/native/common-library.sh @@ -55,8 +55,8 @@ function ExpandZip { function GetCurrentOS { local unameOut="$(uname -s)" case $unameOut in - Linux*) echo "Linux";; - Darwin*) echo "MacOS";; + Linux*) echo "linux";; + Darwin*) echo "macos";; esac return 0 } diff --git a/eng/coredistools.targets b/eng/coredistools.targets index 0da9d1cc59b..810a58a2317 100644 --- a/eng/coredistools.targets +++ b/eng/coredistools.targets @@ -9,7 +9,7 @@ $(PkgMicrosoft_NETCore_CoreDisTools)\runtimes\win-$(TargetArchitecture)\native\coredistools.dll - $(PkgMicrosoft_NETCore_CoreDisTools)\runtimes\linux-$(TargetArchitecture)\native\libcoredistools.so - $(PkgMicrosoft_NETCore_CoreDisTools)\runtimes\osx-$(TargetArchitecture)\native\libcoredistools.dylib + $(PkgMicrosoft_NETCore_CoreDisTools)\runtimes\linux-$(TargetArchitecture)\native\libcoredistools.so + $(PkgMicrosoft_NETCore_CoreDisTools)\runtimes\osx-$(TargetArchitecture)\native\libcoredistools.dylib diff --git a/eng/docker/libraries-sdk.linux.Dockerfile b/eng/docker/libraries-sdk.linux.Dockerfile index 9d7b339383a..d1e2fc96167 100644 --- a/eng/docker/libraries-sdk.linux.Dockerfile +++ b/eng/docker/libraries-sdk.linux.Dockerfile @@ -45,6 +45,6 @@ COPY --from=corefxbuild \ # Add AspNetCore bits to testhost: ENV _ASPNETCORE_SOURCE="/usr/share/dotnet/shared/Microsoft.AspNetCore.App/$VERSION*" -ENV _ASPNETCORE_DEST="/live-runtime-artifacts/testhost/net$VERSION-Linux-$CONFIGURATION-x64/shared/Microsoft.AspNetCore.App" +ENV _ASPNETCORE_DEST="/live-runtime-artifacts/testhost/net$VERSION-linux-$CONFIGURATION-x64/shared/Microsoft.AspNetCore.App" RUN mkdir -p $_ASPNETCORE_DEST RUN cp -r $_ASPNETCORE_SOURCE $_ASPNETCORE_DEST \ No newline at end of file diff --git a/eng/install-native-dependencies.sh b/eng/install-native-dependencies.sh index a06ed1a6bf8..c0bf36c1a85 100755 --- a/eng/install-native-dependencies.sh +++ b/eng/install-native-dependencies.sh @@ -30,6 +30,6 @@ elif [ "$os" = "maccatalyst" ] || [ "$os" = "osx" ] || [ "$os" = "macos" ] || [ # brew update --preinstall brew bundle --no-upgrade --no-lock --file "$(dirname "$0")/Brewfile" else - echo "Must pass 'Linux', 'macOS', 'maccatalyst', 'iOS' or 'tvOS' as first argument." + echo "Must pass 'linux', 'macos', 'maccatalyst', 'ios' or 'tvos' as first argument." exit 1 fi diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 50fa18c46f5..15768278534 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -29,7 +29,7 @@ $([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'aotsdk')) $([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'build')) - $([MSBuild]::NormalizeDirectory('$(MonoArtifactsPath)', 'cross', $(TargetOS.ToLowerInvariant())-$(TargetArchitecture.ToLowerInvariant()))) + $([MSBuild]::NormalizeDirectory('$(MonoArtifactsPath)', 'cross', $(TargetOS)-$(TargetArchitecture.ToLowerInvariant()))) $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'obj', 'grpcserver', 'docker')) $([MSBuild]::NormalizeDirectory('$(LibrariesArtifactsPath)', 'packages', '$(LibrariesConfiguration)')) @@ -179,7 +179,7 @@ $(LibrariesNativeArtifactsPath)*.pdb" IsNative="true" Exclude="@(ExcludeNativeLibrariesRuntimeFiles)" /> - - - - - /dev/null || { echo >&2 "Please install pkg-config before running this script, see https://github.com/dotnet/runtime/blob/main/docs/workflow/requirements/macos-requirements.md"; exit 1; } @@ -63,7 +63,7 @@ build_native() # All set to commence the build echo "Commencing build of \"$target\" target in \"$message\" for $__TargetOS.$__TargetArch.$__BuildType in $intermediatesDir" - if [[ "$targetOS" == OSX || "$targetOS" == MacCatalyst ]]; then + if [[ "$targetOS" == osx || "$targetOS" == maccatalyst ]]; then if [[ "$hostArch" == x64 ]]; then cmakeArgs="-DCMAKE_OSX_ARCHITECTURES=\"x86_64\" $cmakeArgs" elif [[ "$hostArch" == arm64 ]]; then @@ -74,11 +74,11 @@ build_native() fi fi - if [[ "$targetOS" == MacCatalyst ]]; then - cmakeArgs="-DCMAKE_SYSTEM_VARIANT=MacCatalyst $cmakeArgs" + if [[ "$targetOS" == maccatalyst ]]; then + cmakeArgs="-DCMAKE_SYSTEM_VARIANT=maccatalyst $cmakeArgs" fi - if [[ ( "$targetOS" == Android || "$targetOS" == linux-bionic ) && -z "$ROOTFS_DIR" ]]; then + if [[ ( "$targetOS" == android || "$targetOS" == linux-bionic ) && -z "$ROOTFS_DIR" ]]; then if [[ -z "$ANDROID_NDK_ROOT" ]]; then echo "Error: You need to set the ANDROID_NDK_ROOT environment variable pointing to the Android NDK root." exit 1 @@ -163,7 +163,7 @@ build_native() popd else cmake_command=cmake - if [[ "$build_arch" == "wasm" && "$__TargetOS" == "Browser" ]]; then + if [[ "$build_arch" == "wasm" && "$__TargetOS" == "browser" ]]; then cmake_command="emcmake cmake" echo "Executing $cmake_command --build \"$intermediatesDir\" --target $target -- -j $__NumProc" $cmake_command --build "$intermediatesDir" --target $target -- -j "$__NumProc" @@ -236,12 +236,12 @@ __BuildOS=$os __OutputRid='' # Get the number of processors available to the scheduler -platform="$(uname)" -if [[ "$platform" == "FreeBSD" ]]; then +platform="$(uname -s | tr '[:upper:]' '[:lower:]')" +if [[ "$platform" == "freebsd" ]]; then __NumProc="$(($(sysctl -n hw.ncpu)+1))" -elif [[ "$platform" == "NetBSD" || "$platform" == "SunOS" ]]; then +elif [[ "$platform" == "netbsd" || "$platform" == "sunos" ]]; then __NumProc="$(($(getconf NPROCESSORS_ONLN)+1))" -elif [[ "$platform" == "Darwin" ]]; then +elif [[ "$platform" == "darwin" ]]; then __NumProc="$(($(getconf _NPROCESSORS_ONLN)+1))" elif command -v nproc > /dev/null 2>&1; then __NumProc="$(nproc)" @@ -410,7 +410,7 @@ while :; do os|-os) if [[ -n "$2" ]]; then - __TargetOS="$2" + __TargetOS=$(echo "$2" | tr '[:upper:]' '[:lower:]') shift else echo "ERROR: 'os' requires a non-empty option argument" @@ -460,13 +460,13 @@ fi if [[ "$__TargetArch" == wasm ]]; then # nothing to do here true -elif [[ "$__TargetOS" == iOS || "$__TargetOS" == iOSSimulator ]]; then +elif [[ "$__TargetOS" == ios || "$__TargetOS" == iossimulator ]]; then # nothing to do here true -elif [[ "$__TargetOS" == tvOS || "$__TargetOS" == tvOSSimulator ]]; then +elif [[ "$__TargetOS" == tvos || "$__TargetOS" == tvossimulator ]]; then # nothing to do here true -elif [[ "$__TargetOS" == Android ]]; then +elif [[ "$__TargetOS" == android ]]; then # nothing to do here true else @@ -478,7 +478,7 @@ if [[ "$__CrossBuild" == 1 ]]; then CROSSCOMPILE=1 export CROSSCOMPILE # Darwin that doesn't use rootfs - if [[ -z "$ROOTFS_DIR" && "$platform" != "Darwin" ]]; then + if [[ -z "$ROOTFS_DIR" && "$platform" != "darwin" ]]; then ROOTFS_DIR="$__RepoRootDir/.tools/rootfs/$__TargetArch" export ROOTFS_DIR fi diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake index 62420db41c9..9907cd09e80 100644 --- a/eng/native/configureplatform.cmake +++ b/eng/native/configureplatform.cmake @@ -10,7 +10,8 @@ set(PRERELEASE 1) # - for windows we use the passed in parameter to CMAKE to determine build arch #---------------------------------------- set(CLR_CMAKE_HOST_OS ${CMAKE_SYSTEM_NAME}) -if(CLR_CMAKE_HOST_OS STREQUAL Linux) +string(TOLOWER ${CLR_CMAKE_HOST_OS} CLR_CMAKE_HOST_OS) +if(CLR_CMAKE_HOST_OS STREQUAL linux) set(CLR_CMAKE_HOST_UNIX 1) if(CLR_CROSS_COMPONENTS_BUILD) # CMAKE_HOST_SYSTEM_PROCESSOR returns the value of `uname -p` on host. @@ -94,16 +95,16 @@ if(CLR_CMAKE_HOST_OS STREQUAL Linux) set(CLR_CMAKE_HOST_LINUX_MUSL 1) endif() endif(DEFINED CLR_CMAKE_LINUX_ID) -endif(CLR_CMAKE_HOST_OS STREQUAL Linux) +endif(CLR_CMAKE_HOST_OS STREQUAL linux) -if(CLR_CMAKE_HOST_OS STREQUAL Darwin) +if(CLR_CMAKE_HOST_OS STREQUAL darwin) set(CLR_CMAKE_HOST_UNIX 1) - if(CMAKE_SYSTEM_VARIANT STREQUAL MacCatalyst) + if(CMAKE_SYSTEM_VARIANT STREQUAL maccatalyst) set(CLR_CMAKE_HOST_MACCATALYST 1) else() set(CLR_CMAKE_HOST_OSX 1) - endif(CMAKE_SYSTEM_VARIANT STREQUAL MacCatalyst) + endif(CMAKE_SYSTEM_VARIANT STREQUAL maccatalyst) if(CMAKE_OSX_ARCHITECTURES STREQUAL x86_64) set(CLR_CMAKE_HOST_UNIX_AMD64 1) @@ -113,9 +114,9 @@ if(CLR_CMAKE_HOST_OS STREQUAL Darwin) clr_unknown_arch() endif() set(CMAKE_ASM_COMPILE_OBJECT "${CMAKE_C_COMPILER} -o -c ") -endif(CLR_CMAKE_HOST_OS STREQUAL Darwin) +endif(CLR_CMAKE_HOST_OS STREQUAL darwin) -if(CLR_CMAKE_HOST_OS STREQUAL iOS OR CLR_CMAKE_HOST_OS STREQUAL iOSSimulator) +if(CLR_CMAKE_HOST_OS STREQUAL ios OR CLR_CMAKE_HOST_OS STREQUAL iossimulator) set(CLR_CMAKE_HOST_UNIX 1) set(CLR_CMAKE_HOST_IOS 1) if(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") @@ -129,9 +130,9 @@ if(CLR_CMAKE_HOST_OS STREQUAL iOS OR CLR_CMAKE_HOST_OS STREQUAL iOSSimulator) else() clr_unknown_arch() endif() -endif(CLR_CMAKE_HOST_OS STREQUAL iOS OR CLR_CMAKE_HOST_OS STREQUAL iOSSimulator) +endif(CLR_CMAKE_HOST_OS STREQUAL ios OR CLR_CMAKE_HOST_OS STREQUAL iossimulator) -if(CLR_CMAKE_HOST_OS STREQUAL tvOS OR CLR_CMAKE_HOST_OS STREQUAL tvOSSimulator) +if(CLR_CMAKE_HOST_OS STREQUAL tvos OR CLR_CMAKE_HOST_OS STREQUAL tvossimulator) set(CLR_CMAKE_HOST_UNIX 1) set(CLR_CMAKE_HOST_TVOS 1) if(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") @@ -141,9 +142,9 @@ if(CLR_CMAKE_HOST_OS STREQUAL tvOS OR CLR_CMAKE_HOST_OS STREQUAL tvOSSimulator) else() clr_unknown_arch() endif() -endif(CLR_CMAKE_HOST_OS STREQUAL tvOS OR CLR_CMAKE_HOST_OS STREQUAL tvOSSimulator) +endif(CLR_CMAKE_HOST_OS STREQUAL tvos OR CLR_CMAKE_HOST_OS STREQUAL tvossimulator) -if(CLR_CMAKE_HOST_OS STREQUAL Android) +if(CLR_CMAKE_HOST_OS STREQUAL android) set(CLR_CMAKE_HOST_UNIX 1) set(CLR_CMAKE_HOST_LINUX 1) set(CLR_CMAKE_HOST_ANDROID 1) @@ -158,9 +159,9 @@ if(CLR_CMAKE_HOST_OS STREQUAL Android) else() clr_unknown_arch() endif() -endif(CLR_CMAKE_HOST_OS STREQUAL Android) +endif(CLR_CMAKE_HOST_OS STREQUAL android) -if(CLR_CMAKE_HOST_OS STREQUAL FreeBSD) +if(CLR_CMAKE_HOST_OS STREQUAL freebsd) set(CLR_CMAKE_HOST_UNIX 1) if (CMAKE_SYSTEM_PROCESSOR STREQUAL amd64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64) set(CLR_CMAKE_HOST_UNIX_AMD64 1) @@ -170,21 +171,21 @@ if(CLR_CMAKE_HOST_OS STREQUAL FreeBSD) clr_unknown_arch() endif() set(CLR_CMAKE_HOST_FREEBSD 1) -endif(CLR_CMAKE_HOST_OS STREQUAL FreeBSD) +endif(CLR_CMAKE_HOST_OS STREQUAL freebsd) -if(CLR_CMAKE_HOST_OS STREQUAL OpenBSD) +if(CLR_CMAKE_HOST_OS STREQUAL openbsd) set(CLR_CMAKE_HOST_UNIX 1) set(CLR_CMAKE_HOST_UNIX_AMD64 1) set(CLR_CMAKE_HOST_OPENBSD 1) -endif(CLR_CMAKE_HOST_OS STREQUAL OpenBSD) +endif(CLR_CMAKE_HOST_OS STREQUAL openbsd) -if(CLR_CMAKE_HOST_OS STREQUAL NetBSD) +if(CLR_CMAKE_HOST_OS STREQUAL netbsd) set(CLR_CMAKE_HOST_UNIX 1) set(CLR_CMAKE_HOST_UNIX_AMD64 1) set(CLR_CMAKE_HOST_NETBSD 1) -endif(CLR_CMAKE_HOST_OS STREQUAL NetBSD) +endif(CLR_CMAKE_HOST_OS STREQUAL netbsd) -if(CLR_CMAKE_HOST_OS STREQUAL SunOS) +if(CLR_CMAKE_HOST_OS STREQUAL sunos) set(CLR_CMAKE_HOST_UNIX 1) EXECUTE_PROCESS( COMMAND isainfo -n @@ -208,21 +209,20 @@ if(CLR_CMAKE_HOST_OS STREQUAL SunOS) else(SUNOS_KERNEL_KIND STREQUAL illumos OR CMAKE_CROSSCOMPILING) set(CLR_CMAKE_HOST_OS_SOLARIS 1) endif(SUNOS_KERNEL_KIND STREQUAL illumos OR CMAKE_CROSSCOMPILING) -endif(CLR_CMAKE_HOST_OS STREQUAL SunOS) +endif(CLR_CMAKE_HOST_OS STREQUAL sunos) -if(CLR_CMAKE_HOST_OS STREQUAL Windows) - set(CLR_CMAKE_HOST_OS windows) +if(CLR_CMAKE_HOST_OS STREQUAL windows) set(CLR_CMAKE_HOST_WIN32 1) -endif(CLR_CMAKE_HOST_OS STREQUAL Windows) +endif(CLR_CMAKE_HOST_OS STREQUAL windows) -if(CLR_CMAKE_HOST_OS STREQUAL Emscripten) +if(CLR_CMAKE_HOST_OS STREQUAL emscripten) set(CLR_CMAKE_HOST_UNIX 1) set(CLR_CMAKE_HOST_BROWSER 1) -endif(CLR_CMAKE_HOST_OS STREQUAL Emscripten) +endif(CLR_CMAKE_HOST_OS STREQUAL emscripten) -if(CLR_CMAKE_TARGET_OS STREQUAL WASI) +if(CLR_CMAKE_TARGET_OS STREQUAL wasi) set(CLR_CMAKE_HOST_WASI 1) -endif(CLR_CMAKE_TARGET_OS STREQUAL WASI) +endif(CLR_CMAKE_TARGET_OS STREQUAL wasi) #-------------------------------------------- # This repo builds two set of binaries @@ -345,10 +345,10 @@ if (NOT DEFINED CLR_CMAKE_TARGET_OS OR CLR_CMAKE_TARGET_OS STREQUAL "" ) set(CLR_CMAKE_TARGET_OS ${CLR_CMAKE_HOST_OS}) endif() -if(CLR_CMAKE_TARGET_OS STREQUAL Linux) +if(CLR_CMAKE_TARGET_OS STREQUAL linux) set(CLR_CMAKE_TARGET_UNIX 1) set(CLR_CMAKE_TARGET_LINUX 1) -endif(CLR_CMAKE_TARGET_OS STREQUAL Linux) +endif(CLR_CMAKE_TARGET_OS STREQUAL linux) if(CLR_CMAKE_HOST_LINUX_MUSL) set(CLR_CMAKE_TARGET_LINUX_MUSL 1) @@ -366,48 +366,48 @@ if(CLR_CMAKE_TARGET_OS STREQUAL alpine) set(CLR_CMAKE_TARGET_ALPINE_LINUX 1) endif(CLR_CMAKE_TARGET_OS STREQUAL alpine) -if(CLR_CMAKE_TARGET_OS STREQUAL Android) +if(CLR_CMAKE_TARGET_OS STREQUAL android) set(CLR_CMAKE_TARGET_UNIX 1) set(CLR_CMAKE_TARGET_LINUX 1) set(CLR_CMAKE_TARGET_ANDROID 1) -endif(CLR_CMAKE_TARGET_OS STREQUAL Android) +endif(CLR_CMAKE_TARGET_OS STREQUAL android) -if(CLR_CMAKE_TARGET_OS STREQUAL Darwin) +if(CLR_CMAKE_TARGET_OS STREQUAL darwin) set(CLR_CMAKE_TARGET_UNIX 1) - if(CMAKE_SYSTEM_VARIANT STREQUAL MacCatalyst) + if(CMAKE_SYSTEM_VARIANT STREQUAL maccatalyst) set(CLR_CMAKE_TARGET_MACCATALYST 1) else() set(CLR_CMAKE_TARGET_OSX 1) - endif(CMAKE_SYSTEM_VARIANT STREQUAL MacCatalyst) -endif(CLR_CMAKE_TARGET_OS STREQUAL Darwin) + endif(CMAKE_SYSTEM_VARIANT STREQUAL maccatalyst) +endif(CLR_CMAKE_TARGET_OS STREQUAL darwin) -if(CLR_CMAKE_TARGET_OS STREQUAL iOS OR CLR_CMAKE_TARGET_OS STREQUAL iOSSimulator) +if(CLR_CMAKE_TARGET_OS STREQUAL ios OR CLR_CMAKE_TARGET_OS STREQUAL iossimulator) set(CLR_CMAKE_TARGET_UNIX 1) set(CLR_CMAKE_TARGET_IOS 1) -endif(CLR_CMAKE_TARGET_OS STREQUAL iOS OR CLR_CMAKE_TARGET_OS STREQUAL iOSSimulator) +endif(CLR_CMAKE_TARGET_OS STREQUAL ios OR CLR_CMAKE_TARGET_OS STREQUAL iossimulator) -if(CLR_CMAKE_TARGET_OS STREQUAL tvOS OR CLR_CMAKE_TARGET_OS STREQUAL tvOSSimulator) +if(CLR_CMAKE_TARGET_OS STREQUAL tvos OR CLR_CMAKE_TARGET_OS STREQUAL tvossimulator) set(CLR_CMAKE_TARGET_UNIX 1) set(CLR_CMAKE_TARGET_TVOS 1) -endif(CLR_CMAKE_TARGET_OS STREQUAL tvOS OR CLR_CMAKE_TARGET_OS STREQUAL tvOSSimulator) +endif(CLR_CMAKE_TARGET_OS STREQUAL tvos OR CLR_CMAKE_TARGET_OS STREQUAL tvossimulator) -if(CLR_CMAKE_TARGET_OS STREQUAL FreeBSD) +if(CLR_CMAKE_TARGET_OS STREQUAL freebsd) set(CLR_CMAKE_TARGET_UNIX 1) set(CLR_CMAKE_TARGET_FREEBSD 1) -endif(CLR_CMAKE_TARGET_OS STREQUAL FreeBSD) +endif(CLR_CMAKE_TARGET_OS STREQUAL freebsd) -if(CLR_CMAKE_TARGET_OS STREQUAL OpenBSD) +if(CLR_CMAKE_TARGET_OS STREQUAL openbsd) set(CLR_CMAKE_TARGET_UNIX 1) set(CLR_CMAKE_TARGET_OPENBSD 1) -endif(CLR_CMAKE_TARGET_OS STREQUAL OpenBSD) +endif(CLR_CMAKE_TARGET_OS STREQUAL openbsd) -if(CLR_CMAKE_TARGET_OS STREQUAL NetBSD) +if(CLR_CMAKE_TARGET_OS STREQUAL netbsd) set(CLR_CMAKE_TARGET_UNIX 1) set(CLR_CMAKE_TARGET_NETBSD 1) -endif(CLR_CMAKE_TARGET_OS STREQUAL NetBSD) +endif(CLR_CMAKE_TARGET_OS STREQUAL netbsd) -if(CLR_CMAKE_TARGET_OS STREQUAL SunOS) +if(CLR_CMAKE_TARGET_OS STREQUAL sunos) set(CLR_CMAKE_TARGET_UNIX 1) if(CLR_CMAKE_HOST_OS_ILLUMOS) set(CLR_CMAKE_TARGET_OS_ILLUMOS 1) @@ -415,17 +415,17 @@ if(CLR_CMAKE_TARGET_OS STREQUAL SunOS) set(CLR_CMAKE_TARGET_OS_SOLARIS 1) endif(CLR_CMAKE_HOST_OS_ILLUMOS) set(CLR_CMAKE_TARGET_SUNOS 1) -endif(CLR_CMAKE_TARGET_OS STREQUAL SunOS) +endif(CLR_CMAKE_TARGET_OS STREQUAL sunos) -if(CLR_CMAKE_TARGET_OS STREQUAL Emscripten) +if(CLR_CMAKE_TARGET_OS STREQUAL emscripten) set(CLR_CMAKE_TARGET_UNIX 1) set(CLR_CMAKE_TARGET_LINUX 1) set(CLR_CMAKE_TARGET_BROWSER 1) -endif(CLR_CMAKE_TARGET_OS STREQUAL Emscripten) +endif(CLR_CMAKE_TARGET_OS STREQUAL emscripten) -if(CLR_CMAKE_TARGET_OS STREQUAL WASI) +if(CLR_CMAKE_TARGET_OS STREQUAL wasi) set(CLR_CMAKE_TARGET_WASI 1) -endif(CLR_CMAKE_TARGET_OS STREQUAL WASI) +endif(CLR_CMAKE_TARGET_OS STREQUAL wasi) if(CLR_CMAKE_TARGET_UNIX) if(CLR_CMAKE_TARGET_ARCH STREQUAL x64) diff --git a/eng/native/gen-buildsys.cmd b/eng/native/gen-buildsys.cmd index fb70a4e0c29..30c502fe1d9 100644 --- a/eng/native/gen-buildsys.cmd +++ b/eng/native/gen-buildsys.cmd @@ -46,7 +46,7 @@ if /i "%__Arch%" == "wasm" ( echo Error: Please add target OS parameter exit /B 1 ) - if /i "%__Os%" == "Browser" ( + if /i "%__Os%" == "browser" ( if "%EMSDK_PATH%" == "" ( if not exist "%__repoRoot%\src\mono\wasm\emsdk" ( echo Error: Should set EMSDK_PATH environment variable pointing to emsdk root. @@ -75,7 +75,7 @@ if /i "%__Arch%" == "wasm" ( set "WASI_SDK_PATH=!WASI_SDK_PATH:\=/!" if not "!WASI_SDK_PATH:~-1!" == "/" set "WASI_SDK_PATH=!WASI_SDK_PATH!/" set __CmakeGenerator=Ninja - set __ExtraCmakeParams=%__ExtraCmakeParams% -DCLR_CMAKE_TARGET_OS=WASI -DCLR_CMAKE_TARGET_ARCH=wasm "-DWASI_SDK_PREFIX=!WASI_SDK_PATH!" "-DCMAKE_TOOLCHAIN_FILE=!WASI_SDK_PATH!/share/cmake/wasi-sdk.cmake" "-DCMAKE_SYSROOT=!WASI_SDK_PATH!/share/wasi-sysroot" + set __ExtraCmakeParams=%__ExtraCmakeParams% -DCLR_CMAKE_TARGET_OS=wasi -DCLR_CMAKE_TARGET_ARCH=wasm "-DWASI_SDK_PREFIX=!WASI_SDK_PATH!" "-DCMAKE_TOOLCHAIN_FILE=!WASI_SDK_PATH!/share/cmake/wasi-sdk.cmake" "-DCMAKE_SYSROOT=!WASI_SDK_PATH!/share/wasi-sysroot" ) ) else ( set __ExtraCmakeParams=%__ExtraCmakeParams% "-DCMAKE_SYSTEM_VERSION=10.0" diff --git a/eng/native/gen-buildsys.sh b/eng/native/gen-buildsys.sh index 72f90cdf15f..b39448626fb 100755 --- a/eng/native/gen-buildsys.sh +++ b/eng/native/gen-buildsys.sh @@ -61,9 +61,9 @@ done cmake_extra_defines= if [[ "$CROSSCOMPILE" == "1" ]]; then - platform="$(uname)" + platform="$(uname -s | tr '[:upper:]' '[:lower:]')" # OSX doesn't use rootfs - if ! [[ -n "$ROOTFS_DIR" || "$platform" == "Darwin" ]]; then + if ! [[ -n "$ROOTFS_DIR" || "$platform" == "darwin" ]]; then echo "ROOTFS_DIR not set for crosscompile" exit 1 fi @@ -73,7 +73,7 @@ if [[ "$CROSSCOMPILE" == "1" ]]; then cmake_extra_defines="$cmake_extra_defines -C $scriptroot/tryrun.cmake" - if [[ "$platform" == "Darwin" ]]; then + if [[ "$platform" == "darwin" ]]; then cmake_extra_defines="$cmake_extra_defines -DCMAKE_SYSTEM_NAME=Darwin" else cmake_extra_defines="$cmake_extra_defines -DCMAKE_TOOLCHAIN_FILE=$scriptroot/../common/cross/toolchain.cmake" @@ -94,7 +94,7 @@ if [[ "$scan_build" == "ON" && -n "$SCAN_BUILD_COMMAND" ]]; then fi if [[ "$host_arch" == "wasm" ]]; then - if [[ "$target_os" == "Browser" ]]; then + if [[ "$target_os" == "browser" ]]; then cmake_command="emcmake $cmake_command" elif [[ "$target_os" == "wasi" ]]; then true diff --git a/eng/native/init-distro-rid.sh b/eng/native/init-distro-rid.sh index 309f6970a0f..a380367e60e 100644 --- a/eng/native/init-distro-rid.sh +++ b/eng/native/init-distro-rid.sh @@ -34,7 +34,7 @@ initNonPortableDistroRid() local rootfsDir="$4" local nonPortableBuildID="" - if [ "$targetOs" = "Linux" ]; then + if [ "$targetOs" = "linux" ]; then if [ -e "${rootfsDir}/etc/os-release" ]; then source "${rootfsDir}/etc/os-release" @@ -61,7 +61,7 @@ initNonPortableDistroRid() fi fi - if [ "$targetOs" = "FreeBSD" ]; then + if [ "$targetOs" = "freebsd" ]; then if (( isPortable == 0 )); then # $rootfsDir can be empty. freebsd-version is shell script and it should always work. __freebsd_major_version=$($rootfsDir/bin/freebsd-version | { read v; echo "${v%%.*}"; }) @@ -85,7 +85,7 @@ initNonPortableDistroRid() nonPortableBuildID=openindiana-"$buildArch" ;; esac - elif [ "$targetOs" = "Solaris" ]; then + elif [ "$targetOs" = "solaris" ]; then __uname_version=$(uname -v) __solaris_major_version=$(echo "${__uname_version%.*}") nonPortableBuildID=solaris."$__solaris_major_version"-"$buildArch" @@ -148,7 +148,7 @@ initDistroRidGlobal() initNonPortableDistroRid "${targetOs}" "${buildArch}" "${isPortable}" "${rootfsDir}" if [ "$buildArch" = "wasm" ]; then - if [ "$targetOs" = "Browser" ]; then + if [ "$targetOs" = "browser" ]; then __DistroRid=browser-wasm export __DistroRid elif [ "$targetOs" = "wasi" ]; then @@ -171,33 +171,33 @@ initDistroRidGlobal() fi if [ -z "${distroRid}" ]; then - if [ "$targetOs" = "Linux" ]; then + if [ "$targetOs" = "linux" ]; then distroRid="linux-$buildArch" elif [ "$targetOs" = "linux-bionic" ]; then distroRid="linux-bionic-$buildArch" - elif [ "$targetOs" = "OSX" ]; then + elif [ "$targetOs" = "osx" ]; then distroRid="osx-$buildArch" - elif [ "$targetOs" = "MacCatalyst" ]; then + elif [ "$targetOs" = "maccatalyst" ]; then distroRid="maccatalyst-$buildArch" - elif [ "$targetOs" = "tvOS" ]; then + elif [ "$targetOs" = "tvos" ]; then distroRid="tvos-$buildArch" - elif [ "$targetOs" = "tvOSSimulator" ]; then + elif [ "$targetOs" = "tvossimulator" ]; then distroRid="tvossimulator-$buildArch" - elif [ "$targetOs" = "iOS" ]; then + elif [ "$targetOs" = "ios" ]; then distroRid="ios-$buildArch" - elif [ "$targetOs" = "iOSSimulator" ]; then + elif [ "$targetOs" = "iossimulator" ]; then distroRid="iossimulator-$buildArch" - elif [ "$targetOs" = "Android" ]; then + elif [ "$targetOs" = "android" ]; then distroRid="android-$buildArch" - elif [ "$targetOs" = "Browser" ]; then + elif [ "$targetOs" = "browser" ]; then distroRid="browser-$buildArch" elif [ "$targetOs" = "wasi" ]; then distroRid="wasi-$buildArch" - elif [ "$targetOs" = "FreeBSD" ]; then + elif [ "$targetOs" = "freebsd" ]; then distroRid="freebsd-$buildArch" elif [ "$targetOs" = "illumos" ]; then distroRid="illumos-$buildArch" - elif [ "$targetOs" = "Solaris" ]; then + elif [ "$targetOs" = "solaris" ]; then distroRid="solaris-$buildArch" fi fi diff --git a/eng/native/init-os-and-arch.sh b/eng/native/init-os-and-arch.sh index 9f8b78984db..897e895e5a1 100644 --- a/eng/native/init-os-and-arch.sh +++ b/eng/native/init-os-and-arch.sh @@ -1,17 +1,17 @@ #!/usr/bin/env bash # Use uname to determine what the OS is. -OSName=$(uname -s) +OSName=$(uname -s | tr '[:upper:]' '[:lower:]') if command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then - OSName="Android" + OSName="android" fi case "$OSName" in -FreeBSD|Linux|NetBSD|OpenBSD|SunOS|Android) +freebsd|linux|netbsd|openbsd|sunos|android) os="$OSName" ;; -Darwin) - os=OSX ;; +darwin) + os=osx ;; *) echo "Unsupported OS $OSName detected!" exit 1 ;; @@ -20,11 +20,11 @@ esac # On Solaris, `uname -m` is discouraged, see https://docs.oracle.com/cd/E36784_01/html/E36870/uname-1.html # and `uname -p` returns processor type (e.g. i386 on amd64). # The appropriate tool to determine CPU is isainfo(1) https://docs.oracle.com/cd/E36784_01/html/E36870/isainfo-1.html. -if [ "$os" = "SunOS" ]; then +if [ "$os" = "sunos" ]; then if uname -o 2>&1 | grep -q illumos; then os="illumos" else - os="Solaris" + os="solaris" fi CPUName=$(isainfo -n) else diff --git a/eng/native/tryrun.cmake b/eng/native/tryrun.cmake index dc7bffb741a..48f847a1a00 100644 --- a/eng/native/tryrun.cmake +++ b/eng/native/tryrun.cmake @@ -14,10 +14,10 @@ if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv7-alpine-linux-musleabihf OR elseif(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) set(FREEBSD 1) set(CMAKE_SYSTEM_NAME FreeBSD) - set(CLR_CMAKE_TARGET_OS FreeBSD) + set(CLR_CMAKE_TARGET_OS freebsd) elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc) set(ILLUMOS 1) - set(CLR_CMAKE_TARGET_OS SunOS) + set(CLR_CMAKE_TARGET_OS sunos) elseif(EXISTS /System/Library/CoreServices) set(DARWIN 1) elseif(EXISTS ${CROSS_ROOTFS}/etc/tizen-release) diff --git a/eng/nativepgo.targets b/eng/nativepgo.targets index 5dc312774e3..9f5984efdb6 100644 --- a/eng/nativepgo.targets +++ b/eng/nativepgo.targets @@ -1,11 +1,11 @@ true - true + true false false - <_NativeOptimizationDataPackageTarget>$(TargetOS.ToLower())-$(TargetArchitecture.ToLower()) + <_NativeOptimizationDataPackageTarget>$(TargetOS)-$(TargetArchitecture.ToLower()) <_NativeOptimizationDataPackageTarget Condition="'$(TargetOS)' == 'windows'">windows_nt-$(TargetArchitecture.ToLower()) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index ba532728a17..c41d31f65aa 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -39,10 +39,10 @@ jobs: parameters: ${{ if eq(parameters.hostedOs, '') }}: name: ${{ format('build_{0}{1}_{2}_{3}_{4}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig, parameters.nameSuffix) }} - displayName: ${{ format('{0}{1} {2} {3} {4} {5}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig, parameters.nameSuffix, parameters.runtimeVariant) }} + displayName: ${{ format('{0}{1}-{2} {3} {4} {5}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig, parameters.nameSuffix, parameters.runtimeVariant) }} ${{ if ne(parameters.hostedOs, '') }}: name: ${{ format('build_{0}{1}_{2}_{3}_{4}_{5}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.hostedOs, parameters.buildConfig, parameters.nameSuffix) }} - displayName: ${{ format('{0}{1} {2} {3} {4} {5} {6}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.hostedOs, parameters.buildConfig, parameters.nameSuffix, parameters.runtimeVariant) }} + displayName: ${{ format('{0}{1}-{2} {3} {4} {5} {6}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.hostedOs, parameters.buildConfig, parameters.nameSuffix, parameters.runtimeVariant) }} pool: ${{ parameters.pool }} container: ${{ parameters.container }} condition: and(succeeded(), ${{ parameters.condition }}) @@ -76,7 +76,7 @@ jobs: - name: _osParameter value: -os ${{ parameters.osGroup }} - - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_bionic')) }}: + - ${{ if and(eq(parameters.osGroup, 'linux'), eq(parameters.osSubGroup, '_bionic')) }}: - name: _osParameter value: /p:RuntimeOS=linux-bionic @@ -90,9 +90,9 @@ jobs: value: ${{ parameters.jobParameters.crossrootfsDir }} - name: _cxx11Parameter - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.archType, 'arm64')) }}: + ${{ if and(eq(parameters.osGroup, 'linux'), eq(parameters.archType, 'arm64')) }}: value: /p:MonoLLVMUseCxx11Abi=true - ${{ if and(eq(parameters.osGroup, 'Linux'), not(eq(parameters.archType, 'arm64'))) }}: + ${{ if and(eq(parameters.osGroup, 'linux'), not(eq(parameters.archType, 'arm64'))) }}: value: /p:MonoLLVMUseCxx11Abi=false - name: _officialBuildParameter @@ -102,9 +102,9 @@ jobs: value: '' - name: _buildDarwinFrameworksParameter - ${{ if in(parameters.osGroup, 'iOS', 'tvOS', 'MacCatalyst')}}: + ${{ if in(parameters.osGroup, 'ios', 'tvos', 'maccatalyst')}}: value: /p:BuildDarwinFrameworks=true - ${{ if notin(parameters.osGroup, 'iOS', 'tvOS', 'MacCatalyst')}}: + ${{ if notin(parameters.osGroup, 'ios', 'tvos', 'maccatalyst')}}: value: '' - name: _richCodeNavigationParam @@ -162,7 +162,7 @@ jobs: runtimeOS: linux name: ${{ parameters.platform }} - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'MacCatalyst') }}: + - ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos', 'maccatalyst') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} displayName: Install Build Dependencies @@ -171,7 +171,7 @@ jobs: df -h displayName: Disk Usage before Build - - ${{ if eq(parameters.platform, 'Browser_wasm_win') }}: + - ${{ if eq(parameters.platform, 'browser_wasm_win') }}: # Update machine certs - task: PowerShell@2 displayName: Update machine certs @@ -195,7 +195,7 @@ jobs: displayName: Finalize CodeQL (manually-injected) #endif isSourceBuild - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'Android') }}: + - ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos', 'android') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h @@ -225,9 +225,9 @@ jobs: inputs: PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/' PublishLocation: Container - ${{ if ne(parameters.osGroup, 'Browser') }}: + ${{ if ne(parameters.osGroup, 'browser') }}: ArtifactName: Logs_Build_${{ parameters.osGroup }}_${{ parameters.osSubGroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}_${{ parameters.nameSuffix }} - ${{ if eq(parameters.osGroup, 'Browser') }}: - ArtifactName: Logs_Build_Browser_wasm_${{ parameters.hostedOs }}_${{ parameters.buildConfig }}_${{ parameters.nameSuffix }} + ${{ if eq(parameters.osGroup, 'browser') }}: + ArtifactName: Logs_Build_browser_wasm_${{ parameters.hostedOs }}_${{ parameters.buildConfig }}_${{ parameters.nameSuffix }} continueOnError: true condition: always() diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index a876f91e81b..d240154ed81 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -24,18 +24,18 @@ parameters: jobs: # Linux arm -- ${{ if or(containsValue(parameters.platforms, 'Linux_arm'), in(parameters.platformGroup, 'all', 'gcstress')) }}: +- ${{ if or(containsValue(parameters.platforms, 'linux_arm'), in(parameters.platformGroup, 'all', 'gcstress')) }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Linux + osGroup: linux archType: arm targetRid: linux-arm - platform: Linux_arm + platform: linux_arm shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - container: Linux_arm + container: linux_arm jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} buildConfig: ${{ parameters.buildConfig }} @@ -44,18 +44,18 @@ jobs: ${{ insert }}: ${{ parameters.jobParameters }} # Linux armv6 -- ${{ if containsValue(parameters.platforms, 'Linux_armv6') }}: +- ${{ if containsValue(parameters.platforms, 'linux_armv6') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Linux + osGroup: linux archType: armv6 targetRid: linux-armv6 - platform: Linux_armv6 + platform: linux_armv6 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - container: Linux_armv6 + container: linux_armv6 jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} buildConfig: ${{ parameters.buildConfig }} @@ -65,19 +65,19 @@ jobs: # Linux arm64 -- ${{ if or(containsValue(parameters.platforms, 'Linux_arm64'), in(parameters.platformGroup, 'all', 'gcstress')) }}: +- ${{ if or(containsValue(parameters.platforms, 'linux_arm64'), in(parameters.platformGroup, 'all', 'gcstress')) }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Linux + osGroup: linux archType: arm64 targetRid: linux-arm64 - platform: Linux_arm64 + platform: linux_arm64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} ${{ if eq(parameters.container, '') }}: - container: Linux_arm64 + container: linux_arm64 ${{ if ne(parameters.container, '') }}: container: image: ${{ parameters.container }} @@ -91,19 +91,19 @@ jobs: # Linux musl x64 -- ${{ if or(containsValue(parameters.platforms, 'Linux_musl_x64'), eq(parameters.platformGroup, 'all')) }}: +- ${{ if or(containsValue(parameters.platforms, 'linux_musl_x64'), eq(parameters.platformGroup, 'all')) }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Linux + osGroup: linux osSubgroup: _musl archType: x64 targetRid: linux-musl-x64 - platform: Linux_musl_x64 + platform: linux_musl_x64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - container: Linux_musl_x64 + container: linux_musl_x64 jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} buildConfig: ${{ parameters.buildConfig }} @@ -112,19 +112,19 @@ jobs: # Linux musl arm -- ${{ if or(containsValue(parameters.platforms, 'Linux_musl_arm'), eq(parameters.platformGroup, 'all')) }}: +- ${{ if or(containsValue(parameters.platforms, 'linux_musl_arm'), eq(parameters.platformGroup, 'all')) }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Linux + osGroup: linux osSubgroup: _musl archType: arm targetRid: linux-musl-arm - platform: Linux_musl_arm + platform: linux_musl_arm shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - container: Linux_musl_arm + container: linux_musl_arm jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} buildConfig: ${{ parameters.buildConfig }} @@ -134,19 +134,19 @@ jobs: # Linux musl arm64 -- ${{ if or(containsValue(parameters.platforms, 'Linux_musl_arm64'), eq(parameters.platformGroup, 'all')) }}: +- ${{ if or(containsValue(parameters.platforms, 'linux_musl_arm64'), eq(parameters.platformGroup, 'all')) }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Linux + osGroup: linux osSubgroup: _musl archType: arm64 targetRid: linux-musl-arm64 - platform: Linux_musl_arm64 + platform: linux_musl_arm64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - container: Linux_musl_arm64 + container: linux_musl_arm64 jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} buildConfig: ${{ parameters.buildConfig }} @@ -156,19 +156,19 @@ jobs: # Linux Bionic arm64 -- ${{ if containsValue(parameters.platforms, 'Linux_bionic_arm64') }}: +- ${{ if containsValue(parameters.platforms, 'linux_bionic_arm64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Linux + osGroup: linux osSubgroup: _bionic archType: arm64 targetRid: linux-bionic-arm64 - platform: Linux_bionic_arm64 + platform: linux_bionic_arm64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - container: Linux_bionic + container: linux_bionic jobParameters: runtimeFlavor: mono # We build on Linux, but the test queue runs Windows, so @@ -180,19 +180,19 @@ jobs: # Linux Bionic x64 -- ${{ if containsValue(parameters.platforms, 'Linux_bionic_x64') }}: +- ${{ if containsValue(parameters.platforms, 'linux_bionic_x64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Linux + osGroup: linux osSubgroup: _bionic archType: x64 targetRid: linux-bionic-x64 - platform: Linux_bionic_x64 + platform: linux_bionic_x64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - container: Linux_bionic + container: linux_bionic jobParameters: runtimeFlavor: mono buildConfig: ${{ parameters.buildConfig }} @@ -201,19 +201,19 @@ jobs: # Linux x64 -- ${{ if or(containsValue(parameters.platforms, 'Linux_x64'), containsValue(parameters.platforms, 'CoreClrTestBuildHost'), in(parameters.platformGroup, 'all', 'gcstress')) }}: +- ${{ if or(containsValue(parameters.platforms, 'linux_x64'), containsValue(parameters.platforms, 'CoreClrTestBuildHost'), in(parameters.platformGroup, 'all', 'gcstress')) }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Linux + osGroup: linux archType: x64 targetRid: linux-x64 - platform: Linux_x64 + platform: linux_x64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} ${{ if eq(parameters.container, '') }}: - container: Linux_x64 + container: linux_x64 ${{ if ne(parameters.container, '') }}: container: image: ${{ parameters.container }} @@ -226,18 +226,18 @@ jobs: # Linux x86 -- ${{ if containsValue(parameters.platforms, 'Linux_x86') }}: +- ${{ if containsValue(parameters.platforms, 'linux_x86') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Linux + osGroup: linux archType: x86 targetRid: linux-x86 - platform: Linux_x86 + platform: linux_x86 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - container: Linux_x86 + container: linux_x86 jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} buildConfig: ${{ parameters.buildConfig }} @@ -248,16 +248,16 @@ jobs: # Centos 7 x64 Source Build -- ${{ if containsValue(parameters.platforms, 'SourceBuild_Centos7_x64') }}: +- ${{ if containsValue(parameters.platforms, 'SourceBuild_centos7_x64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Linux + osGroup: linux archType: x64 targetRid: centos.7-x64 - platform: Centos7_Linux_x64 + platform: centos7_linux_x64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} container: image: centos-7-source-build @@ -272,16 +272,16 @@ jobs: # Non-existent RID Source Build -- ${{ if containsValue(parameters.platforms, 'SourceBuild_Banana24_x64') }}: +- ${{ if containsValue(parameters.platforms, 'SourceBuild_banana24_x64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Linux + osGroup: linux archType: x64 targetRid: banana.24-x64 - platform: Banana24_Linux_x64 + platform: banana24_linux_x64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} container: image: centos-7-source-build-20210714125450-5d87b80 @@ -296,18 +296,18 @@ jobs: # Portable Linux x64 Source Build -- ${{ if containsValue(parameters.platforms, 'SourceBuild_Linux_x64') }}: +- ${{ if containsValue(parameters.platforms, 'SourceBuild_linux_x64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Linux + osGroup: linux archType: x64 targetRid: linux-x64 - platform: Linux_x64 + platform: linux_x64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - container: SourceBuild_Linux_x64 + container: SourceBuild_linux_x64 jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} buildConfig: ${{ parameters.buildConfig }} @@ -318,18 +318,18 @@ jobs: # Linux s390x -- ${{ if containsValue(parameters.platforms, 'Linux_s390x') }}: +- ${{ if containsValue(parameters.platforms, 'linux_s390x') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Linux + osGroup: linux archType: s390x targetRid: linux-s390x - platform: Linux_s390x + platform: linux_s390x shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - container: Linux_s390x + container: linux_s390x jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} buildConfig: ${{ parameters.buildConfig }} @@ -339,18 +339,18 @@ jobs: # Linux PPC64le -- ${{ if containsValue(parameters.platforms, 'Linux_ppc64le') }}: +- ${{ if containsValue(parameters.platforms, 'linux_ppc64le') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Linux + osGroup: linux archType: ppc64le targetRid: linux-ppc64le - platform: Linux_ppc64le + platform: linux_ppc64le shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - container: Linux_ppc64le + container: linux_ppc64le jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} buildConfig: ${{ parameters.buildConfig }} @@ -373,7 +373,7 @@ jobs: shouldContinueOnError: ${{ parameters.shouldContinueOnError }} container: wasi_wasm jobParameters: - hostedOs: Linux + hostedOs: linux runtimeFlavor: ${{ parameters.runtimeFlavor }} stagedBuild: ${{ parameters.stagedBuild }} buildConfig: ${{ parameters.buildConfig }} @@ -381,56 +381,56 @@ jobs: # Browser WebAssembly -- ${{ if containsValue(parameters.platforms, 'Browser_wasm') }}: +- ${{ if containsValue(parameters.platforms, 'browser_wasm') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Browser + osGroup: browser archType: wasm targetRid: browser-wasm - platform: Browser_wasm + platform: browser_wasm shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - container: Browser_wasm + container: browser_wasm jobParameters: - hostedOs: Linux + hostedOs: linux runtimeFlavor: ${{ parameters.runtimeFlavor }} buildConfig: ${{ parameters.buildConfig }} ${{ insert }}: ${{ parameters.jobParameters }} # Browser WebAssembly Linux Firefox -- ${{ if containsValue(parameters.platforms, 'Browser_wasm_firefox') }}: +- ${{ if containsValue(parameters.platforms, 'browser_wasm_firefox') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Browser + osGroup: browser archType: wasm targetRid: browser-wasm - platform: Browser_wasm_firefox + platform: browser_wasm_firefox shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - container: Browser_wasm + container: browser_wasm jobParameters: - hostedOs: Linux + hostedOs: linux runtimeFlavor: ${{ parameters.runtimeFlavor }} buildConfig: ${{ parameters.buildConfig }} ${{ insert }}: ${{ parameters.jobParameters }} # Browser WebAssembly on Windows -- ${{ if containsValue(parameters.platforms, 'Browser_wasm_win') }}: +- ${{ if containsValue(parameters.platforms, 'browser_wasm_win') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Browser + osGroup: browser archType: wasm targetRid: browser-wasm - platform: Browser_wasm_win + platform: browser_wasm_win shouldContinueOnError: ${{ parameters.shouldContinueOnError }} jobParameters: hostedOs: windows @@ -439,18 +439,18 @@ jobs: ${{ insert }}: ${{ parameters.jobParameters }} # FreeBSD -- ${{ if containsValue(parameters.platforms, 'FreeBSD_x64') }}: +- ${{ if containsValue(parameters.platforms, 'freebsd_x64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: FreeBSD + osGroup: freebsd archType: x64 targetRid: freebsd-x64 - platform: FreeBSD_x64 + platform: freebsd_x64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - container: FreeBSD_x64 + container: freebsd_x64 jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} buildConfig: ${{ parameters.buildConfig }} @@ -460,18 +460,18 @@ jobs: # Android x64 -- ${{ if containsValue(parameters.platforms, 'Android_x64') }}: +- ${{ if containsValue(parameters.platforms, 'android_x64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Android + osGroup: android archType: x64 targetRid: android-x64 - platform: Android_x64 + platform: android_x64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - container: Linux_bionic + container: linux_bionic jobParameters: runtimeFlavor: mono buildConfig: ${{ parameters.buildConfig }} @@ -480,18 +480,18 @@ jobs: # Android x86 -- ${{ if containsValue(parameters.platforms, 'Android_x86') }}: +- ${{ if containsValue(parameters.platforms, 'android_x86') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Android + osGroup: android archType: x86 targetRid: android-x86 - platform: Android_x86 + platform: android_x86 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - container: Linux_bionic + container: linux_bionic jobParameters: runtimeFlavor: mono buildConfig: ${{ parameters.buildConfig }} @@ -500,18 +500,18 @@ jobs: # Android arm -- ${{ if containsValue(parameters.platforms, 'Android_arm') }}: +- ${{ if containsValue(parameters.platforms, 'android_arm') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Android + osGroup: android archType: arm targetRid: android-arm - platform: Android_arm + platform: android_arm shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - container: Linux_bionic + container: linux_bionic jobParameters: runtimeFlavor: mono buildConfig: ${{ parameters.buildConfig }} @@ -520,18 +520,18 @@ jobs: # Android arm64 -- ${{ if containsValue(parameters.platforms, 'Android_arm64') }}: +- ${{ if containsValue(parameters.platforms, 'android_arm64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Android + osGroup: android archType: arm64 targetRid: android-arm64 - platform: Android_arm64 + platform: android_arm64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - container: Linux_bionic + container: linux_bionic jobParameters: runtimeFlavor: mono buildConfig: ${{ parameters.buildConfig }} @@ -540,16 +540,16 @@ jobs: # Mac Catalyst x64 -- ${{ if containsValue(parameters.platforms, 'MacCatalyst_x64') }}: +- ${{ if containsValue(parameters.platforms, 'maccatalyst_x64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: MacCatalyst + osGroup: maccatalyst archType: x64 targetRid: maccatalyst-x64 - platform: MacCatalyst_x64 + platform: maccatalyst_x64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} jobParameters: runtimeFlavor: mono @@ -559,16 +559,16 @@ jobs: # Mac Catalyst arm64 -- ${{ if containsValue(parameters.platforms, 'MacCatalyst_arm64') }}: +- ${{ if containsValue(parameters.platforms, 'maccatalyst_arm64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: MacCatalyst + osGroup: maccatalyst archType: arm64 targetRid: maccatalyst-arm64 - platform: MacCatalyst_arm64 + platform: maccatalyst_arm64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} jobParameters: runtimeFlavor: mono @@ -578,16 +578,16 @@ jobs: # tvOS arm64 -- ${{ if containsValue(parameters.platforms, 'tvOS_arm64') }}: +- ${{ if containsValue(parameters.platforms, 'tvos_arm64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: tvOS + osGroup: tvos archType: arm64 targetRid: tvos-arm64 - platform: tvOS_arm64 + platform: tvos_arm64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} jobParameters: runtimeFlavor: mono @@ -597,16 +597,16 @@ jobs: # tvOS Simulator x64 -- ${{ if containsValue(parameters.platforms, 'tvOSSimulator_x64') }}: +- ${{ if containsValue(parameters.platforms, 'tvossimulator_x64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: tvOSSimulator + osGroup: tvossimulator archType: x64 targetRid: tvossimulator-x64 - platform: tvOSSimulator_x64 + platform: tvossimulator_x64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} jobParameters: runtimeFlavor: mono @@ -616,16 +616,16 @@ jobs: # tvOS Simulator arm64 -- ${{ if containsValue(parameters.platforms, 'tvOSSimulator_arm64') }}: +- ${{ if containsValue(parameters.platforms, 'tvossimulator_arm64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: tvOSSimulator + osGroup: tvossimulator archType: arm64 targetRid: tvossimulator-arm64 - platform: tvOSSimulator_arm64 + platform: tvossimulator_arm64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} jobParameters: runtimeFlavor: mono @@ -635,16 +635,16 @@ jobs: # iOS arm -- ${{ if containsValue(parameters.platforms, 'iOS_arm') }}: +- ${{ if containsValue(parameters.platforms, 'ios_arm') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: iOS + osGroup: ios archType: arm targetRid: ios-arm - platform: iOS_arm + platform: ios_arm shouldContinueOnError: ${{ parameters.shouldContinueOnError }} jobParameters: runtimeFlavor: mono @@ -654,16 +654,16 @@ jobs: # iOS arm64 -- ${{ if containsValue(parameters.platforms, 'iOS_arm64') }}: +- ${{ if containsValue(parameters.platforms, 'ios_arm64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: iOS + osGroup: ios archType: arm64 targetRid: ios-arm64 - platform: iOS_arm64 + platform: ios_arm64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} jobParameters: runtimeFlavor: mono @@ -673,16 +673,16 @@ jobs: # iOS Simulator x64 -- ${{ if containsValue(parameters.platforms, 'iOSSimulator_x64') }}: +- ${{ if containsValue(parameters.platforms, 'iossimulator_x64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: iOSSimulator + osGroup: iossimulator archType: x64 targetRid: iossimulator-x64 - platform: iOSSimulator_x64 + platform: iossimulator_x64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} jobParameters: runtimeFlavor: mono @@ -692,36 +692,35 @@ jobs: # iOS Simulator x86 -- ${{ if containsValue(parameters.platforms, 'iOSSimulator_x86') }}: +- ${{ if containsValue(parameters.platforms, 'iossimulator_x86') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: iOSSimulator + osGroup: iossimulator archType: x86 targetRid: iossimulator-x86 - platform: iOSsimulator_x86 + platform: iossimulator_x86 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} jobParameters: runtimeFlavor: mono buildConfig: ${{ parameters.buildConfig }} helixQueueGroup: ${{ parameters.helixQueueGroup }} - managedTestBuildOsGroup: OSX ${{ insert }}: ${{ parameters.jobParameters }} # iOS Simulator arm64 -- ${{ if containsValue(parameters.platforms, 'iOSSimulator_arm64') }}: +- ${{ if containsValue(parameters.platforms, 'iossimulator_arm64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: iOSSimulator + osGroup: iossimulator archType: arm64 targetRid: iossimulator-arm64 - platform: iOSSimulator_arm64 + platform: iossimulator_arm64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} jobParameters: runtimeFlavor: mono @@ -731,16 +730,16 @@ jobs: # macOS arm64 -- ${{ if containsValue(parameters.platforms, 'OSX_arm64') }}: +- ${{ if containsValue(parameters.platforms, 'osx_arm64') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: OSX + osGroup: osx archType: arm64 targetRid: osx-arm64 - platform: OSX_arm64 + platform: osx_arm64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} @@ -751,16 +750,16 @@ jobs: # macOS x64 -- ${{ if or(containsValue(parameters.platforms, 'OSX_x64'), eq(parameters.platformGroup, 'all')) }}: +- ${{ if or(containsValue(parameters.platforms, 'osx_x64'), eq(parameters.platformGroup, 'all')) }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: OSX + osGroup: osx archType: x64 targetRid: osx-x64 - platform: OSX_x64 + platform: osx_x64 shouldContinueOnError: ${{ parameters.shouldContinueOnError }} jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} @@ -770,18 +769,18 @@ jobs: # Tizen armel -- ${{ if containsValue(parameters.platforms, 'Tizen_armel') }}: +- ${{ if containsValue(parameters.platforms, 'tizen_armel') }}: - template: xplat-setup.yml parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} variables: ${{ parameters.variables }} - osGroup: Tizen + osGroup: tizen archType: armel targetRid: tizen-armel - platform: Tizen_armel + platform: tizen_armel shouldContinueOnError: ${{ parameters.shouldContinueOnError }} - container: Tizen_armel + container: tizen_armel jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} buildConfig: ${{ parameters.buildConfig }} diff --git a/eng/pipelines/common/templates/pipeline-with-resources.yml b/eng/pipelines/common/templates/pipeline-with-resources.yml index 9de181cce75..209270a1313 100644 --- a/eng/pipelines/common/templates/pipeline-with-resources.yml +++ b/eng/pipelines/common/templates/pipeline-with-resources.yml @@ -4,71 +4,71 @@ parameters: resources: containers: - - container: Linux_arm + - container: linux_arm image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm env: ROOTFS_DIR: /crossrootfs/arm - - container: Linux_armv6 + - container: linux_armv6 image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-cross-armv6-raspbian-10 env: ROOTFS_DIR: /crossrootfs/armv6 - - container: Linux_arm64 + - container: linux_arm64 image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64 env: ROOTFS_DIR: /crossrootfs/arm64 - - container: Linux_musl_x64 + - container: linux_musl_x64 image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-WithNode - - container: Linux_musl_arm + - container: linux_musl_arm image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine env: ROOTFS_DIR: /crossrootfs/arm - - container: Linux_musl_arm64 + - container: linux_musl_arm64 image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm64-alpine env: ROOTFS_DIR: /crossrootfs/arm64 # This container contains all required toolsets to build for Android and for Linux with bionic libc. - - container: Linux_bionic + - container: linux_bionic image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-android - - container: Linux_x64 + - container: linux_x64 image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7 - - container: Linux_x86 + - container: linux_x86 image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-x86-linux env: ROOTFS_DIR: /crossrootfs/x86 - - container: SourceBuild_Linux_x64 + - container: SourceBuild_linux_x64 image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build - - container: Linux_s390x + - container: linux_s390x image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-s390x env: ROOTFS_DIR: /crossrootfs/s390x - - container: Linux_ppc64le + - container: linux_ppc64le image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-ppc64le env: ROOTFS_DIR: /crossrootfs/ppc64le - - container: Browser_wasm + - container: browser_wasm image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-webassembly - container: wasi_wasm image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-webassembly - - container: FreeBSD_x64 + - container: freebsd_x64 image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-freebsd-12 env: ROOTFS_DIR: /crossrootfs/x64 - - container: Tizen_armel + - container: tizen_armel image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-armel-tizen env: ROOTFS_DIR: /crossrootfs/armel diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index c0efcead3e7..15c2d39f15c 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -37,9 +37,9 @@ jobs: pool: ${{ parameters.pool }} dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }} - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'OSX'))) }}: + ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'osx'))) }}: compilerArg: '-clang9' - ${{ if not(and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'OSX')))) }}: + ${{ if not(and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc'), not(and(eq(parameters.osGroup, 'linux'), eq(parameters.osSubgroup, '_musl'))), not(eq(parameters.osGroup, 'osx')))) }}: compilerArg: '' # Test jobs should continue on error for internal builds @@ -78,11 +78,11 @@ jobs: - name: compilerArg value: '-clang9' # We need to use the stable version available on Alpine Linux - - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}: + - ${{ if and(eq(parameters.osGroup, 'linux'), eq(parameters.osSubgroup, '_musl')) }}: - name: compilerArg value: '' # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH - - ${{ if eq(parameters.osGroup, 'OSX') }}: + - ${{ if eq(parameters.osGroup, 'osx') }}: - name: compilerArg value: '' @@ -108,7 +108,7 @@ jobs: steps: # Install test build dependencies - - ${{ if eq(parameters.osGroup, 'OSX') }}: + - ${{ if eq(parameters.osGroup, 'osx') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) displayName: Install native dependencies @@ -116,7 +116,7 @@ jobs: - script: $(Build.SourcesDirectory)/build$(scriptExt) $(liveRuntimeBuildParams) $(compilerArg) displayName: Build coreclr/libs components needed by test build - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: + - ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h @@ -126,7 +126,7 @@ jobs: - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)Managed allTargets skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(runtimeFlavorArgs) $(crossArg) $(priorityArg) $(testTreeFilterArg) ci /p:TargetOS=AnyOS displayName: Build managed test components - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: + - ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h diff --git a/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml b/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml index 0bea2e67bff..504f921e9de 100644 --- a/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml +++ b/eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml @@ -25,7 +25,7 @@ steps: - script: $(Build.SourcesDirectory)/eng/common/build.sh --ci --warnaserror false ${{ parameters.restoreParams }} displayName: Restore blob feed tasks (Unix) condition: and(succeeded(), ${{ and(ne(parameters.condition, false), ne(parameters.restoreParams, '')) }}) - ${{ if eq(parameters.osGroup, 'FreeBSD') }}: + ${{ if eq(parameters.osGroup, 'freebsd') }}: env: # Arcade uses this SDK instead of trying to restore one. DotNetCoreSdkDir: /usr/local/dotnet diff --git a/eng/pipelines/common/templates/runtimes/xplat-job.yml b/eng/pipelines/common/templates/runtimes/xplat-job.yml index d624e0aa341..b2c0091730b 100644 --- a/eng/pipelines/common/templates/runtimes/xplat-job.yml +++ b/eng/pipelines/common/templates/runtimes/xplat-job.yml @@ -54,11 +54,11 @@ jobs: workspace: clean: all - ${{ if eq(parameters.osGroup, 'Linux') }}: + ${{ if eq(parameters.osGroup, 'linux') }}: agentOs: Ubuntu - ${{ if eq(parameters.osGroup, 'FreeBSD') }}: + ${{ if eq(parameters.osGroup, 'freebsd') }}: agentOs: FreeBSD - ${{ if in(parameters.osGroup, 'OSX', 'iOS') }}: + ${{ if in(parameters.osGroup, 'osx', 'ios') }}: agentOs: MacOS ${{ if eq(parameters.osGroup, 'windows') }}: agentOs: windows diff --git a/eng/pipelines/common/templates/wasm-library-aot-tests.yml b/eng/pipelines/common/templates/wasm-library-aot-tests.yml index 08c78f7fcad..7c5e9e64fe5 100644 --- a/eng/pipelines/common/templates/wasm-library-aot-tests.yml +++ b/eng/pipelines/common/templates/wasm-library-aot-tests.yml @@ -17,11 +17,11 @@ jobs: # Build for Browser/wasm, with EnableAggressiveTrimming=true # # non-windows - run only with v8 -- ${{ if containsValue(parameters.platforms, 'Browser_wasm') }}: +- ${{ if containsValue(parameters.platforms, 'browser_wasm') }}: - template: /eng/pipelines/common/templates/wasm-library-tests.yml parameters: platforms: - - Browser_wasm + - browser_wasm nameSuffix: ${{ parameters.nameSuffix }} isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} @@ -34,11 +34,11 @@ jobs: - normal # windows - run only with browser -- ${{ if containsValue(parameters.platforms, 'Browser_wasm_win') }}: +- ${{ if containsValue(parameters.platforms, 'browser_wasm_win') }}: - template: /eng/pipelines/common/templates/wasm-library-tests.yml parameters: platforms: - - Browser_wasm_win + - browser_wasm_win nameSuffix: ${{ parameters.nameSuffix }} isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index c791725fd6a..84a3ae999f3 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -131,17 +131,17 @@ jobs: ${{ if eq(parameters.jobParameters.pool, '') }}: pool: # Public Linux Build Pool - ${{ if and(or(in(parameters.osGroup, 'Linux', 'FreeBSD', 'Android', 'Tizen'), eq(parameters.jobParameters.hostedOs, 'Linux')), eq(variables['System.TeamProject'], 'public')) }}: + ${{ if and(or(in(parameters.osGroup, 'linux', 'freebsd', 'android', 'tizen'), eq(parameters.jobParameters.hostedOs, 'linux')), eq(variables['System.TeamProject'], 'public')) }}: name: NetCore-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open # Official Build Linux Pool - ${{ if and(or(in(parameters.osGroup, 'Linux', 'FreeBSD', 'Android', 'Tizen'), eq(parameters.jobParameters.hostedOs, 'Linux')), ne(variables['System.TeamProject'], 'public')) }}: + ${{ if and(or(in(parameters.osGroup, 'linux', 'freebsd', 'android', 'tizen'), eq(parameters.jobParameters.hostedOs, 'linux')), ne(variables['System.TeamProject'], 'public')) }}: name: NetCore1ESPool-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 # OSX Build Pool (we don't have on-prem OSX BuildPool - ${{ if in(parameters.osGroup, 'OSX', 'MacCatalyst', 'iOS', 'iOSSimulator', 'tvOS', 'tvOSSimulator') }}: + ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}: vmImage: 'macos-11' # Official Build Windows Pool @@ -157,7 +157,7 @@ jobs: ${{ if eq(parameters.helixQueuesTemplate, '') }}: # macOS hosted pool machines are slower so we need to give a greater timeout than the 60 mins default. - ${{ if and(eq(parameters.jobParameters.timeoutInMinutes, ''), in(parameters.osGroup, 'OSX', 'MacCatalyst', 'iOS', 'tvOS')) }}: + ${{ if and(eq(parameters.jobParameters.timeoutInMinutes, ''), in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'tvos')) }}: timeoutInMinutes: 120 ${{ insert }}: ${{ parameters.jobParameters }} ${{ if ne(parameters.helixQueuesTemplate, '') }}: diff --git a/eng/pipelines/coreclr/ci.yml b/eng/pipelines/coreclr/ci.yml index 2c901b9d743..0272bf2a7ac 100644 --- a/eng/pipelines/coreclr/ci.yml +++ b/eng/pipelines/coreclr/ci.yml @@ -44,13 +44,13 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml buildConfig: debug platforms: - - Linux_arm - - Linux_arm64 - - Linux_musl_arm64 - - Linux_musl_x64 - - Linux_x64 - - OSX_arm64 - - OSX_x64 + - linux_arm + - linux_arm64 + - linux_musl_arm64 + - linux_musl_x64 + - linux_x64 + - osx_arm64 + - osx_x64 - windows_arm - windows_arm64 jobParameters: @@ -65,9 +65,9 @@ extends: buildConfig: checked platformGroup: all platforms: - # It is too early to include OSX_arm64 in platform group all + # It is too early to include osx_arm64 in platform group all # Adding it here will enable it also - - OSX_arm64 + - osx_arm64 jobParameters: testGroup: outerloop @@ -79,11 +79,11 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml buildConfig: release platforms: - - Linux_arm - - Linux_musl_arm64 - - Linux_x64 - - OSX_arm64 - - OSX_x64 + - linux_arm + - linux_musl_arm64 + - linux_x64 + - osx_arm64 + - osx_x64 - windows_x86 jobParameters: testGroup: outerloop @@ -97,9 +97,9 @@ extends: buildConfig: Release platformGroup: all platforms: - # It is too early to include OSX_arm64 in platform group all + # It is too early to include osx_arm64 in platform group all # Adding it here will enable it also - - OSX_arm64 + - osx_arm64 jobParameters: isOfficialBuild: false liveRuntimeBuildConfig: checked @@ -112,7 +112,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 testGroup: outerloop # @@ -124,9 +124,9 @@ extends: buildConfig: checked platformGroup: all platforms: - # It is too early to include OSX_arm64 in platform group all + # It is too early to include osx_arm64 in platform group all # Adding it here will enable it to also run this test - - OSX_arm64 + - osx_arm64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: @@ -141,11 +141,11 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - Linux_arm64 - - Linux_musl_x64 - - Linux_musl_arm64 - - Linux_x64 - - OSX_x64 + - linux_arm64 + - linux_musl_x64 + - linux_musl_arm64 + - linux_x64 + - osx_x64 - windows_x64 - windows_x86 - windows_arm @@ -165,5 +165,5 @@ extends: parameters: jobTemplate: /eng/pipelines/coreclr/templates/format-job.yml platforms: - - Linux_x64 + - linux_x64 - windows_x64 diff --git a/eng/pipelines/coreclr/clrinterpreter.yml b/eng/pipelines/coreclr/clrinterpreter.yml index dab893fffd4..cba44b98e91 100644 --- a/eng/pipelines/coreclr/clrinterpreter.yml +++ b/eng/pipelines/coreclr/clrinterpreter.yml @@ -21,13 +21,13 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_arm - - Linux_arm64 - - Linux_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: clrinterpreter @@ -36,7 +36,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: clrinterpreter @@ -45,9 +45,9 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - Linux_arm - - Linux_arm64 - - Linux_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 diff --git a/eng/pipelines/coreclr/crossgen2-composite.yml b/eng/pipelines/coreclr/crossgen2-composite.yml index b32b086b705..4751107d728 100644 --- a/eng/pipelines/coreclr/crossgen2-composite.yml +++ b/eng/pipelines/coreclr/crossgen2-composite.yml @@ -20,15 +20,15 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_arm - - Linux_x64 - - Linux_arm64 - - OSX_arm64 - - OSX_x64 + - linux_arm + - linux_x64 + - linux_arm64 + - osx_arm64 + - osx_x64 - windows_x86 - windows_x64 - windows_arm64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: innerloop @@ -37,7 +37,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: innerloop @@ -47,11 +47,11 @@ extends: helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml buildConfig: checked platforms: - - Linux_arm - - Linux_x64 - - Linux_arm64 - - OSX_arm64 - - OSX_x64 + - linux_arm + - linux_x64 + - linux_arm64 + - osx_arm64 + - osx_x64 - windows_x86 - windows_x64 - windows_arm64 diff --git a/eng/pipelines/coreclr/crossgen2-gcstress.yml b/eng/pipelines/coreclr/crossgen2-gcstress.yml index aa1e605bae8..323b99d1759 100644 --- a/eng/pipelines/coreclr/crossgen2-gcstress.yml +++ b/eng/pipelines/coreclr/crossgen2-gcstress.yml @@ -20,14 +20,14 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_x64 - - Linux_arm64 - - OSX_arm64 + - linux_x64 + - linux_arm64 + - osx_arm64 # See https://github.com/dotnet/runtime/issues/71931 - # - OSX_x64 + # - osx_x64 - windows_x64 - windows_arm64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: gcstress-extra @@ -36,7 +36,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: gcstress-extra @@ -46,11 +46,11 @@ extends: helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml buildConfig: checked platforms: - - Linux_x64 - - Linux_arm64 - - OSX_arm64 + - linux_x64 + - linux_arm64 + - osx_arm64 # See https://github.com/dotnet/runtime/issues/71931 - # - OSX_x64 + # - osx_x64 - windows_x64 - windows_arm64 jobParameters: diff --git a/eng/pipelines/coreclr/crossgen2-outerloop.yml b/eng/pipelines/coreclr/crossgen2-outerloop.yml index 52ba7694d33..325bd85ea3c 100644 --- a/eng/pipelines/coreclr/crossgen2-outerloop.yml +++ b/eng/pipelines/coreclr/crossgen2-outerloop.yml @@ -20,15 +20,15 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml buildConfig: checked platforms: - - Linux_arm - - Linux_x64 - - Linux_arm64 - - OSX_arm64 - - OSX_x64 + - linux_arm + - linux_x64 + - linux_arm64 + - osx_arm64 + - osx_x64 - windows_x86 - windows_x64 - windows_arm64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: outerloop @@ -37,10 +37,10 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml buildConfig: Release platforms: - - Linux_arm - - Linux_arm64 - - Linux_x64 - - OSX_arm64 + - linux_arm + - linux_arm64 + - linux_x64 + - osx_arm64 - windows_x86 - windows_x64 jobParameters: @@ -51,15 +51,15 @@ extends: jobTemplate: /eng/pipelines/libraries/build-job.yml buildConfig: Release platforms: - - Linux_arm - - Linux_arm64 - - Linux_x64 - - OSX_arm64 - - OSX_x64 + - linux_arm + - linux_arm64 + - linux_x64 + - osx_arm64 + - osx_x64 - windows_x86 - windows_x64 - windows_arm64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: isOfficialBuild: false liveRuntimeBuildConfig: Release @@ -69,7 +69,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: outerloop @@ -80,10 +80,10 @@ extends: helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml buildConfig: checked platforms: - - Linux_x64 - - Linux_arm64 - - OSX_arm64 - - OSX_x64 + - linux_x64 + - linux_arm64 + - osx_arm64 + - osx_x64 - windows_x64 - windows_arm64 jobParameters: @@ -100,11 +100,11 @@ extends: helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml buildConfig: checked platforms: - - Linux_arm - - Linux_arm64 - - Linux_x64 - - OSX_x64 - - OSX_arm64 + - linux_arm + - linux_arm64 + - linux_x64 + - osx_x64 + - osx_arm64 - windows_arm64 - windows_x64 - windows_x86 @@ -122,10 +122,10 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/crossgen2-comparison-build-job.yml buildConfig: Release platforms: - - Linux_arm - - Linux_arm64 - - Linux_x64 - - OSX_arm64 + - linux_arm + - linux_arm64 + - linux_x64 + - osx_arm64 - windows_x86 - windows_x64 jobParameters: @@ -140,7 +140,7 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml buildConfig: Release platforms: - - Linux_x64 + - linux_x64 - windows_x86 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -173,7 +173,7 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml buildConfig: Release platforms: - - Linux_x64 + - linux_x64 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: @@ -189,7 +189,7 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml buildConfig: Release platforms: - - Linux_arm + - linux_arm helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: @@ -205,7 +205,7 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml buildConfig: Release platforms: - - Linux_arm64 + - linux_arm64 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: @@ -221,7 +221,7 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml buildConfig: Release platforms: - - OSX_arm64 + - osx_arm64 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/crossgen2.yml b/eng/pipelines/coreclr/crossgen2.yml index f36ce6a8702..479dfc5f112 100644 --- a/eng/pipelines/coreclr/crossgen2.yml +++ b/eng/pipelines/coreclr/crossgen2.yml @@ -20,13 +20,13 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_x64 - - Linux_arm64 - - OSX_arm64 - - OSX_x64 + - linux_x64 + - linux_arm64 + - osx_arm64 + - osx_x64 - windows_x64 - windows_arm64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: innerloop @@ -35,7 +35,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: innerloop @@ -45,10 +45,10 @@ extends: helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml buildConfig: checked platforms: - - Linux_x64 - - Linux_arm64 - - OSX_arm64 - - OSX_x64 + - linux_x64 + - linux_arm64 + - osx_arm64 + - osx_x64 - windows_x64 - windows_arm64 jobParameters: diff --git a/eng/pipelines/coreclr/exploratory.yml b/eng/pipelines/coreclr/exploratory.yml index 07b7859a315..64875c717f7 100644 --- a/eng/pipelines/coreclr/exploratory.yml +++ b/eng/pipelines/coreclr/exploratory.yml @@ -27,14 +27,14 @@ extends: buildConfig: checked platforms: # Linux tests are built on the OSX machines. - - Linux_arm - - Linux_arm64 - - Linux_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 - - OSX_arm64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - osx_arm64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: outerloop @@ -44,13 +44,13 @@ extends: buildConfig: checked platforms: # Linux tests are built on the OSX machines. - - Linux_arm - - Linux_arm64 - - Linux_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 - - OSX_arm64 + - osx_arm64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/gc-longrunning.yml b/eng/pipelines/coreclr/gc-longrunning.yml index b49e2586551..8780b662eea 100644 --- a/eng/pipelines/coreclr/gc-longrunning.yml +++ b/eng/pipelines/coreclr/gc-longrunning.yml @@ -20,12 +20,12 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: release platforms: - - Linux_x64 - - Linux_arm64 + - linux_x64 + - linux_arm64 - windows_x64 - windows_arm64 - - OSX_x64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - osx_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: gc-longrunning @@ -34,7 +34,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: release platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: gc-longrunning @@ -43,8 +43,8 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: release platforms: - - Linux_x64 - - Linux_arm64 + - linux_x64 + - linux_arm64 - windows_x64 - windows_arm64 helixQueueGroup: ci diff --git a/eng/pipelines/coreclr/gc-simulator.yml b/eng/pipelines/coreclr/gc-simulator.yml index b38cb3c9fa8..07c06f996f8 100644 --- a/eng/pipelines/coreclr/gc-simulator.yml +++ b/eng/pipelines/coreclr/gc-simulator.yml @@ -21,12 +21,12 @@ extends: buildConfig: release platforms: # disable Linux x64 for now until OOMs are resolved. - # - Linux_x64 - - Linux_arm64 + # - linux_x64 + - linux_arm64 - windows_x64 - windows_arm64 - - OSX_x64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - osx_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: gc-simulator @@ -35,7 +35,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: release platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: gc-simulator @@ -45,8 +45,8 @@ extends: buildConfig: release platforms: # disable Linux x64 for now until OOMs are resolved. - # - Linux_x64 - - Linux_arm64 + # - linux_x64 + - linux_arm64 - windows_x64 - windows_arm64 helixQueueGroup: ci diff --git a/eng/pipelines/coreclr/gc-standalone.yml b/eng/pipelines/coreclr/gc-standalone.yml index 122266c7897..a162c1bdc09 100644 --- a/eng/pipelines/coreclr/gc-standalone.yml +++ b/eng/pipelines/coreclr/gc-standalone.yml @@ -20,10 +20,10 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_arm64 + - linux_arm64 - windows_arm64 - windows_x64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: gc-standalone @@ -32,7 +32,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: gc-standalone @@ -41,8 +41,8 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - Linux_arm64 - - Linux_x64 + - linux_arm64 + - linux_x64 - windows_arm64 - windows_x64 helixQueueGroup: ci @@ -57,8 +57,8 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - Linux_arm64 - - Linux_x64 + - linux_arm64 + - linux_x64 - windows_arm64 - windows_x64 helixQueueGroup: ci diff --git a/eng/pipelines/coreclr/gcstress-extra.yml b/eng/pipelines/coreclr/gcstress-extra.yml index 28a449ab46a..28b6fd73ace 100644 --- a/eng/pipelines/coreclr/gcstress-extra.yml +++ b/eng/pipelines/coreclr/gcstress-extra.yml @@ -21,10 +21,10 @@ extends: buildConfig: checked platformGroup: gcstress platforms: - # It is too early to include OSX_arm64 in platform group gcstress + # It is too early to include osx_arm64 in platform group gcstress # Adding it here will enable it also - - OSX_arm64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - osx_arm64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: gcstress-extra @@ -33,7 +33,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: gcstress-extra @@ -43,9 +43,9 @@ extends: buildConfig: checked platformGroup: gcstress platforms: - # It is too early to include OSX_arm64 in platform group gcstress + # It is too early to include osx_arm64 in platform group gcstress # Adding it here will enable it also - - OSX_arm64 + - osx_arm64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml b/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml index 40a358abb53..69a9201d0c5 100644 --- a/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml +++ b/eng/pipelines/coreclr/gcstress0x3-gcstress0xc.yml @@ -21,10 +21,10 @@ extends: buildConfig: checked platformGroup: gcstress platforms: - # It is too early to include OSX_arm64 in platform group gcstress + # It is too early to include osx_arm64 in platform group gcstress # Adding it here will enable it also - - OSX_arm64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - osx_arm64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: gcstress0x3-gcstress0xc @@ -33,7 +33,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: gcstress0x3-gcstress0xc @@ -43,9 +43,9 @@ extends: buildConfig: checked platformGroup: gcstress platforms: - # It is too early to include OSX_arm64 in platform group gcstress + # It is too early to include osx_arm64 in platform group gcstress # Adding it here will enable it also - - OSX_arm64 + - osx_arm64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/ilasm.yml b/eng/pipelines/coreclr/ilasm.yml index 2fd5a6597b8..da80300676d 100644 --- a/eng/pipelines/coreclr/ilasm.yml +++ b/eng/pipelines/coreclr/ilasm.yml @@ -29,15 +29,15 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - OSX_arm64 - - OSX_x64 - - Linux_arm - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - osx_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: ilasm @@ -46,7 +46,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: ilasm @@ -55,11 +55,11 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - OSX_arm64 - - OSX_x64 - - Linux_arm - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - osx_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 diff --git a/eng/pipelines/coreclr/jit-cfg.yml b/eng/pipelines/coreclr/jit-cfg.yml index 685aa3a292d..8928fe61b7a 100644 --- a/eng/pipelines/coreclr/jit-cfg.yml +++ b/eng/pipelines/coreclr/jit-cfg.yml @@ -20,11 +20,11 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_arm64 - - Linux_x64 + - linux_arm64 + - linux_x64 - windows_arm64 - windows_x64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: jit-cfg @@ -33,7 +33,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: jit-cfg @@ -42,8 +42,8 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - Linux_arm64 - - Linux_x64 + - linux_arm64 + - linux_x64 - windows_arm64 - windows_x64 helixQueueGroup: ci diff --git a/eng/pipelines/coreclr/jit-experimental.yml b/eng/pipelines/coreclr/jit-experimental.yml index e898669eee8..3ecf6e5b6d6 100644 --- a/eng/pipelines/coreclr/jit-experimental.yml +++ b/eng/pipelines/coreclr/jit-experimental.yml @@ -20,13 +20,13 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - OSX_arm64 - - OSX_x64 - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - osx_x64 + - linux_arm64 + - linux_x64 - windows_arm64 - windows_x64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: jit-experimental @@ -35,7 +35,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: jit-experimental @@ -44,10 +44,10 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - OSX_arm64 - - OSX_x64 - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - osx_x64 + - linux_arm64 + - linux_x64 - windows_arm64 - windows_x64 helixQueueGroup: ci diff --git a/eng/pipelines/coreclr/jitrollingbuild.yml b/eng/pipelines/coreclr/jitrollingbuild.yml index d6e00530c78..ded3915703f 100644 --- a/eng/pipelines/coreclr/jitrollingbuild.yml +++ b/eng/pipelines/coreclr/jitrollingbuild.yml @@ -25,11 +25,11 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/build-jit-job.yml buildConfig: checked platforms: - - OSX_arm64 - - OSX_x64 - - Linux_arm - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - osx_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 @@ -39,11 +39,11 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/build-jit-job.yml buildConfig: release platforms: - - OSX_arm64 - - OSX_x64 - - Linux_arm - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - osx_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 diff --git a/eng/pipelines/coreclr/jitstress-isas-arm.yml b/eng/pipelines/coreclr/jitstress-isas-arm.yml index c1a2f6339ca..5aa83d1d7a5 100644 --- a/eng/pipelines/coreclr/jitstress-isas-arm.yml +++ b/eng/pipelines/coreclr/jitstress-isas-arm.yml @@ -20,10 +20,10 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_arm64 - - OSX_arm64 + - linux_arm64 + - osx_arm64 - windows_arm64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: jitstress-isas-arm @@ -32,7 +32,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: jitstress-isas-arm @@ -41,8 +41,8 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - Linux_arm64 - - OSX_arm64 + - linux_arm64 + - osx_arm64 - windows_arm64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml diff --git a/eng/pipelines/coreclr/jitstress-isas-avx512.yml b/eng/pipelines/coreclr/jitstress-isas-avx512.yml index c9ef59b804a..d961b058a36 100644 --- a/eng/pipelines/coreclr/jitstress-isas-avx512.yml +++ b/eng/pipelines/coreclr/jitstress-isas-avx512.yml @@ -32,10 +32,10 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_x64 + - linux_x64 - windows_x64 - windows_x86 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: jitstress-isas-avx512 @@ -44,7 +44,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: jitstress-isas-avx512 @@ -53,7 +53,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - Linux_x64 + - linux_x64 - windows_x64 - windows_x86 helixQueueGroup: ci diff --git a/eng/pipelines/coreclr/jitstress-isas-x86.yml b/eng/pipelines/coreclr/jitstress-isas-x86.yml index a7bbb60e241..4048980c0ff 100644 --- a/eng/pipelines/coreclr/jitstress-isas-x86.yml +++ b/eng/pipelines/coreclr/jitstress-isas-x86.yml @@ -20,11 +20,11 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_x64 - - OSX_x64 + - linux_x64 + - osx_x64 - windows_x64 - windows_x86 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: jitstress-isas-x86 @@ -33,7 +33,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: jitstress-isas-x86 @@ -42,8 +42,8 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - Linux_x64 - - OSX_x64 + - linux_x64 + - osx_x64 - windows_x64 - windows_x86 helixQueueGroup: ci diff --git a/eng/pipelines/coreclr/jitstress-random.yml b/eng/pipelines/coreclr/jitstress-random.yml index 771fa927fa5..37952bcd904 100644 --- a/eng/pipelines/coreclr/jitstress-random.yml +++ b/eng/pipelines/coreclr/jitstress-random.yml @@ -20,15 +20,15 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - OSX_arm64 - - OSX_x64 - - Linux_arm - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - osx_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: jitstress-random @@ -37,7 +37,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: jitstress-random @@ -46,11 +46,11 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - OSX_arm64 - - OSX_x64 - - Linux_arm - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - osx_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 diff --git a/eng/pipelines/coreclr/jitstress.yml b/eng/pipelines/coreclr/jitstress.yml index 9d5ec57315b..4598ee54a56 100644 --- a/eng/pipelines/coreclr/jitstress.yml +++ b/eng/pipelines/coreclr/jitstress.yml @@ -20,15 +20,15 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - OSX_arm64 - - OSX_x64 - - Linux_arm - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - osx_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: jitstress @@ -37,7 +37,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: jitstress @@ -46,11 +46,11 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - OSX_arm64 - - OSX_x64 - - Linux_arm - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - osx_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 diff --git a/eng/pipelines/coreclr/jitstress2-jitstressregs.yml b/eng/pipelines/coreclr/jitstress2-jitstressregs.yml index f96441cebcc..9120d2b682d 100644 --- a/eng/pipelines/coreclr/jitstress2-jitstressregs.yml +++ b/eng/pipelines/coreclr/jitstress2-jitstressregs.yml @@ -20,15 +20,15 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - OSX_arm64 - - OSX_x64 - - Linux_arm - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - osx_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: jitstress2-jitstressregs @@ -37,7 +37,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: checked @@ -46,11 +46,11 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - OSX_arm64 - - OSX_x64 - - Linux_arm - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - osx_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 diff --git a/eng/pipelines/coreclr/jitstressregs-x86.yml b/eng/pipelines/coreclr/jitstressregs-x86.yml index da7cb821268..d0a4a259724 100644 --- a/eng/pipelines/coreclr/jitstressregs-x86.yml +++ b/eng/pipelines/coreclr/jitstressregs-x86.yml @@ -20,10 +20,10 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_x64 + - linux_x64 - windows_x64 - windows_x86 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: jitstressregs-x86 @@ -32,7 +32,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: jitstressregs-x86 @@ -41,7 +41,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - Linux_x64 + - linux_x64 - windows_x64 - windows_x86 helixQueueGroup: ci diff --git a/eng/pipelines/coreclr/jitstressregs.yml b/eng/pipelines/coreclr/jitstressregs.yml index 90116cd3f26..a3f59dce11d 100644 --- a/eng/pipelines/coreclr/jitstressregs.yml +++ b/eng/pipelines/coreclr/jitstressregs.yml @@ -20,15 +20,15 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - OSX_arm64 - - OSX_x64 - - Linux_arm - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - osx_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: jitstressregs @@ -37,7 +37,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: jitstressregs @@ -46,11 +46,11 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - OSX_arm64 - - OSX_x64 - - Linux_arm - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - osx_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 diff --git a/eng/pipelines/coreclr/libraries-gcstress-extra.yml b/eng/pipelines/coreclr/libraries-gcstress-extra.yml index 21131b860c0..593c183f68e 100644 --- a/eng/pipelines/coreclr/libraries-gcstress-extra.yml +++ b/eng/pipelines/coreclr/libraries-gcstress-extra.yml @@ -27,7 +27,7 @@ extends: jobParameters: # libraries test build platforms testBuildPlatforms: - - Linux_x64 + - linux_x64 - windows_x64 # diff --git a/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml b/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml index a5536effcce..a2b17d48c9f 100644 --- a/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml +++ b/eng/pipelines/coreclr/libraries-gcstress0x3-gcstress0xc.yml @@ -27,7 +27,7 @@ extends: jobParameters: # libraries test build platforms testBuildPlatforms: - - Linux_x64 + - linux_x64 - windows_x64 # diff --git a/eng/pipelines/coreclr/libraries-jitstress-random.yml b/eng/pipelines/coreclr/libraries-jitstress-random.yml index 7b394a51ecc..dda4bad80f5 100644 --- a/eng/pipelines/coreclr/libraries-jitstress-random.yml +++ b/eng/pipelines/coreclr/libraries-jitstress-random.yml @@ -23,16 +23,16 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_x64 - - Linux_arm - - Linux_arm64 + - linux_x64 + - linux_arm + - linux_arm64 - windows_x86 - windows_x64 - windows_arm64 jobParameters: # libraries test build platforms testBuildPlatforms: - - Linux_x64 + - linux_x64 - windows_x64 # @@ -43,9 +43,9 @@ extends: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: Release platforms: - - Linux_arm - - Linux_arm64 - - Linux_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_arm64 - windows_x64 - windows_x86 diff --git a/eng/pipelines/coreclr/libraries-jitstress.yml b/eng/pipelines/coreclr/libraries-jitstress.yml index 189ba8684c8..8bca0980a3d 100644 --- a/eng/pipelines/coreclr/libraries-jitstress.yml +++ b/eng/pipelines/coreclr/libraries-jitstress.yml @@ -23,16 +23,16 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_x64 - - Linux_arm - - Linux_arm64 + - linux_x64 + - linux_arm + - linux_arm64 - windows_x86 - windows_x64 - windows_arm64 jobParameters: # libraries test build platforms testBuildPlatforms: - - Linux_x64 + - linux_x64 - windows_x64 # @@ -43,9 +43,9 @@ extends: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: Release platforms: - - Linux_arm - - Linux_arm64 - - Linux_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_arm64 - windows_x64 - windows_x86 diff --git a/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml b/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml index d5ac8f09210..95f80f42b87 100644 --- a/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml +++ b/eng/pipelines/coreclr/libraries-jitstress2-jitstressregs.yml @@ -23,16 +23,16 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_x64 - - Linux_arm - - Linux_arm64 + - linux_x64 + - linux_arm + - linux_arm64 - windows_x86 - windows_x64 - windows_arm64 jobParameters: # libraries test build platforms testBuildPlatforms: - - Linux_x64 + - linux_x64 - windows_x64 # @@ -43,9 +43,9 @@ extends: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: Release platforms: - - Linux_arm - - Linux_arm64 - - Linux_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_arm64 - windows_x64 - windows_x86 diff --git a/eng/pipelines/coreclr/libraries-jitstressregs.yml b/eng/pipelines/coreclr/libraries-jitstressregs.yml index d082d8b9732..6230689b8a5 100644 --- a/eng/pipelines/coreclr/libraries-jitstressregs.yml +++ b/eng/pipelines/coreclr/libraries-jitstressregs.yml @@ -23,16 +23,16 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_x64 - - Linux_arm - - Linux_arm64 + - linux_x64 + - linux_arm + - linux_arm64 - windows_x86 - windows_x64 - windows_arm64 jobParameters: # libraries test build platforms testBuildPlatforms: - - Linux_x64 + - linux_x64 - windows_x64 # @@ -43,9 +43,9 @@ extends: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: Release platforms: - - Linux_arm - - Linux_arm64 - - Linux_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_arm64 - windows_x64 - windows_x86 diff --git a/eng/pipelines/coreclr/libraries-pgo.yml b/eng/pipelines/coreclr/libraries-pgo.yml index e73d8c7cb59..66d9c65c261 100644 --- a/eng/pipelines/coreclr/libraries-pgo.yml +++ b/eng/pipelines/coreclr/libraries-pgo.yml @@ -23,16 +23,16 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_x64 - - Linux_arm - - Linux_arm64 + - linux_x64 + - linux_arm + - linux_arm64 - windows_x86 - windows_x64 - windows_arm64 jobParameters: # libraries test build platforms testBuildPlatforms: - - Linux_x64 + - linux_x64 - windows_x64 # @@ -43,9 +43,9 @@ extends: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: Release platforms: - - Linux_arm - - Linux_arm64 - - Linux_x64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_arm64 - windows_x64 - windows_x86 diff --git a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml index 69479200e24..80b27290bd2 100644 --- a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml +++ b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml @@ -9,7 +9,7 @@ jobs: runtimeFlavor: mono buildConfig: release platforms: - - Linux_x64 + - linux_x64 # build coreclr and libraries - template: /eng/pipelines/common/platform-matrix.yml @@ -17,7 +17,7 @@ jobs: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: release platforms: - - Linux_x64 + - linux_x64 jobParameters: testGroup: perf @@ -29,10 +29,10 @@ jobs: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: release platforms: - - Linux_x64 + - linux_x64 - windows_x64 - windows_x86 - - Linux_musl_x64 + - linux_musl_x64 jobParameters: testGroup: perf @@ -43,7 +43,7 @@ jobs: buildConfig: release runtimeFlavor: mono platforms: - - Linux_x64 + - linux_x64 jobParameters: buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) nameSuffix: AOT @@ -65,7 +65,7 @@ jobs: buildConfig: release runtimeFlavor: mono platforms: - - Android_arm64 + - android_arm64 jobParameters: buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) nameSuffix: AndroidMono @@ -87,7 +87,7 @@ jobs: buildConfig: release runtimeFlavor: mono platforms: - - iOS_arm64 + - ios_arm64 jobParameters: buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) nameSuffix: iOSMono @@ -109,7 +109,7 @@ jobs: runtimeFlavor: mono buildConfig: release platforms: - - Linux_x64 + - linux_x64 # run mono and maui android scenarios - template: /eng/pipelines/common/platform-matrix.yml @@ -118,10 +118,10 @@ jobs: buildConfig: release runtimeFlavor: mono platforms: - - Windows_x64 + - windows_x64 variables: - name: mauiVersion - value: $[ dependencies.Build_iOS_arm64_release_MACiOSAndroidMauiNet7.outputs['getMauiVersion.mauiVersion'] ] + value: $[ dependencies.Build_ios_arm64_release_MACiOSAndroidMauiNet7.outputs['getMauiVersion.mauiVersion'] ] jobParameters: testGroup: perf runtimeType: AndroidMono @@ -138,10 +138,10 @@ jobs: buildConfig: release runtimeFlavor: mono platforms: - - OSX_x64 + - osx_x64 variables: - name: mauiVersion - value: $[ dependencies.Build_iOS_arm64_release_MACiOSAndroidMauiNet7.outputs['getMauiVersion.mauiVersion'] ] + value: $[ dependencies.Build_ios_arm64_release_MACiOSAndroidMauiNet7.outputs['getMauiVersion.mauiVersion'] ] jobParameters: testGroup: perf runtimeType: iOSMono @@ -158,10 +158,10 @@ jobs: buildConfig: release runtimeFlavor: mono platforms: - - OSX_x64 + - osx_x64 variables: - name: mauiVersion - value: $[ dependencies.Build_iOS_arm64_release_MACiOSAndroidMauiNet7.outputs['getMauiVersion.mauiVersion'] ] + value: $[ dependencies.Build_ios_arm64_release_MACiOSAndroidMauiNet7.outputs['getMauiVersion.mauiVersion'] ] jobParameters: testGroup: perf runtimeType: iOSMono @@ -179,10 +179,10 @@ jobs: buildConfig: release runtimeFlavor: mono platforms: - - Windows_x64 + - windows_x64 variables: - name: mauiVersion - value: $[ dependencies.Build_iOS_arm64_release_MACiOSAndroidMauiNet6.outputs['getMauiVersion.mauiVersion'] ] + value: $[ dependencies.Build_ios_arm64_release_MACiOSAndroidMauiNet6.outputs['getMauiVersion.mauiVersion'] ] jobParameters: testGroup: perf runtimeType: AndroidMobileNet6 @@ -199,10 +199,10 @@ jobs: buildConfig: release runtimeFlavor: mono platforms: - - OSX_x64 + - osx_x64 variables: - name: mauiVersion - value: $[ dependencies.Build_iOS_arm64_release_MACiOSAndroidMauiNet6.outputs['getMauiVersion.mauiVersion'] ] + value: $[ dependencies.Build_ios_arm64_release_MACiOSAndroidMauiNet6.outputs['getMauiVersion.mauiVersion'] ] jobParameters: testGroup: perf runtimeType: iOSMobileNet6 @@ -220,7 +220,7 @@ jobs: buildConfig: release runtimeFlavor: mono platforms: - - Linux_x64 + - linux_x64 jobParameters: testGroup: perf liveLibrariesBuildConfig: Release @@ -237,7 +237,7 @@ jobs: buildConfig: release runtimeFlavor: mono platforms: - - Linux_x64 + - linux_x64 jobParameters: testGroup: perf liveLibrariesBuildConfig: Release @@ -255,7 +255,7 @@ jobs: buildConfig: release runtimeFlavor: aot platforms: - - Linux_x64 + - linux_x64 jobParameters: testGroup: perf liveLibrariesBuildConfig: Release @@ -273,10 +273,10 @@ jobs: buildConfig: release runtimeFlavor: coreclr platforms: - - Linux_x64 + - linux_x64 - windows_x64 - windows_x86 - - Linux_musl_x64 + - linux_musl_x64 jobParameters: testGroup: perf liveLibrariesBuildConfig: Release @@ -341,7 +341,7 @@ jobs: buildConfig: release runtimeFlavor: coreclr platforms: - - Linux_x64 + - linux_x64 - windows_x64 jobParameters: testGroup: perf @@ -358,7 +358,7 @@ jobs: buildConfig: release runtimeFlavor: coreclr platforms: - - Linux_x64 + - linux_x64 - windows_x64 - windows_x86 jobParameters: @@ -377,14 +377,14 @@ jobs: # buildConfig: release # runtimeFlavor: mono # platforms: - # - Android_x86 - # - Android_x64 - # - Android_arm - # - Android_arm64 - # - MacCatalyst_x64 - # - iOSSimulator_x64 - # - iOS_arm64 - # - iOS_arm + # - android_x86 + # - android_x64 + # - android_arm + # - android_arm64 + # - maccatalyst_x64 + # - iossimulator_x64 + # - ios_arm64 + # - ios_arm # jobParameters: # buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) # nameSuffix: Maui_Packs_Mono @@ -400,18 +400,18 @@ jobs: buildConfig: release runtimeFlavor: mono platforms: - - iOS_arm64 + - ios_arm64 jobParameters: # Uncomment to reenable package replacement for main #dependsOn: - # - Build_Android_arm_release_Maui_Packs_Mono - # - Build_Android_arm64_release_Maui_Packs_Mono - # - Build_Android_x86_release_Maui_Packs_Mono - # - Build_Android_x64_release_Maui_Packs_Mono - # - Build_MacCatalyst_x64_release_Maui_Packs_Mono - # - Build_iOSSimulator_x64_release_Maui_Packs_Mono - # - Build_iOS_arm_release_Maui_Packs_Mono - # - Build_iOS_arm64_release_Maui_Packs_Mono + # - Build_android_arm_release_Maui_Packs_Mono + # - Build_android_arm64_release_Maui_Packs_Mono + # - Build_android_x86_release_Maui_Packs_Mono + # - Build_android_x64_release_Maui_Packs_Mono + # - Build_maccatalyst_x64_release_Maui_Packs_Mono + # - Build_iossimulator_x64_release_Maui_Packs_Mono + # - Build_ios_arm_release_Maui_Packs_Mono + # - Build_ios_arm64_release_Maui_Packs_Mono buildArgs: -s mono -c $(_BuildConfig) nameSuffix: MACiOSAndroidMauiNet7 isOfficialBuild: false @@ -434,7 +434,7 @@ jobs: buildConfig: release runtimeFlavor: mono platforms: - - iOS_arm64 + - ios_arm64 jobParameters: buildArgs: -s mono -c $(_BuildConfig) nameSuffix: MACiOSAndroidMauiNet6 diff --git a/eng/pipelines/coreclr/perf-wasm-jobs.yml b/eng/pipelines/coreclr/perf-wasm-jobs.yml index c9f4cbcb413..1f620b8d83e 100644 --- a/eng/pipelines/coreclr/perf-wasm-jobs.yml +++ b/eng/pipelines/coreclr/perf-wasm-jobs.yml @@ -20,7 +20,7 @@ jobs: buildConfig: Release runtimeFlavor: mono platforms: - - Browser_wasm + - browser_wasm jobParameters: buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) nameSuffix: wasm @@ -36,7 +36,7 @@ jobs: buildConfig: Release runtimeFlavor: wasm platforms: - - Linux_x64 + - linux_x64 jobParameters: testGroup: perf liveLibrariesBuildConfig: Release @@ -87,7 +87,7 @@ jobs: buildConfig: Release runtimeFlavor: mono platforms: - - Browser_wasm + - browser_wasm jobParameters: buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) nameSuffix: wasm @@ -103,7 +103,7 @@ jobs: buildConfig: release runtimeFlavor: wasm platforms: - - Linux_x64 + - linux_x64 jobParameters: testGroup: perf liveLibrariesBuildConfig: Release @@ -155,7 +155,7 @@ jobs: buildConfig: release runtimeFlavor: wasm platforms: - - Linux_x64 + - linux_x64 jobParameters: testGroup: perf liveLibrariesBuildConfig: Release diff --git a/eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml b/eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml index acda734f006..f8d0c51022c 100644 --- a/eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml +++ b/eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml @@ -3,7 +3,7 @@ parameters: steps: - script: >- - ./dotnet.sh build -p:TargetOS=Browser -p:TargetArchitecture=wasm /nr:false /p:TreatWarningsAsErrors=true + ./dotnet.sh build -p:TargetOS=browser -p:TargetArchitecture=wasm /nr:false /p:TreatWarningsAsErrors=true /p:Configuration=${{ parameters.configForBuild }} /p:ContinuousIntegrationBuild=true /t:InstallWorkloadUsingArtifacts diff --git a/eng/pipelines/coreclr/perf_slow.yml b/eng/pipelines/coreclr/perf_slow.yml index 99849b89099..3f0e1034b26 100644 --- a/eng/pipelines/coreclr/perf_slow.yml +++ b/eng/pipelines/coreclr/perf_slow.yml @@ -43,7 +43,7 @@ extends: runtimeFlavor: mono buildConfig: release platforms: - - Linux_arm64 + - linux_arm64 # build coreclr and libraries - template: /eng/pipelines/common/platform-matrix.yml @@ -51,7 +51,7 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: release platforms: - - Linux_arm64 + - linux_arm64 jobParameters: testGroup: perf @@ -62,7 +62,7 @@ extends: buildConfig: release runtimeFlavor: mono platforms: - - Linux_arm64 + - linux_arm64 jobParameters: testGroup: perf liveLibrariesBuildConfig: Release @@ -81,7 +81,7 @@ extends: buildConfig: release runtimeFlavor: mono platforms: - - Browser_wasm + - browser_wasm jobParameters: buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) nameSuffix: wasm @@ -103,7 +103,7 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: release platforms: - - Linux_arm64 + - linux_arm64 - windows_arm64 jobParameters: testGroup: perf @@ -115,7 +115,7 @@ extends: buildConfig: release runtimeFlavor: mono platforms: - - Browser_wasm + - browser_wasm jobParameters: buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) nameSuffix: wasm @@ -136,7 +136,7 @@ extends: runtimeFlavor: mono runtimeVariant: 'llvmaot' platforms: - - Linux_arm64 + - linux_arm64 jobParameters: buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true nameSuffix: AOT @@ -158,7 +158,7 @@ extends: buildConfig: release runtimeFlavor: aot platforms: - - Linux_arm64 + - linux_arm64 jobParameters: testGroup: perf liveLibrariesBuildConfig: Release @@ -177,7 +177,7 @@ extends: buildConfig: release runtimeFlavor: coreclr platforms: - - Linux_arm64 + - linux_arm64 jobParameters: testGroup: perf liveLibrariesBuildConfig: Release @@ -227,7 +227,7 @@ extends: # buildConfig: release # runtimeFlavor: coreclr # platforms: - # - Linux_arm64 + # - linux_arm64 # jobParameters: # testGroup: perf # liveLibrariesBuildConfig: Release diff --git a/eng/pipelines/coreclr/pgo.yml b/eng/pipelines/coreclr/pgo.yml index affc0c1faff..d5c3efba0d9 100644 --- a/eng/pipelines/coreclr/pgo.yml +++ b/eng/pipelines/coreclr/pgo.yml @@ -20,15 +20,15 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_arm - - Linux_arm64 - - Linux_x64 - - OSX_arm64 + - linux_arm + - linux_arm64 + - linux_x64 + - osx_arm64 - windows_arm - windows_arm64 - windows_x64 - windows_x86 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: pgo @@ -37,7 +37,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: pgo @@ -46,10 +46,10 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - Linux_arm - - Linux_arm64 - - Linux_x64 - - OSX_arm64 + - linux_arm + - linux_arm64 + - linux_x64 + - osx_arm64 - windows_arm - windows_arm64 - windows_x64 diff --git a/eng/pipelines/coreclr/pgostress.yml b/eng/pipelines/coreclr/pgostress.yml index f7f729fed1a..3d0a8beef0b 100644 --- a/eng/pipelines/coreclr/pgostress.yml +++ b/eng/pipelines/coreclr/pgostress.yml @@ -20,15 +20,15 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_arm - - Linux_arm64 - - Linux_x64 - - OSX_arm64 + - linux_arm + - linux_arm64 + - linux_x64 + - osx_arm64 - windows_arm - windows_arm64 - windows_x64 - windows_x86 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: pgostress @@ -37,7 +37,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: pgostress @@ -46,10 +46,10 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - Linux_arm - - Linux_arm64 - - Linux_x64 - - OSX_arm64 + - linux_arm + - linux_arm64 + - linux_x64 + - osx_arm64 - windows_arm - windows_arm64 - windows_x64 diff --git a/eng/pipelines/coreclr/r2r-extra.yml b/eng/pipelines/coreclr/r2r-extra.yml index 7a44a0936a7..843fb9e4f3d 100644 --- a/eng/pipelines/coreclr/r2r-extra.yml +++ b/eng/pipelines/coreclr/r2r-extra.yml @@ -21,10 +21,10 @@ extends: buildConfig: checked platformGroup: gcstress platforms: - # It is too early to include OSX_arm64 in platform group gcstress + # It is too early to include osx_arm64 in platform group gcstress # Adding it here will enable it also - - OSX_arm64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - osx_arm64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: r2r-extra @@ -33,7 +33,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: r2r-extra @@ -43,9 +43,9 @@ extends: buildConfig: checked platformGroup: gcstress # r2r-extra testGroup runs gcstress0xf scenario platforms: - # It is too early to include OSX_arm64 in platform group gcstress + # It is too early to include osx_arm64 in platform group gcstress # Adding it here will enable it also - - OSX_arm64 + - osx_arm64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/r2r.yml b/eng/pipelines/coreclr/r2r.yml index dd8d0d6e53e..ea4a7f99b5b 100644 --- a/eng/pipelines/coreclr/r2r.yml +++ b/eng/pipelines/coreclr/r2r.yml @@ -20,15 +20,15 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_arm - - Linux_arm64 - - Linux_x64 - - OSX_arm64 + - linux_arm + - linux_arm64 + - linux_x64 + - osx_arm64 - windows_arm - windows_arm64 - windows_x64 - windows_x86 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: outerloop @@ -37,7 +37,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: outerloop @@ -46,10 +46,10 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - Linux_arm - - Linux_arm64 - - Linux_x64 - - OSX_arm64 + - linux_arm + - linux_arm64 + - linux_x64 + - osx_arm64 - windows_arm - windows_arm64 - windows_x64 diff --git a/eng/pipelines/coreclr/release-tests.yml b/eng/pipelines/coreclr/release-tests.yml index 13a04affda4..9eb62f900ca 100644 --- a/eng/pipelines/coreclr/release-tests.yml +++ b/eng/pipelines/coreclr/release-tests.yml @@ -24,9 +24,9 @@ extends: buildConfig: release platformGroup: all platforms: - # It is too early to include OSX_arm64 in platform group all + # It is too early to include osx_arm64 in platform group all # Adding it here will enable it also - - OSX_arm64 + - osx_arm64 jobParameters: isOfficialBuild: false @@ -38,7 +38,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: release platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: outerloop @@ -51,9 +51,9 @@ extends: buildConfig: release platformGroup: all platforms: - # It is too early to include OSX_arm64 in platform group all + # It is too early to include osx_arm64 in platform group all # Adding it here will enable it also - - OSX_arm64 + - osx_arm64 helixQueueGroup: ci helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/coreclr/runincontext.yml b/eng/pipelines/coreclr/runincontext.yml index 2009f6a0a0f..5ec1b5593f0 100644 --- a/eng/pipelines/coreclr/runincontext.yml +++ b/eng/pipelines/coreclr/runincontext.yml @@ -20,10 +20,10 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_x64 + - linux_x64 - windows_x64 - windows_x86 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: outerloop @@ -32,7 +32,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: outerloop @@ -41,7 +41,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - Linux_x64 + - linux_x64 - windows_x64 - windows_x86 helixQueueGroup: ci diff --git a/eng/pipelines/coreclr/superpmi-collect.yml b/eng/pipelines/coreclr/superpmi-collect.yml index e8aabaa296a..c0d4ce288b4 100644 --- a/eng/pipelines/coreclr/superpmi-collect.yml +++ b/eng/pipelines/coreclr/superpmi-collect.yml @@ -35,30 +35,30 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - OSX_arm64 - - Linux_arm - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: outerloop # libraries test build platforms testBuildPlatforms: - - Linux_x64 + - linux_x64 - windows_x64 # superpmi-collect-job that targets macOS/arm64 depends on coreclr binaries produced by the macOS/x64 job - # We don't collect osx-x64 (it's essentially the same as linux-x64). If we did, we'd add OSX_x64 in the + # We don't collect osx-x64 (it's essentially the same as linux-x64). If we did, we'd add osx_x64 in the # build-coreclr-and-libraries-job.yml above, and remove this. - template: /eng/pipelines/common/platform-matrix.yml parameters: jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml buildConfig: checked platforms: - - OSX_x64 + - osx_x64 jobParameters: testGroup: outerloop @@ -67,7 +67,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: outerloop @@ -76,10 +76,10 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/superpmi-collect-job.yml buildConfig: checked platforms: - - OSX_arm64 - - Linux_arm - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 @@ -96,10 +96,10 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/superpmi-collect-job.yml buildConfig: checked platforms: - - OSX_arm64 - - Linux_arm - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 @@ -116,10 +116,10 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/superpmi-collect-job.yml buildConfig: checked platforms: - - OSX_arm64 - - Linux_arm - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 @@ -136,10 +136,10 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/superpmi-collect-job.yml buildConfig: checked platforms: - - OSX_arm64 - - Linux_arm - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 @@ -159,10 +159,10 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - OSX_arm64 - - Linux_arm - - Linux_arm64 - - Linux_x64 + - osx_arm64 + - linux_arm + - linux_arm64 + - linux_x64 - windows_x64 - windows_x86 - windows_arm64 diff --git a/eng/pipelines/coreclr/templates/build-jit-job.yml b/eng/pipelines/coreclr/templates/build-jit-job.yml index febb0d9aba9..05136f40f40 100644 --- a/eng/pipelines/coreclr/templates/build-jit-job.yml +++ b/eng/pipelines/coreclr/templates/build-jit-job.yml @@ -57,11 +57,11 @@ jobs: - name: compilerArg value: '-clang9' # We need to use the stable version available on Alpine Linux - - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}: + - ${{ if and(eq(parameters.osGroup, 'linux'), eq(parameters.osSubgroup, '_musl')) }}: - name: compilerArg value: '' # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH - - ${{ if eq(parameters.osGroup, 'OSX') }}: + - ${{ if eq(parameters.osGroup, 'osx') }}: - name: compilerArg value: '' @@ -84,7 +84,7 @@ jobs: # Linux builds use docker images with dependencies preinstalled, # and FreeBSD builds use a build agent with dependencies # preinstalled, so we only need this step for OSX and Windows. - - ${{ if eq(parameters.osGroup, 'OSX') }}: + - ${{ if eq(parameters.osGroup, 'osx') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) displayName: Install native dependencies (OSX) diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index f4fed704d8e..21b756f67b3 100644 --- a/eng/pipelines/coreclr/templates/build-job.yml +++ b/eng/pipelines/coreclr/templates/build-job.yml @@ -90,11 +90,11 @@ jobs: - name: compilerArg value: '-clang9' # We need to use the stable version available on Alpine Linux - - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubgroup, '_musl')) }}: + - ${{ if and(eq(parameters.osGroup, 'linux'), eq(parameters.osSubgroup, '_musl')) }}: - name: compilerArg value: '' # AppleClang has different version scheme, so we let compiler introspection pick up the available clang from PATH - - ${{ if eq(parameters.osGroup, 'OSX') }}: + - ${{ if eq(parameters.osGroup, 'osx') }}: - name: compilerArg value: '' - ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}: @@ -129,7 +129,7 @@ jobs: - ${{ if ne(parameters.testGroup, 'innerloop') }}: - name: clrRuntimeComponentsBuildArg value: '-component runtime -component alljits -component paltests -component nativeaot -component spmi ' - - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.archType, 'x86')) }}: + - ${{ if and(eq(parameters.osGroup, 'linux'), eq(parameters.archType, 'x86')) }}: - name: clrRuntimeComponentsBuildArg value: '-component runtime -component jit -component iltools -component spmi ' @@ -144,7 +144,7 @@ jobs: - name: clrRuntimePortableBuildArg value: '' - - ${{ if eq(parameters.osGroup, 'Tizen') }}: + - ${{ if eq(parameters.osGroup, 'tizen') }}: - name: clrRuntimePortableBuildArg value: '-portablebuild=false' @@ -156,7 +156,7 @@ jobs: # Linux builds use docker images with dependencies preinstalled, # and FreeBSD builds use a build agent with dependencies # preinstalled, so we only need this step for OSX and Windows. - - ${{ if eq(parameters.osGroup, 'OSX') }}: + - ${{ if eq(parameters.osGroup, 'osx') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) displayName: Install native dependencies @@ -178,7 +178,7 @@ jobs: continueOnError: false condition: and(succeeded(), in(variables['SignType'], 'real', 'test')) - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: + - ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h @@ -204,17 +204,17 @@ jobs: - script: $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -hostarch x86 $(osArg) -ci $(compilerArg) -component crosscomponents -cmakeargs "-DCLR_CROSS_COMPONENTS_BUILD=1" $(officialBuildIdArg) $(clrRuntimePortableBuildArg) displayName: Build CoreCLR Cross-Arch Tools (Tools that run on x86 targeting arm) - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: + - ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h displayName: Disk Usage after Build # Build CoreCLR Managed Components - - ${{ if or(ne(parameters.osGroup, 'Linux'), ne(parameters.archType, 'x86')) }}: + - ${{ if or(ne(parameters.osGroup, 'linux'), ne(parameters.archType, 'x86')) }}: - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -subset clr.corelib+clr.nativecorelib+clr.nativeaotlibs+clr.tools+clr.packages+clr.paltestlist $(crossArg) -arch $(archType) $(osArg) -c $(buildConfig) $(pgoInstrumentArg) $(officialBuildIdArg) -ci displayName: Build managed product components and packages - - ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.archType, 'x86')) }}: + - ${{ if and(eq(parameters.osGroup, 'linux'), eq(parameters.archType, 'x86')) }}: - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -subset clr.corelib $(crossArg) -arch $(archType) $(osArg) -c $(buildConfig) $(pgoInstrumentArg) $(officialBuildIdArg) -ci displayName: Build managed product components and packages @@ -237,7 +237,7 @@ jobs: # Sign and add entitlements to these MacOS binaries - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if eq(parameters.osGroup, 'OSX') }}: + - ${{ if eq(parameters.osGroup, 'osx') }}: - template: /eng/pipelines/common/macos-sign-with-entitlements.yml parameters: @@ -277,7 +277,7 @@ jobs: artifactName: $(buildProductArtifactName) displayName: 'product build' - - ${{ if and(in(parameters.osGroup, 'windows', 'Linux'), ne(parameters.archType, 'x86'), ne(parameters.compilerName, 'gcc'), ne(parameters.testGroup, 'clrTools'), eq(parameters.pgoType, '')) }}: + - ${{ if and(in(parameters.osGroup, 'windows', 'linux'), ne(parameters.archType, 'x86'), ne(parameters.compilerName, 'gcc'), ne(parameters.testGroup, 'clrTools'), eq(parameters.pgoType, '')) }}: - template: /eng/pipelines/coreclr/templates/crossdac-build.yml parameters: archType: ${{ parameters.archType }} diff --git a/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml b/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml index 526d6351a05..abbf51bcc4c 100644 --- a/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml @@ -19,7 +19,7 @@ parameters: steps: # Build Android sample app - - ${{ if eq(parameters.osGroup, 'Android') }}: + - ${{ if eq(parameters.osGroup, 'android') }}: - script: make run MONO_ARCH=arm64 DEPLOY_AND_RUN=false workingDirectory: $(Build.SourcesDirectory)/src/mono/sample/Android displayName: Build HelloAndroid sample app @@ -36,7 +36,7 @@ steps: workingDirectory: $(Build.SourcesDirectory)/artifacts/bin displayName: clean bindir - - ${{ if eq(parameters.osGroup, 'iOS') }}: + - ${{ if eq(parameters.osGroup, 'ios') }}: - script: make build-appbundle TARGET=iOS MONO_ARCH=arm64 MONO_CONFIG=Release AOT=True USE_LLVM=False DEPLOY_AND_RUN=false env: DevTeamProvisioning: '-' diff --git a/eng/pipelines/coreclr/templates/crossdac-build.yml b/eng/pipelines/coreclr/templates/crossdac-build.yml index 31154ec5487..82ad6e2e365 100644 --- a/eng/pipelines/coreclr/templates/crossdac-build.yml +++ b/eng/pipelines/coreclr/templates/crossdac-build.yml @@ -8,7 +8,7 @@ parameters: steps: # Always build the crossdac, that way we know in CI/PR if things break to build. - ${{ if and(eq(parameters.osGroup, 'windows'), notin(parameters.archType, 'x86')) }}: - - script: $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) ${{ parameters.archType }} -hostarch ${{ parameters.hostArchType }} -ci -os Linux -cmakeargs "-DCLR_CROSS_COMPONENTS_BUILD=1" -ninja $(officialBuildIdArg) -component crosscomponents + - script: $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) ${{ parameters.archType }} -hostarch ${{ parameters.hostArchType }} -ci -os linux -cmakeargs "-DCLR_CROSS_COMPONENTS_BUILD=1" -ninja $(officialBuildIdArg) -component crosscomponents displayName: Build Cross OS Linux DAC for Windows - script: $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) ${{ parameters.archType }} -hostarch ${{ parameters.hostArchType }} -ci -os alpine -cmakeargs "-DCLR_CROSS_COMPONENTS_BUILD=1" -ninja $(officialBuildIdArg) -component crosscomponents @@ -59,7 +59,7 @@ steps: isOfficialBuild: ${{ parameters.isOfficialBuild }} timeoutInMinutes: 30 - - ${{ if eq(parameters.osGroup, 'Linux') }}: + - ${{ if eq(parameters.osGroup, 'linux') }}: - task: CopyFiles@2 displayName: Gather runtime for CrossDac inputs: diff --git a/eng/pipelines/coreclr/templates/crossgen2-comparison-build-job.yml b/eng/pipelines/coreclr/templates/crossgen2-comparison-build-job.yml index 9d44dade3d1..9a2117bd51c 100644 --- a/eng/pipelines/coreclr/templates/crossgen2-comparison-build-job.yml +++ b/eng/pipelines/coreclr/templates/crossgen2-comparison-build-job.yml @@ -64,10 +64,10 @@ jobs: - ${{ if eq(parameters.osGroup, 'windows') }}: - name: target_crossgen2_os value: windows - - ${{ if eq(parameters.osGroup, 'Linux') }}: + - ${{ if eq(parameters.osGroup, 'linux') }}: - name: target_crossgen2_os value: linux - - ${{ if eq(parameters.osGroup, 'OSX') }}: + - ${{ if eq(parameters.osGroup, 'osx') }}: - name: target_crossgen2_os value: osx - name: crossgen2location diff --git a/eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml b/eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml index f59933e6871..0e2cb6cff64 100644 --- a/eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml +++ b/eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml @@ -72,10 +72,10 @@ jobs: - ${{ if eq(parameters.targetos, 'windows') }}: - name: target_crossgen2_os value: windows - - ${{ if eq(parameters.targetos, 'Linux') }}: + - ${{ if eq(parameters.targetos, 'linux') }}: - name: target_crossgen2_os value: linux - - ${{ if eq(parameters.targetos, 'OSX') }}: + - ${{ if eq(parameters.targetos, 'osx') }}: - name: target_crossgen2_os value: osx diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index 46b55c10c46..d1ca07cf6c6 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -33,23 +33,23 @@ jobs: helixQueues: # iOS/tvOS simulator x64/x86 - - ${{ if in(parameters.platform, 'iOSSimulator_x64', 'tvOSSimulator_x64') }}: + - ${{ if in(parameters.platform, 'iossimulator_x64', 'tvossimulator_x64') }}: - OSX.1015.Amd64.Open # Android arm64 - - ${{ if in(parameters.platform, 'Android_arm64') }}: + - ${{ if in(parameters.platform, 'android_arm64') }}: - Windows.10.Amd64.Android.Open # Android x64 - - ${{ if in(parameters.platform, 'Android_x64') }}: + - ${{ if in(parameters.platform, 'android_x64') }}: - Ubuntu.1804.Amd64.Android.29.Open # Browser wasm - - ${{ if eq(parameters.platform, 'Browser_wasm') }}: + - ${{ if eq(parameters.platform, 'browser_wasm') }}: - Ubuntu.1804.Amd64.Open # Linux arm - - ${{ if eq(parameters.platform, 'Linux_arm') }}: + - ${{ if eq(parameters.platform, 'linux_arm') }}: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - (Ubuntu.1804.Arm32.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7 - ${{ if and(eq(variables['System.TeamProject'], 'internal'), in(parameters.jobParameters.helixQueueGroup, 'superpmi')) }}: @@ -60,7 +60,7 @@ jobs: - (Ubuntu.1804.Arm32)Ubuntu.1804.Armarch@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7 # Linux arm64 - - ${{ if eq(parameters.platform, 'Linux_arm64') }}: + - ${{ if eq(parameters.platform, 'linux_arm64') }}: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - (Ubuntu.1804.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8 - ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}: @@ -74,28 +74,28 @@ jobs: - (Ubuntu.1804.Arm64)Ubuntu.1804.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8 # Linux musl x64 - - ${{ if eq(parameters.platform, 'Linux_musl_x64') }}: + - ${{ if eq(parameters.platform, 'linux_musl_x64') }}: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - (Alpine.314.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64 - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - (Alpine.314.Amd64)ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64 # Linux musl arm32 - - ${{ if eq(parameters.platform, 'Linux_musl_arm') }}: + - ${{ if eq(parameters.platform, 'linux_musl_arm') }}: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - (Alpine.314.Arm32.Open)Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-arm32v7 - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - (Alpine.314.Arm32)Ubuntu.1804.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-arm32v7 # Linux musl arm64 - - ${{ if eq(parameters.platform, 'Linux_musl_arm64') }}: + - ${{ if eq(parameters.platform, 'linux_musl_arm64') }}: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - (Alpine.314.Arm64.Open)Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-arm64v8 - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - (Alpine.314.Arm64)Ubuntu.1804.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-arm64v8 # Linux x64 - - ${{ if eq(parameters.platform, 'Linux_x64') }}: + - ${{ if eq(parameters.platform, 'linux_x64') }}: - ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}: - Ubuntu.1804.Amd64.Open - ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}: @@ -115,14 +115,14 @@ jobs: - RedHat.7.Amd64 # OSX arm64 - - ${{ if eq(parameters.platform, 'OSX_arm64') }}: + - ${{ if eq(parameters.platform, 'osx_arm64') }}: - ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}: - OSX.1200.ARM64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - OSX.1200.ARM64 # OSX x64 - - ${{ if eq(parameters.platform, 'OSX_x64') }}: + - ${{ if eq(parameters.platform, 'osx_x64') }}: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - OSX.1200.Amd64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: diff --git a/eng/pipelines/coreclr/templates/perf-job.yml b/eng/pipelines/coreclr/templates/perf-job.yml index da76dc3458e..af0de6eb8dd 100644 --- a/eng/pipelines/coreclr/templates/perf-job.yml +++ b/eng/pipelines/coreclr/templates/perf-job.yml @@ -74,19 +74,19 @@ jobs: - ${{ if and(eq(parameters.runtimeType, 'mono'), ne(parameters.codeGenType, 'AOT')) }}: - ${{ format('mono_{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} - ${{ if eq(parameters.runtimeType, 'wasm')}}: - - ${{ format('build_{0}{1}_{2}_{3}_{4}_{5}', 'Browser', '', 'wasm', 'Linux', parameters.buildConfig, parameters.runtimeType) }} + - ${{ format('build_{0}{1}_{2}_{3}_{4}_{5}', 'browser', '', 'wasm', 'linux', parameters.buildConfig, parameters.runtimeType) }} - ${{ if and(eq(parameters.codeGenType, 'AOT'), ne(parameters.runtimeType, 'wasm'))}}: - ${{ format('build_{0}{1}_{2}_{3}_{4}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig, parameters.codeGenType) }} - ${{ if eq(parameters.runtimeType, 'AndroidMono')}}: - - ${{ 'build_Android_arm64_release_AndroidMono' }} - - ${{ 'Build_iOS_arm64_release_MACiOSAndroidMauiNet7' }} + - ${{ 'build_android_arm64_release_AndroidMono' }} + - ${{ 'Build_ios_arm64_release_MACiOSAndroidMauiNet7' }} - ${{ if eq(parameters.runtimeType, 'AndroidMobileNet6')}}: - - ${{ 'Build_iOS_arm64_release_MACiOSAndroidMauiNet6' }} + - ${{ 'Build_ios_arm64_release_MACiOSAndroidMauiNet6' }} - ${{ if eq(parameters.runtimeType, 'iOSMono')}}: - - ${{ 'build_iOS_arm64_release_iOSMono' }} - - ${{ 'Build_iOS_arm64_release_MACiOSAndroidMauiNet7' }} + - ${{ 'build_ios_arm64_release_iOSMono' }} + - ${{ 'Build_ios_arm64_release_MACiOSAndroidMauiNet7' }} - ${{ if eq(parameters.runtimeType, 'iOSMobileNet6')}}: - - ${{ 'Build_iOS_arm64_release_MACiOSAndroidMauiNet6' }} + - ${{ 'Build_ios_arm64_release_MACiOSAndroidMauiNet6' }} ${{ if and(eq(parameters.osGroup, 'windows'), not(in(parameters.runtimeType, 'AndroidMono', 'iOSMono', 'AndroidMobileNet6', 'iOSMobileNet6'))) }}: ${{ if eq(parameters.runtimeType, 'mono') }}: diff --git a/eng/pipelines/coreclr/templates/run-scenarios-job.yml b/eng/pipelines/coreclr/templates/run-scenarios-job.yml index 7ca2aa12a3d..b33f8b6cf2b 100644 --- a/eng/pipelines/coreclr/templates/run-scenarios-job.yml +++ b/eng/pipelines/coreclr/templates/run-scenarios-job.yml @@ -65,13 +65,13 @@ jobs: - ${{ if eq(parameters.osGroup, 'windows') }}: - HelixPreCommandWindows: 'set ORIGPYPATH=%PYTHONPATH%;py -3 -m venv %HELIX_WORKITEM_PAYLOAD%\.venv;call %HELIX_WORKITEM_PAYLOAD%\.venv\Scripts\activate.bat;set PYTHONPATH=;py -3 -m pip install -U pip;py -3 -m pip install --user azure.storage.blob==12.0.0 --force-reinstall;py -3 -m pip install --user azure.storage.queue==12.0.0 --force-reinstall;set "PERFLAB_UPLOAD_TOKEN=$(PerfCommandUploadToken)"' - HelixPostCommandsWindows: 'set PYTHONPATH=%ORIGPYPATH%' - - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.osGroup, 'OSX'), ne(parameters.osSubGroup, '_musl')) }}: + - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.osGroup, 'osx'), ne(parameters.osSubGroup, '_musl')) }}: - HelixPreCommandLinux: 'export ORIGPYPATH=$PYTHONPATH;export CRYPTOGRAPHY_ALLOW_OPENSSL_102=true;sudo apt-get -y install python3-venv;python3 -m venv $HELIX_WORKITEM_PAYLOAD/.venv;source $HELIX_WORKITEM_PAYLOAD/.venv/bin/activate;export PYTHONPATH=;python3 -m pip install -U pip;pip3 install --user azure.storage.blob==12.0.0 --force-reinstall;pip3 install --user azure.storage.queue==12.0.0 --force-reinstall;export PERFLAB_UPLOAD_TOKEN="$(PerfCommandUploadTokenLinux)"' - HelixPostCommandsLinux: 'export PYTHONPATH=$ORIGPYPATH' - - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.osGroup, 'OSX'), eq(parameters.osSubGroup, '_musl')) }}: + - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.osGroup, 'osx'), eq(parameters.osSubGroup, '_musl')) }}: - HelixPreCommandMusl: 'export ORIGPYPATH=$PYTHONPATH;sudo apk add py3-virtualenv;python3 -m venv $HELIX_WORKITEM_PAYLOAD/.venv;source $HELIX_WORKITEM_PAYLOAD/.venv/bin/activate;export PYTHONPATH=;python3 -m pip install -U pip;pip3 install --user azure.storage.blob==12.0.0 --force-reinstall;pip3 install --user azure.storage.queue==12.0.0 --force-reinstall;export PERFLAB_UPLOAD_TOKEN="$(PerfCommandUploadTokenLinux)"' - HelixPostCommandsMusl: 'export PYTHONPATH=$ORIGPYPATH' - - ${{ if eq(parameters.osGroup, 'OSX') }}: + - ${{ if eq(parameters.osGroup, 'osx') }}: - HelixPreCommandOSX: 'export ORIGPYPATH=$PYTHONPATH;export CRYPTOGRAPHY_ALLOW_OPENSSL_102=true;python3 -m venv $HELIX_WORKITEM_PAYLOAD/.venv;source $HELIX_WORKITEM_PAYLOAD/.venv/bin/activate;export PYTHONPATH=;python3 -m pip install -U pip;pip3 install azure.storage.blob==12.0.0 --force-reinstall;pip3 install azure.storage.queue==12.0.0 --force-reinstall;export PERFLAB_UPLOAD_TOKEN="$(PerfCommandUploadTokenLinux)"' - HelixPostCommandOSX: 'export PYTHONPATH=$ORIGPYPATH' @@ -81,15 +81,15 @@ jobs: - AdditionalHelixPreCommands: $(HelixPreCommandWindows) - AdditionalHelixPostCommands: $(HelixPostCommandsWindows) - IsInternal: -Internal - - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.osGroup, 'OSX'), ne(parameters.osSubGroup, '_musl')) }}: + - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.osGroup, 'osx'), ne(parameters.osSubGroup, '_musl')) }}: - AdditionalHelixPreCommands: $(HelixPreCommandLinux) - AdditionalHelixPostCommands: $(HelixPostCommandsLinux) - IsInternal: --internal - - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.osGroup, 'OSX'), eq(parameters.osSubGroup, '_musl')) }}: + - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.osGroup, 'osx'), eq(parameters.osSubGroup, '_musl')) }}: - AdditionalHelixPreCommands: $(HelixPreCommandMusl) - AdditionalHelixPostCommands: $(HelixPostCommandsMusl) - IsInternal: --internal - - ${{ if eq(parameters.osGroup, 'OSX') }}: + - ${{ if eq(parameters.osGroup, 'osx') }}: - AdditionalHelixPreCommands: $(HelixPreCommandOSX) - AdditionalHelixPostCommands: $(HelixPostCommandOSX) - IsInternal: --internal @@ -100,10 +100,10 @@ jobs: - ${{ if eq(parameters.osGroup, 'windows') }}: - AdditionalHelixPreCommands: $(HelixPreCommandWindows) - AdditionalHelixPostCommands: $(HelixPostCommandsWindows) - - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.osGroup, 'OSX')) }}: + - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.osGroup, 'osx')) }}: - AdditionalHelixPreCommands: $(HelixPreCommandLinux) - AdditionalHelixPostCommands: $(HelixPostCommandsLinux) - - ${{ if eq(parameters.osGroup, 'OSX') }}: + - ${{ if eq(parameters.osGroup, 'osx') }}: - AdditionalHelixPreCommands: $(HelixPreCommandOSX) - AdditionalHelixPostCommands: $(HelixPostCommandOSX) diff --git a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml index 980899a4233..4d8028f5e75 100644 --- a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml @@ -142,8 +142,8 @@ jobs: - name: osArg value: '' - - ${{ if eq(parameters.osGroup, 'FreeBSD') }}: + - ${{ if eq(parameters.osGroup, 'freebsd') }}: - name: osArg - value: -os FreeBSD + value: -os freebsd steps: ${{ parameters.steps }} diff --git a/eng/pipelines/coreclr/tieringtest.yml b/eng/pipelines/coreclr/tieringtest.yml index 0b803ff3e36..4bdf1c0e2cb 100644 --- a/eng/pipelines/coreclr/tieringtest.yml +++ b/eng/pipelines/coreclr/tieringtest.yml @@ -20,10 +20,10 @@ extends: jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml buildConfig: checked platforms: - - Linux_x64 + - linux_x64 - windows_x64 - windows_x86 - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: outerloop @@ -32,7 +32,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: outerloop @@ -41,7 +41,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - Linux_x64 + - linux_x64 - windows_x64 - windows_x86 helixQueueGroup: ci diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml index f42691df4ed..913b97751d0 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml @@ -22,7 +22,7 @@ jobs: isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isAndroidOnlyBuild: ${{ parameters.isAndroidOnlyBuild }} platforms: - - Android_arm64 + - android_arm64 variables: - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}: - name: _HelixSource @@ -60,8 +60,8 @@ jobs: buildConfig: Release runtimeFlavor: mono platforms: - - Android_arm - - Android_arm64 + - android_arm + - android_arm64 variables: # map dependencies variables to local variables - name: librariesContainsChange diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml index 1a0185f8997..635455cb2e0 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml @@ -21,7 +21,7 @@ jobs: isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isAndroidEmulatorOnlyBuild: ${{ parameters.isAndroidEmulatorOnlyBuild }} platforms: - - Android_x64 + - android_x64 variables: - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}: - name: _HelixSource @@ -57,7 +57,7 @@ jobs: isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isAndroidEmulatorOnlyBuild: ${{ parameters.isAndroidEmulatorOnlyBuild }} platforms: - - Android_x64 + - android_x64 variables: - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}: - name: _HelixSource @@ -92,8 +92,8 @@ jobs: buildConfig: Release runtimeFlavor: mono platforms: - - Android_x86 - - Android_x64 + - android_x86 + - android_x64 variables: # map dependencies variables to local variables - name: librariesContainsChange diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml index bb0e3d9d1e4..86b62963de6 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml @@ -23,8 +23,8 @@ jobs: isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isiOSLikeOnlyBuild: ${{ parameters.isiOSLikeOnlyBuild }} platforms: - - iOS_arm64 - - tvOS_arm64 + - ios_arm64 + - tvos_arm64 variables: # map dependencies variables to local variables - name: librariesContainsChange diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml index 8492e2ccd6c..b1514af8023 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml @@ -23,11 +23,11 @@ jobs: isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isiOSLikeSimulatorOnlyBuild: ${{ parameters.isiOSLikeSimulatorOnlyBuild }} platforms: - - iOSSimulator_x64 - - tvOSSimulator_x64 + - iossimulator_x64 + - tvossimulator_x64 # don't run tests on arm64 PRs until we can get significantly more devices - ${{ if eq(variables['isRollingBuild'], true) }}: - - iOSSimulator_arm64 + - iossimulator_arm64 variables: # map dependencies variables to local variables - name: librariesContainsChange diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-linuxbionic.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-linuxbionic.yml index e974ae14a4e..69a854fa84f 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-linuxbionic.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-linuxbionic.yml @@ -22,8 +22,8 @@ jobs: isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isLinuxBionicOnlyBuild: ${{ parameters.isLinuxBionicOnlyBuild }} platforms: - - Linux_bionic_arm64 - - Linux_bionic_x64 + - linux_bionic_arm64 + - linux_bionic_x64 variables: - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}: - name: _HelixSource @@ -37,7 +37,7 @@ jobs: value: 180 jobParameters: testGroup: innerloop - targetRid: Linux-bionic-x64 + targetRid: linux-bionic-x64 nameSuffix: AllSubsets_Mono buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true timeoutInMinutes: 240 diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml index 2466c71b60e..736bf0516df 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml @@ -23,8 +23,8 @@ jobs: isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isMacCatalystOnlyBuild: ${{ parameters.isMacCatalystOnlyBuild }} platforms: - - MacCatalyst_x64 - - MacCatalyst_arm64 + - maccatalyst_x64 + - maccatalyst_arm64 variables: # map dependencies variables to local variables - name: librariesContainsChange @@ -56,8 +56,8 @@ jobs: isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isMacCatalystOnlyBuild: ${{ parameters.isMacCatalystOnlyBuild }} platforms: - - MacCatalyst_x64 - - MacCatalyst_arm64 + - maccatalyst_x64 + - maccatalyst_arm64 variables: # map dependencies variables to local variables - name: librariesContainsChange diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml index eab647e47de..ddc45036a63 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml @@ -16,11 +16,11 @@ jobs: jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml buildConfig: release platforms: - - Linux_x64 - - Linux_arm - - Linux_arm64 - - Linux_musl_x64 - - OSX_x64 + - linux_x64 + - linux_arm + - linux_arm64 + - linux_musl_x64 + - osx_x64 - windows_x64 - windows_x86 - windows_arm64 @@ -35,11 +35,11 @@ jobs: jobTemplate: /eng/pipelines/libraries/build-job.yml buildConfig: Release platforms: - - Linux_x64 - - Linux_arm - - Linux_arm64 - - Linux_musl_x64 - - OSX_x64 + - linux_x64 + - linux_arm + - linux_arm64 + - linux_musl_x64 + - osx_x64 - windows_x64 - windows_x86 - windows_arm64 @@ -53,11 +53,11 @@ jobs: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: Release platforms: - - Linux_x64 - - Linux_arm - - Linux_arm64 - - Linux_musl_x64 - - OSX_x64 + - linux_x64 + - linux_arm + - linux_arm64 + - linux_musl_x64 + - osx_x64 - windows_x64 - windows_x86 - windows_arm64 @@ -84,11 +84,11 @@ jobs: platforms: - windows_x64 - windows_arm64 - - OSX_x64 - - OSX_arm64 - - Linux_x64 - - Linux_arm64 - - Linux_musl_x64 + - osx_x64 + - osx_arm64 + - linux_x64 + - linux_arm64 + - linux_musl_x64 jobParameters: testGroup: innerloop isSingleFile: true @@ -117,7 +117,7 @@ jobs: buildConfig: Release platforms: - windows_x64 - - Linux_arm64 + - linux_arm64 jobParameters: testGroup: innerloop isSingleFile: true @@ -164,7 +164,7 @@ jobs: buildConfig: Release runtimeFlavor: mono platforms: - - Windows_x64 + - windows_x64 variables: # map dependencies variables to local variables - name: librariesContainsChange @@ -204,7 +204,7 @@ jobs: runtimeFlavor: mono buildConfig: release platforms: - - Linux_arm64 + - linux_arm64 jobParameters: condition: >- or( @@ -222,7 +222,7 @@ jobs: buildConfig: release runtimeFlavor: mono platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: innerloop condition: >- @@ -240,7 +240,7 @@ jobs: buildConfig: release runtimeFlavor: mono platforms: - - Linux_arm64 + - linux_arm64 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: @@ -263,7 +263,7 @@ jobs: buildConfig: release runtimeFlavor: mono platforms: - - Linux_arm64 + - linux_arm64 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml index 53e2dc56269..227eb4c7ced 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml @@ -22,8 +22,8 @@ jobs: - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml parameters: platforms: - - Browser_wasm - - Browser_wasm_win + - browser_wasm + - browser_wasm_win nameSuffix: _AOT runAOT: true alwaysRun: true @@ -32,8 +32,8 @@ jobs: - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml parameters: platforms: - - Browser_wasm - - Browser_wasm_win + - browser_wasm + - browser_wasm_win nameSuffix: _HighResource_AOT extraBuildArgs: /p:TestAssemblies=false /p:RunHighAOTResourceRequiringTestsOnly=true buildAOTOnHelix: false @@ -45,7 +45,7 @@ jobs: #- template: /eng/pipelines/common/templates/wasm-debugger-tests.yml #parameters: #platforms: - #- Browser_wasm_firefox + #- browser_wasm_firefox #browser: firefox ## ff tests are unstable currently #shouldContinueOnError: true @@ -68,7 +68,7 @@ jobs: - template: /eng/pipelines/common/templates/wasm-library-tests.yml parameters: platforms: - - Browser_wasm + - browser_wasm # Don't run for rolling builds, as this is covered isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} @@ -80,7 +80,7 @@ jobs: - template: /eng/pipelines/common/templates/wasm-library-tests.yml parameters: platforms: - - Browser_wasm + - browser_wasm nameSuffix: _NodeJs isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} @@ -92,7 +92,7 @@ jobs: - template: /eng/pipelines/common/templates/wasm-library-tests.yml parameters: platforms: - - Browser_wasm_win + - browser_wasm_win # Don't run for rolling builds, as this is covered isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} @@ -104,8 +104,8 @@ jobs: - template: /eng/pipelines/common/templates/wasm-library-tests.yml parameters: platforms: - - Browser_wasm - #- Browser_wasm_win + - browser_wasm + #- browser_wasm_win nameSuffix: _Threading extraBuildArgs: /p:MonoWasmBuildVariant=multithread /p:_WasmPThreadPoolSize=8 isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} @@ -124,8 +124,8 @@ jobs: - template: /eng/pipelines/common/templates/wasm-library-tests.yml parameters: platforms: - - Browser_wasm - #- Browser_wasm_win + - browser_wasm + #- browser_wasm_win nameSuffix: _Threading_PerfTracing extraBuildArgs: /p:MonoWasmBuildVariant=perftrace isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} @@ -144,7 +144,7 @@ jobs: - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml parameters: platforms: - - Browser_wasm + - browser_wasm nameSuffix: _EAT runAOT: false isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} @@ -154,8 +154,8 @@ jobs: - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml parameters: platforms: - - Browser_wasm - - Browser_wasm_win + - browser_wasm + - browser_wasm_win nameSuffix: _AOT runAOT: true isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} @@ -166,8 +166,8 @@ jobs: - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml parameters: platforms: - - Browser_wasm - - Browser_wasm_win + - browser_wasm + - browser_wasm_win nameSuffix: _HighResource_AOT extraBuildArgs: /p:TestAssemblies=false /p:RunHighAOTResourceRequiringTestsOnly=true buildAOTOnHelix: false @@ -181,8 +181,8 @@ jobs: - template: /eng/pipelines/common/templates/wasm-build-tests.yml parameters: platforms: - - Browser_wasm - - Browser_wasm_win + - browser_wasm + - browser_wasm_win isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} @@ -190,22 +190,22 @@ jobs: - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml parameters: platforms: - - Browser_wasm - - Browser_wasm_win + - browser_wasm + - browser_wasm_win isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} - template: /eng/pipelines/common/templates/wasm-runtime-tests.yml parameters: platforms: - - Browser_wasm + - browser_wasm isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml parameters: platforms: - - Browser_wasm_firefox + - browser_wasm_firefox browser: firefox isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} diff --git a/eng/pipelines/global-build.yml b/eng/pipelines/global-build.yml index b3b74b222ec..1e47945648e 100644 --- a/eng/pipelines/global-build.yml +++ b/eng/pipelines/global-build.yml @@ -50,8 +50,8 @@ extends: buildConfig: release platforms: - windows_x86 - - OSX_x64 - - OSX_arm64 + - osx_x64 + - osx_arm64 jobParameters: testGroup: innerloop nameSuffix: Runtime_Debug @@ -91,7 +91,7 @@ extends: jobTemplate: /eng/pipelines/common/global-build-job.yml buildConfig: debug platforms: - - Linux_x64 + - linux_x64 jobParameters: testGroup: innerloop nameSuffix: Runtime_Release @@ -112,7 +112,7 @@ extends: jobTemplate: /eng/pipelines/common/global-build-job.yml buildConfig: debug platforms: - - Linux_x64 + - linux_x64 jobParameters: testGroup: innerloop nameSuffix: RuntimeFlavor_Mono @@ -152,7 +152,7 @@ extends: jobTemplate: /eng/pipelines/common/global-build-job.yml buildConfig: debug platforms: - - Linux_x64 + - linux_x64 jobParameters: nameSuffix: Libraries_AllConfigurations buildArgs: -subset libs -allconfigurations @@ -170,7 +170,7 @@ extends: jobTemplate: /eng/pipelines/common/global-build-job.yml buildConfig: Release platforms: - - SourceBuild_Linux_x64 + - SourceBuild_linux_x64 jobParameters: nameSuffix: PortableSourceBuild extraStepsParameters: diff --git a/eng/pipelines/installer/jobs/build-job.yml b/eng/pipelines/installer/jobs/build-job.yml index d1e0d6683bd..a66b2e09f41 100644 --- a/eng/pipelines/installer/jobs/build-job.yml +++ b/eng/pipelines/installer/jobs/build-job.yml @@ -150,7 +150,7 @@ jobs: $(CommonMSBuildArgs) $(MsbuildSigningArguments) - - ${{ if eq(parameters.osGroup, 'OSX') }}: + - ${{ if eq(parameters.osGroup, 'osx') }}: - name: CommonMSBuildArgs value: >- @@ -170,7 +170,7 @@ jobs: $(CommonMSBuildArgs) $(OfficialBuildArg) - - ${{ if in(parameters.osGroup, 'iOS', 'tvOS', 'Android', 'Browser') }}: + - ${{ if in(parameters.osGroup, 'ios', 'tvos', 'android', 'browser') }}: - name: CommonMSBuildArgs value: >- @@ -189,7 +189,7 @@ jobs: $(CommonMSBuildArgs) $(OfficialBuildArg) - - ${{ if in(parameters.osGroup, 'Linux', 'FreeBSD') }}: + - ${{ if in(parameters.osGroup, 'linux', 'freebsd') }}: - name: CommonMSBuildArgs value: >- /p:Configuration=$(_BuildConfig) @@ -201,7 +201,7 @@ jobs: - name: _PortableBuild value: ${{ eq(parameters.osSubgroup, '') }} - - ${{ if and(eq(parameters.osSubgroup, '_musl'), eq(parameters.osGroup, 'Linux')) }}: + - ${{ if and(eq(parameters.osSubgroup, '_musl'), eq(parameters.osGroup, 'linux')) }}: - name: _PortableBuild value: true @@ -313,7 +313,7 @@ jobs: displayName: 'Libraries artifacts' cleanUnpackFolder: false - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: + - ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} displayName: Install Build Dependencies @@ -323,13 +323,13 @@ jobs: displayName: Disk Usage before Build # Build the default subset non-MacOS platforms - - ${{ if ne(parameters.osGroup, 'OSX') }}: + - ${{ if ne(parameters.osGroup, 'osx') }}: - script: $(BaseJobBuildCommand) displayName: Build continueOnError: ${{ and(eq(variables.SkipTests, false), eq(parameters.shouldContinueOnError, true)) }} # Build corehost, sign and add entitlements to MacOS binaries - - ${{ if eq(parameters.osGroup, 'OSX') }}: + - ${{ if eq(parameters.osGroup, 'osx') }}: - script: $(BaseJobBuildCommand) -subset host.native displayName: Build CoreHost continueOnError: ${{ and(eq(variables.SkipTests, false), eq(parameters.shouldContinueOnError, true)) }} @@ -349,20 +349,20 @@ jobs: displayName: Build and Package continueOnError: ${{ and(eq(variables.SkipTests, false), eq(parameters.shouldContinueOnError, true)) }} - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: + - ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h displayName: Disk Usage after Build # Only in glibc leg, we produce RPMs and Debs - - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), or(eq(parameters.platform, 'Linux_x64'), eq(parameters.platform, 'Linux_arm64')), eq(parameters.osSubgroup, ''), eq(parameters.pgoType, ''))}}: + - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), or(eq(parameters.platform, 'linux_x64'), eq(parameters.platform, 'linux_arm64')), eq(parameters.osSubgroup, ''), eq(parameters.pgoType, ''))}}: - ${{ each packageBuild in parameters.packageDistroList }}: # This leg's RID matches the build image. Build its distro-dependent packages, as well as # the distro-independent installers. (There's no particular reason to build the distro- # independent installers on this leg, but we need to do it somewhere.) - # Currently, Linux_arm64 supports 'rpm' type only. - - ${{ if or(not(eq(parameters.platform, 'Linux_arm64')), eq(packageBuild.packageType, 'rpm')) }}: + # Currently, linux_arm64 supports 'rpm' type only. + - ${{ if or(not(eq(parameters.platform, 'linux_arm64')), eq(packageBuild.packageType, 'rpm')) }}: - template: /eng/pipelines/installer/jobs/steps/build-linux-package.yml parameters: packageType: ${{ packageBuild.packageType }} diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index 77af5e8b6ec..ebf4d5f3c5a 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/eng/pipelines/libraries/base-job.yml @@ -70,7 +70,7 @@ jobs: - _crossBuildPropertyArg: /p:CrossBuild=true # force a value for OS when cross-building - - ${{ if in(parameters.osGroup, 'Browser', 'iOS', 'tvOS', 'Android', 'FreeBSD') }}: + - ${{ if in(parameters.osGroup, 'browser', 'ios', 'tvos', 'android', 'freebsd') }}: - _osArg: -os ${{ parameters.osGroup }} - ${{ if ne(parameters.framework, '') }}: diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml index df14606d602..98efbcf69a4 100644 --- a/eng/pipelines/libraries/build-job.yml +++ b/eng/pipelines/libraries/build-job.yml @@ -85,7 +85,7 @@ jobs: - ${{ if eq(parameters.isOfficialBuild, true) }}: - template: /eng/pipelines/common/restore-internal-tools.yml - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: + - ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} displayName: Install Build Dependencies @@ -101,7 +101,7 @@ jobs: $(_additionalBuildArguments) displayName: Restore and Build Product - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: + - ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 043d5fb251c..734530b9b68 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -26,18 +26,18 @@ jobs: helixQueues: # Linux arm - - ${{ if eq(parameters.platform, 'Linux_arm') }}: + - ${{ if eq(parameters.platform, 'linux_arm') }}: - ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - (Debian.10.Arm32.Open)Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-arm32v7 - (Debian.11.Arm32.Open)Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm32v7 # Linux armv6 - - ${{ if eq(parameters.platform, 'Linux_armv6') }}: + - ${{ if eq(parameters.platform, 'linux_armv6') }}: # - ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}: - (Raspbian.10.Armv6.Open)Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:raspbian-10-helix-arm32v6 # Linux arm64 - - ${{ if eq(parameters.platform, 'Linux_arm64') }}: + - ${{ if eq(parameters.platform, 'linux_arm64') }}: - ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - (Ubuntu.2204.Arm64.Open)Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-arm64v8 - ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: @@ -48,19 +48,19 @@ jobs: - (Debian.11.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm64v8 # Linux musl x64 - - ${{ if eq(parameters.platform, 'Linux_musl_x64') }}: + - ${{ if eq(parameters.platform, 'linux_musl_x64') }}: - ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - (Alpine.314.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64 - ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}: - (Alpine.313.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-helix-amd64 # Linux musl arm64 - - ${{ if and(eq(parameters.platform, 'Linux_musl_arm64'), or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true))) }}: + - ${{ if and(eq(parameters.platform, 'linux_musl_arm64'), or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true))) }}: - (Alpine.313.Arm64.Open)ubuntu.1804.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-helix-arm64v8 - (Alpine.314.Arm64.Open)ubuntu.1804.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-helix-arm64v8 # Linux x64 - - ${{ if eq(parameters.platform, 'Linux_x64') }}: + - ${{ if eq(parameters.platform, 'linux_x64') }}: - ${{ if and(eq(parameters.jobParameters.interpreter, ''), ne(parameters.jobParameters.isSingleFile, true)) }}: - ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}: - RedHat.7.Amd64.Open @@ -86,37 +86,37 @@ jobs: - (Debian.10.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-10-helix-amd64 # Linux s390x - - ${{ if eq(parameters.platform, 'Linux_s390x') }}: + - ${{ if eq(parameters.platform, 'linux_s390x') }}: - Ubuntu.2004.S390X.Experimental.Open # Linux PPC64le - - ${{ if eq(parameters.platform, 'Linux_ppc64le') }}: + - ${{ if eq(parameters.platform, 'linux_ppc64le') }}: - Ubuntu.2004.PPC64le.Experimental.Open # OSX arm64 - - ${{ if eq(parameters.platform, 'OSX_arm64') }}: + - ${{ if eq(parameters.platform, 'osx_arm64') }}: - OSX.1200.ARM64.Open # OSX x64 - - ${{ if eq(parameters.platform, 'OSX_x64') }}: + - ${{ if eq(parameters.platform, 'osx_x64') }}: - OSX.1200.Amd64.Open # Android - - ${{ if in(parameters.platform, 'Android_x86', 'Android_x64', 'Linux_bionic_x64') }}: + - ${{ if in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64') }}: - Ubuntu.1804.Amd64.Android.29.Open - - ${{ if in(parameters.platform, 'Android_arm', 'Android_arm64', 'Linux_bionic_arm64') }}: + - ${{ if in(parameters.platform, 'android_arm', 'android_arm64', 'linux_bionic_arm64') }}: - Windows.10.Amd64.Android.Open # iOS Simulator/Mac Catalyst arm64 - - ${{ if in(parameters.platform, 'MacCatalyst_arm64', 'iOSSimulator_arm64') }}: + - ${{ if in(parameters.platform, 'maccatalyst_arm64', 'iossimulator_arm64') }}: - OSX.1200.Arm64.Open # iOS/tvOS simulator x64/x86 & MacCatalyst x64 - - ${{ if in(parameters.platform, 'iOSSimulator_x64', 'iOSSimulator_x86', 'tvOSSimulator_x64', 'MacCatalyst_x64') }}: + - ${{ if in(parameters.platform, 'iossimulator_x64', 'iossimulator_x86', 'tvossimulator_x64', 'maccatalyst_x64') }}: - OSX.1200.Amd64.Open # iOS devices - - ${{ if in(parameters.platform, 'iOS_arm64') }}: + - ${{ if in(parameters.platform, 'ios_arm64') }}: # split traffic for runtime-extra-platforms (which mostly runs on rolling builds) - ${{ if ne(parameters.jobParameters.isExtraPlatforms, true) }}: - OSX.1015.Amd64.Iphone.Open @@ -124,7 +124,7 @@ jobs: - OSX.1200.Amd64.Iphone.Open # tvOS devices - - ${{ if in(parameters.platform, 'tvOS_arm64') }}: + - ${{ if in(parameters.platform, 'tvos_arm64') }}: # split traffic for runtime-extra-platforms (which mostly runs on rolling builds) - ${{ if ne(parameters.jobParameters.isExtraPlatforms, true) }}: - OSX.1015.Amd64.AppleTV.Open @@ -188,15 +188,15 @@ jobs: - Windows.11.Arm64.Open # Browser/WASI WebAssembly - - ${{ if in(parameters.platform, 'Browser_wasm', 'wasi_wasm') }}: + - ${{ if in(parameters.platform, 'browser_wasm', 'wasi_wasm') }}: - Ubuntu.1804.Amd64.Open # Browser WebAssembly Firefox - - ${{ if eq(parameters.platform, 'Browser_wasm_firefox') }}: + - ${{ if eq(parameters.platform, 'browser_wasm_firefox') }}: - (Ubuntu.1804.Amd64)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-webassembly # Browser WebAssembly windows - - ${{ if eq(parameters.platform, 'Browser_wasm_win') }}: + - ${{ if eq(parameters.platform, 'browser_wasm_win') }}: - (Windows.Amd64.Server2022.Open)windows.amd64.server2022.open@mcr.microsoft.com/dotnet-buildtools/prereqs:windowsservercore-ltsc2022-helix-webassembly ${{ insert }}: ${{ parameters.jobParameters }} diff --git a/eng/pipelines/libraries/outerloop-mono.yml b/eng/pipelines/libraries/outerloop-mono.yml index 68e54dbc591..dd0ef5ba00e 100644 --- a/eng/pipelines/libraries/outerloop-mono.yml +++ b/eng/pipelines/libraries/outerloop-mono.yml @@ -27,13 +27,13 @@ extends: runtimeFlavor: mono platforms: - windows_x86 - - Browser_wasm + - browser_wasm - ${{ if eq(variables['isRollingBuild'], true) }}: - windows_x64 - - Linux_x64 - - Linux_arm - - Linux_musl_x64 - - OSX_x64 + - linux_x64 + - linux_arm + - linux_musl_x64 + - osx_x64 jobParameters: testScope: outerloop nameSuffix: AllSubsets_Mono @@ -58,10 +58,10 @@ extends: runtimeFlavor: mono platforms: - windows_x64 - - Linux_x64 - - Linux_musl_x64 - - OSX_x64 - - Android_arm64 + - linux_x64 + - linux_musl_x64 + - osx_x64 + - android_arm64 jobParameters: testScope: outerloop nameSuffix: AllSubsets_Mono diff --git a/eng/pipelines/libraries/outerloop.yml b/eng/pipelines/libraries/outerloop.yml index 1aae9ad7c71..125a7edd4dc 100644 --- a/eng/pipelines/libraries/outerloop.yml +++ b/eng/pipelines/libraries/outerloop.yml @@ -30,14 +30,14 @@ extends: - windows_x64 - ${{ if eq(variables['includeLinuxOuterloop'], true) }}: - ${{ if eq(variables['isRollingBuild'], true) }}: - - Linux_x64 - - Linux_arm - - Linux_arm64 - - Linux_musl_x64 - - Linux_musl_arm64 + - linux_x64 + - linux_arm + - linux_arm64 + - linux_musl_x64 + - linux_musl_arm64 - ${{ if and(eq(variables['includeOsxOuterloop'], true), eq(variables['isRollingBuild'], true)) }}: - - OSX_arm64 - - OSX_x64 + - osx_arm64 + - osx_x64 jobParameters: testScope: outerloop nameSuffix: CoreCLR_Release @@ -61,11 +61,11 @@ extends: - ${{ if eq(variables['includeWindowsOuterloop'], true) }}: - windows_x64 - ${{ if eq(variables['includeLinuxOuterloop'], true) }}: - - Linux_x64 - - Linux_musl_x64 + - linux_x64 + - linux_musl_x64 - ${{ if eq(variables['includeOsxOuterloop'], true) }}: - - OSX_arm64 - - OSX_x64 + - osx_arm64 + - osx_x64 jobParameters: testScope: outerloop nameSuffix: CoreCLR_Release diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index f683aed31e9..4302f274684 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -65,48 +65,48 @@ jobs: value: '' - ${{ if eq(parameters.isOfficialBuild, true) }}: - name: officialBuildIdArg - value: '/p:officialBuildId=$(Build.BuildNumber)' - - ${{ if and(eq(parameters.osSubgroup, '_musl'), eq(parameters.osGroup, 'Linux')) }}: + value: '/p:OfficialBuildId=$(Build.BuildNumber)' + - ${{ if and(eq(parameters.osSubgroup, '_musl'), eq(parameters.osGroup, 'linux')) }}: # Set output RID manually: musl isn't properly detected. Make sure to also convert linux to # lowercase for RID format. (Detection normally converts, but we're preventing it.) - name: OutputRidArg value: /p:OutputRid=linux-musl-${{ parameters.archType }} - name: _PortableBuild value: true - - ${{ if eq(parameters.osGroup, 'tvOS') }}: + - ${{ if eq(parameters.osGroup, 'tvos') }}: - name: osOverride - value: -os tvOS + value: -os tvos - name: darwinFrameworks value: /p:BuildDarwinFrameworks=true - - ${{ if eq(parameters.osGroup, 'tvOSSimulator') }}: + - ${{ if eq(parameters.osGroup, 'tvossimulator') }}: - name: osOverride - value: -os tvOSSimulator + value: -os tvossimulator - name: darwinFrameworks value: /p:BuildDarwinFrameworks=true - - ${{ if eq(parameters.osGroup, 'iOS') }}: + - ${{ if eq(parameters.osGroup, 'ios') }}: - name: osOverride - value: -os iOS + value: -os ios - name: darwinFrameworks value: /p:BuildDarwinFrameworks=true - - ${{ if eq(parameters.osGroup, 'iOSSimulator') }}: + - ${{ if eq(parameters.osGroup, 'iossimulator') }}: - name: osOverride - value: -os iOSSimulator + value: -os iossimulator - name: darwinFrameworks value: /p:BuildDarwinFrameworks=true - - ${{ if eq(parameters.osGroup, 'Android') }}: + - ${{ if eq(parameters.osGroup, 'android') }}: - name: osOverride - value: -os Android - - ${{ if eq(parameters.osGroup, 'Browser') }}: + value: -os android + - ${{ if eq(parameters.osGroup, 'browser') }}: - name: archType value: wasm - name: osOverride - value: '-os Browser' + value: '-os browser' - ${{ if eq(parameters.osGroup, 'wasi') }}: - name: archType value: wasm - name: osOverride value: '-os wasi' - - ${{ if and(eq(parameters.osGroup, 'Linux'), not(eq(parameters.archType, 'x64'))) }}: + - ${{ if and(eq(parameters.osGroup, 'linux'), not(eq(parameters.archType, 'x64'))) }}: name: llvmCxxAbi value: /p:MonoLLVMUseCxx11Abi=true - ${{ if eq(parameters.runtimeVariant, 'llvmjit') }}: @@ -126,7 +126,7 @@ jobs: # Linux builds use docker images with dependencies preinstalled, # and FreeBSD builds use a build agent with dependencies # preinstalled, so we only need this step for OSX and Windows. - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: + - ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) displayName: Install native dependencies @@ -137,7 +137,7 @@ jobs: artifact: Mono_Offsets_${{monoCrossAOTTargetOS}} path: '$(Build.SourcesDirectory)/artifacts/obj/mono/offsetfiles' - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: + - ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h @@ -151,7 +151,7 @@ jobs: - script: build$(scriptExt) -subset mono$(msCorDbi)+clr.hosts -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(aotCrossParameter) $(llvmParameter) displayName: Build product - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: + - ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}: - script: | du -sh $(Build.SourcesDirectory)/* df -h @@ -184,7 +184,7 @@ jobs: env: # TODO: remove NUGET_PACKAGES once https://github.com/dotnet/arcade/issues/1578 is fixed NUGET_PACKAGES: $(Build.SourcesDirectory)/.packages - ${{ if eq(parameters.osGroup, 'FreeBSD') }}: + ${{ if eq(parameters.osGroup, 'freebsd') }}: # Arcade uses this SDK instead of trying to restore one. DotNetCoreSdkDir: /usr/local/dotnet - ${{ if eq(parameters.osGroup, 'windows') }}: diff --git a/eng/pipelines/mono/templates/generate-offsets.yml b/eng/pipelines/mono/templates/generate-offsets.yml index 7bb83887c5c..e8a3ed18c3e 100644 --- a/eng/pipelines/mono/templates/generate-offsets.yml +++ b/eng/pipelines/mono/templates/generate-offsets.yml @@ -43,9 +43,9 @@ jobs: value: '' - ${{ if eq(parameters.isOfficialBuild, true) }}: - name: officialBuildIdArg - value: '/p:officialBuildId=$(Build.BuildNumber)' + value: '/p:OfficialBuildId=$(Build.BuildNumber)' - name: osOverride - value: -os Linux + value: -os linux - name: archType value: x64 - ${{ parameters.variables }} @@ -56,7 +56,7 @@ jobs: # Linux builds use docker images with dependencies preinstalled, # and FreeBSD builds use a build agent with dependencies # preinstalled, so we only need this step for OSX and Windows. - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: + - ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) displayName: Install native dependencies diff --git a/eng/pipelines/runtime-android-grpc-client-tests.yml b/eng/pipelines/runtime-android-grpc-client-tests.yml index a10ab4396fe..2c52bbf136c 100644 --- a/eng/pipelines/runtime-android-grpc-client-tests.yml +++ b/eng/pipelines/runtime-android-grpc-client-tests.yml @@ -36,7 +36,7 @@ extends: buildConfig: Release runtimeFlavor: mono platforms: - - Android_x64 + - android_x64 jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono_gRPC diff --git a/eng/pipelines/runtime-cet.yml b/eng/pipelines/runtime-cet.yml index b4c2fa82b63..c639088dba5 100644 --- a/eng/pipelines/runtime-cet.yml +++ b/eng/pipelines/runtime-cet.yml @@ -74,7 +74,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: innerloop diff --git a/eng/pipelines/runtime-codeql.yml b/eng/pipelines/runtime-codeql.yml index d39d542d658..991fa0d4002 100644 --- a/eng/pipelines/runtime-codeql.yml +++ b/eng/pipelines/runtime-codeql.yml @@ -37,7 +37,7 @@ extends: jobTemplate: /eng/pipelines/common/global-build-job.yml buildConfig: release platforms: - - Linux_x64 + - linux_x64 - windows_x64 jobParameters: buildArgs: -s clr+libs+host+packs -c $(_BuildConfig) @@ -55,7 +55,7 @@ extends: buildConfig: release runtimeFlavor: mono platforms: - - Linux_x64 + - linux_x64 - windows_x64 jobParameters: buildArgs: -s mono+libs+host+packs+mono.mscordbi -c $(_BuildConfig) diff --git a/eng/pipelines/runtime-community.yml b/eng/pipelines/runtime-community.yml index d8b70217670..22a7b7ce3e8 100644 --- a/eng/pipelines/runtime-community.yml +++ b/eng/pipelines/runtime-community.yml @@ -53,8 +53,8 @@ extends: buildConfig: Release runtimeFlavor: mono platforms: - - Linux_s390x - - Linux_ppc64le + - linux_s390x + - linux_ppc64le variables: # map dependencies variables to local variables - name: librariesContainsChange @@ -92,7 +92,7 @@ extends: buildConfig: Release runtimeFlavor: mono platforms: - - FreeBSD_x64 + - freebsd_x64 variables: # map dependencies variables to local variables - name: librariesContainsChange @@ -120,7 +120,7 @@ extends: buildConfig: Release runtimeFlavor: mono platforms: - - Linux_armv6 + - linux_armv6 variables: # map dependencies variables to local variables - name: librariesContainsChange diff --git a/eng/pipelines/runtime-linker-tests.yml b/eng/pipelines/runtime-linker-tests.yml index 4a75a0be9f9..698d0f88414 100644 --- a/eng/pipelines/runtime-linker-tests.yml +++ b/eng/pipelines/runtime-linker-tests.yml @@ -70,8 +70,8 @@ extends: buildConfig: release platforms: - windows_x64 - - OSX_x64 - - Linux_x64 + - osx_x64 + - linux_x64 jobParameters: testGroup: innerloop timeoutInMinutes: 120 @@ -91,8 +91,8 @@ extends: buildConfig: release platforms: - windows_x64 - - OSX_x64 - - Linux_x64 + - osx_x64 + - linux_x64 jobParameters: testGroup: innerloop timeoutInMinutes: 120 @@ -112,7 +112,7 @@ extends: jobTemplate: /eng/pipelines/common/global-build-job.yml buildConfig: release platforms: - - Browser_wasm + - browser_wasm jobParameters: testGroup: innerloop timeoutInMinutes: 120 diff --git a/eng/pipelines/runtime-llvm.yml b/eng/pipelines/runtime-llvm.yml index 189e36e82e6..eac9266a1df 100644 --- a/eng/pipelines/runtime-llvm.yml +++ b/eng/pipelines/runtime-llvm.yml @@ -73,7 +73,7 @@ extends: buildConfig: Release runtimeFlavor: mono platforms: - - OSX_x64 + - osx_x64 jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono_LLVMJIT @@ -92,8 +92,8 @@ extends: buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} runtimeFlavor: mono platforms: - - Linux_x64 - - Linux_arm64 + - linux_x64 + - linux_arm64 jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono_LLVMJIT @@ -115,8 +115,8 @@ extends: buildConfig: Release runtimeFlavor: mono platforms: - - Linux_x64 - - Linux_arm64 + - linux_x64 + - linux_arm64 jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono_LLVMAOT @@ -135,7 +135,7 @@ extends: buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} runtimeFlavor: mono platforms: - - OSX_x64 + - osx_x64 jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono_LLVMAOT @@ -158,8 +158,8 @@ extends: runtimeFlavor: mono buildConfig: release platforms: - - Linux_x64 - - Linux_arm64 + - linux_x64 + - linux_arm64 jobParameters: runtimeVariant: llvmaot condition: >- @@ -178,9 +178,9 @@ extends: buildConfig: release runtimeFlavor: mono platforms: - - Linux_x64 + - linux_x64 # Disabled pending outcome of https://github.com/dotnet/runtime/issues/60234 investigation - #- Linux_arm64 + #- linux_arm64 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: @@ -204,8 +204,8 @@ extends: buildConfig: release runtimeFlavor: mono platforms: - - Linux_x64 - - Linux_arm64 + - linux_x64 + - linux_arm64 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 862e7708abf..7c7c867b321 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -51,7 +51,7 @@ extends: - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}: - template: /eng/common/templates/job/source-index-stage1.yml parameters: - sourceIndexBuildCommand: build.cmd -subset libs.sfx+libs.oob -binarylog -os Linux -ci + sourceIndexBuildCommand: build.cmd -subset libs.sfx+libs.oob -binarylog -os linux -ci # # Build CoreCLR @@ -61,14 +61,14 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml buildConfig: release platforms: - - OSX_arm64 - - OSX_x64 - - Linux_x64 - - Linux_arm - - Linux_arm64 - - Linux_musl_x64 - - Linux_musl_arm - - Linux_musl_arm64 + - osx_arm64 + - osx_x64 + - linux_x64 + - linux_arm + - linux_arm64 + - linux_musl_x64 + - linux_musl_arm + - linux_musl_arm64 - windows_x86 - windows_x64 - windows_arm @@ -88,12 +88,12 @@ extends: isOfficialBuild: ${{ variables.isOfficialBuild }} timeoutInMinutes: 120 crossDacPlatforms: - - Linux_x64 - - Linux_arm - - Linux_arm64 - - Linux_musl_x64 - - Linux_musl_arm - - Linux_musl_arm64 + - linux_x64 + - linux_arm + - linux_arm64 + - linux_musl_x64 + - linux_musl_arm + - linux_musl_arm64 - windows_x64 - windows_arm - windows_arm64 @@ -106,32 +106,32 @@ extends: buildConfig: release runtimeFlavor: mono platforms: - - Android_x64 - - Android_x86 - - Android_arm - - Android_arm64 - - MacCatalyst_x64 - - MacCatalyst_arm64 - - tvOSSimulator_x64 - - tvOSSimulator_arm64 - - tvOS_arm64 - - iOSSimulator_x64 - - iOSSimulator_x86 - - iOSSimulator_arm64 - - iOS_arm - - iOS_arm64 - - OSX_x64 - - OSX_arm64 - - Linux_x64 - - Linux_arm - - Linux_arm64 - - Linux_musl_x64 - - Browser_wasm + - android_x64 + - android_x86 + - android_arm + - android_arm64 + - maccatalyst_x64 + - maccatalyst_arm64 + - tvossimulator_x64 + - tvossimulator_arm64 + - tvos_arm64 + - iossimulator_x64 + - iossimulator_x86 + - iossimulator_arm64 + - ios_arm + - ios_arm64 + - osx_x64 + - osx_arm64 + - linux_x64 + - linux_arm + - linux_arm64 + - linux_musl_x64 + - browser_wasm - wasi_wasm - - Linux_bionic_arm64 - - Linux_bionic_x64 - # - Linux_musl_arm - # - Linux_musl_arm64 + - linux_bionic_arm64 + - linux_bionic_x64 + # - linux_musl_arm + # - linux_musl_arm64 - windows_x64 - windows_x86 # - windows_arm @@ -150,7 +150,7 @@ extends: buildConfig: release runtimeFlavor: mono platforms: - - Browser_wasm + - browser_wasm jobParameters: buildArgs: -s mono+libs+host+packs+mono.mscordbi -c $(_BuildConfig) /p:MonoWasmBuildVariant=perftrace nameSuffix: AllSubsets_Mono_perftrace @@ -166,7 +166,7 @@ extends: buildConfig: release runtimeFlavor: mono platforms: - - Browser_wasm + - browser_wasm jobParameters: buildArgs: -s mono+libs+host+packs+mono.mscordbi -c $(_BuildConfig) /p:MonoWasmBuildVariant=multithread nameSuffix: AllSubsets_Mono_multithread @@ -183,11 +183,11 @@ extends: jobTemplate: /eng/pipelines/mono/templates/generate-offsets.yml buildConfig: release platforms: - - Android_x64 - - Browser_wasm - - tvOS_arm64 - - iOS_arm64 - - MacCatalyst_x64 + - android_x64 + - browser_wasm + - tvos_arm64 + - ios_arm64 + - maccatalyst_x64 jobParameters: isOfficialBuild: ${{ variables.isOfficialBuild }} @@ -200,18 +200,18 @@ extends: runtimeFlavor: mono buildConfig: release platforms: - - Linux_x64 + - linux_x64 jobParameters: buildArgs: -s mono+packs -c $(_BuildConfig) - /p:MonoCrossAOTTargetOS=Android+Browser /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true + /p:MonoCrossAOTTargetOS=android+browser /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true nameSuffix: CrossAOT_Mono runtimeVariant: crossaot dependsOn: - mono_android_offsets - mono_browser_offsets monoCrossAOTTargetOS: - - Android - - Browser + - android + - browser isOfficialBuild: ${{ variables.isOfficialBuild }} extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml extraStepsParameters: @@ -223,16 +223,16 @@ extends: runtimeFlavor: mono buildConfig: release platforms: - - Linux_arm64 + - linux_arm64 jobParameters: buildArgs: -s mono+packs -c $(_BuildConfig) - /p:MonoCrossAOTTargetOS=Browser /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true + /p:MonoCrossAOTTargetOS=browser /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true nameSuffix: CrossAOT_Mono runtimeVariant: crossaot dependsOn: - mono_browser_offsets monoCrossAOTTargetOS: - - Browser + - browser isOfficialBuild: ${{ variables.isOfficialBuild }} extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml extraStepsParameters: @@ -244,18 +244,18 @@ extends: runtimeFlavor: mono buildConfig: release platforms: - - Windows_x64 + - windows_x64 jobParameters: buildArgs: -s mono+packs -c $(_BuildConfig) - /p:MonoCrossAOTTargetOS=Android+Browser /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true + /p:MonoCrossAOTTargetOS=android+browser /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true nameSuffix: CrossAOT_Mono runtimeVariant: crossaot dependsOn: - mono_android_offsets - mono_browser_offsets monoCrossAOTTargetOS: - - Android - - Browser + - android + - browser isOfficialBuild: ${{ variables.isOfficialBuild }} extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml extraStepsParameters: @@ -267,10 +267,10 @@ extends: runtimeFlavor: mono buildConfig: release platforms: - - OSX_x64 + - osx_x64 jobParameters: buildArgs: -s mono+packs -c $(_BuildConfig) - /p:MonoCrossAOTTargetOS=Android+Browser+tvOS+iOS+MacCatalyst /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true + /p:MonoCrossAOTTargetOS=android+browser+tvos+ios+maccatalyst /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true nameSuffix: CrossAOT_Mono runtimeVariant: crossaot dependsOn: @@ -280,11 +280,11 @@ extends: - mono_ios_offsets - mono_maccatalyst_offsets monoCrossAOTTargetOS: - - Android - - Browser - - tvOS - - iOS - - MacCatalyst + - android + - browser + - tvos + - ios + - maccatalyst isOfficialBuild: ${{ variables.isOfficialBuild }} extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml extraStepsParameters: @@ -296,16 +296,16 @@ extends: runtimeFlavor: mono buildConfig: release platforms: - - OSX_arm64 + - osx_arm64 jobParameters: buildArgs: -s mono+packs -c $(_BuildConfig) - /p:MonoCrossAOTTargetOS=Browser /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true + /p:MonoCrossAOTTargetOS=browser /p:SkipMonoCrossJitConfigure=true /p:BuildMonoAOTCrossCompilerOnly=true nameSuffix: CrossAOT_Mono runtimeVariant: crossaot dependsOn: - mono_browser_offsets monoCrossAOTTargetOS: - - Browser + - browser isOfficialBuild: ${{ variables.isOfficialBuild }} extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml extraStepsParameters: @@ -317,12 +317,12 @@ extends: - template: /eng/pipelines/common/platform-matrix-multijob.yml parameters: platforms: - - OSX_x64 - - Linux_x64 - # - Linux_arm - - Linux_arm64 - # - Linux_musl_x64 - # - Linux_musl_arm64 + - osx_x64 + - linux_x64 + # - linux_arm + - linux_arm64 + # - linux_musl_x64 + # - linux_musl_arm64 # - windows_x64 # - windows_x86 # - windows_arm @@ -363,14 +363,14 @@ extends: jobTemplate: /eng/pipelines/libraries/build-job.yml buildConfig: Release platforms: - - OSX_arm64 - - OSX_x64 - - Linux_x64 - - Linux_arm - - Linux_arm64 - - Linux_musl_x64 - - Linux_musl_arm - - Linux_musl_arm64 + - osx_arm64 + - osx_x64 + - linux_x64 + - linux_arm + - linux_arm64 + - linux_musl_x64 + - linux_musl_arm + - linux_musl_arm64 - windows_x86 - windows_x64 - windows_arm @@ -406,7 +406,7 @@ extends: buildConfig: Release helixQueueGroup: ci platforms: - - SourceBuild_Linux_x64 + - SourceBuild_linux_x64 jobParameters: nameSuffix: PortableSourceBuild extraStepsTemplate: /eng/pipelines/common/upload-intermediate-artifacts-step.yml @@ -426,14 +426,14 @@ extends: liveLibrariesBuildConfig: Release isOfficialBuild: ${{ variables.isOfficialBuild }} platforms: - - OSX_arm64 - - OSX_x64 - - Linux_x64 - - Linux_arm - - Linux_arm64 - - Linux_musl_x64 - - Linux_musl_arm - - Linux_musl_arm64 + - osx_arm64 + - osx_x64 + - linux_x64 + - linux_arm + - linux_arm64 + - linux_musl_x64 + - linux_musl_arm + - linux_musl_arm64 - windows_x86 - windows_x64 - windows_arm @@ -449,9 +449,9 @@ extends: platforms: - windows_x64 - windows_x86 - - Linux_x64 + - linux_x64 - windows_arm64 - - Linux_arm64 + - linux_arm64 jobParameters: isOfficialBuild: ${{ variables.isOfficialBuild }} signBinaries: false @@ -473,9 +473,9 @@ extends: platforms: - windows_x64 - windows_x86 - - Linux_x64 + - linux_x64 - windows_arm64 - - Linux_arm64 + - linux_arm64 # # Build Workloads @@ -490,22 +490,22 @@ extends: isOfficialBuild: ${{ variables.isOfficialBuild }} timeoutInMinutes: 120 dependsOn: - - Build_Android_arm_release_AllSubsets_Mono - - Build_Android_arm64_release_AllSubsets_Mono - - Build_Android_x86_release_AllSubsets_Mono - - Build_Android_x64_release_AllSubsets_Mono - - Build_Browser_wasm_Linux_release_AllSubsets_Mono - - Build_iOS_arm_release_AllSubsets_Mono - - Build_iOS_arm64_release_AllSubsets_Mono - - Build_iOSSimulator_x64_release_AllSubsets_Mono - - Build_iOSSimulator_x86_release_AllSubsets_Mono - - Build_iOSSimulator_arm64_release_AllSubsets_Mono - - Build_MacCatalyst_arm64_release_AllSubsets_Mono - - Build_MacCatalyst_x64_release_AllSubsets_Mono - - Build_tvOS_arm64_release_AllSubsets_Mono - - Build_tvOSSimulator_arm64_release_AllSubsets_Mono - - Build_tvOSSimulator_x64_release_AllSubsets_Mono - - Build_Windows_x64_release_CrossAOT_Mono + - Build_android_arm_release_AllSubsets_Mono + - Build_android_arm64_release_AllSubsets_Mono + - Build_android_x86_release_AllSubsets_Mono + - Build_android_x64_release_AllSubsets_Mono + - Build_browser_wasm_Linux_release_AllSubsets_Mono + - Build_ios_arm_release_AllSubsets_Mono + - Build_ios_arm64_release_AllSubsets_Mono + - Build_iossimulator_x64_release_AllSubsets_Mono + - Build_iossimulator_x86_release_AllSubsets_Mono + - Build_iossimulator_arm64_release_AllSubsets_Mono + - Build_maccatalyst_arm64_release_AllSubsets_Mono + - Build_maccatalyst_x64_release_AllSubsets_Mono + - Build_tvos_arm64_release_AllSubsets_Mono + - Build_tvossimulator_arm64_release_AllSubsets_Mono + - Build_tvossimulator_x64_release_AllSubsets_Mono + - Build_windows_x64_release_CrossAOT_Mono - installer__coreclr__windows_x64_Release_ - installer__coreclr__windows_x86_Release_ - installer__coreclr__windows_arm_Release_ diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml index 7cf8b874bd3..5d4de5af698 100644 --- a/eng/pipelines/runtime-staging.yml +++ b/eng/pipelines/runtime-staging.yml @@ -73,7 +73,7 @@ extends: buildConfig: Release runtimeFlavor: mono platforms: - - iOSSimulator_x64 + - iossimulator_x64 variables: - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}: - name: _HelixSource diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index a899ac948f1..4a48636643d 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -72,15 +72,15 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml buildConfig: checked platforms: - - Linux_x86 - - Linux_x64 - - Linux_arm - - Linux_arm64 - - Linux_musl_arm - - Linux_musl_arm64 - - Linux_musl_x64 - - OSX_arm64 - - Tizen_armel + - linux_x86 + - linux_x64 + - linux_arm + - linux_arm64 + - linux_musl_arm + - linux_musl_arm64 + - linux_musl_x64 + - osx_arm64 + - tizen_armel - windows_x86 - windows_x64 - windows_arm @@ -102,7 +102,7 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml buildConfig: checked platforms: - - Linux_x64 + - linux_x64 container: debian-11-gcc12-amd64-20220511124845-b7a6185 jobParameters: testGroup: innerloop @@ -117,7 +117,7 @@ extends: eq(variables['isRollingBuild'], true)) # - # Build CoreCLR OSX_x64 checked + # Build CoreCLR osx_x64 checked # Only when CoreCLR or Libraries is changed # - template: /eng/pipelines/common/platform-matrix.yml @@ -125,7 +125,7 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml buildConfig: checked platforms: - - OSX_x64 + - osx_x64 jobParameters: testGroup: innerloop condition: >- @@ -144,19 +144,19 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml buildConfig: release platforms: - - OSX_arm64 - - OSX_x64 - - Linux_x64 - - Linux_arm - - Linux_arm64 - - Linux_musl_x64 - - Linux_musl_arm - - Linux_musl_arm64 + - osx_arm64 + - osx_x64 + - linux_x64 + - linux_arm + - linux_arm64 + - linux_musl_x64 + - linux_musl_arm + - linux_musl_arm64 - windows_x64 - windows_x86 - windows_arm - windows_arm64 - - FreeBSD_x64 + - freebsd_x64 jobParameters: testGroup: innerloop # Mono/runtimetests also need this, but skip for wasm @@ -176,7 +176,7 @@ extends: parameters: jobTemplate: /eng/pipelines/coreclr/templates/format-job.yml platforms: - - Linux_x64 + - linux_x64 - windows_x64 jobParameters: condition: >- @@ -197,7 +197,7 @@ extends: jobTemplate: /eng/pipelines/common/global-build-job.yml buildConfig: debug platforms: - - Linux_x64 + - linux_x64 - windows_x64 jobParameters: testGroup: innerloop @@ -242,9 +242,9 @@ extends: jobTemplate: /eng/pipelines/common/global-build-job.yml buildConfig: release platforms: - - Linux_x64 + - linux_x64 - windows_x64 - - OSX_x64 + - osx_x64 jobParameters: testGroup: innerloop timeoutInMinutes: 120 @@ -268,8 +268,8 @@ extends: buildConfig: Release platforms: - windows_arm64 - - Linux_arm64 - - OSX_arm64 + - linux_arm64 + - osx_arm64 jobParameters: testGroup: innerloop isSingleFile: true @@ -293,7 +293,7 @@ extends: jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml buildConfig: checked platforms: - - Linux_x64 + - linux_x64 jobParameters: testGroup: clrTools timeoutInMinutes: 120 @@ -310,11 +310,11 @@ extends: jobTemplate: /eng/pipelines/mono/templates/generate-offsets.yml buildConfig: release platforms: - - Android_x64 - - Browser_wasm - - tvOS_arm64 - - iOS_arm64 - - MacCatalyst_x64 + - android_x64 + - browser_wasm + - tvos_arm64 + - ios_arm64 + - maccatalyst_x64 jobParameters: isOfficialBuild: ${{ variables.isOfficialBuild }} # needed by crossaot @@ -333,9 +333,9 @@ extends: buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} runtimeFlavor: mono platforms: - - tvOSSimulator_x64 - - iOSSimulator_x86 - - Linux_arm + - tvossimulator_x64 + - iossimulator_x86 + - linux_arm jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono @@ -353,8 +353,8 @@ extends: buildConfig: Release runtimeFlavor: mono platforms: - - iOS_arm - - Linux_musl_x64 + - ios_arm + - linux_musl_x64 jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono @@ -372,7 +372,7 @@ extends: - template: /eng/pipelines/common/templates/wasm-library-tests.yml parameters: platforms: - - Browser_wasm + - browser_wasm buildAndRunWasi: true alwaysRun: ${{ variables.isRollingBuild }} scenarios: @@ -382,7 +382,7 @@ extends: - template: /eng/pipelines/common/templates/wasm-library-tests.yml parameters: platforms: - - Browser_wasm_win + - browser_wasm_win alwaysRun: ${{ variables.isRollingBuild }} scenarios: - WasmTestOnBrowser @@ -391,7 +391,7 @@ extends: - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml parameters: platforms: - - Browser_wasm + - browser_wasm nameSuffix: _EAT runAOT: false shouldRunSmokeOnly: false @@ -401,7 +401,7 @@ extends: - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml parameters: platforms: - - Browser_wasm + - browser_wasm nameSuffix: _AOT runAOT: true shouldRunSmokeOnly: true @@ -410,7 +410,7 @@ extends: - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml parameters: platforms: - - Browser_wasm_win + - browser_wasm_win nameSuffix: _AOT runAOT: true shouldRunSmokeOnly: true @@ -420,30 +420,30 @@ extends: - template: /eng/pipelines/common/templates/wasm-build-tests.yml parameters: platforms: - - Browser_wasm - - Browser_wasm_win + - browser_wasm + - browser_wasm_win alwaysRun: ${{ variables.isRollingBuild }} # Wasm Debugger tests - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml parameters: platforms: - - Browser_wasm - - Browser_wasm_win + - browser_wasm + - browser_wasm_win alwaysRun: ${{ variables.isRollingBuild }} # Wasm runtime tests - template: /eng/pipelines/common/templates/wasm-runtime-tests.yml parameters: platforms: - - Browser_wasm + - browser_wasm alwaysRun: ${{ variables.isRollingBuild }} # BUILD ONLY - Wasm Threading Legs - template: /eng/pipelines/common/templates/wasm-build-only.yml parameters: platforms: - - Browser_wasm + - browser_wasm nameSuffix: _Threading extraBuildArgs: /p:MonoWasmBuildVariant=multithread alwaysRun: ${{ variables.isRollingBuild }} @@ -451,7 +451,7 @@ extends: - template: /eng/pipelines/common/templates/wasm-build-only.yml parameters: platforms: - - Browser_wasm + - browser_wasm nameSuffix: _Threading_PerfTracing extraBuildArgs: /p:MonoWasmBuildVariant=perftrace alwaysRun: ${{ variables.isRollingBuild }} @@ -474,8 +474,8 @@ extends: buildConfig: Release runtimeFlavor: mono platforms: - - iOS_arm64 - - tvOS_arm64 + - ios_arm64 + - tvos_arm64 variables: # map dependencies variables to local variables - name: librariesContainsChange @@ -516,9 +516,9 @@ extends: buildConfig: Release runtimeFlavor: mono platforms: - - MacCatalyst_x64 + - maccatalyst_x64 - ${{ if eq(variables['isRollingBuild'], true) }}: - - MacCatalyst_arm64 + - maccatalyst_arm64 variables: # map dependencies variables to local variables - name: librariesContainsChange @@ -556,7 +556,7 @@ extends: buildConfig: Release runtimeFlavor: mono platforms: - - OSX_x64 + - osx_x64 jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono_LLVMJIT @@ -575,8 +575,8 @@ extends: buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} runtimeFlavor: mono platforms: - - Linux_x64 - - Linux_arm64 + - linux_x64 + - linux_arm64 jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono_LLVMJIT @@ -598,8 +598,8 @@ extends: buildConfig: Release runtimeFlavor: mono platforms: - - Linux_x64 - - Linux_arm64 + - linux_x64 + - linux_arm64 jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono_LLVMAOT @@ -618,7 +618,7 @@ extends: buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} runtimeFlavor: mono platforms: - - OSX_x64 + - osx_x64 jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono_LLVMAOT @@ -641,11 +641,11 @@ extends: runtimeFlavor: mono buildConfig: debug platforms: - - OSX_x64 - - OSX_arm64 - - Linux_x64 - - Linux_arm64 - # - Linux_musl_arm64 + - osx_x64 + - osx_arm64 + - linux_x64 + - linux_arm64 + # - linux_musl_arm64 - windows_x64 - windows_x86 # - windows_arm @@ -666,10 +666,10 @@ extends: runtimeFlavor: mono buildConfig: release platforms: - - Linux_x64 - # - Linux_arm64 - # - Linux_musl_arm64 - - Windows_x64 + - linux_x64 + # - linux_arm64 + # - linux_musl_arm64 + - windows_x64 # - windows_x86 # - windows_arm # - windows_arm64 @@ -679,8 +679,8 @@ extends: - mono_android_offsets - mono_browser_offsets monoCrossAOTTargetOS: - - Android - - Browser + - android + - browser condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), @@ -693,7 +693,7 @@ extends: runtimeFlavor: mono buildConfig: release platforms: - - OSX_x64 + - osx_x64 jobParameters: runtimeVariant: crossaot dependsOn: @@ -703,11 +703,11 @@ extends: - mono_ios_offsets - mono_maccatalyst_offsets monoCrossAOTTargetOS: - - Android - - Browser - - tvOS - - iOS - - MacCatalyst + - android + - browser + - tvos + - ios + - maccatalyst condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), @@ -720,14 +720,14 @@ extends: runtimeFlavor: mono buildConfig: release platforms: - - Linux_arm64 - - OSX_arm64 + - linux_arm64 + - osx_arm64 jobParameters: runtimeVariant: crossaot dependsOn: - mono_browser_offsets monoCrossAOTTargetOS: - - Browser + - browser condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), @@ -744,8 +744,8 @@ extends: runtimeFlavor: mono buildConfig: release platforms: - - Linux_x64 - # - Linux_musl_arm64 + - linux_x64 + # - linux_musl_arm64 - windows_x64 - windows_x86 # - windows_arm @@ -767,8 +767,8 @@ extends: runtimeFlavor: mono buildConfig: release platforms: - - OSX_x64 - - Linux_arm64 + - osx_x64 + - linux_arm64 jobParameters: condition: >- or( @@ -787,8 +787,8 @@ extends: runtimeFlavor: mono buildConfig: release platforms: - - Linux_x64 - - Linux_arm64 + - linux_x64 + - linux_arm64 jobParameters: runtimeVariant: llvmaot condition: >- @@ -808,9 +808,9 @@ extends: jobTemplate: /eng/pipelines/libraries/build-job.yml buildConfig: Release platforms: - - Linux_arm - - Linux_musl_arm - - Linux_musl_arm64 + - linux_arm + - linux_musl_arm + - linux_musl_arm64 - windows_arm - windows_arm64 - windows_x86 @@ -829,13 +829,13 @@ extends: jobTemplate: /eng/pipelines/libraries/build-job.yml buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - - Linux_arm64 - - Linux_musl_x64 - - Linux_x64 - - OSX_arm64 - - OSX_x64 + - linux_arm64 + - linux_musl_x64 + - linux_x64 + - osx_arm64 + - osx_x64 - windows_x64 - - FreeBSD_x64 + - freebsd_x64 jobParameters: testScope: innerloop condition: @@ -873,7 +873,7 @@ extends: jobTemplate: /eng/pipelines/libraries/build-job.yml buildConfig: Release platforms: - - Linux_x64 + - linux_x64 - windows_x64 jobParameters: condition: >- @@ -920,12 +920,12 @@ extends: jobTemplate: /eng/pipelines/installer/jobs/build-job.yml buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - - Linux_musl_arm - - Linux_musl_arm64 + - linux_musl_arm + - linux_musl_arm64 - windows_x86 - windows_arm - windows_arm64 - - Linux_arm + - linux_arm jobParameters: liveRuntimeBuildConfig: release liveLibrariesBuildConfig: Release @@ -940,13 +940,13 @@ extends: jobTemplate: /eng/pipelines/installer/jobs/build-job.yml buildConfig: Release platforms: - - OSX_arm64 - - OSX_x64 - - Linux_x64 - - Linux_arm64 - - Linux_musl_x64 + - osx_arm64 + - osx_x64 + - linux_x64 + - linux_arm64 + - linux_musl_x64 - windows_x64 - - FreeBSD_x64 + - freebsd_x64 jobParameters: liveRuntimeBuildConfig: release liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} @@ -965,7 +965,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: innerloop condition: >- @@ -983,7 +983,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - Linux_arm + - linux_arm - windows_x86 - windows_arm64 helixQueueGroup: pr @@ -1002,9 +1002,9 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - OSX_x64 - - Linux_x64 - - Linux_arm64 + - osx_x64 + - linux_x64 + - linux_arm64 - windows_x64 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -1022,7 +1022,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: checked platforms: - - OSX_arm64 + - osx_arm64 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: @@ -1042,7 +1042,7 @@ extends: buildConfig: release runtimeFlavor: mono platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: innerloop condition: >- @@ -1081,7 +1081,7 @@ extends: buildConfig: Release runtimeFlavor: mono platforms: - - OSX_x64 + - osx_x64 variables: - name: timeoutPerTestInMinutes value: 60 @@ -1115,7 +1115,7 @@ extends: buildConfig: Release runtimeFlavor: mono platforms: - - OSX_x64 + - osx_x64 variables: - name: timeoutPerTestInMinutes value: 60 @@ -1147,9 +1147,9 @@ extends: buildConfig: Release runtimeFlavor: mono platforms: - - Linux_x64 + - linux_x64 # Disabled pending outcome of https://github.com/dotnet/runtime/issues/60234 investigation - #- Linux_arm64 + #- linux_arm64 variables: - name: timeoutPerTestInMinutes value: 60 @@ -1183,8 +1183,8 @@ extends: buildConfig: Release runtimeFlavor: mono platforms: - - Linux_x64 - - Linux_arm64 + - linux_x64 + - linux_arm64 variables: - name: timeoutPerTestInMinutes value: 60 @@ -1218,9 +1218,9 @@ extends: buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: # - windows_x64 - - OSX_x64 - - Linux_arm64 - - Linux_x64 + - osx_x64 + - linux_arm64 + - linux_x64 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: isOfficialBuild: false @@ -1244,8 +1244,8 @@ extends: buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: # - windows_x64 - #- OSX_x64 - - Linux_x64 + #- osx_x64 + - linux_x64 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: isOfficialBuild: false @@ -1289,9 +1289,9 @@ extends: buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - windows_x64 - - OSX_x64 - - Linux_x64 - - Linux_musl_x64 + - osx_x64 + - linux_x64 + - linux_musl_x64 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: isOfficialBuild: false @@ -1326,9 +1326,9 @@ extends: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - - Linux_arm64 + - linux_arm64 - windows_x86 - - Linux_musl_x64 + - linux_musl_x64 helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml helixQueueGroup: libraries jobParameters: @@ -1348,9 +1348,9 @@ extends: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: Release platforms: - - Linux_musl_arm - - Linux_musl_arm64 - - Linux_x64 + - linux_musl_arm + - linux_musl_arm64 + - linux_x64 - windows_x64 helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml helixQueueGroup: libraries @@ -1367,7 +1367,7 @@ extends: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: ${{ variables.debugOnPrReleaseOnRolling }} platforms: - - OSX_x64 + - osx_x64 helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml helixQueueGroup: libraries jobParameters: @@ -1395,9 +1395,9 @@ extends: buildConfig: Release helixQueueGroup: pr platforms: - - SourceBuild_Centos7_x64 + - SourceBuild_centos7_x64 jobParameters: - nameSuffix: Centos7SourceBuild + nameSuffix: centos7SourceBuild extraStepsParameters: name: SourceBuildPackages timeoutInMinutes: 95 @@ -1409,9 +1409,9 @@ extends: buildConfig: Debug helixQueueGroup: pr platforms: - - SourceBuild_Banana24_x64 + - SourceBuild_banana24_x64 jobParameters: - nameSuffix: Banana24SourceBuild + nameSuffix: banana24SourceBuild extraStepsParameters: name: SourceBuildPackages timeoutInMinutes: 95 diff --git a/eng/pipelines/runtimelab.yml b/eng/pipelines/runtimelab.yml index bbd34298c21..12762da7304 100644 --- a/eng/pipelines/runtimelab.yml +++ b/eng/pipelines/runtimelab.yml @@ -69,7 +69,7 @@ extends: jobTemplate: /eng/pipelines/common/global-build-job.yml buildConfig: Checked platforms: - - Linux_x64 + - linux_x64 - windows_x64 jobParameters: timeoutInMinutes: 100 @@ -87,7 +87,7 @@ extends: jobTemplate: /eng/pipelines/common/global-build-job.yml buildConfig: Release platforms: - - Linux_x64 + - linux_x64 - windows_x64 jobParameters: timeoutInMinutes: 100 @@ -135,7 +135,7 @@ extends: useOfficialAllConfigurations: true dependsOnGlobalBuild: true platforms: - - Linux_x64 + - linux_x64 - windows_x64 - ${{ if ne(variables.isOfficialBuild, true) }}: @@ -147,12 +147,12 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml buildConfig: Checked platforms: - - CoreClrTestBuildHost # Either OSX_x64 or Linux_x64 + - CoreClrTestBuildHost # Either osx_x64 or linux_x64 jobParameters: testGroup: innerloop dependsOn: - - build_Linux_x64_Checked_ - - build_Linux_x64_Release_ + - build_linux_x64_Checked_ + - build_linux_x64_Release_ # # CoreCLR Test executions using live libraries @@ -162,7 +162,7 @@ extends: jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml buildConfig: Checked platforms: - - Linux_x64 + - linux_x64 helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: @@ -195,7 +195,7 @@ extends: jobTemplate: /eng/pipelines/libraries/run-test-job.yml buildConfig: Release platforms: - - Linux_x64 + - linux_x64 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: isRollingBuild: false @@ -205,7 +205,7 @@ extends: dependsOnTestBuildConfiguration: Release dependsOnTestArchitecture: x64 dependsOn: - - build_Linux_x64_Release_ + - build_linux_x64_Release_ - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/restore/optimizationData.targets b/eng/restore/optimizationData.targets index 9d8717803f1..207992d2e89 100644 --- a/eng/restore/optimizationData.targets +++ b/eng/restore/optimizationData.targets @@ -1,16 +1,16 @@  - - - - - + + + + + - - - + + + diff --git a/eng/testing/linker/SupportFiles/Directory.Build.targets b/eng/testing/linker/SupportFiles/Directory.Build.targets index 0e960695809..e735d71fa0f 100644 --- a/eng/testing/linker/SupportFiles/Directory.Build.targets +++ b/eng/testing/linker/SupportFiles/Directory.Build.targets @@ -10,7 +10,7 @@ + Condition="'$(TargetArchitecture)' == 'wasm' And '$(TargetOS)' == 'browser'" /> $(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets diff --git a/eng/testing/linker/trimmingTests.targets b/eng/testing/linker/trimmingTests.targets index 0c78e23416e..24315195a66 100644 --- a/eng/testing/linker/trimmingTests.targets +++ b/eng/testing/linker/trimmingTests.targets @@ -25,10 +25,10 @@ %(ProjectDir)project.csproj - $([MSBuild]::NormalizePath('%(ProjectDir)', 'bin', '$(Configuration)', '%(TargetFramework)', '%(TestRuntimeIdentifier)', 'publish', 'project')) - $([MSBuild]::NormalizePath('%(ProjectDir)', 'bin', '$(Configuration)', '%(TargetFramework)', '%(TestRuntimeIdentifier)', 'AppBundle', 'run-v8.sh')) - $([MSBuild]::NormalizeDirectory('%(ProjectDir)', 'bin', '$(Configuration)', '%(TargetFramework)', '%(TestRuntimeIdentifier)', 'publish')) - $([MSBuild]::NormalizeDirectory('%(ProjectDir)', 'bin', '$(Configuration)', '%(TargetFramework)', '%(TestRuntimeIdentifier)', 'AppBundle')) + $([MSBuild]::NormalizePath('%(ProjectDir)', 'bin', '$(Configuration)', '%(TargetFramework)', '%(TestRuntimeIdentifier)', 'publish', 'project')) + $([MSBuild]::NormalizePath('%(ProjectDir)', 'bin', '$(Configuration)', '%(TargetFramework)', '%(TestRuntimeIdentifier)', 'AppBundle', 'run-v8.sh')) + $([MSBuild]::NormalizeDirectory('%(ProjectDir)', 'bin', '$(Configuration)', '%(TargetFramework)', '%(TestRuntimeIdentifier)', 'publish')) + $([MSBuild]::NormalizeDirectory('%(ProjectDir)', 'bin', '$(Configuration)', '%(TargetFramework)', '%(TestRuntimeIdentifier)', 'AppBundle')) diff --git a/eng/testing/tests.ioslike.targets b/eng/testing/tests.ioslike.targets index fd7e4a92938..8b46d2d9012 100644 --- a/eng/testing/tests.ioslike.targets +++ b/eng/testing/tests.ioslike.targets @@ -19,8 +19,8 @@ <_AOTBuildCommand>$(_AOTBuildCommand) /p:XHARNESS_EXECUTION_DIR="$XHARNESS_EXECUTION_DIR" /p:RunAOTCompilation=$(RunAOTCompilation) /p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:MonoForceInterpreter=$(MonoForceInterpreter) /p:MonoEnableLLVM=true /p:DevTeamProvisioning=$(DevTeamProvisioning) /p:UsePortableRuntimePack=true /p:Configuration=$(Configuration) <_AOTBuildCommand>$(_AOTBuildCommand) - <_ResetSimulatorSwitch Condition="'$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOSSimulator'">--reset-simulator - <_SignalAppEndSwitch Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'">--signal-app-end + <_ResetSimulatorSwitch Condition="'$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvossimulator'">--reset-simulator + <_SignalAppEndSwitch Condition="'$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvos'">--signal-app-end <_AfterBuildCommands> mv $XHARNESS_OUT/AOTBuild.binlog "$HELIX_WORKITEM_UPLOAD_ROOT" diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index 99a5c10c4c2..01cd9b32fc8 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -12,7 +12,7 @@ - true + true @@ -58,13 +58,13 @@ $(DiagnosticPorts),$(DiagnosticStartupMode) - + $(AdditionalXHarnessArguments) --arg=-m=$(XUnitMethodName) $(AdditionalXHarnessArguments) --arg=-c=$(XUnitClassName) - + $(AdditionalXHarnessArguments) -- -m=$(XUnitMethodName) $(AdditionalXHarnessArguments) -- -c=$(XUnitClassName) @@ -75,11 +75,11 @@ + Condition="'$(TargetOS)' == 'android'" /> + Condition="'$(TargetOS)' == 'browser'" /> <_MobileIntermediateOutputPath>$(IntermediateOutputPath)mobile @@ -131,9 +131,9 @@ AfterTargets="ComputeResolvedFilesToPublishList" Condition="'$(TestFramework)' == 'xunit'"> - <_runnerFilesToPublish Include="$(AndroidTestRunnerDir)*" Condition="'$(TargetOS)' == 'Android'" /> - <_runnerFilesToPublish Include="$(AppleTestRunnerDir)*" Condition="'$(TargetOS)' == 'MacCatalyst' or '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'iOSSimulator' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'tvOSSimulator'" /> - <_runnerFilesToPublish Include="$(WasmTestRunnerDir)*" Condition="'$(TargetOS)' == 'Browser'" /> + <_runnerFilesToPublish Include="$(AndroidTestRunnerDir)*" Condition="'$(TargetOS)' == 'android'" /> + <_runnerFilesToPublish Include="$(AppleTestRunnerDir)*" Condition="'$(TargetOS)' == 'maccatalyst' or '$(TargetOS)' == 'ios' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'tvossimulator'" /> + <_runnerFilesToPublish Include="$(WasmTestRunnerDir)*" Condition="'$(TargetOS)' == 'browser'" /> <_resolvedFilesToPublishToFileName Include="@(ResolvedFileToPublish -> '%(FileName)%(Extension)')" /> diff --git a/eng/testing/tests.targets b/eng/testing/tests.targets index c358ff594f3..0d1bb2c0637 100644 --- a/eng/testing/tests.targets +++ b/eng/testing/tests.targets @@ -8,10 +8,10 @@ RunnerTemplate.sh AppleHelixRunnerTemplate.sh AppleRunnerTemplate.sh - AndroidRunnerTemplate.sh - WasmRunnerAOTTemplate.sh - WasmRunnerTemplate.sh - WasmRunnerTemplate.cmd + AndroidRunnerTemplate.sh + WasmRunnerAOTTemplate.sh + WasmRunnerTemplate.sh + WasmRunnerTemplate.cmd BionicRunnerTemplate.sh BionicRunnerTemplate.cmd BionicRunOnDevice.sh @@ -23,7 +23,7 @@ RunTests.sh build-apple-app.sh - RunTests.cmd + RunTests.cmd $(AssemblyName).sh $([MSBuild]::NormalizePath('$(OutDir)', '$(RunScriptOutputName)')) $([MSBuild]::NormalizePath('$(OutDir)', '$(InnerRunScriptOutputName)')) @@ -54,7 +54,7 @@ <_MonoAotCrossCompilerPath Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">$(_MonoAotCrossCompilerPath).exe - + @@ -63,12 +63,12 @@ - + @@ -78,7 +78,7 @@ <_ZipSourceDirectory>$(OutDir) - <_ZipSourceDirectory Condition="'$(TargetOS)' == 'Browser' or '$(TestSingleFile)' == 'true'">$(BundleDir) + <_ZipSourceDirectory Condition="'$(TargetOS)' == 'browser' or '$(TestSingleFile)' == 'true'">$(BundleDir) @@ -94,8 +94,8 @@ - $(RunScriptCommand) $RSP_FILE - $(RunScriptCommand) %RSP_FILE% + $(RunScriptCommand) $RSP_FILE + $(RunScriptCommand) %RSP_FILE% $([MSBuild]::Escape('$(RunScriptCommand)')) @@ -158,10 +158,10 @@ TEST_ARCH=$(_AndroidArchitecture) - "$(RunScriptOutputPath)" $(AssemblyName) $(TargetArchitecture) $(TargetOS.ToLowerInvariant()) $(TestProjectName) + "$(RunScriptOutputPath)" $(AssemblyName) $(TargetArchitecture) $(TargetOS) $(TestProjectName) $(RunTestsCommand) $(Configuration) $(AdditionalXHarnessArguments) - $(RunTestsCommand) $(AdditionalXHarnessArguments) - "$(RunScriptOutputPath)" $(JSEngine) $(AssemblyName).dll $(Scenario) + $(RunTestsCommand) $(AdditionalXHarnessArguments) + "$(RunScriptOutputPath)" $(JSEngine) $(AssemblyName).dll $(Scenario) diff --git a/eng/testing/workloads-testing.targets b/eng/testing/workloads-testing.targets index be571215f53..c6242a87c4d 100644 --- a/eng/testing/workloads-testing.targets +++ b/eng/testing/workloads-testing.targets @@ -22,7 +22,7 @@ <_DefaultPropsForNuGetBuild Include="Configuration=$(Configuration)" /> - <_DefaultPropsForNuGetBuild Include="TargetOS=Browser" /> + <_DefaultPropsForNuGetBuild Include="TargetOS=browser" /> <_DefaultPropsForNuGetBuild Include="TargetArchitecture=wasm" /> <_DefaultPropsForNuGetBuild Include="ContinuousIntegrationBuild=$(ContinuousIntegrationBuild)" /> @@ -157,7 +157,7 @@ - + <_DefaultBuildVariant Condition="'$(MonoWasmBuildVariant)' == 'multithread'">.multithread. <_DefaultBuildVariant Condition="'$(MonoWasmBuildVariant)' == 'perftrace'">.perftrace. diff --git a/eng/testing/xunit/xunit.console.targets b/eng/testing/xunit/xunit.console.targets index 75d73d10374..175d149c96a 100644 --- a/eng/testing/xunit/xunit.console.targets +++ b/eng/testing/xunit/xunit.console.targets @@ -2,7 +2,7 @@ true testResults.xml - true + true diff --git a/eng/versioning.targets b/eng/versioning.targets index 96dab803732..47d8cb570dc 100644 --- a/eng/versioning.targets +++ b/eng/versioning.targets @@ -89,7 +89,6 @@ - false - windows;OSX;Android;Linux;FreeBSD;NetBSD;illumos;Solaris + windows;osx;android;linux;freebsd;netbsd;illumos;solaris ;$(SupportedPackageOSGroups); <_isSupportedOSGroup>true @@ -42,7 +42,7 @@ <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(TargetOS)' != ''">$(TargetOS) - <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == ''">Linux + <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == ''">linux <_isSupportedOSGroup Condition="!$(SupportedPackageOSGroups.Contains(';$(_derivedPackageTargetOSGroup);'))">false @@ -52,7 +52,7 @@ <_packageTargetOSGroup>$(_derivedPackageTargetOSGroup) - <_packageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == 'Android'">Linux + <_packageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == 'android'">linux true @@ -64,7 +64,7 @@ true - + @@ -87,19 +87,19 @@ armel - + - + - + - + diff --git a/src/coreclr/.nuget/Microsoft.CrossOsDiag.Private.CoreCLR/Microsoft.CrossOsDiag.Private.CoreCLR.proj b/src/coreclr/.nuget/Microsoft.CrossOsDiag.Private.CoreCLR/Microsoft.CrossOsDiag.Private.CoreCLR.proj index 6abaeb473b3..993908a8e6e 100644 --- a/src/coreclr/.nuget/Microsoft.CrossOsDiag.Private.CoreCLR/Microsoft.CrossOsDiag.Private.CoreCLR.proj +++ b/src/coreclr/.nuget/Microsoft.CrossOsDiag.Private.CoreCLR/Microsoft.CrossOsDiag.Private.CoreCLR.proj @@ -12,12 +12,12 @@ <_projectsToBuild Include="@(Project)" Condition="$(SupportedRids.Contains('%(Project.PackageTargetRuntime)'))"> - %(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/Linux.x64.$(Configuration)/x64 - %(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/Linux_musl.x64.$(Configuration)/x64 - %(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/Linux.arm64.$(Configuration)/x64 - %(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/Linux_musl.arm64.$(Configuration)/x64 - %(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/Linux.arm.$(Configuration)/x86 - %(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/Linux_musl.arm.$(Configuration)/x86 + %(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/linux.x64.$(Configuration)/x64 + %(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/linux_musl.x64.$(Configuration)/x64 + %(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/linux.arm64.$(Configuration)/x64 + %(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/linux_musl.arm64.$(Configuration)/x64 + %(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/linux.arm.$(Configuration)/x86 + %(AdditionalProperties);CrossDacBinRoot=$(CrossDacArtifactsDir)/linux_musl.arm.$(Configuration)/x86 diff --git a/src/coreclr/clr.featuredefines.props b/src/coreclr/clr.featuredefines.props index bf83a286311..1bc919b6dc9 100644 --- a/src/coreclr/clr.featuredefines.props +++ b/src/coreclr/clr.featuredefines.props @@ -13,7 +13,7 @@ - true + true true true diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj index 02ff1c2594a..4091d46c546 100644 --- a/src/coreclr/crossgen-corelib.proj +++ b/src/coreclr/crossgen-corelib.proj @@ -24,10 +24,10 @@ false false - true + true false - true + true diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets index 48c7a953c18..b55c7bd92a6 100644 --- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets +++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets @@ -15,11 +15,11 @@ The .NET Foundation licenses this file to you under the MIT license. - gcc + gcc clang $(CppCompilerAndLinker) ar - --flat + --flat @@ -33,15 +33,15 @@ The .NET Foundation licenses this file to you under the MIT license. x86_64 - aarch64 - arm64 + aarch64 + arm64 $(CrossCompileArch)-linux-gnu $(CrossCompileArch)-alpine-linux-musl - $ORIGIN - @executable_path + $ORIGIN + @executable_path @@ -57,7 +57,7 @@ The .NET Foundation licenses this file to you under the MIT license. - + @@ -77,7 +77,7 @@ The .NET Foundation licenses this file to you under the MIT license. - + @@ -91,38 +91,38 @@ The .NET Foundation licenses this file to you under the MIT license. - - + + - + - - - - + + + + - - - + + + - - - + + + - - + + - + - + - - - + + + - + @@ -139,24 +139,24 @@ The .NET Foundation licenses this file to you under the MIT license. <_WhereLinker>0 - + objcopy llvm-objcopy objcopy - + - - + - + @@ -167,20 +167,20 @@ The .NET Foundation licenses this file to you under the MIT license. - - + - - + - + $(DsymUtilOptions) --minimize diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets index 135743c7b6d..fe12a04fe1f 100755 --- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets +++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets @@ -28,7 +28,7 @@ The .NET Foundation licenses this file to you under the MIT license. $(IlcFrameworkPath) $(IlcPath)\mibc\ windows - OSX + osx $(OS) true @@ -68,14 +68,14 @@ The .NET Foundation licenses this file to you under the MIT license. .exe .dll - .dylib - .so + .dylib + .so .lib .a - .dwarf + .dwarf .pdb - .dbg + .dbg .def .exports @@ -323,12 +323,12 @@ The .NET Foundation licenses this file to you under the MIT license. - - + + - + @@ -343,7 +343,7 @@ The .NET Foundation licenses this file to you under the MIT license. <_IgnoreLinkerWarnings>false - <_IgnoreLinkerWarnings Condition="'$(TargetOS)' == 'OSX'">true + <_IgnoreLinkerWarnings Condition="'$(TargetOS)' == 'osx'">true @@ -358,13 +358,13 @@ The .NET Foundation licenses this file to you under the MIT license. - - diff --git a/src/coreclr/pal/tests/palsuite/issues.targets b/src/coreclr/pal/tests/palsuite/issues.targets index e422a8ea7b0..67b5df72eeb 100644 --- a/src/coreclr/pal/tests/palsuite/issues.targets +++ b/src/coreclr/pal/tests/palsuite/issues.targets @@ -2,23 +2,23 @@ - + https://github.com/dotnet/runtime/issues/42291 - + https://github.com/dotnet/runtime/issues/42291 - + https://github.com/dotnet/runtime/issues/42291 - + https://github.com/dotnet/runtime/issues/7639 diff --git a/src/coreclr/run-cppcheck.sh b/src/coreclr/run-cppcheck.sh index a02a4e19948..0f2de2426d0 100755 --- a/src/coreclr/run-cppcheck.sh +++ b/src/coreclr/run-cppcheck.sh @@ -40,10 +40,10 @@ SloccountOutput="sloccount.sc" # Get the number of processors available to the scheduler # Other techniques such as `nproc` only get the number of # processors available to a single process. -platform="$(uname)" -if [ "$platform" = "FreeBSD" ]; then +platform="$(uname -s | tr '[:upper:]' '[:lower:]')" +if [ "$platform" = "freebsd" ]; then NumProc=$(($(sysctl -n hw.ncpu)+1)) -elif [ "$platform" = "NetBSD" || "$platform" = "SunOS" ]; then +elif [ "$platform" = "netbsd" || "$platform" = "sunos" ]; then NumProc=$(($(getconf NPROCESSORS_ONLN)+1)) else NumProc=$(($(getconf _NPROCESSORS_ONLN)+1)) diff --git a/src/coreclr/scripts/coreclr_arguments.py b/src/coreclr/scripts/coreclr_arguments.py index 4f3f8abe56d..400a2da00c2 100644 --- a/src/coreclr/scripts/coreclr_arguments.py +++ b/src/coreclr/scripts/coreclr_arguments.py @@ -65,7 +65,7 @@ class CoreclrArguments: self.valid_arches = ["x64", "x86", "arm", "arm64", "loongarch64", "wasm"] self.valid_build_types = ["Debug", "Checked", "Release"] - self.valid_host_os = ["windows", "OSX", "Linux", "illumos", "Solaris", "Browser", "Android", "wasi"] + self.valid_host_os = ["windows", "osx", "linux", "illumos", "solaris", "browser", "android", "wasi"] self.__initialize__(args) @@ -175,18 +175,18 @@ class CoreclrArguments: def provide_default_host_os(): """ Return a string representing the current host operating system. - Returns one of: Linux, OSX, windows, illumos, Solaris + Returns one of: linux, osx, windows, illumos, solaris """ if sys.platform == "linux" or sys.platform == "linux2": - return "Linux" + return "linux" elif sys.platform == "darwin": - return "OSX" + return "osx" elif sys.platform == "win32": return "windows" elif sys.platform.startswith("sunos"): is_illumos = ('illumos' in subprocess.Popen(["uname", "-o"], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0].decode('utf-8')) - return 'illumos' if is_illumos else 'Solaris' + return 'illumos' if is_illumos else 'solaris' else: print("Unknown OS: %s" % sys.platform) sys.exit(1) diff --git a/src/coreclr/scripts/jitformat.py b/src/coreclr/scripts/jitformat.py index 2083e38892b..ad63529fa75 100644 --- a/src/coreclr/scripts/jitformat.py +++ b/src/coreclr/scripts/jitformat.py @@ -108,7 +108,7 @@ def main(argv): repoRoot = os.path.dirname(os.path.dirname(coreclr)) formattingScriptFolder = os.path.join(repoRoot, "eng", "formatting") formattingDownloadScriptCommand = [] - if platform == 'Linux' or platform == 'OSX': + if platform == 'linux' or platform == 'osx': formattingDownloadScriptCommand = [os.path.join(formattingScriptFolder, "download-tools.sh")] elif platform == 'windows': formattingDownloadScriptCommand = ["powershell", os.path.join(formattingScriptFolder, "download-tools.ps1")] @@ -129,7 +129,7 @@ def main(argv): cleanup(jitUtilsPath, '') - if platform == 'Linux' or platform == 'OSX': + if platform == 'linux' or platform == 'osx': bootstrapFilename = "bootstrap.sh" elif platform == 'windows': bootstrapFilename = "bootstrap.cmd" @@ -161,12 +161,12 @@ def main(argv): # On *nix platforms, we need to make the bootstrap file executable - if platform == 'Linux' or platform == 'OSX': + if platform == 'linux' or platform == 'osx': logging.info("Making bootstrap executable") os.chmod(bootstrapPath, 0o751) # Run bootstrap - if platform == 'Linux' or platform == 'OSX': + if platform == 'linux' or platform == 'osx': logging.info('Running: bash {}'.format(bootstrapPath)) proc = subprocess.Popen(['bash', bootstrapPath], env=my_env) output,error = proc.communicate() @@ -192,7 +192,7 @@ def main(argv): jitformat = jitutilsBin - if platform == 'Linux' or platform == 'OSX': + if platform == 'linux' or platform == 'osx': jitformat = os.path.join(jitformat, "jit-format") elif platform == 'windows': jitformat = os.path.join(jitformat,"jit-format.exe") diff --git a/src/coreclr/scripts/jitrollingbuild.py b/src/coreclr/scripts/jitrollingbuild.py index dc40ba0f96c..5097c4530fa 100644 --- a/src/coreclr/scripts/jitrollingbuild.py +++ b/src/coreclr/scripts/jitrollingbuild.py @@ -66,7 +66,7 @@ arch_help = "Architecture (x64, x86, arm, arm64). Default: current architecture. build_type_help = "Build type (Debug, Checked, Release). Default: Checked." -host_os_help = "OS (windows, OSX, Linux). Default: current OS." +host_os_help = "OS (windows, osx, linux). Default: current OS." spmi_location_help = """\ Directory in which to put SuperPMI files, such as downloaded MCH files, asm diffs, and repro .MC files. @@ -183,9 +183,9 @@ def determine_jit_name(coreclr_args): """ jit_base_name = "clrjit" - if coreclr_args.host_os == "OSX": + if coreclr_args.host_os == "osx": return "lib" + jit_base_name + ".dylib" - elif coreclr_args.host_os == "Linux": + elif coreclr_args.host_os == "linux": return "lib" + jit_base_name + ".so" elif coreclr_args.host_os == "windows": return jit_base_name + ".dll" @@ -468,10 +468,10 @@ def upload_command(coreclr_args): # We don't do a recursive walk because the JIT is also copied to the "sharedFramework" subdirectory, # so we don't want to pick that up. - if coreclr_args.host_os == "OSX": + if coreclr_args.host_os == "osx": allowed_extensions = [ ".dylib" ] # Add .dwarf for debug info - elif coreclr_args.host_os == "Linux": + elif coreclr_args.host_os == "linux": allowed_extensions = [ ".so" ] # Add .dbg for debug info elif coreclr_args.host_os == "windows": diff --git a/src/coreclr/scripts/superpmi-asmdiffs-checked-release.proj b/src/coreclr/scripts/superpmi-asmdiffs-checked-release.proj index 4600858f22e..2f5c43ddf41 100644 --- a/src/coreclr/scripts/superpmi-asmdiffs-checked-release.proj +++ b/src/coreclr/scripts/superpmi-asmdiffs-checked-release.proj @@ -54,13 +54,13 @@ - - + + - + diff --git a/src/coreclr/scripts/superpmi-diffs.proj b/src/coreclr/scripts/superpmi-diffs.proj index 55334d2db76..2ffe7d7b735 100644 --- a/src/coreclr/scripts/superpmi-diffs.proj +++ b/src/coreclr/scripts/superpmi-diffs.proj @@ -54,14 +54,14 @@ - - - + + + - + diff --git a/src/coreclr/scripts/superpmi-replay.proj b/src/coreclr/scripts/superpmi-replay.proj index d8c786d32f6..c1d7a336779 100644 --- a/src/coreclr/scripts/superpmi-replay.proj +++ b/src/coreclr/scripts/superpmi-replay.proj @@ -57,12 +57,12 @@ - - - - - - + + + + + + @@ -70,9 +70,9 @@ - - - + + + diff --git a/src/coreclr/scripts/superpmi.py b/src/coreclr/scripts/superpmi.py index 5a0b400cdf8..993032200e1 100644 --- a/src/coreclr/scripts/superpmi.py +++ b/src/coreclr/scripts/superpmi.py @@ -132,11 +132,11 @@ was built with the same JIT/EE version as the JIT we are using, and run "mcs -pr to get that version. Otherwise, use "unknown-jit-ee-version". """ -host_os_help = "OS (windows, OSX, Linux). Default: current OS." +host_os_help = "OS (windows, osx, linux). Default: current OS." arch_help = "Architecture (x64, x86, arm, arm64). Default: current architecture." -target_os_help = "Target OS, for use with cross-compilation JIT (windows, OSX, Linux). Default: current OS." +target_os_help = "Target OS, for use with cross-compilation JIT (windows, osx, linux). Default: current OS." target_arch_help = "Target architecture, for use with cross-compilation JIT (x64, x86, arm, arm64). Passed as asm diffs target to SuperPMI. Default: current architecture." @@ -625,10 +625,10 @@ class SuperPMICollect: self.core_root = coreclr_args.core_root - if coreclr_args.host_os == "OSX": + if coreclr_args.host_os == "osx": self.collection_shim_name = "libsuperpmi-shim-collector.dylib" self.corerun_tool_name = "corerun" - elif coreclr_args.host_os == "Linux": + elif coreclr_args.host_os == "linux": self.collection_shim_name = "libsuperpmi-shim-collector.so" self.corerun_tool_name = "corerun" elif coreclr_args.host_os == "windows": @@ -2524,7 +2524,7 @@ def determine_jit_name(coreclr_args): if coreclr_args.target_arch.startswith("arm"): os_name = "universal" - elif coreclr_args.target_os == "OSX" or coreclr_args.target_os == "Linux": + elif coreclr_args.target_os == "osx" or coreclr_args.target_os == "linux": os_name = "unix" elif coreclr_args.target_os == "windows": os_name = "win" @@ -2533,9 +2533,9 @@ def determine_jit_name(coreclr_args): jit_base_name = 'clrjit_{}_{}_{}'.format(os_name, coreclr_args.target_arch, coreclr_args.arch) - if coreclr_args.host_os == "OSX": + if coreclr_args.host_os == "osx": return "lib" + jit_base_name + ".dylib" - elif coreclr_args.host_os == "Linux": + elif coreclr_args.host_os == "linux": return "lib" + jit_base_name + ".so" elif coreclr_args.host_os == "windows": return jit_base_name + ".dll" @@ -2597,7 +2597,7 @@ def determine_superpmi_tool_name(coreclr_args): (str) Name of the superpmi tool to use """ - if coreclr_args.host_os == "OSX" or coreclr_args.host_os == "Linux": + if coreclr_args.host_os == "osx" or coreclr_args.host_os == "linux": return "superpmi" elif coreclr_args.host_os == "windows": return "superpmi.exe" @@ -2629,7 +2629,7 @@ def determine_mcs_tool_name(coreclr_args): (str) Name of the mcs tool to use """ - if coreclr_args.host_os == "OSX" or coreclr_args.host_os == "Linux": + if coreclr_args.host_os == "osx" or coreclr_args.host_os == "linux": return "mcs" elif coreclr_args.host_os == "windows": return "mcs.exe" @@ -2661,7 +2661,7 @@ def determine_dotnet_tool_name(coreclr_args): (str) Name of the dotnet tool to use """ - if coreclr_args.host_os == "OSX" or coreclr_args.host_os == "Linux": + if coreclr_args.host_os == "osx" or coreclr_args.host_os == "linux": return "dotnet" elif coreclr_args.host_os == "windows": return "dotnet.exe" diff --git a/src/coreclr/scripts/superpmi_aspnet.py b/src/coreclr/scripts/superpmi_aspnet.py index 0d46202c614..fbfe5a44641 100644 --- a/src/coreclr/scripts/superpmi_aspnet.py +++ b/src/coreclr/scripts/superpmi_aspnet.py @@ -73,9 +73,9 @@ def determine_native_name(coreclr_args, base_lib_name, target_os): (str) : name of the native lib for this OS """ - if target_os == "OSX": + if target_os == "osx": return "lib" + base_lib_name + ".dylib" - elif target_os == "Linux": + elif target_os == "linux": return "lib" + base_lib_name + ".so" elif target_os == "windows": return base_lib_name + ".dll" @@ -99,12 +99,12 @@ def determine_benchmark_machine(coreclr_args): if coreclr_args.host_os == "windows": # return "aspnet-perf-win" return "aspnet-citrine-win" - elif coreclr_args.host_os == "Linux": + elif coreclr_args.host_os == "linux": return "aspnet-perf-lin" else: raise RuntimeError("Invalid OS for x64.") elif coreclr_args.arch == "arm64": - if coreclr_args.host_os == "Linux": + if coreclr_args.host_os == "linux": return "aspnet-citrine-arm" else: raise RuntimeError("Invalid OS for arm64.") diff --git a/src/coreclr/tools/ILVerify/README.md b/src/coreclr/tools/ILVerify/README.md index 6d77831bdc7..4a4f6a1ef5c 100644 --- a/src/coreclr/tools/ILVerify/README.md +++ b/src/coreclr/tools/ILVerify/README.md @@ -65,7 +65,7 @@ dotnet.(cmd/sh) msbuild ./src/tests/ilverify/ILVerification.Tests.csproj /p:Conf In order to run the tests, execute: ```sh -artifacts/tests/coreclr/(Windows/Linux).x64.Release/ilverify/ILVerification.Tests.(cmd/sh) -coreroot=artifacts/tests/coreclr/(Windows/Linux).x64.Release/Tests/Core_Root +artifacts/tests/coreclr/(windows/linux).x64.Release/ilverify/ILVerification.Tests.(cmd/sh) -coreroot=artifacts/tests/coreclr/(windows/linux).x64.Release/Tests/Core_Root ``` diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj index a75fab86c93..ad52edf783d 100644 --- a/src/coreclr/tools/aot/crossgen2/crossgen2.csproj +++ b/src/coreclr/tools/aot/crossgen2/crossgen2.csproj @@ -20,9 +20,9 @@ true true - false + false - false + false true diff --git a/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj b/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj index 6624b2f5c27..45683a898eb 100644 --- a/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj +++ b/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/Microsoft.DotNet.ILCompiler.pkgproj @@ -16,7 +16,7 @@ - + diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props index 77bcb239745..7f849b8cb63 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props @@ -8,9 +8,9 @@ true false - false + false - false + false true true diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj index ae250acbad5..77b16b1af62 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj @@ -5,8 +5,8 @@ RuntimePack dotnet-runtime-internal - dotnet-runtime - dotnet-runtime-internal + dotnet-runtime + dotnet-runtime-internal $(SharedFrameworkName).PGO true dotnet-runtime-symbols diff --git a/src/installer/pkg/sfx/installers/dotnet-host.proj b/src/installer/pkg/sfx/installers/dotnet-host.proj index edf3f5bf753..79b8c3e3a5c 100644 --- a/src/installer/pkg/sfx/installers/dotnet-host.proj +++ b/src/installer/pkg/sfx/installers/dotnet-host.proj @@ -3,7 +3,7 @@ true true dotnet-host - dotnet-host-internal + dotnet-host-internal / Host NetCore.SharedHost diff --git a/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj b/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj index b9eb792a38f..f589289c1ce 100644 --- a/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj +++ b/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj @@ -4,7 +4,7 @@ true dotnet-hostfxr-internal dotnet-hostfxr - dotnet-hostfxr-internal + dotnet-hostfxr-internal Host FX Resolver ToolPack NetCore.HostFXR diff --git a/src/libraries/Common/tests/System/Net/Prerequisites/LocalEchoServer.props b/src/libraries/Common/tests/System/Net/Prerequisites/LocalEchoServer.props index 8d6f6da581d..53fe2308aa5 100644 --- a/src/libraries/Common/tests/System/Net/Prerequisites/LocalEchoServer.props +++ b/src/libraries/Common/tests/System/Net/Prerequisites/LocalEchoServer.props @@ -1,5 +1,5 @@ - + <_TargetFrameworkForXHarness>$(AspNetCoreAppCurrent) $(MSBuildThisFileDirectory)LocalEchoServer.helix.targets @@ -19,7 +19,7 @@ $(WasmXHarnessArgs) --web-server-middleware=$(_TestEchoMiddleware)/NetCoreServer.dll,NetCoreServer.GenericHandler - + diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index c0a74cb10ef..8b4c397b16a 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -96,7 +96,7 @@ - $(LibrariesAllBinArtifactsPath) $(LibrariesAllRefArtifactsPath) @@ -109,13 +109,13 @@ '$(TargetFramework)' == 'netstandard2.0'" /> - + $(NetCoreAppCurrentTestHostSharedFrameworkPath) $(NetCoreAppCurrentTestHostSharedFrameworkPath) - + $(MicrosoftNetCoreAppRuntimePackNativeDir) $(MicrosoftNetCoreAppRefPackRefDir) $(MicrosoftNetCoreAppRuntimePackRidLibTfmDir) diff --git a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj index 9e53ca9054a..370dc77ce5c 100644 --- a/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj +++ b/src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj @@ -8,7 +8,7 @@ --> $(Features.Replace('strict', '') - true + true diff --git a/src/libraries/Microsoft.NETCore.Platforms/tests/Microsoft.NETCore.Platforms.Tests.csproj b/src/libraries/Microsoft.NETCore.Platforms/tests/Microsoft.NETCore.Platforms.Tests.csproj index 4148acef7d7..26226353801 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/tests/Microsoft.NETCore.Platforms.Tests.csproj +++ b/src/libraries/Microsoft.NETCore.Platforms/tests/Microsoft.NETCore.Platforms.Tests.csproj @@ -1,7 +1,7 @@ $(NetCoreAppCurrent);net472 - true + true diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj b/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj index b88bec027d8..2f10f4d0574 100644 --- a/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj +++ b/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj @@ -2,7 +2,7 @@ $(DefineConstants);XMLSERIALIZERGENERATORTESTS $(NetCoreAppCurrent) - true + true diff --git a/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj b/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj index 4ec01c9ceb9..60abdc553a4 100644 --- a/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj +++ b/src/libraries/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj @@ -3,7 +3,7 @@ true true $(NetCoreAppCurrent) - true + true 0436 $(NetCoreAppCurrent);$(NetFrameworkMinimum) - true + true diff --git a/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj b/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj index 9527a6f551a..60b01faed6e 100644 --- a/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj +++ b/src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj @@ -2,7 +2,7 @@ true $(NetCoreAppCurrent) - true + true diff --git a/src/libraries/System.Collections/tests/System.Collections.Tests.csproj b/src/libraries/System.Collections/tests/System.Collections.Tests.csproj index 2187dff4f7c..20ef2c39e8b 100644 --- a/src/libraries/System.Collections/tests/System.Collections.Tests.csproj +++ b/src/libraries/System.Collections/tests/System.Collections.Tests.csproj @@ -2,7 +2,7 @@ $(NetCoreAppCurrent) true - true + true diff --git a/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj b/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj index b4346c10b82..2e6b8d57979 100644 --- a/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj +++ b/src/libraries/System.Composition.TypedParts/tests/System.Composition.TypedParts.Tests.csproj @@ -1,7 +1,7 @@ $(NetCoreAppCurrent);$(NetFrameworkMinimum) - true + true diff --git a/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj b/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj index d60907513c9..2bbb45f5f74 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj +++ b/src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj @@ -2,7 +2,7 @@ true $(NetCoreAppCurrent);$(NetFrameworkMinimum) - true + true diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj index 08047ad205e..8a18d381c0b 100644 --- a/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj +++ b/src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj @@ -2,7 +2,7 @@ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser true - true + true true @@ -45,10 +45,10 @@ - + Content PreserveNewest - + diff --git a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj index 83b1df051cc..35a748804d1 100644 --- a/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj +++ b/src/libraries/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.csproj @@ -3,7 +3,7 @@ true true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser - true + true true diff --git a/src/libraries/System.Diagnostics.StackTrace/tests/System.Diagnostics.StackTrace.Tests.csproj b/src/libraries/System.Diagnostics.StackTrace/tests/System.Diagnostics.StackTrace.Tests.csproj index 09993688ac1..d32645ab4b2 100644 --- a/src/libraries/System.Diagnostics.StackTrace/tests/System.Diagnostics.StackTrace.Tests.csproj +++ b/src/libraries/System.Diagnostics.StackTrace/tests/System.Diagnostics.StackTrace.Tests.csproj @@ -6,7 +6,7 @@ true - true + true @@ -18,7 +18,7 @@ - + diff --git a/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj b/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj index 75300d8460b..a650b53c797 100644 --- a/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj +++ b/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj @@ -6,7 +6,7 @@ true - diagnostics_tracing;marshal-ilgen + diagnostics_tracing;marshal-ilgen diff --git a/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj b/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj index f99f37a6cd8..a196c2bbcf3 100644 --- a/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj +++ b/src/libraries/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj @@ -1,7 +1,7 @@ $(NetCoreAppCurrent) - true + true diff --git a/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj b/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj index afb5a269db9..64fa67abe38 100644 --- a/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj +++ b/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj @@ -2,7 +2,7 @@ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser true - true + true diff --git a/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj b/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj index 2b314ba27a2..4fbc6583ca3 100644 --- a/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj +++ b/src/libraries/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj @@ -6,7 +6,7 @@ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser - + WasmTestOnBrowser $(TestArchiveRoot)browserornodejs/ diff --git a/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj b/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj index 2598f311d40..518be0f8e9c 100644 --- a/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj +++ b/src/libraries/System.IO.Compression/tests/System.IO.Compression.Tests.csproj @@ -5,7 +5,7 @@ true - + WasmTestOnBrowser $(TestArchiveRoot)browserornodejs/ diff --git a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj index 402b0b9da58..25892f3a7d0 100644 --- a/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj +++ b/src/libraries/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj @@ -3,7 +3,7 @@ true true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-linux;$(NetCoreAppCurrent)-osx;$(NetCoreAppCurrent)-maccatalyst;$(NetCoreAppCurrent)-freebsd - true + true true diff --git a/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj b/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj index 9c9233c1d3c..8bfc91c56f7 100644 --- a/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj +++ b/src/libraries/System.IO.IsolatedStorage/tests/System.IO.IsolatedStorage.Tests.csproj @@ -1,7 +1,7 @@ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser;$(NetCoreAppCurrent)-maccatalyst;$(NetCoreAppCurrent)-ios;$(NetCoreAppCurrent)-tvos;$(NetCoreAppCurrent)-android - true + true diff --git a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj index 83ace70b927..c1118486917 100644 --- a/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj +++ b/src/libraries/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj @@ -3,7 +3,7 @@ true true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent) - true + true true diff --git a/src/libraries/System.Linq/tests/System.Linq.Tests.csproj b/src/libraries/System.Linq/tests/System.Linq.Tests.csproj index 1ea6a48d738..22fb00cf9cc 100644 --- a/src/libraries/System.Linq/tests/System.Linq.Tests.csproj +++ b/src/libraries/System.Linq/tests/System.Linq.Tests.csproj @@ -1,7 +1,7 @@ $(NetCoreAppCurrent) - true + true diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTestBase.SocketsHttpHandler.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTestBase.SocketsHttpHandler.cs index a372c7d372d..855dc25acb2 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTestBase.SocketsHttpHandler.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTestBase.SocketsHttpHandler.cs @@ -41,7 +41,7 @@ namespace System.Net.Http.Functional.Tests // The public keys of our self-signed certificates that are used by the loopback server are part of the System.Net.TestData // package and they can be included in a the Android test apk by adding the following property to the test's .csproj: // - // true + // true // handler.ServerCertificateCustomValidationCallback = TestHelper.AllowAllCertificates; diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj index 3562f5b5f8c..f4480104d29 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj @@ -1,5 +1,5 @@ - + ../../src/Resources/Strings.resx @@ -10,7 +10,7 @@ true true - true + true true @@ -21,7 +21,7 @@ $(DefineConstants);TARGETS_BROWSER - + WasmTestOnBrowser $(TestArchiveRoot)browserornodejs/ @@ -37,7 +37,7 @@ - + diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile index 93f52003db7..e03c201c2c0 100644 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile @@ -42,5 +42,5 @@ EXPOSE 5001 ENV VERSION=$VERSION ENV CONFIGURATION=$CONFIGURATION ENV HTTPSTRESS_ARGS='' -CMD /live-runtime-artifacts/testhost/net$VERSION-Linux-$CONFIGURATION-x64/dotnet exec --roll-forward Major \ +CMD /live-runtime-artifacts/testhost/net$VERSION-linux-$CONFIGURATION-x64/dotnet exec --roll-forward Major \ ./bin/$CONFIGURATION/net$VERSION/HttpStress.dll $HTTPSTRESS_ARGS diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.sh b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.sh index cbb3f2bfced..7d8095936de 100755 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.sh +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/build-local.sh @@ -21,7 +21,7 @@ if [ "$2" != "" ]; then libraries_configuration=${libraries_configuration^} # Uppercase first character fi -testhost_root=$repo_root/artifacts/bin/testhost/net$version-Linux-$libraries_configuration-x64 +testhost_root=$repo_root/artifacts/bin/testhost/net$version-linux-$libraries_configuration-x64 echo "StressConfiguration: $stress_configuration, LibrariesConfiguration: $libraries_configuration, testhost: $testhost_root" if [[ ! -d $testhost_root ]]; then diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/load-corefx-testhost.ps1 b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/load-corefx-testhost.ps1 index 7fbab2592c9..48168f4ee76 100755 --- a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/load-corefx-testhost.ps1 +++ b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/load-corefx-testhost.ps1 @@ -35,9 +35,9 @@ function Find-Os() { switch -Wildcard ($(uname -s)) { - "Linux*" { return "Linux" } - "Darwin*" { return "MacOS" } - "*" { return "Unix" } + "Linux*" { return "linux" } + "Darwin*" { return "osx" } + "*" { return "unix" } } } } diff --git a/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj b/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj index 823a75101cf..aa2e4ce1273 100644 --- a/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj +++ b/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj @@ -3,7 +3,7 @@ true ../src/Resources/Strings.resx $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser;$(NetCoreAppCurrent)-osx - true + true diff --git a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj index 00baeb74700..b70d26344c8 100644 --- a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj +++ b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj @@ -2,7 +2,7 @@ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser true - true + true true diff --git a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj index 2993a98f6fb..8dff1e58cf7 100644 --- a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj +++ b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj @@ -3,7 +3,7 @@ true ../../src/Resources/Strings.resx $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser - true + true true diff --git a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj index d0d92ab8682..afefb7a4fde 100644 --- a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj +++ b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/System.Net.NetworkInformation.Functional.Tests.csproj @@ -3,7 +3,7 @@ true ../../src/Resources/Strings.resx $(NetCoreAppCurrent) - true + true $(DefineConstants);NETWORKINFORMATION_TEST true diff --git a/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj b/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj index b140512de99..1187130b5aa 100644 --- a/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj +++ b/src/libraries/System.Net.Ping/tests/FunctionalTests/System.Net.Ping.Functional.Tests.csproj @@ -3,7 +3,7 @@ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser true true - true + true true diff --git a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj index 8e47f09dd48..46fd9cc48db 100644 --- a/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj +++ b/src/libraries/System.Net.Primitives/src/System.Net.Primitives.csproj @@ -144,7 +144,7 @@ - + - + - - - - - - - - + + diff --git a/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj b/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj index 8e509bd356a..c7c5bf5f83c 100644 --- a/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj +++ b/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj @@ -4,11 +4,11 @@ true $(NetCoreAppCurrent) $(DefineConstants);NETSTANDARD - true + true $(NoWarn);SYSLIB0014 - true + true true true diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj index 76bef62ae71..ecee9fc3852 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj @@ -3,10 +3,10 @@ true true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser;$(NetCoreAppCurrent)-osx;$(NetCoreAppCurrent)-ios - true + true true - true + true true true diff --git a/src/libraries/System.Net.Security/tests/StressTests/SslStress/Dockerfile b/src/libraries/System.Net.Security/tests/StressTests/SslStress/Dockerfile index ae86f7e6fb2..c2009787114 100644 --- a/src/libraries/System.Net.Security/tests/StressTests/SslStress/Dockerfile +++ b/src/libraries/System.Net.Security/tests/StressTests/SslStress/Dockerfile @@ -19,5 +19,5 @@ ENV VERSION=$VERSION ENV CONFIGURATION=$CONFIGURATION ENV SSLSTRESS_ARGS='' -CMD /live-runtime-artifacts/testhost/net$VERSION-Linux-$CONFIGURATION-x64/dotnet exec --roll-forward Major \ +CMD /live-runtime-artifacts/testhost/net$VERSION-linux-$CONFIGURATION-x64/dotnet exec --roll-forward Major \ ./bin/$CONFIGURATION/net$VERSION/SslStress.dll $SSLSTRESS_ARGS \ No newline at end of file diff --git a/src/libraries/System.Net.Security/tests/StressTests/SslStress/build-local.sh b/src/libraries/System.Net.Security/tests/StressTests/SslStress/build-local.sh index 99e8647c90c..fc7eefad993 100755 --- a/src/libraries/System.Net.Security/tests/StressTests/SslStress/build-local.sh +++ b/src/libraries/System.Net.Security/tests/StressTests/SslStress/build-local.sh @@ -23,7 +23,7 @@ if [ "$2" != "" ]; then libraries_configuration=${libraries_configuration^} # Uppercase first character fi -testhost_root=$repo_root/artifacts/bin/testhost/net$version-Linux-$libraries_configuration-x64 +testhost_root=$repo_root/artifacts/bin/testhost/net$version-linux-$libraries_configuration-x64 echo "StressConfiguration: $stress_configuration, LibrariesConfiguration: $libraries_configuration, testhost: $testhost_root" if [[ ! -d $testhost_root ]]; then diff --git a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj index 512eded0334..a2fa3f65511 100644 --- a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj +++ b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj @@ -11,7 +11,7 @@ $(NoWarn);3021 $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser;$(NetCoreAppCurrent)-osx;$(NetCoreAppCurrent)-ios;$(NetCoreAppCurrent)-android - true + true true diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj b/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj index e1f59297946..ad1851d97a9 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj @@ -3,7 +3,7 @@ true true $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser - true + true true diff --git a/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj b/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj index 4d0dfbdac80..a2974969715 100644 --- a/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj +++ b/src/libraries/System.Net.WebClient/tests/System.Net.WebClient.Tests.csproj @@ -4,7 +4,7 @@ $(DefineConstants);NETSTANDARD $(NoWarn);SYSLIB0014 - true + true diff --git a/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj b/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj index 603607b9e49..d0228354993 100644 --- a/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj +++ b/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj @@ -1,5 +1,5 @@ - + ../src/Resources/Strings.resx @@ -8,10 +8,10 @@ false - true + true - + WasmTestOnBrowser $(TestArchiveRoot)browserornodejs/ diff --git a/src/libraries/System.Net.WebSockets.Client/tests/wasm/System.Net.WebSockets.Client.Wasm.Tests.csproj b/src/libraries/System.Net.WebSockets.Client/tests/wasm/System.Net.WebSockets.Client.Wasm.Tests.csproj index b01e12688a4..4024dc05baf 100644 --- a/src/libraries/System.Net.WebSockets.Client/tests/wasm/System.Net.WebSockets.Client.Wasm.Tests.csproj +++ b/src/libraries/System.Net.WebSockets.Client/tests/wasm/System.Net.WebSockets.Client.Wasm.Tests.csproj @@ -1,5 +1,5 @@ - + ../../src/Resources/Strings.resx @@ -7,7 +7,7 @@ $(DefineConstants);NETSTANDARD - + --background-throttling WasmTestOnBrowser $(TestArchiveRoot)browseronly/ diff --git a/src/libraries/System.Private.Xml/tests/System.Private.Xml.Tests.csproj b/src/libraries/System.Private.Xml/tests/System.Private.Xml.Tests.csproj index 19991a03d03..2b7df4833a7 100644 --- a/src/libraries/System.Private.Xml/tests/System.Private.Xml.Tests.csproj +++ b/src/libraries/System.Private.Xml/tests/System.Private.Xml.Tests.csproj @@ -7,7 +7,7 @@ false - + WasmTestOnBrowser $(TestArchiveRoot)browserornodejs/ diff --git a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj index 465eca5fba4..c946c2e8966 100644 --- a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj +++ b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj @@ -7,7 +7,7 @@ $(NoWarn);436;SYSLIB0037 $(NetCoreAppCurrent);$(NetFrameworkMinimum) true - $(DefineConstants);TARGET_BROWSER + $(DefineConstants);TARGET_BROWSER - + diff --git a/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj b/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj index 32e2dcef87d..ecafc778a16 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj @@ -75,7 +75,7 @@ - + diff --git a/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj b/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj index bc011a8a600..d6ebfb00812 100644 --- a/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj +++ b/src/libraries/System.Reflection/tests/System.Reflection.Tests.csproj @@ -8,7 +8,7 @@ $(NoWarn);SYSLIB0013;SYSLIB0037 - true + true @@ -75,7 +75,7 @@ - + diff --git a/src/libraries/System.Runtime.InteropServices.JavaScript/src/System.Runtime.InteropServices.JavaScript.csproj b/src/libraries/System.Runtime.InteropServices.JavaScript/src/System.Runtime.InteropServices.JavaScript.csproj index ac64827c2db..f4e04daaae5 100644 --- a/src/libraries/System.Runtime.InteropServices.JavaScript/src/System.Runtime.InteropServices.JavaScript.csproj +++ b/src/libraries/System.Runtime.InteropServices.JavaScript/src/System.Runtime.InteropServices.JavaScript.csproj @@ -2,7 +2,7 @@ $(NetCoreAppCurrent)-browser;$(NetCoreAppCurrent) true - true + true $(DefineConstants);FEATURE_WASM_THREADS diff --git a/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.ComDisabled.UnitTests/System.Runtime.InteropServices.ComDisabled.Tests.csproj b/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.ComDisabled.UnitTests/System.Runtime.InteropServices.ComDisabled.Tests.csproj index 7a2afe9fda6..d54fcd8a3e9 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.ComDisabled.UnitTests/System.Runtime.InteropServices.ComDisabled.Tests.csproj +++ b/src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.ComDisabled.UnitTests/System.Runtime.InteropServices.ComDisabled.Tests.csproj @@ -4,7 +4,7 @@ $(NetCoreAppCurrent) true - true + true diff --git a/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj b/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj index 9e517c1c2dd..9424f519025 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj +++ b/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj @@ -13,9 +13,9 @@ $(OutputRid) $(PackageRID) - <_TargetsAppleOS Condition="'$(TargetOS)' == 'OSX' or '$(TargetOS)' == 'MacCatalyst' or - '$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS' or '$(TargetOS)' == 'iOSSimulator' or - '$(TargetOS)' == 'tvOSSimulator'">true + <_TargetsAppleOS Condition="'$(TargetOS)' == 'osx' or '$(TargetOS)' == 'maccatalyst' or + '$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'iossimulator' or + '$(TargetOS)' == 'tvossimulator'">true - - - - - - + + + + + + @@ -65,13 +65,13 @@ - + - + @@ -86,7 +86,7 @@ - + diff --git a/src/libraries/System.Security.Cryptography.Cose/tests/System.Security.Cryptography.Cose.Tests.csproj b/src/libraries/System.Security.Cryptography.Cose/tests/System.Security.Cryptography.Cose.Tests.csproj index ed5c68c860f..3c181df35e4 100644 --- a/src/libraries/System.Security.Cryptography.Cose/tests/System.Security.Cryptography.Cose.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Cose/tests/System.Security.Cryptography.Cose.Tests.csproj @@ -2,7 +2,7 @@ $(NetCoreAppCurrent);net48 enable - true + true diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj index 37bd485fcf2..3ed8b1f1e20 100644 --- a/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.csproj @@ -2,7 +2,7 @@ $(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser - true + true true true diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj index 51fbcbfc195..4d09a6c1954 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj @@ -10,9 +10,9 @@ - true + true - true + true $(WasmXHarnessArgs) --timeout=1800 true diff --git a/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj b/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj index c83d53bcbc1..fc4332176a2 100644 --- a/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj +++ b/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj @@ -6,7 +6,7 @@ $(NoWarn);xUnit2008;SYSLIB0036;SYSLIB1045 $(NetCoreAppCurrent);net48 - true + true true true diff --git a/src/libraries/System.Text.RegularExpressions/tests/UnitTests/System.Text.RegularExpressions.Unit.Tests.csproj b/src/libraries/System.Text.RegularExpressions/tests/UnitTests/System.Text.RegularExpressions.Unit.Tests.csproj index 684b36c6d3d..25c3668059d 100644 --- a/src/libraries/System.Text.RegularExpressions/tests/UnitTests/System.Text.RegularExpressions.Unit.Tests.csproj +++ b/src/libraries/System.Text.RegularExpressions/tests/UnitTests/System.Text.RegularExpressions.Unit.Tests.csproj @@ -5,7 +5,7 @@ $(NoWarn);xUnit2008;SYSLIB0036 ..\..\src\Resources\Strings.resx $(NetCoreAppCurrent) - true + true true true $(DefineConstants);DEBUG diff --git a/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj b/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj index b3723431805..ded390e9833 100644 --- a/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj +++ b/src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj @@ -1,7 +1,7 @@ $(NetCoreAppCurrent);$(NetFrameworkMinimum) - true + true diff --git a/src/libraries/apicompat/ApiCompat.proj b/src/libraries/apicompat/ApiCompat.proj index 210f60e5f85..0a36ff6d36a 100644 --- a/src/libraries/apicompat/ApiCompat.proj +++ b/src/libraries/apicompat/ApiCompat.proj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent)-$(TargetOS.ToLowerInvariant()) + $(NetCoreAppCurrent)-$(TargetOS) false diff --git a/src/libraries/externals.csproj b/src/libraries/externals.csproj index 00effdc6e8e..d077d662069 100644 --- a/src/libraries/externals.csproj +++ b/src/libraries/externals.csproj @@ -11,8 +11,8 @@ false - true - true + true + true false true diff --git a/src/libraries/oob-src.proj b/src/libraries/oob-src.proj index 60c713c8894..ccdaf0c39a3 100644 --- a/src/libraries/oob-src.proj +++ b/src/libraries/oob-src.proj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent)-$(TargetOS.ToLowerInvariant()) + $(NetCoreAppCurrent)-$(TargetOS) true diff --git a/src/libraries/oob.proj b/src/libraries/oob.proj index c66085039e2..074f952826d 100644 --- a/src/libraries/oob.proj +++ b/src/libraries/oob.proj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent)-$(TargetOS.ToLowerInvariant()) + $(NetCoreAppCurrent)-$(TargetOS) $(NetCoreAppCurrent) diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj index 95c61b1b050..bbe56c8bcd5 100644 --- a/src/libraries/pretest.proj +++ b/src/libraries/pretest.proj @@ -20,17 +20,17 @@ - - - - + + + + - + + Condition="'$(TargetOS)' == 'browser' and '$(ContinuousIntegrationBuild)' == 'true'" /> diff --git a/src/libraries/sendtohelix-mobile.targets b/src/libraries/sendtohelix-mobile.targets index 33b538779f0..6ac4a8a6e65 100644 --- a/src/libraries/sendtohelix-mobile.targets +++ b/src/libraries/sendtohelix-mobile.targets @@ -4,11 +4,11 @@ false false - true + true true - + maccatalyst $(_workItemTimeout) @@ -16,7 +16,7 @@ - + armeabi-v7a arm64-v8a @@ -40,12 +40,12 @@ - - ios-simulator-64 - tvos-simulator - ios-device - tvos-device - maccatalyst + + ios-simulator-64 + tvos-simulator + ios-device + tvos-device + maccatalyst @@ -63,7 +63,7 @@ - + @@ -92,7 +92,7 @@ Note: We're excluding iOS and tvOS device runonly as mlaunch does not seem to return and times out. --> - + false @@ -101,7 +101,7 @@ - @@ -112,7 +112,7 @@ - + <_apks Include="$(TestArchiveTestsRoot)**/*.apk" /> net.dot.%(Filename) @@ -133,7 +133,7 @@ <_TestPath Condition="'%(XHarnessAppBundleToTest.CustomCommands)' != ''">$([System.IO.Path]::GetDirectoryName('%(XHarnessAppBundleToTest.Identity)')) - wasm.helix.targets + wasm.helix.targets - This files gets copied next to the test archive as $(MSBuildProjectName).helix.targets - In this `wasm.helix.targets` file, add to $(HelixExtensionTargets) to run your custom target diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj index 6aca13e92bc..65d5ca651db 100644 --- a/src/libraries/sendtohelix.proj +++ b/src/libraries/sendtohelix.proj @@ -143,7 +143,7 @@ - + diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index 61a21bfe413..6f0b7704b57 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -17,8 +17,8 @@ true - - + + - false + false @@ -98,7 +98,7 @@ --> SetStressModes_$(Scenario).cmd - SetStressModes_$(Scenario).sh + SetStressModes_$(Scenario).sh true diff --git a/src/libraries/sfx.proj b/src/libraries/sfx.proj index e759e2e2c74..d5a37e1959d 100644 --- a/src/libraries/sfx.proj +++ b/src/libraries/sfx.proj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent)-$(TargetOS.ToLowerInvariant()) + $(NetCoreAppCurrent)-$(TargetOS) false diff --git a/src/libraries/shims.proj b/src/libraries/shims.proj index c0a1415b644..5c138fd1e70 100644 --- a/src/libraries/shims.proj +++ b/src/libraries/shims.proj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent)-$(TargetOS.ToLowerInvariant()) + $(NetCoreAppCurrent)-$(TargetOS) diff --git a/src/libraries/shims/Directory.Build.props b/src/libraries/shims/Directory.Build.props index 52d31dadd2f..aa98afd27a6 100644 --- a/src/libraries/shims/Directory.Build.props +++ b/src/libraries/shims/Directory.Build.props @@ -3,7 +3,7 @@ - $(NetCoreAppCurrent)-$(TargetOS.ToLowerInvariant()) + $(NetCoreAppCurrent)-$(TargetOS) disable true diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index 8b6a516050e..6ef5e0b26a6 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -22,10 +22,10 @@ false - true + true - + @@ -34,7 +34,7 @@ - + @@ -45,21 +45,21 @@ - + - + - + - + @@ -112,7 +112,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -147,12 +147,12 @@ - + - + @@ -170,7 +170,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -229,7 +229,7 @@ - + @@ -237,7 +237,7 @@ - + @@ -249,19 +249,19 @@ - + - + - + - + @@ -303,19 +303,19 @@ - + - + - + @@ -323,7 +323,7 @@ - + @@ -335,10 +335,10 @@ - + - + @@ -369,7 +369,7 @@ - + @@ -378,7 +378,7 @@ - + @@ -386,17 +386,17 @@ - + - + - + @@ -578,20 +578,20 @@ - + @@ -600,14 +600,14 @@ BuildInParallel="false" /> - + - + @@ -616,13 +616,13 @@ BuildInParallel="false" /> - + - + @@ -631,13 +631,13 @@ BuildInParallel="false" /> - + - + 5.1 10.14 - 11.0 + 11.0 @@ -66,12 +66,12 @@ - $([MSBuild]::NormalizePath($(RuntimeBinDir), 'cross', '$(TargetOS.ToLowerInvariant())-$(TargetArchitecture.ToLowerInvariant())')) + $([MSBuild]::NormalizePath($(RuntimeBinDir), 'cross', '$(TargetOS)-$(TargetArchitecture.ToLowerInvariant())')) <_MonoAotCrossCompilerPath>$([MSBuild]::NormalizePath($(MonoAotCrossDir), 'mono-aot-cross')) <_MonoAotCrossCompilerPath Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">$(_MonoAotCrossCompilerPath).exe - + diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 3e229dab9db..b4289a0b76f 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -284,7 +284,7 @@ <_MonoCMakeArgs Include="-DCMAKE_TOOLCHAIN_FILE=$(CrossToolchainFile)" /> - <_MonoCMakeArgs Condition="'$(TargetOS)' == 'Linux' and ('$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'armv6')" Include="-DMONO_ARM_FPU=vfp-hard" /> + <_MonoCMakeArgs Condition="'$(TargetOS)' == 'linux' and ('$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'armv6')" Include="-DMONO_ARM_FPU=vfp-hard" /> <_MonoBuildEnv Condition="'$(Platform)' == 'arm64'" Include="TARGET_BUILD_ARCH=arm64" /> <_MonoBuildEnv Condition="'$(Platform)' == 'arm'" Include="TARGET_BUILD_ARCH=arm" /> <_MonoBuildEnv Condition="'$(Platform)' == 'armv6'" Include="TARGET_BUILD_ARCH=armv6" /> @@ -380,7 +380,7 @@ - <_MonoCMakeArgs Include="-DCMAKE_SYSTEM_VARIANT=MacCatalyst" /> + <_MonoCMakeArgs Include="-DCMAKE_SYSTEM_VARIANT=maccatalyst" /> <_MonoCPPFLAGS Include="-Wno-overriding-t-option" /> <_MonoCFlags Condition="'$(TargetArchitecture)' == 'arm64'" Include="-target arm64-apple-ios14.2-macabi" /> @@ -541,7 +541,7 @@ <_MonoCFLAGS Include="-Wl,--build-id=sha1" /> <_MonoCXXFLAGS Include="-Wl,--build-id=sha1" /> - + <_MonoAOTCFLAGS Include="-Wl,--build-id=sha1" /> <_MonoAOTCXXFLAGS Include="-Wl,--build-id=sha1" /> @@ -703,7 +703,7 @@ - + <_LibClang Include="$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(MonoToolchainPrebuiltOS)/lib64/libclang.so.*"/> @@ -714,7 +714,7 @@ - + @@ -738,7 +738,7 @@ - + <_MonoAOTCPPFLAGS Include="-DHOST_WIN32" /> <_MonoAOTCPPFLAGS Include="-D__WIN32__" /> <_MonoAOTCPPFLAGS Include="-DWIN32" /> diff --git a/src/mono/mono/mini/CMakeLists.txt b/src/mono/mono/mini/CMakeLists.txt index 0848baf8593..efa3935a0cc 100644 --- a/src/mono/mono/mini/CMakeLists.txt +++ b/src/mono/mono/mini/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories( if(HOST_DARWIN) set(OS_LIBS "-framework CoreFoundation" "-framework Foundation") - if(CMAKE_SYSTEM_VARIANT STREQUAL "MacCatalyst") + if(CMAKE_SYSTEM_VARIANT STREQUAL "maccatalyst") set(OS_LIBS ${OS_LIBS} "-lobjc" "-lc++") endif() elseif(HOST_IOS) diff --git a/src/mono/monoaotcross.proj b/src/mono/monoaotcross.proj index 7d8b2a10a31..b24b75e761f 100644 --- a/src/mono/monoaotcross.proj +++ b/src/mono/monoaotcross.proj @@ -2,18 +2,18 @@ - <_MonoCrossAOTTargetOS Condition="'$(MonoCrossAOTTargetOS)' != ''">+$(MonoCrossAOTTargetOS.ToLowerInvariant())+ - <_MonoGenerateOffsetsOSGroups Condition="'$(MonoGenerateOffsetsOSGroups)' != ''">+$(MonoGenerateOffsetsOSGroups.ToLowerInvariant())+ + <_MonoCrossAOTTargetOS Condition="'$(MonoCrossAOTTargetOS)' != ''">+$(MonoCrossAOTTargetOS)+ + <_MonoGenerateOffsetsOSGroups Condition="'$(MonoGenerateOffsetsOSGroups)' != ''">+$(MonoGenerateOffsetsOSGroups)+ <_MonoCrossAOTTargetOS Condition="$(_MonoGenerateOffsetsOSGroups.contains('+android+'))">$(_MonoCrossAOTTargetOS)+android+ <_MonoCrossAOTTargetOS Condition="$(_MonoGenerateOffsetsOSGroups.contains('+browser+'))">$(_MonoCrossAOTTargetOS)+browser+ <_MonoCrossAOTTargetOS Condition="$(_MonoGenerateOffsetsOSGroups.contains('+tvos+'))">$(_MonoCrossAOTTargetOS)+tvos+ <_MonoCrossAOTTargetOS Condition="$(_MonoGenerateOffsetsOSGroups.contains('+ios+'))">$(_MonoCrossAOTTargetOS)+ios+ <_MonoCrossAOTTargetOS Condition="$(_MonoGenerateOffsetsOSGroups.contains('+maccatalyst+'))">$(_MonoCrossAOTTargetOS)+maccatalyst+ - $(MonoAotTargets);Android-x64;Android-arm64;Android-x86;Android-arm - $(MonoAotTargets);Browser-wasm - $(MonoAotTargets);tvOSSimulator-x64;tvOSSimulator-arm64;tvOS-arm64 - $(MonoAotTargets);iOSSimulator-x64;iOSSimulator-arm64;iOSSimulator-x86;iOS-arm64;iOS-arm - $(MonoAotTargets);MacCatalyst-x64;MacCatalyst-arm64 + $(MonoAotTargets);android-x64;android-arm64;android-x86;android-arm + $(MonoAotTargets);browser-wasm + $(MonoAotTargets);tvossimulator-x64;tvossimulator-arm64;tvos-arm64 + $(MonoAotTargets);iossimulator-x64;iossimulator-arm64;iossimulator-x86;ios-arm64;ios-arm + $(MonoAotTargets);maccatalyst-x64;maccatalyst-arm64 @@ -48,9 +48,9 @@ <_MonoAOTCrossFiles Include="$(ArtifactsBinDir)mono\$(MonoAotTargetOS).$(MonoAotTargetArchitecture).$(Configuration)\cross\$(MonoAotTargetRid.ToLower())\**" /> - + - + diff --git a/src/mono/msbuild/android/build/AndroidApp.props b/src/mono/msbuild/android/build/AndroidApp.props index 3e8f62b3e0a..8bcbe0dcc28 100644 --- a/src/mono/msbuild/android/build/AndroidApp.props +++ b/src/mono/msbuild/android/build/AndroidApp.props @@ -1,6 +1,6 @@ - $(TargetOS.ToLowerInvariant())-$(TargetArchitecture.ToLowerInvariant()) + $(TargetOS)-$(TargetArchitecture.ToLowerInvariant()) true true diff --git a/src/mono/msbuild/android/build/AndroidApp.targets b/src/mono/msbuild/android/build/AndroidApp.targets index 3d6024763b0..cafe0ea419c 100644 --- a/src/mono/msbuild/android/build/AndroidApp.targets +++ b/src/mono/msbuild/android/build/AndroidApp.targets @@ -101,7 +101,7 @@ - adhoc + adhoc diff --git a/src/mono/msbuild/apple/build/AppleApp.LocalBuild.props b/src/mono/msbuild/apple/build/AppleApp.LocalBuild.props index c9e738a178c..c0307cd12b3 100644 --- a/src/mono/msbuild/apple/build/AppleApp.LocalBuild.props +++ b/src/mono/msbuild/apple/build/AppleApp.LocalBuild.props @@ -29,16 +29,16 @@ $(RuntimeSrcDir)\artifacts\bin\ - $([MSBuild]::NormalizeDirectory($(ArtifactsBinDir), 'microsoft.netcore.app.runtime.$(TargetOS.ToLowerInvariant())-$(TargetArchitecture.ToLowerInvariant())', $(RuntimeConfig))) - $([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackLocationToUse), 'runtimes', '$(TargetOS.ToLowerInvariant())-$(TargetArchitecture.ToLowerInvariant())', 'lib', '$(_NetCoreAppCurrent)')) - $([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackLocationToUse), 'runtimes', '$(TargetOS.ToLowerInvariant())-$(TargetArchitecture.ToLowerInvariant())', 'native')) + $([MSBuild]::NormalizeDirectory($(ArtifactsBinDir), 'microsoft.netcore.app.runtime.$(TargetOS)-$(TargetArchitecture.ToLowerInvariant())', $(RuntimeConfig))) + $([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackLocationToUse), 'runtimes', '$(TargetOS)-$(TargetArchitecture.ToLowerInvariant())', 'lib', '$(_NetCoreAppCurrent)')) + $([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackLocationToUse), 'runtimes', '$(TargetOS)-$(TargetArchitecture.ToLowerInvariant())', 'native')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'AppleAppBuilder', 'Debug', '$(_NetCoreAppToolCurrent)')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoAOTCompiler', 'Debug', '$(_NetCoreAppToolCurrent)')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoTargetsTasks', 'Debug', '$(_NetCoreAppToolCurrent)')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'mono', '$(TargetOS).$(TargetArchitecture).$(RuntimeConfig)')) - $([MSBuild]::NormalizePath($(MonoArtifactsPath), 'cross', '$(TargetOS.ToLowerInvariant())-$(TargetArchitecture.ToLowerInvariant())')) + $([MSBuild]::NormalizePath($(MonoArtifactsPath), 'cross', '$(TargetOS)-$(TargetArchitecture.ToLowerInvariant())')) <_MonoAotCrossCompilerPath>$([MSBuild]::NormalizePath($(MonoAotCrossDir), 'mono-aot-cross')) <_MonoAotCrossCompilerPath Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">$(_MonoAotCrossCompilerPath).exe @@ -46,9 +46,9 @@ $(AppleBuildSupportDir)\ - $([MSBuild]::NormalizeDirectory($(BuildBaseDir), 'microsoft.netcore.app.runtime.$(TargetOS.ToLowerInvariant())-$(TargetArchitecture.ToLowerInvariant())')) - $([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackLocationToUse), 'runtimes', '$(TargetOS.ToLowerInvariant())-$(TargetArchitecture.ToLowerInvariant())', 'lib', '$(_NetCoreAppCurrent)')) - $([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackLocationToUse), 'runtimes', '$(TargetOS.ToLowerInvariant())-$(TargetArchitecture.ToLowerInvariant())', 'native')) + $([MSBuild]::NormalizeDirectory($(BuildBaseDir), 'microsoft.netcore.app.runtime.$(TargetOS)-$(TargetArchitecture.ToLowerInvariant())')) + $([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackLocationToUse), 'runtimes', '$(TargetOS)-$(TargetArchitecture.ToLowerInvariant())', 'lib', '$(_NetCoreAppCurrent)')) + $([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackLocationToUse), 'runtimes', '$(TargetOS)-$(TargetArchitecture.ToLowerInvariant())', 'native')) $([MSBuild]::NormalizeDirectory($(BuildBaseDir), 'MonoAOTCompiler')) $([MSBuild]::NormalizeDirectory($(BuildBaseDir), 'MonoTargetsTasks')) $([MSBuild]::NormalizeDirectory($(BuildBaseDir), 'AppleAppBuilder')) @@ -59,12 +59,12 @@ - + $([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackLocationToUse))) - $([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackDir), 'runtimes', '$(TargetOS.ToLowerInvariant())-$(TargetArchitecture.ToLowerInvariant())')) + $([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackDir), 'runtimes', '$(TargetOS)-$(TargetArchitecture.ToLowerInvariant())')) $([MSBuild]::NormalizePath('$(AppleAppBuilderDir)', 'AppleAppBuilder.dll')) $([MSBuild]::NormalizePath('$(MonoAOTCompilerDir)', 'MonoAOTCompiler.dll')) $([MSBuild]::NormalizePath('$(MonoTargetsTasksDir)', 'MonoTargetsTasks.dll')) diff --git a/src/mono/msbuild/apple/build/AppleApp.LocalBuild.targets b/src/mono/msbuild/apple/build/AppleApp.LocalBuild.targets index 524f71be9ff..593371e69c0 100644 --- a/src/mono/msbuild/apple/build/AppleApp.LocalBuild.targets +++ b/src/mono/msbuild/apple/build/AppleApp.LocalBuild.targets @@ -69,7 +69,7 @@ $([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackLocationToUse))) - $([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackDir), 'runtimes', '$(TargetOS.ToLowerInvariant())-$(TargetArchitecture.ToLowerInvariant())')) + $([MSBuild]::NormalizeDirectory($(MicrosoftNetCoreAppRuntimePackDir), 'runtimes', '$(TargetOS)-$(TargetArchitecture.ToLowerInvariant())')) $([MSBuild]::NormalizePath('$(AppleAppBuilderDir)', 'AppleAppBuilder.dll')) $([MSBuild]::NormalizePath('$(MonoAOTCompilerDir)', 'MonoAOTCompiler.dll')) $([MSBuild]::NormalizePath('$(MonoTargetsTasksDir)', 'RuntimeConfigParser.dll')) diff --git a/src/mono/msbuild/apple/build/AppleApp.props b/src/mono/msbuild/apple/build/AppleApp.props index a9ccee0c8f1..2d29b16a2ec 100644 --- a/src/mono/msbuild/apple/build/AppleApp.props +++ b/src/mono/msbuild/apple/build/AppleApp.props @@ -1,16 +1,16 @@ - + true - + true - $(TargetOS.ToLowerInvariant())-$(TargetArchitecture.ToLowerInvariant()) + $(TargetOS)-$(TargetArchitecture.ToLowerInvariant()) true true diff --git a/src/mono/msbuild/apple/build/AppleApp.targets b/src/mono/msbuild/apple/build/AppleApp.targets index 588a6f2bee9..8c038bccb8d 100644 --- a/src/mono/msbuild/apple/build/AppleApp.targets +++ b/src/mono/msbuild/apple/build/AppleApp.targets @@ -11,7 +11,7 @@ - @@ -47,11 +47,11 @@ - - + + - - + + @@ -89,7 +89,7 @@ - + - + - + diff --git a/src/mono/sample/Android/AndroidSampleApp.csproj b/src/mono/sample/Android/AndroidSampleApp.csproj index 444e454c206..895af7d5e63 100644 --- a/src/mono/sample/Android/AndroidSampleApp.csproj +++ b/src/mono/sample/Android/AndroidSampleApp.csproj @@ -64,7 +64,7 @@ RunTests.sh - RunTests.cmd + RunTests.cmd - - + + - + diff --git a/src/mono/sample/mbr/README.md b/src/mono/sample/mbr/README.md index f95030266bb..97c6ec77b66 100644 --- a/src/mono/sample/mbr/README.md +++ b/src/mono/sample/mbr/README.md @@ -26,13 +26,13 @@ build.sh --os browser For Apple targets: ```console -build.sh --os MacCatalyst -s Mono+Libs +build.sh --os maccatalyst -s mono+libs ``` or ```console -build.sh --os iOSSimulator -s Mono+Libs +build.sh --os iossimulator -s mono+libs ``` ## Running diff --git a/src/mono/sample/mbr/apple/AppleDelta.csproj b/src/mono/sample/mbr/apple/AppleDelta.csproj index 145dfb80552..716fd9b61c6 100644 --- a/src/mono/sample/mbr/apple/AppleDelta.csproj +++ b/src/mono/sample/mbr/apple/AppleDelta.csproj @@ -3,7 +3,7 @@ Exe bin $(NetCoreAppCurrent) - $(TargetOS.ToLower())-$(TargetArchitecture) + $(TargetOS)-$(TargetArchitecture) $(DefineConstants);CI_TEST true false @@ -23,8 +23,8 @@ 1 - - - + + - @@ -51,7 +51,7 @@ TargetOS="$(TargetOS)" Arch="$(TargetArchitecture)" ProjectName="AppleDelta" - MonoRuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackDir)runtimes\$(TargetOS.ToLower())-$(TargetArchitecture)\native\include\mono-2.0" + MonoRuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackDir)runtimes\$(TargetOS)-$(TargetArchitecture)\native\include\mono-2.0" Assemblies="@(BundleAssemblies)" NativeMainSource="$(MSBuildThisFileDirectory)\main.m" MainLibraryFileName="AppleDelta.dll" @@ -70,10 +70,10 @@ - + - + diff --git a/src/mono/sample/mbr/apple/Makefile b/src/mono/sample/mbr/apple/Makefile index a126141d389..f303ab5d18c 100644 --- a/src/mono/sample/mbr/apple/Makefile +++ b/src/mono/sample/mbr/apple/Makefile @@ -4,11 +4,11 @@ MONO_ARCH?=$(shell . $(TOP)eng/native/init-os-and-arch.sh && echo $${arch}) DOTNET:=$(TOP)dotnet.sh run-sim: - $(DOTNET) publish -c $(CONFIG) /p:TargetOS=iOSSimulator /p:TargetArchitecture=$(MONO_ARCH) \ + $(DOTNET) publish -c $(CONFIG) /p:TargetOS=iossimulator /p:TargetArchitecture=$(MONO_ARCH) \ /p:UseLLVM=False /p:ForceAOT=False /p:MonoForceInterpreter=true run-catalyst: - $(DOTNET) publish -c $(CONFIG) /p:TargetOS=MacCatalyst /p:TargetArchitecture=$(MONO_ARCH) \ + $(DOTNET) publish -c $(CONFIG) /p:TargetOS=maccatalyst /p:TargetArchitecture=$(MONO_ARCH) \ /p:UseLLVM=False /p:ForceAOT=False /p:MonoForceInterpreter=true clean: diff --git a/src/mono/sample/mbr/console/Makefile b/src/mono/sample/mbr/console/Makefile index 0b9794019aa..39f01ebf214 100644 --- a/src/mono/sample/mbr/console/Makefile +++ b/src/mono/sample/mbr/console/Makefile @@ -7,7 +7,7 @@ CONFIG ?=Debug # How was dotnet/runtime built? should be the same as build.sh -c option BUILT_RUNTIME_CONFIG ?= Release MONO_ARCH?=$(shell . $(TOP)eng/native/init-os-and-arch.sh && echo $${arch}) -TARGET_OS?=$(shell . $(TOP)eng/native/init-os-and-arch.sh && echo $${os} | tr "[:upper:]" "[:lower:]") +TARGET_OS?=$(shell . $(TOP)eng/native/init-os-and-arch.sh && echo $${os}) MONO_ENV_OPTIONS = --interp diff --git a/src/mono/sample/wasm/Directory.Build.targets b/src/mono/sample/wasm/Directory.Build.targets index a0ec478d9e7..e9447a94400 100644 --- a/src/mono/sample/wasm/Directory.Build.targets +++ b/src/mono/sample/wasm/Directory.Build.targets @@ -3,8 +3,8 @@ - WasmRunnerTemplate.sh - WasmRunnerTemplate.cmd + WasmRunnerTemplate.sh + WasmRunnerTemplate.cmd $([MSBuild]::NormalizePath('$(WasmAppDir)', '$(RunScriptOutputName)')) @@ -39,7 +39,7 @@ <_WasmMainJSFileName>$([System.IO.Path]::GetFileName('$(WasmMainJSPath)')) $(BuildAdditionalArgs) /p:MonoDiagnosticsMock=$(MonoDiagnosticsMock) - + diff --git a/src/mono/sample/wasm/browser-eventpipe/README.md b/src/mono/sample/wasm/browser-eventpipe/README.md index 855f2e4c78c..41e10bc7b8b 100644 --- a/src/mono/sample/wasm/browser-eventpipe/README.md +++ b/src/mono/sample/wasm/browser-eventpipe/README.md @@ -27,7 +27,7 @@ c:\Dev\diagnostics\artifacts\bin\dotnet-dsrouter\Debug\net6.0\dotnet-dsrouter.ex In console #2 start the sample ``` -dotnet build /p:TargetOS=Browser /p:TargetArchitecture=wasm /p:Configuration=Debug /t:RunSample src/mono/sample/wasm/browser-eventpipe /p:MonoDiagnosticsMock=false +dotnet build /p:TargetOS=browser /p:TargetArchitecture=wasm /p:Configuration=Debug /t:RunSample src/mono/sample/wasm/browser-eventpipe /p:MonoDiagnosticsMock=false ``` In console #3 start the dotnet trace diff --git a/src/mono/sample/wasm/browser-nextjs/README.md b/src/mono/sample/wasm/browser-nextjs/README.md index 49418d33d23..4bffb7255fb 100644 --- a/src/mono/sample/wasm/browser-nextjs/README.md +++ b/src/mono/sample/wasm/browser-nextjs/README.md @@ -3,5 +3,5 @@ Shows how to create react component and re-use runtime instance, when the component is instantiated multiple times. ``` -dotnet build /p:TargetOS=Browser /p:TargetArchitecture=wasm /p:Configuration=Debug /t:RunSample +dotnet build /p:TargetOS=browser /p:TargetArchitecture=wasm -c Debug /t:RunSample ``` \ No newline at end of file diff --git a/src/mono/sample/wasm/browser-nextjs/package.json b/src/mono/sample/wasm/browser-nextjs/package.json index 6946d30d5f4..57c7acab556 100644 --- a/src/mono/sample/wasm/browser-nextjs/package.json +++ b/src/mono/sample/wasm/browser-nextjs/package.json @@ -3,7 +3,7 @@ "private": true, "license": "MIT", "scripts": { - "build:dotnet": "dotnet build /p:TargetOS=Browser /p:TargetArchitecture=wasm /p:Configuration=Debug", + "build:dotnet": "dotnet build /p:TargetOS=browser /p:TargetArchitecture=wasm /p:Configuration=Debug", "dev": "next dev", "build": "next build", "start": "next start" diff --git a/src/mono/sample/wasm/browser-webpack/README.md b/src/mono/sample/wasm/browser-webpack/README.md index 55a28abfb13..f0de4a24f81 100644 --- a/src/mono/sample/wasm/browser-webpack/README.md +++ b/src/mono/sample/wasm/browser-webpack/README.md @@ -1,5 +1,5 @@ ## Sample for packaging dotnet.js via WebPack ``` -dotnet build /p:TargetOS=Browser /p:TargetArchitecture=wasm /p:Configuration=Debug /t:RunSample +dotnet build /p:TargetOS=browser /p:TargetArchitecture=wasm -c Debug /t:RunSample ``` \ No newline at end of file diff --git a/src/mono/sample/wasm/browser-webpack/package.json b/src/mono/sample/wasm/browser-webpack/package.json index 4d2bf68208a..485b109679d 100644 --- a/src/mono/sample/wasm/browser-webpack/package.json +++ b/src/mono/sample/wasm/browser-webpack/package.json @@ -4,7 +4,7 @@ "license": "MIT", "main": "index.js", "scripts": { - "build": "dotnet build /p:TargetOS=Browser /p:TargetArchitecture=wasm /p:Configuration=Debug", + "build": "dotnet build /p:TargetOS=browser /p:TargetArchitecture=wasm -c Debug", "webpack": "webpack" }, "devDependencies": { diff --git a/src/mono/sample/wasm/console-node-ts/package.json b/src/mono/sample/wasm/console-node-ts/package.json index ab5a079cee6..19e0b041086 100644 --- a/src/mono/sample/wasm/console-node-ts/package.json +++ b/src/mono/sample/wasm/console-node-ts/package.json @@ -5,7 +5,7 @@ "description": "TypeScript sample for dotnet in WASM", "type": "module", "scripts": { - "build": "dotnet build /p:TargetOS=Browser /p:TargetArchitecture=wasm /p:Configuration=Debug", + "build": "dotnet build /p:TargetOS=browser /p:TargetArchitecture=wasm -c Debug", "tsc": "tsc -p ." }, "devDependencies": { diff --git a/src/mono/sample/wasm/node-webpack/README.md b/src/mono/sample/wasm/node-webpack/README.md index 55a28abfb13..f0de4a24f81 100644 --- a/src/mono/sample/wasm/node-webpack/README.md +++ b/src/mono/sample/wasm/node-webpack/README.md @@ -1,5 +1,5 @@ ## Sample for packaging dotnet.js via WebPack ``` -dotnet build /p:TargetOS=Browser /p:TargetArchitecture=wasm /p:Configuration=Debug /t:RunSample +dotnet build /p:TargetOS=browser /p:TargetArchitecture=wasm -c Debug /t:RunSample ``` \ No newline at end of file diff --git a/src/mono/sample/wasm/node-webpack/package.json b/src/mono/sample/wasm/node-webpack/package.json index 9484e6d8f71..0de8b127650 100644 --- a/src/mono/sample/wasm/node-webpack/package.json +++ b/src/mono/sample/wasm/node-webpack/package.json @@ -4,7 +4,7 @@ "license": "MIT", "main": "index.js", "scripts": { - "build": "dotnet build /p:TargetOS=Browser /p:TargetArchitecture=wasm /p:Configuration=Debug", + "build": "dotnet build /p:TargetOS=browser /p:TargetArchitecture=wasm -c Debug", "webpack": "webpack" }, "devDependencies": { diff --git a/src/mono/sample/wasm/wasm.mk b/src/mono/sample/wasm/wasm.mk index a2a49b0f93e..67c4fa36207 100644 --- a/src/mono/sample/wasm/wasm.mk +++ b/src/mono/sample/wasm/wasm.mk @@ -8,7 +8,7 @@ endif CONFIG?=Release -WASM_DEFAULT_BUILD_ARGS?=/p:TargetArchitecture=wasm /p:TargetOS=Browser /p:Configuration=$(CONFIG) +WASM_DEFAULT_BUILD_ARGS?=/p:TargetArchitecture=wasm /p:TargetOS=browser /p:Configuration=$(CONFIG) # we set specific headers to enable SharedArrayBuffer support in browsers for threading: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer#security_requirements CORS_HEADERS?= -h "Cross-Origin-Opener-Policy:same-origin" -h "Cross-Origin-Embedder-Policy:require-corp" diff --git a/src/mono/wasm/Makefile b/src/mono/wasm/Makefile index 9188f97550f..3914e46b821 100644 --- a/src/mono/wasm/Makefile +++ b/src/mono/wasm/Makefile @@ -17,7 +17,7 @@ EMSDK_PATH?=$(TOP)/src/mono/wasm/emsdk CONFIG?=Release BINDIR?=$(TOP)/artifacts/bin OBJDIR?=$(TOP)/artifacts/obj -_MSBUILD_WASM_BUILD_ARGS=/p:TargetOS=Browser /p:TargetArchitecture=wasm /p:Configuration=$(CONFIG) +_MSBUILD_WASM_BUILD_ARGS=/p:TargetOS=browser /p:TargetArchitecture=wasm /p:Configuration=$(CONFIG) XHARNESS_BROWSER?=chrome HELIX_TARGET_QUEUE?=Ubuntu.1804.Amd64.Open @@ -45,7 +45,7 @@ provision-wasm: .stamp-wasm-install-and-select-$(EMSCRIPTEN_VERSION) @echo "----------------------------------------------------------" @echo "Installed emsdk into EMSDK_PATH=$(TOP)/src/mono/wasm/emsdk" -MONO_OBJ_DIR=$(OBJDIR)/mono/Browser.wasm.$(CONFIG) +MONO_OBJ_DIR=$(OBJDIR)/mono/browser.wasm.$(CONFIG) BUILDS_OBJ_DIR=$(MONO_OBJ_DIR)/wasm clean-emsdk: @@ -59,20 +59,20 @@ clean-emsdk: .PHONY: build build: - EMSDK_PATH=$(EMSDK_PATH) $(TOP)/build.sh mono+libs.pretest -os Browser -c $(CONFIG) --binaryLog /p:ContinueOnError=false /p:StopOnFirstFailure=true $(MSBUILD_ARGS) + EMSDK_PATH=$(EMSDK_PATH) $(TOP)/build.sh mono+libs.pretest -os browser -c $(CONFIG) --binaryLog /p:ContinueOnError=false /p:StopOnFirstFailure=true $(MSBUILD_ARGS) build-all: - EMSDK_PATH=$(EMSDK_PATH) $(TOP)/build.sh mono+libs -os Browser -c $(CONFIG) --binaryLog /p:ContinueOnError=false /p:StopOnFirstFailure=true $(MSBUILD_ARGS) + EMSDK_PATH=$(EMSDK_PATH) $(TOP)/build.sh mono+libs -os browser -c $(CONFIG) --binaryLog /p:ContinueOnError=false /p:StopOnFirstFailure=true $(MSBUILD_ARGS) runtime: - EMSDK_PATH=$(EMSDK_PATH) $(TOP)/build.sh mono.runtime+mono.wasmruntime+libs.native+libs.pretest -os Browser -c $(CONFIG) /p:ContinueOnError=false /p:StopOnFirstFailure=true $(MSBUILD_ARGS) + EMSDK_PATH=$(EMSDK_PATH) $(TOP)/build.sh mono.runtime+mono.wasmruntime+libs.native+libs.pretest -os browser -c $(CONFIG) /p:ContinueOnError=false /p:StopOnFirstFailure=true $(MSBUILD_ARGS) # Rebuild only the mono runtime+cross compiler, don't build dotnet.wasm mono-runtime: - EMSDK_PATH=$(EMSDK_PATH) $(TOP)/build.sh mono.runtime+libs.native+libs.pretest -os Browser -c $(CONFIG) /p:ContinueOnError=false /p:StopOnFirstFailure=true $(MSBUILD_ARGS) + EMSDK_PATH=$(EMSDK_PATH) $(TOP)/build.sh mono.runtime+libs.native+libs.pretest -os browser -c $(CONFIG) /p:ContinueOnError=false /p:StopOnFirstFailure=true $(MSBUILD_ARGS) corlib: - EMSDK_PATH=$(EMSDK_PATH) $(TOP)/build.sh mono.corelib+mono.wasmruntime+libs.pretest -os Browser -c $(CONFIG) /p:ContinueOnError=false /p:StopOnFirstFailure=true $(MSBUILD_ARGS) + EMSDK_PATH=$(EMSDK_PATH) $(TOP)/build.sh mono.corelib+mono.wasmruntime+libs.pretest -os browser -c $(CONFIG) /p:ContinueOnError=false /p:StopOnFirstFailure=true $(MSBUILD_ARGS) test-runner: $(DOTNET) build $(TOP)/src/libraries/Common/tests/WasmTestRunner /p:Configuration=$(CONFIG) $(MSBUILD_ARGS) diff --git a/src/mono/wasm/README.md b/src/mono/wasm/README.md index bdc0ecda687..94dfc37ac53 100644 --- a/src/mono/wasm/README.md +++ b/src/mono/wasm/README.md @@ -41,7 +41,7 @@ If `EMSDK_PATH` is not set, the `emsdk` should be provisioned automatically duri * To build everything -`build.cmd -os Browser -subset mono+libs` in the repo top level directory. +`build.cmd -os browser -subset mono+libs` in the repo top level directory. # Running tests @@ -104,8 +104,8 @@ Library tests on windows can be run as described in [testing-libraries](https:// Examples of running tests for individual libraries: -`.\dotnet.cmd build /t:Test /p:TargetOS=Browser src\libraries\System.Collections.Concurrent\tests` -`.\dotnet.cmd build /t:Test /p:TargetOS=Browser /p:JSEngine="SpiderMonkey" src\libraries\System.Text.Json\tests` +`.\dotnet.cmd build /t:Test /p:TargetOS=browser src\libraries\System.Collections.Concurrent\tests` +`.\dotnet.cmd build /t:Test /p:TargetOS=browser /p:JSEngine="SpiderMonkey" src\libraries\System.Text.Json\tests` ### Browser tests on macOS diff --git a/src/mono/wasm/Wasm.Build.Tests/README.md b/src/mono/wasm/Wasm.Build.Tests/README.md index b1cba579760..3981c8a0f2a 100644 --- a/src/mono/wasm/Wasm.Build.Tests/README.md +++ b/src/mono/wasm/Wasm.Build.Tests/README.md @@ -13,7 +13,7 @@ being generated. - Running: Linux/macOS: `$ make -C src/mono/wasm run-build-tests` -Windows: `.\dotnet.cmd build .\src\mono\wasm\BuildWasmApps\Wasm.Build.Tests\Wasm.Build.Tests.csproj -c Release -t:Test -p:TargetOS=Browser -p:TargetArchitecture=wasm` +Windows: `.\dotnet.cmd build .\src\mono\wasm\BuildWasmApps\Wasm.Build.Tests\Wasm.Build.Tests.csproj -c Release -t:Test -p:TargetOS=browser -p:TargetArchitecture=wasm` - Specific tests can be run via `XUnitClassName`, and `XUnitMethodName` - eg. `XUnitClassName=Wasm.Build.Tests.BlazorWasmTests` diff --git a/src/mono/wasm/build/WasmApp.LocalBuild.props b/src/mono/wasm/build/WasmApp.LocalBuild.props index 6cbb86d94e7..4d6cfc2410c 100644 --- a/src/mono/wasm/build/WasmApp.LocalBuild.props +++ b/src/mono/wasm/build/WasmApp.LocalBuild.props @@ -38,7 +38,7 @@ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'MonoTargetsTasks', 'Debug', '$(_TargetFrameworkForNETCoreTasks)')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'mono', '$(TargetOS).$(TargetArchitecture).$(RuntimeConfig)')) - <_MonoAotCrossCompilerPath>$([MSBuild]::NormalizePath($(MonoArtifactsPath), 'cross', '$(TargetOS.ToLowerInvariant())-$(TargetArchitecture.ToLowerInvariant())', 'mono-aot-cross')) + <_MonoAotCrossCompilerPath>$([MSBuild]::NormalizePath($(MonoArtifactsPath), 'cross', '$(TargetOS)-$(TargetArchitecture.ToLowerInvariant())', 'mono-aot-cross')) <_MonoAotCrossCompilerPath Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">$(_MonoAotCrossCompilerPath).exe @@ -56,7 +56,7 @@ - + diff --git a/src/mono/wasm/build/WasmApp.props b/src/mono/wasm/build/WasmApp.props index 89ce6193cac..1b8b651d74c 100644 --- a/src/mono/wasm/build/WasmApp.props +++ b/src/mono/wasm/build/WasmApp.props @@ -1,7 +1,7 @@ wasm - Browser + browser browser-wasm true partial diff --git a/src/mono/wasm/debugger/tests/debugger-test/debugger-test.csproj b/src/mono/wasm/debugger/tests/debugger-test/debugger-test.csproj index f312b67ebca..7f6732875e3 100644 --- a/src/mono/wasm/debugger/tests/debugger-test/debugger-test.csproj +++ b/src/mono/wasm/debugger/tests/debugger-test/debugger-test.csproj @@ -81,7 +81,7 @@ @@ -95,7 +95,7 @@ + Condition="'$(TargetOS)' == 'browser'"> diff --git a/src/mono/wasm/wasm.proj b/src/mono/wasm/wasm.proj index b049dcfbabb..10b11cd843f 100644 --- a/src/mono/wasm/wasm.proj +++ b/src/mono/wasm/wasm.proj @@ -37,7 +37,7 @@ - + diff --git a/src/native/corehost/build.cmd b/src/native/corehost/build.cmd index 7a47bb9266d..3313ea53023 100644 --- a/src/native/corehost/build.cmd +++ b/src/native/corehost/build.cmd @@ -11,7 +11,7 @@ set __engNativeDir=%__sourceDir%\..\..\..\eng\native set __CMakeBinDir="" set __IntermediatesDir="" set __BuildArch=x64 -set __TargetOS=Windows +set __TargetOS=windows set CMAKE_BUILD_TYPE=Debug set __PortableBuild=0 set __ConfigureOnly=0 diff --git a/src/native/corehost/build.sh b/src/native/corehost/build.sh index f300b10f672..e48ab8cd287 100755 --- a/src/native/corehost/build.sh +++ b/src/native/corehost/build.sh @@ -12,7 +12,7 @@ __scriptpath="$(cd "$(dirname "$0")"; pwd -P)" __RepoRootDir="$(cd "$__scriptpath"/../../..; pwd -P)" __TargetArch=x64 -__TargetOS=Linux +__TargetOS=linux __BuildType=Debug __CMakeArgs="" __Compiler=clang diff --git a/src/native/libs/build-native.cmd b/src/native/libs/build-native.cmd index 1244f95b6a7..8585752889c 100644 --- a/src/native/libs/build-native.cmd +++ b/src/native/libs/build-native.cmd @@ -32,7 +32,7 @@ if /i [%1] == [wasm] ( set __BuildArch=wasm&&shift&goto Arg_Loop) if /i [%1] == [outconfig] ( set __outConfig=%2&&shift&&shift&goto Arg_Loop) -if /i [%1] == [Browser] ( set __TargetOS=Browser&&shift&goto Arg_Loop) +if /i [%1] == [browser] ( set __TargetOS=browser&&shift&goto Arg_Loop) if /i [%1] == [wasi] ( set __TargetOS=wasi&&shift&goto Arg_Loop) if /i [%1] == [rebuild] ( set __BuildTarget=rebuild&&shift&goto Arg_Loop) @@ -95,7 +95,7 @@ popd set __generatorArgs= if [%__Ninja%] == [1] ( set __generatorArgs= -) else if [%__TargetOS%] == [Browser] ( +) else if [%__TargetOS%] == [browser] ( set __generatorArgs= ) else if [%__TargetOS%] == [wasi] ( set __generatorArgs= diff --git a/src/native/libs/build-native.sh b/src/native/libs/build-native.sh index 39e0c59c5b3..f347ff69c6a 100755 --- a/src/native/libs/build-native.sh +++ b/src/native/libs/build-native.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -usage_list=("-outconfig: Configuration, typically a quadruplet such as 'net8.0-Linux-Release-x64', used to name output directory.") +usage_list=("-outconfig: Configuration, typically a quadruplet such as 'net8.0-linux-Release-x64', used to name output directory.") usage_list+=("-staticLibLink: Optional argument to statically link any native library.") __scriptpath="$(cd "$(dirname "$0")"; pwd -P)" @@ -27,7 +27,7 @@ handle_arguments() { # Set the various build properties here so that CMake and MSBuild can pick them up __TargetArch=x64 -__TargetOS=Linux +__TargetOS=linux __BuildType=Debug __CMakeArgs="" __Compiler=clang @@ -42,7 +42,7 @@ __VerboseBuild=false source "$__RepoRootDir"/eng/native/build-commons.sh # Set cross build -if [[ "$__TargetOS" == Browser ]]; then +if [[ "$__TargetOS" == browser ]]; then if [[ -z "$EMSDK_PATH" ]]; then if [[ -d "$__RepoRootDir"/src/mono/wasm/emsdk/ ]]; then export EMSDK_PATH="$__RepoRootDir"/src/mono/wasm/emsdk/ @@ -65,14 +65,14 @@ elif [[ "$__TargetOS" == wasi ]]; then export WASI_SDK_PATH="${WASI_SDK_PATH%/}/" export CLR_CC="$WASI_SDK_PATH"bin/clang export TARGET_BUILD_ARCH=wasm - __CMakeArgs="-DCLR_CMAKE_TARGET_OS=WASI -DCLR_CMAKE_TARGET_ARCH=wasm -DWASI_SDK_PREFIX=$WASI_SDK_PATH -DCMAKE_TOOLCHAIN_FILE=$WASI_SDK_PATH/share/cmake/wasi-sdk.cmake" -elif [[ "$__TargetOS" == iOS || "$__TargetOS" == iOSSimulator ]]; then + __CMakeArgs="-DCLR_CMAKE_TARGET_OS=wasi -DCLR_CMAKE_TARGET_ARCH=wasm -DWASI_SDK_PREFIX=$WASI_SDK_PATH -DCMAKE_TOOLCHAIN_FILE=$WASI_SDK_PATH/share/cmake/wasi-sdk.cmake" +elif [[ "$__TargetOS" == ios || "$__TargetOS" == iossimulator ]]; then # nothing to do here true -elif [[ "$__TargetOS" == tvOS || "$__TargetOS" == tvOSSimulator ]]; then +elif [[ "$__TargetOS" == tvos || "$__TargetOS" == tvossimulator ]]; then # nothing to do here true -elif [[ "$__TargetOS" == Android && -z "$ROOTFS_DIR" ]]; then +elif [[ "$__TargetOS" == android && -z "$ROOTFS_DIR" ]]; then # nothing to do here true else @@ -85,13 +85,13 @@ else fi fi -if [[ "$__TargetOS" == Android && -z "$ROOTFS_DIR" ]]; then +if [[ "$__TargetOS" == android && -z "$ROOTFS_DIR" ]]; then # Android SDK defaults to c++_static; we only need C support __CMakeArgs="-DANDROID_STL=none $__CMakeArgs" elif [[ "$__TargetOS" == linux-bionic && -z "$ROOTFS_DIR" ]]; then # Android SDK defaults to c++_static; we only need C support __CMakeArgs="-DFORCE_ANDROID_OPENSSL=1 -DANDROID_STL=none $__CMakeArgs" -elif [[ "$__TargetOS" == iOSSimulator ]]; then +elif [[ "$__TargetOS" == iossimulator ]]; then # set default iOS simulator deployment target # keep in sync with src/mono/Directory.Build.props __CMakeArgs="-DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator -DCMAKE_OSX_DEPLOYMENT_TARGET=10.0 $__CMakeArgs" @@ -102,10 +102,10 @@ elif [[ "$__TargetOS" == iOSSimulator ]]; then elif [[ "$__TargetArch" == arm64 ]]; then __CMakeArgs="-DCMAKE_OSX_ARCHITECTURES=\"arm64\" $__CMakeArgs" else - echo "Error: Unknown iOSSimulator architecture $__TargetArch." + echo "Error: Unknown iossimulator architecture $__TargetArch." exit 1 fi -elif [[ "$__TargetOS" == iOS ]]; then +elif [[ "$__TargetOS" == ios ]]; then # set default iOS device deployment target # keep in sync with src/mono/Directory.Build.props __CMakeArgs="-DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DCMAKE_OSX_DEPLOYMENT_TARGET=10.0 $__CMakeArgs" @@ -114,10 +114,10 @@ elif [[ "$__TargetOS" == iOS ]]; then elif [[ "$__TargetArch" == arm ]]; then __CMakeArgs="-DCMAKE_OSX_ARCHITECTURES=\"armv7;armv7s\" $__CMakeArgs" else - echo "Error: Unknown iOS architecture $__TargetArch." + echo "Error: Unknown ios architecture $__TargetArch." exit 1 fi -elif [[ "$__TargetOS" == tvOSSimulator ]]; then +elif [[ "$__TargetOS" == tvossimulator ]]; then # set default tvOS simulator deployment target # keep in sync with src/mono/Directory.Build.props __CMakeArgs="-DCMAKE_SYSTEM_NAME=tvOS -DCMAKE_OSX_SYSROOT=appletvsimulator -DCMAKE_OSX_DEPLOYMENT_TARGET=10.0 $__CMakeArgs" @@ -126,17 +126,17 @@ elif [[ "$__TargetOS" == tvOSSimulator ]]; then elif [[ "$__TargetArch" == arm64 ]]; then __CMakeArgs="-DCMAKE_OSX_ARCHITECTURES=\"arm64\" $__CMakeArgs" else - echo "Error: Unknown tvOSSimulator architecture $__TargetArch." + echo "Error: Unknown tvossimulator architecture $__TargetArch." exit 1 fi -elif [[ "$__TargetOS" == tvOS ]]; then +elif [[ "$__TargetOS" == tvos ]]; then # set default tvOS device deployment target # keep in sync with src/mono/Directory.Build.props __CMakeArgs="-DCMAKE_SYSTEM_NAME=tvOS -DCMAKE_OSX_SYSROOT=appletvos -DCMAKE_OSX_DEPLOYMENT_TARGET=10.0 $__CMakeArgs" if [[ "$__TargetArch" == arm64 ]]; then __CMakeArgs="-DCMAKE_OSX_ARCHITECTURES=\"arm64\" $__CMakeArgs" else - echo "Error: Unknown tvOS architecture $__TargetArch." + echo "Error: Unknown tvos architecture $__TargetArch." exit 1 fi fi diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.props b/src/tasks/AotCompilerTask/MonoAOTCompiler.props index 6ef2f973eb8..97f84e34beb 100644 --- a/src/tasks/AotCompilerTask/MonoAOTCompiler.props +++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.props @@ -1,29 +1,29 @@ - - - + + + - - + + - + - + - + - + @@ -32,7 +32,7 @@ - + diff --git a/src/tests/Common/CLRTest.Execute.Bash.targets b/src/tests/Common/CLRTest.Execute.Bash.targets index c240fd2e564..27557752e31 100644 --- a/src/tests/Common/CLRTest.Execute.Bash.targets +++ b/src/tests/Common/CLRTest.Execute.Bash.targets @@ -302,7 +302,7 @@ $__Command msbuild $CORE_ROOT/wasm-test-runner/WasmTestRunner.proj /p:NetCoreApp ]]> - + - + - + - + - + - + - + diff --git a/src/tests/Common/CLRTest.Execute.Batch.targets b/src/tests/Common/CLRTest.Execute.Batch.targets index 5fa714cb5dd..db74a66be45 100644 --- a/src/tests/Common/CLRTest.Execute.Batch.targets +++ b/src/tests/Common/CLRTest.Execute.Batch.targets @@ -294,7 +294,7 @@ REM Local CoreShim requested - see MSBuild property 'CLRTestScriptLocalCoreShim' ECHO Copying '%CORE_ROOT%\CoreShim.dll'... COPY /y %CORE_ROOT%\CoreShim.dll . ]]> - + - + false - true + true $(scriptPath)__jit_disasm.out $(scriptPath)__jit_disasm_list.out diff --git a/src/tests/Common/Directory.Build.targets b/src/tests/Common/Directory.Build.targets index b3d05df7e69..c7386e7de33 100644 --- a/src/tests/Common/Directory.Build.targets +++ b/src/tests/Common/Directory.Build.targets @@ -13,7 +13,7 @@ false true - true + true false true diff --git a/src/tests/Common/helixpublishwitharcade.proj b/src/tests/Common/helixpublishwitharcade.proj index 8a0edff8334..c129179b999 100644 --- a/src/tests/Common/helixpublishwitharcade.proj +++ b/src/tests/Common/helixpublishwitharcade.proj @@ -104,7 +104,7 @@ SuperPmiCollect=$(_SuperPmiCollect) - <_PropertiesToPass Condition="'$(TargetOS)' == 'Browser' Or '$(TargetsAndroid)' == 'true'"> + <_PropertiesToPass Condition="'$(TargetOS)' == 'browser' Or '$(TargetsAndroid)' == 'true'"> $(_PropertiesToPass); IncludeDotNetCli=$(IncludeDotNetCli); DotNetCliRuntime=$(DotNetCliRuntime); @@ -150,12 +150,12 @@ $(TargetOS)$(TargetOSSubgroup) win-$(TargetArchitecture) - osx-$(TargetArchitecture) - linux-$(TargetArchitecture) - linux-musl-$(TargetArchitecture) - browser-wasm - android-$(TargetArchitecture) - iossimulator-$(TargetArchitecture) + osx-$(TargetArchitecture) + linux-$(TargetArchitecture) + linux-musl-$(TargetArchitecture) + browser-wasm + android-$(TargetArchitecture) + iossimulator-$(TargetArchitecture) diff --git a/src/tests/Common/scripts/bringup_runtest.sh b/src/tests/Common/scripts/bringup_runtest.sh index f3dd10250ba..24d6a0cb72a 100755 --- a/src/tests/Common/scripts/bringup_runtest.sh +++ b/src/tests/Common/scripts/bringup_runtest.sh @@ -728,12 +728,12 @@ function run_test { } # Get the number of processors available to the scheduler -platform="$(uname)" -if [[ "$platform" == "FreeBSD" ]]; then +platform="$(uname -s | tr '[:upper:]' '[:lower:]')" +if [[ "$platform" == "freebsd" ]]; then NumProc="$(($(sysctl -n hw.ncpu)+1))" -elif [[ "$platform" == "NetBSD" || "$platform" == "SunOS" ]]; then +elif [[ "$platform" == "netbsd" || "$platform" == "sunos" ]]; then NumProc="$(($(getconf NPROCESSORS_ONLN)+1))" -elif [[ "$platform" == "Darwin" ]]; then +elif [[ "$platform" == "darwin" ]]; then NumProc="$(($(getconf _NPROCESSORS_ONLN)+1))" elif command -v nproc > /dev/null 2>&1; then NumProc="$(nproc)" diff --git a/src/tests/Common/scripts/crossgen2_comparison.py b/src/tests/Common/scripts/crossgen2_comparison.py index d63dd835f00..57cb7be1c17 100644 --- a/src/tests/Common/scripts/crossgen2_comparison.py +++ b/src/tests/Common/scripts/crossgen2_comparison.py @@ -22,15 +22,15 @@ # The following command # # ~/git/coreclr$ python tests/scripts/crossgen_comparison.py crossgen_corelib -# --crossgen artifacts/bin/coreclr/Linux.arm.Checked/crossgen -# --il_corelib artifacts/bin/coreclr/Linux.arm.Checked/IL/System.Private.CoreLib.dll -# --result_dir Linux.arm_arm.Checked +# --crossgen artifacts/bin/coreclr/linux.arm.Checked/crossgen +# --il_corelib artifacts/bin/coreclr/linux.arm.Checked/IL/System.Private.CoreLib.dll +# --result_dir linux.arm_arm.Checked # # runs Hostarm/arm crossgen on System.Private.CoreLib.dll and puts all the -# information in files Linux.arm_arm.Checked/System.Private.CoreLib-NativeOrReadyToRunImage.json +# information in files linux.arm_arm.Checked/System.Private.CoreLib-NativeOrReadyToRunImage.json # and System.Private.CoreLib-DebuggingFile.json # -# ~/git/coreclr$ cat Linux.arm_arm.Checked/System.Private.CoreLib-NativeOrReadyToRunImage.json +# ~/git/coreclr$ cat linux.arm_arm.Checked/System.Private.CoreLib-NativeOrReadyToRunImage.json # { # "AssemblyName": "System.Private.CoreLib", # "ReturnCode": 0, @@ -43,7 +43,7 @@ # "OutputFileSizeInBytes": 9564160 # } # -# ~/git/coreclr$ cat Linux.x64_arm.Checked/System.Private.CoreLib-DebuggingFile.json +# ~/git/coreclr$ cat linux.x64_arm.Checked/System.Private.CoreLib-DebuggingFile.json # { # "ReturnCode": 0, # "StdOut": [ @@ -59,16 +59,16 @@ # The following command # # ~/git/coreclr$ python tests/scripts/crossgen_comparison.py crossgen_dotnet_sdk -# --crossgen artifacts/bin/coreclr/Linux.arm.Checked/x64/crossgen -# --il_corelib artifacts/bin/coreclr/Linux.arm.Checked/IL/System.Private.CoreLib.dll +# --crossgen artifacts/bin/coreclr/linux.arm.Checked/x64/crossgen +# --il_corelib artifacts/bin/coreclr/linux.arm.Checked/IL/System.Private.CoreLib.dll # --dotnet_sdk dotnet-sdk-latest-linux-arm.tar.gz -# --result_dir Linux.x64_arm.Checked +# --result_dir linux.x64_arm.Checked # # runs Hostx64/arm crossgen on System.Private.CoreLib.dll in artifacts/Product and on # all the assemblies inside dotnet-sdk-latest-linux-arm.tar.gz and stores the -# collected information in directory Linux.x64_arm.Checked +# collected information in directory linux.x64_arm.Checked # -# ~/git/coreclr$ ls Linux.x64_arm.Checked | head +# ~/git/coreclr$ ls linux.x64_arm.Checked | head # Microsoft.AI.DependencyCollector.dll.json # Microsoft.ApplicationInsights.AspNetCore.dll.json # Microsoft.ApplicationInsights.dll.json @@ -83,8 +83,8 @@ # The following command # # ~/git/coreclr$ python -u tests/scripts/crossgen_comparison.py compare -# --base_dir Linux.x64_arm.Checked -# --diff_dir Linux.x86_arm.Checked +# --base_dir linux.x64_arm.Checked +# --diff_dir linux.x86_arm.Checked # # compares the results of Hostx64/arm crossgen and Hostx86/arm crossgen. ################################################################################ diff --git a/src/tests/Common/scripts/run-gc-reliability-framework.sh b/src/tests/Common/scripts/run-gc-reliability-framework.sh index c634fbbb114..eda4d70bde2 100755 --- a/src/tests/Common/scripts/run-gc-reliability-framework.sh +++ b/src/tests/Common/scripts/run-gc-reliability-framework.sh @@ -1,29 +1,29 @@ #!/usr/bin/env bash -OSName=$(uname -s) +OSName=$(uname -s | tr '[:upper:]' '[:lower:]') case $OSName in - Darwin) - OS=OSX + darwin) + OS=osx ;; - FreeBSD) - OS=FreeBSD + freeBSD) + OS=freebsd ;; - Linux) - OS=Linux + linux) + OS=linux ;; - NetBSD) - OS=NetBSD + netbsd) + OS=netbsd ;; - SunOS) - OS=SunOS + sunos) + OS=sunos ;; *) echo "Unsupported OS $OSName detected, configuring as if for Linux" - OS=Linux + OS=linux ;; esac diff --git a/src/tests/Common/tests.targets b/src/tests/Common/tests.targets index 4ec5bb08044..3eb9b10fb8e 100644 --- a/src/tests/Common/tests.targets +++ b/src/tests/Common/tests.targets @@ -57,8 +57,8 @@ $(CORE_ROOT)\xunit\xunit.console.dll - -parallel none - -parallel $(ParallelRun) + -parallel none + -parallel $(ParallelRun) $(XunitArgs) -html $(__TestRunHtmlLog) $(XunitArgs) -xml $(__TestRunXmlLog) $(XunitArgs) @(IncludeTraitsItems->'-trait %(Identity)', ' ') diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props index 281c43fd390..d09ffadace1 100644 --- a/src/tests/Directory.Build.props +++ b/src/tests/Directory.Build.props @@ -79,7 +79,7 @@ false false - true + true false true @@ -145,7 +145,7 @@ - true + true C# F# IL @@ -176,7 +176,7 @@ false - true + true sh cmd @@ -188,7 +188,7 @@ 2.1.0-preview3-26416-01 - + /p:MSBuildEnableWorkloadResolver=false /p:Configuration=$(Configuration) diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets index 7fde247fea5..29b8159ce3a 100644 --- a/src/tests/Directory.Build.targets +++ b/src/tests/Directory.Build.targets @@ -180,7 +180,7 @@ + Condition="'@(NativeProjectBinaries)' == '' And '$(TargetOS)' != 'browser' And '$(TargetOS)' != 'android' And '$(TargetOS)' != 'ios' And '$(TargetOS)' != 'iossimulator'"/> - $ORIGIN/.. - @executable_path/.. + $ORIGIN/.. + @executable_path/.. diff --git a/src/tests/FunctionalTests/Directory.Build.props b/src/tests/FunctionalTests/Directory.Build.props index ca9552dc781..78b1b08bbbf 100644 --- a/src/tests/FunctionalTests/Directory.Build.props +++ b/src/tests/FunctionalTests/Directory.Build.props @@ -16,7 +16,7 @@ - + false false @@ -25,19 +25,19 @@ - + false false - + false true false false false - true + true false false diff --git a/src/tests/FunctionalTests/WebAssembly/Browser/HotReload/WebAssembly.Browser.HotReload.Test.csproj b/src/tests/FunctionalTests/WebAssembly/Browser/HotReload/WebAssembly.Browser.HotReload.Test.csproj index cd0aa2d29c8..178befbaed9 100644 --- a/src/tests/FunctionalTests/WebAssembly/Browser/HotReload/WebAssembly.Browser.HotReload.Test.csproj +++ b/src/tests/FunctionalTests/WebAssembly/Browser/HotReload/WebAssembly.Browser.HotReload.Test.csproj @@ -24,7 +24,7 @@ @@ -36,7 +36,7 @@ + Condition="'$(TargetOS)' == 'browser'"> diff --git a/src/tests/FunctionalTests/iOS/Device/AOT-LLVM/iOS.Device.Aot-Llvm.Test.csproj b/src/tests/FunctionalTests/iOS/Device/AOT-LLVM/iOS.Device.Aot-Llvm.Test.csproj index d9b860872c0..e4d28d62359 100644 --- a/src/tests/FunctionalTests/iOS/Device/AOT-LLVM/iOS.Device.Aot-Llvm.Test.csproj +++ b/src/tests/FunctionalTests/iOS/Device/AOT-LLVM/iOS.Device.Aot-Llvm.Test.csproj @@ -6,7 +6,7 @@ true true $(NetCoreAppCurrent) - iOS + ios iOS.Device.Aot-Llvm.Test.dll false 42 diff --git a/src/tests/FunctionalTests/iOS/Simulator/AOT-LLVM/iOS.Simulator.Aot-Llvm.Test.csproj b/src/tests/FunctionalTests/iOS/Simulator/AOT-LLVM/iOS.Simulator.Aot-Llvm.Test.csproj index 79e1cf744b5..c5f6be1a98c 100644 --- a/src/tests/FunctionalTests/iOS/Simulator/AOT-LLVM/iOS.Simulator.Aot-Llvm.Test.csproj +++ b/src/tests/FunctionalTests/iOS/Simulator/AOT-LLVM/iOS.Simulator.Aot-Llvm.Test.csproj @@ -6,7 +6,7 @@ true true $(NetCoreAppCurrent) - iOSSimulator + iossimulator iOS.Simulator.Aot-Llvm.Test.dll false 42 diff --git a/src/tests/FunctionalTests/iOS/Simulator/AOT/iOS.Simulator.Aot.Test.csproj b/src/tests/FunctionalTests/iOS/Simulator/AOT/iOS.Simulator.Aot.Test.csproj index ffaacba0b2d..201549b23c2 100644 --- a/src/tests/FunctionalTests/iOS/Simulator/AOT/iOS.Simulator.Aot.Test.csproj +++ b/src/tests/FunctionalTests/iOS/Simulator/AOT/iOS.Simulator.Aot.Test.csproj @@ -6,7 +6,7 @@ true true $(NetCoreAppCurrent) - iOSSimulator + iossimulator iOS.Simulator.Aot.Test.dll false 42 diff --git a/src/tests/FunctionalTests/iOS/Simulator/Interpreter/iOS.Simulator.Interpreter.Test.csproj b/src/tests/FunctionalTests/iOS/Simulator/Interpreter/iOS.Simulator.Interpreter.Test.csproj index 1375f924693..8a39086e1e1 100644 --- a/src/tests/FunctionalTests/iOS/Simulator/Interpreter/iOS.Simulator.Interpreter.Test.csproj +++ b/src/tests/FunctionalTests/iOS/Simulator/Interpreter/iOS.Simulator.Interpreter.Test.csproj @@ -5,7 +5,7 @@ false true $(NetCoreAppCurrent) - iOSSimulator + iossimulator iOS.Simulator.Interpreter.Test.dll false 42 diff --git a/src/tests/FunctionalTests/iOS/Simulator/InvariantCultureOnlyMode/iOS.Simulator.InvariantCultureOnlyMode.Test.csproj b/src/tests/FunctionalTests/iOS/Simulator/InvariantCultureOnlyMode/iOS.Simulator.InvariantCultureOnlyMode.Test.csproj index e19f6fe8a57..92c1e888560 100644 --- a/src/tests/FunctionalTests/iOS/Simulator/InvariantCultureOnlyMode/iOS.Simulator.InvariantCultureOnlyMode.Test.csproj +++ b/src/tests/FunctionalTests/iOS/Simulator/InvariantCultureOnlyMode/iOS.Simulator.InvariantCultureOnlyMode.Test.csproj @@ -6,7 +6,7 @@ true true $(NetCoreAppCurrent) - iOSSimulator + iossimulator iOS.Simulator.InvariantCultureOnlyMode.Test.dll false 42 diff --git a/src/tests/FunctionalTests/iOS/Simulator/LambdaCompilerAOT/iOS.Simulator.LambdaCompilerAot.Test.csproj b/src/tests/FunctionalTests/iOS/Simulator/LambdaCompilerAOT/iOS.Simulator.LambdaCompilerAot.Test.csproj index 5041a48ab71..59aea45cbe0 100644 --- a/src/tests/FunctionalTests/iOS/Simulator/LambdaCompilerAOT/iOS.Simulator.LambdaCompilerAot.Test.csproj +++ b/src/tests/FunctionalTests/iOS/Simulator/LambdaCompilerAOT/iOS.Simulator.LambdaCompilerAot.Test.csproj @@ -6,7 +6,7 @@ true true $(NetCoreAppCurrent) - iOSSimulator + iossimulator iOS.Simulator.LambdaCompilerAot.Test.dll false 42 diff --git a/src/tests/FunctionalTests/iOS/Simulator/PInvoke/iOS.Simulator.PInvoke.Test.csproj b/src/tests/FunctionalTests/iOS/Simulator/PInvoke/iOS.Simulator.PInvoke.Test.csproj index 0d8a4b91276..47e536a995e 100644 --- a/src/tests/FunctionalTests/iOS/Simulator/PInvoke/iOS.Simulator.PInvoke.Test.csproj +++ b/src/tests/FunctionalTests/iOS/Simulator/PInvoke/iOS.Simulator.PInvoke.Test.csproj @@ -5,7 +5,7 @@ false true $(NetCoreAppCurrent) - iOSSimulator + iossimulator iOS.Simulator.PInvoke.Test.dll false 42 diff --git a/src/tests/FunctionalTests/iOS/Simulator/XmlFormatWriterGeneratorAOT/iOS.Simulator.XmlFormatWriterGeneratorAot.Test.csproj b/src/tests/FunctionalTests/iOS/Simulator/XmlFormatWriterGeneratorAOT/iOS.Simulator.XmlFormatWriterGeneratorAot.Test.csproj index f90a6db6b83..6f72500c949 100644 --- a/src/tests/FunctionalTests/iOS/Simulator/XmlFormatWriterGeneratorAOT/iOS.Simulator.XmlFormatWriterGeneratorAot.Test.csproj +++ b/src/tests/FunctionalTests/iOS/Simulator/XmlFormatWriterGeneratorAOT/iOS.Simulator.XmlFormatWriterGeneratorAot.Test.csproj @@ -6,7 +6,7 @@ true true $(NetCoreAppCurrent) - iOSSimulator + iossimulator iOS.Simulator.XmlFormatWriterGeneratorAot.Test.dll false 42 diff --git a/src/tests/FunctionalTests/iOS/Simulator/XmlSerializer_Deserialize/iOS.Simulator.XmlSerializer_Deserialize.Test.csproj b/src/tests/FunctionalTests/iOS/Simulator/XmlSerializer_Deserialize/iOS.Simulator.XmlSerializer_Deserialize.Test.csproj index 352b14c84b6..b70323c49ca 100644 --- a/src/tests/FunctionalTests/iOS/Simulator/XmlSerializer_Deserialize/iOS.Simulator.XmlSerializer_Deserialize.Test.csproj +++ b/src/tests/FunctionalTests/iOS/Simulator/XmlSerializer_Deserialize/iOS.Simulator.XmlSerializer_Deserialize.Test.csproj @@ -6,7 +6,7 @@ true true $(NetCoreAppCurrent) - iOSSimulator + iossimulator iOS.Simulator.XmlSerializer_Deserialize.Test.dll false 42 diff --git a/src/tests/FunctionalTests/tvOS/Device/AOT-LLVM/tvOS.Device.Aot-Llvm.Test.csproj b/src/tests/FunctionalTests/tvOS/Device/AOT-LLVM/tvOS.Device.Aot-Llvm.Test.csproj index 148ed610058..2cdbe1ddf13 100644 --- a/src/tests/FunctionalTests/tvOS/Device/AOT-LLVM/tvOS.Device.Aot-Llvm.Test.csproj +++ b/src/tests/FunctionalTests/tvOS/Device/AOT-LLVM/tvOS.Device.Aot-Llvm.Test.csproj @@ -6,7 +6,7 @@ true true $(NetCoreAppCurrent) - tvOS + tvos tvOS.Device.Aot-Llvm.Test.dll false 42 diff --git a/src/tests/JIT/Directed/StructABI/StructABI.csproj b/src/tests/JIT/Directed/StructABI/StructABI.csproj index d07138dc040..f56c320ec48 100644 --- a/src/tests/JIT/Directed/StructABI/StructABI.csproj +++ b/src/tests/JIT/Directed/StructABI/StructABI.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj index 9e996f24f8e..78073132763 100644 --- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj +++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_r.csproj @@ -2,7 +2,7 @@ true 20 - true + true true diff --git a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj index b578af1d705..c926b276bad 100644 --- a/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj +++ b/src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_ro.csproj @@ -2,7 +2,7 @@ true 20 - true + true true diff --git a/src/tests/JIT/Methodical/tailcall_v4/hijacking.ilproj b/src/tests/JIT/Methodical/tailcall_v4/hijacking.ilproj index 0094f3400d5..922046e4f02 100644 --- a/src/tests/JIT/Methodical/tailcall_v4/hijacking.ilproj +++ b/src/tests/JIT/Methodical/tailcall_v4/hijacking.ilproj @@ -2,7 +2,7 @@ true - true + true true true diff --git a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99969/b99969.csproj b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99969/b99969.csproj index 3b217db87e0..65fb1d576b1 100644 --- a/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99969/b99969.csproj +++ b/src/tests/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99969/b99969.csproj @@ -4,7 +4,7 @@ true Exe - true + true PdbOnly diff --git a/src/tests/JIT/jit64/opt/cse/VolatileTest_op_add.csproj b/src/tests/JIT/jit64/opt/cse/VolatileTest_op_add.csproj index b0c5f1e8027..28762628643 100644 --- a/src/tests/JIT/jit64/opt/cse/VolatileTest_op_add.csproj +++ b/src/tests/JIT/jit64/opt/cse/VolatileTest_op_add.csproj @@ -3,7 +3,7 @@ Exe 1 - true + true diff --git a/src/tests/JIT/jit64/opt/cse/VolatileTest_op_and.csproj b/src/tests/JIT/jit64/opt/cse/VolatileTest_op_and.csproj index 8e4d07d868c..b085c257e6d 100644 --- a/src/tests/JIT/jit64/opt/cse/VolatileTest_op_and.csproj +++ b/src/tests/JIT/jit64/opt/cse/VolatileTest_op_and.csproj @@ -3,7 +3,7 @@ Exe 1 - true + true diff --git a/src/tests/JIT/jit64/opt/cse/VolatileTest_op_div.csproj b/src/tests/JIT/jit64/opt/cse/VolatileTest_op_div.csproj index 6d476413fa7..944edb3d584 100644 --- a/src/tests/JIT/jit64/opt/cse/VolatileTest_op_div.csproj +++ b/src/tests/JIT/jit64/opt/cse/VolatileTest_op_div.csproj @@ -3,7 +3,7 @@ Exe 1 - true + true diff --git a/src/tests/JIT/jit64/opt/cse/VolatileTest_op_mod.csproj b/src/tests/JIT/jit64/opt/cse/VolatileTest_op_mod.csproj index 171821831ce..07d0394c252 100644 --- a/src/tests/JIT/jit64/opt/cse/VolatileTest_op_mod.csproj +++ b/src/tests/JIT/jit64/opt/cse/VolatileTest_op_mod.csproj @@ -3,7 +3,7 @@ Exe 1 - true + true diff --git a/src/tests/JIT/jit64/opt/cse/VolatileTest_op_mul.csproj b/src/tests/JIT/jit64/opt/cse/VolatileTest_op_mul.csproj index c4f2c4832f4..a9c8c4769c3 100644 --- a/src/tests/JIT/jit64/opt/cse/VolatileTest_op_mul.csproj +++ b/src/tests/JIT/jit64/opt/cse/VolatileTest_op_mul.csproj @@ -2,7 +2,7 @@ Exe - true + true diff --git a/src/tests/JIT/jit64/opt/cse/VolatileTest_op_or.csproj b/src/tests/JIT/jit64/opt/cse/VolatileTest_op_or.csproj index 015f8773495..60afd232745 100644 --- a/src/tests/JIT/jit64/opt/cse/VolatileTest_op_or.csproj +++ b/src/tests/JIT/jit64/opt/cse/VolatileTest_op_or.csproj @@ -3,7 +3,7 @@ Exe 1 - true + true diff --git a/src/tests/JIT/jit64/opt/cse/VolatileTest_op_shr.csproj b/src/tests/JIT/jit64/opt/cse/VolatileTest_op_shr.csproj index 2e959f5dd7e..cbe54859968 100644 --- a/src/tests/JIT/jit64/opt/cse/VolatileTest_op_shr.csproj +++ b/src/tests/JIT/jit64/opt/cse/VolatileTest_op_shr.csproj @@ -3,7 +3,7 @@ Exe 1 - true + true diff --git a/src/tests/JIT/jit64/opt/cse/VolatileTest_op_sub.csproj b/src/tests/JIT/jit64/opt/cse/VolatileTest_op_sub.csproj index b776d8922f4..e7b5afc8209 100644 --- a/src/tests/JIT/jit64/opt/cse/VolatileTest_op_sub.csproj +++ b/src/tests/JIT/jit64/opt/cse/VolatileTest_op_sub.csproj @@ -3,7 +3,7 @@ Exe 1 - true + true diff --git a/src/tests/JIT/jit64/opt/cse/VolatileTest_op_xor.csproj b/src/tests/JIT/jit64/opt/cse/VolatileTest_op_xor.csproj index 20b340b6e19..9c3215821bb 100644 --- a/src/tests/JIT/jit64/opt/cse/VolatileTest_op_xor.csproj +++ b/src/tests/JIT/jit64/opt/cse/VolatileTest_op_xor.csproj @@ -3,7 +3,7 @@ Exe 1 - true + true diff --git a/src/tests/JIT/superpmi/runtests.sh b/src/tests/JIT/superpmi/runtests.sh index 81ea1713e6f..06c2fbe7bef 100644 --- a/src/tests/JIT/superpmi/runtests.sh +++ b/src/tests/JIT/superpmi/runtests.sh @@ -23,8 +23,8 @@ CORECLRROOT=~/src/coreclr COREFXROOT=~/src/corefx WINDOWSCORECLRROOT=~/WindowsMachine/coreclr WINDOWSFLAVOR=windows.x64.Debug -UNIXANYFLAVOR=OSX.AnyCPU.Debug -UNIXARCHFLAVOR=OSX.x64.Debug +UNIXANYFLAVOR=osx.AnyCPU.Debug +UNIXARCHFLAVOR=osx.x64.Debug ARGS="\ --testRootDir=${TESTROOT}/${WINDOWSFLAVOR} \ diff --git a/src/tests/JIT/superpmi/superpmicollect.csproj b/src/tests/JIT/superpmi/superpmicollect.csproj index ed252f5785a..927f4ab0167 100644 --- a/src/tests/JIT/superpmi/superpmicollect.csproj +++ b/src/tests/JIT/superpmi/superpmicollect.csproj @@ -12,7 +12,7 @@ true - true + true Full diff --git a/src/tests/Loader/binding/assemblies/assemblybugs/37910/Ii.csproj b/src/tests/Loader/binding/assemblies/assemblybugs/37910/Ii.csproj index 325554801b3..5b09e9e5cc3 100644 --- a/src/tests/Loader/binding/assemblies/assemblybugs/37910/Ii.csproj +++ b/src/tests/Loader/binding/assemblies/assemblybugs/37910/Ii.csproj @@ -3,7 +3,7 @@ Exe 1 - true + true diff --git a/src/tests/baseservices/TieredCompilation/BasicTestWithMcj.csproj b/src/tests/baseservices/TieredCompilation/BasicTestWithMcj.csproj index 324e64fe7db..e2b03a1e23e 100644 --- a/src/tests/baseservices/TieredCompilation/BasicTestWithMcj.csproj +++ b/src/tests/baseservices/TieredCompilation/BasicTestWithMcj.csproj @@ -4,7 +4,7 @@ true true - true + true diff --git a/src/tests/build.proj b/src/tests/build.proj index 63b799dc835..e156a911555 100644 --- a/src/tests/build.proj +++ b/src/tests/build.proj @@ -568,7 +568,7 @@ + Condition="'$(__BuildTestWrappersOnly)' != '1' and '$(__GenerateLayoutOnly)' != '1' and '$(__CopyNativeTestBinaries)' != '1' and ('$(TargetOS)' == 'ios' or '$(TargetOS)' == 'iossimulator')" /> /dev/null 2>&1; then __NumProc="$(nproc)" diff --git a/src/tests/ilasm/System/Runtime/CompilerServices/MethodImplOptionsTests.csproj b/src/tests/ilasm/System/Runtime/CompilerServices/MethodImplOptionsTests.csproj index 4b156e7bcbc..a7fdfc08922 100644 --- a/src/tests/ilasm/System/Runtime/CompilerServices/MethodImplOptionsTests.csproj +++ b/src/tests/ilasm/System/Runtime/CompilerServices/MethodImplOptionsTests.csproj @@ -2,7 +2,7 @@ Exe - true + true diff --git a/src/tests/issues.targets b/src/tests/issues.targets index 2dab7ef85c9..351c72c3ca0 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -3712,7 +3712,7 @@ - + No crossgen folder under Core_Root @@ -3910,13 +3910,13 @@ - + https://github.com/dotnet/runtime/issues/52781 - + missing assembly @@ -4175,7 +4175,7 @@ - + mobile and wasm don't support tests with native libraries. wasm also needs static linking diff --git a/src/tests/profiler/transitions/transitions.csproj b/src/tests/profiler/transitions/transitions.csproj index 1a85e4fd2da..ad51d8f96dc 100644 --- a/src/tests/profiler/transitions/transitions.csproj +++ b/src/tests/profiler/transitions/transitions.csproj @@ -9,7 +9,7 @@ context, locals in this loop prevent unloading --> true - true + true diff --git a/src/tests/run.py b/src/tests/run.py index 6eb87775938..0680248f63b 100755 --- a/src/tests/run.py +++ b/src/tests/run.py @@ -644,9 +644,9 @@ def setup_coredump_generation(host_os): """ global coredump_pattern - if host_os == "OSX": + if host_os == "osx": coredump_pattern = subprocess.check_output("sysctl -n kern.corefile", shell=True).rstrip() - elif host_os == "Linux": + elif host_os == "linux": with open("/proc/sys/kernel/core_pattern", "r") as f: coredump_pattern = f.read().rstrip() else: @@ -688,7 +688,7 @@ def setup_coredump_generation(host_os): print("CoreDump generation enabled") - if host_os == "Linux" and os.path.isfile("/proc/self/coredump_filter"): + if host_os == "linux" and os.path.isfile("/proc/self/coredump_filter"): # Include memory in private and shared file-backed mappings in the dump. # This ensures that we can see disassembly from our shared libraries when # inspecting the contents of the dump. See 'man core' for details. @@ -720,9 +720,9 @@ def print_info_from_coredump_file(host_os, arch, coredump_name, executable_name) command = "" - if host_os == "OSX": + if host_os == "osx": command = "lldb -c %s -b -o 'bt all' -o 'disassemble -b -p'" % coredump_name - elif host_os == "Linux": + elif host_os == "linux": command = "gdb --batch -ex \"thread apply all bt full\" -ex \"disassemble /r $pc\" -ex \"quit\" %s %s" % (executable_name, coredump_name) else: print("Not printing coredump due to unsupported OS: %s" % host_os) @@ -808,7 +808,7 @@ def inspect_and_delete_coredump_files(host_os, arch, test_location): if "%P" in coredump_pattern: coredump_name_uses_pid=True - elif host_os == "Linux" and os.path.isfile("/proc/sys/kernel/core_uses_pid"): + elif host_os == "linux" and os.path.isfile("/proc/sys/kernel/core_uses_pid"): with open("/proc/sys/kernel/core_uses_pid", "r") as f: if f.read().rstrip() == "1": coredump_name_uses_pid=True @@ -930,7 +930,7 @@ def setup_args(args): location using the build type and the arch. """ - requires_coreroot = args.host_os != "Browser" and args.host_os != "Android" + requires_coreroot = args.host_os != "browser" and args.host_os != "android" coreclr_setup_args = CoreclrArguments(args, require_built_test_dir=True, require_built_core_root=requires_coreroot, diff --git a/src/tests/run.sh b/src/tests/run.sh index 51f2103defb..6b40dadd578 100755 --- a/src/tests/run.sh +++ b/src/tests/run.sh @@ -12,7 +12,7 @@ function print_usage { echo ' -h|--help : Show usage information.' echo ' -v, --verbose : Show output from each test.' echo ' : One of x64, x86, arm, arm64, loongarch64, riscv64, wasm. Defaults to current architecture.' - echo ' Android : Set build OS to Android.' + echo ' android : Set build OS to Android.' echo ' --test-env= : Script to set environment variables for tests' echo ' --testRootDir= : Root directory of the test build (e.g. runtime/artifacts/tests/windows.x64.Debug).' echo ' --enableEventLogging : Enable event logging through LTTNG.' @@ -98,8 +98,8 @@ do wasm) buildArch="wasm" ;; - Android) - buildOS="Android" + android) + buildOS="android" ;; debug|Debug) buildConfiguration="Debug" @@ -208,11 +208,11 @@ echo "Build Architecture : ${buildArch}" echo "Build Configuration : ${buildConfiguration}" if [ "$buildArch" = "wasm" ]; then - runtestPyArguments+=("-os" "Browser") + runtestPyArguments+=("-os" "browser") fi -if [ "$buildOS" = "Android" ]; then - runtestPyArguments+=("-os" "Android") +if [ "$buildOS" = "android" ]; then + runtestPyArguments+=("-os" "android") fi if [[ -n "$testRootDir" ]]; then diff --git a/src/tests/tracing/eventpipe/bigevent/bigevent.csproj b/src/tests/tracing/eventpipe/bigevent/bigevent.csproj index 457e4af6e29..88ecb83bf1a 100644 --- a/src/tests/tracing/eventpipe/bigevent/bigevent.csproj +++ b/src/tests/tracing/eventpipe/bigevent/bigevent.csproj @@ -6,7 +6,7 @@ true true - true + true diff --git a/src/tests/tracing/eventpipe/rundownvalidation/rundownvalidation.csproj b/src/tests/tracing/eventpipe/rundownvalidation/rundownvalidation.csproj index 425d6254d07..8fa76e87175 100644 --- a/src/tests/tracing/eventpipe/rundownvalidation/rundownvalidation.csproj +++ b/src/tests/tracing/eventpipe/rundownvalidation/rundownvalidation.csproj @@ -10,7 +10,7 @@ context, locals in this loop prevent unloading --> true - true + true diff --git a/src/tests/xunit-wrappers.targets b/src/tests/xunit-wrappers.targets index faa66ac84e1..222e6e4c4f5 100644 --- a/src/tests/xunit-wrappers.targets +++ b/src/tests/xunit-wrappers.targets @@ -104,10 +104,10 @@ $(_XunitEpilog) $([System.String]::Copy('$(CategoryWithSlash)').Replace('/','.')) $(Category).XUnitWrapper $(XunitWrapperGeneratedCSDirBase)$(Category) - android - apple + android + apple false - true + true