diff --git a/.devcontainer/scripts/onCreateCommand.sh b/.devcontainer/scripts/onCreateCommand.sh
index f84c90b1878bb..09b7478bbaca9 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 2da3b59909e3a..327e8d65dffef 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 471f5f44e66c2..5f92d5d4685e8 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 e3e009d12da47..5f49c0e01b733 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 80fed9942f975..215d93fc195db 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 83b7612b719d6..e1d81e46c0b98 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 080c2c283ae46..75740d4a65c91 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 0da9d1cc59b7a..810a58a2317f2 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 9d7b339383ac6..d1e2fc96167a5 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 a06ed1a6bf8c3..c0bf36c1a85b1 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 50fa18c46f509..15768278534e1 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 62420db41c965..9907cd09e80e1 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
- 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 c358ff594f3db..0d1bb2c063722 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 be571215f53ca..c6242a87c4ddd 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 75d73d1037442..175d149c96a91 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 96dab80373295..47d8cb570dcdd 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 6abaeb473b3e8..993908a8e6ea4 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 bf83a286311f8..1bc919b6dc9c8 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 02ff1c2594a0e..4091d46c546fb 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 48c7a953c1883..b55c7bd92a693 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 135743c7b6d67..fe12a04fe1f2e 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 e422a8ea7b0b0..67b5df72eeb33 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 a02a4e19948b3..0f2de2426d0dd 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 4f3f8abe56df2..400a2da00c2dc 100644
--- a/src/coreclr/scripts/coreclr_arguments.py
+++ b/src/coreclr/scripts/coreclr_arguments.py
@@ -65,7 +65,7 @@ def __init__(self,
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 @@ def verify(self,
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 2083e38892bfb..ad63529fa7580 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 dc40ba0f96c78..5097c4530fad2 100644
--- a/src/coreclr/scripts/jitrollingbuild.py
+++ b/src/coreclr/scripts/jitrollingbuild.py
@@ -66,7 +66,7 @@
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_blob(file, blob_name):
# 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 4600858f22e98..2f5c43ddf41f6 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 55334d2db7645..2ffe7d7b73527 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 d8c786d32f6d4..c1d7a336779b3 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 5a0b400cdf81e..993032200e174 100644
--- a/src/coreclr/scripts/superpmi.py
+++ b/src/coreclr/scripts/superpmi.py
@@ -132,11 +132,11 @@
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 @@ def __init__(self, coreclr_args):
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 0d46202c6142a..fbfe5a4464162 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 6d77831bdc70e..4a4f6a1ef5c80 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 a75fab86c93aa..ad52edf783d19 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 6624b2f5c275f..45683a898eb9b 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 77bcb239745a5..7f849b8cb632e 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 ae250acbad5a2..77b16b1af6242 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 edf3f5bf753fe..79b8c3e3a5ccd 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 b9eb792a38fad..f589289c1ce64 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 8d6f6da581d0d..53fe2308aa545 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 c0a74cb10ef70..8b4c397b16a65 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 9e53ca9054a44..370dc77ce5c03 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 4148acef7d780..2622635380116 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 b88bec027d8d1..2f10f4d0574c3 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 4ec01c9ceb970..60abdc553a40d 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 9527a6f551a5c..60b01faed6ed1 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 2187dff4f7c75..20ef2c39e8bef 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 b4346c10b8206..2e6b8d57979fa 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 d60907513c9be..2bbb45f5f7498 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 08047ad205e85..8a18d381c0b22 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 83b1df051ccdc..35a748804d1bd 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 09993688ac120..d32645ab4b2dd 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 75300d8460ba8..a650b53c7975c 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 f99f37a6cd8cf..a196c2bbcf3fe 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 afb5a269db911..64fa67abe3814 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 2b314ba27a2c3..4fbc6583ca39e 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 2598f311d40bb..518be0f8e9cdf 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 402b0b9da58f5..25892f3a7d0b5 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 9c9233c1d3c2d..8bfc91c56f7d7 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 83ace70b92702..c1118486917b8 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 1ea6a48d7382b..22fb00cf9cc86 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 a372c7d372dc1..855dc25acb2d0 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 @@ protected static HttpClientHandler CreateHttpClientHandler(Version useVersion =
// 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 3562f5b5f8c1b..f4480104d296d 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 93f52003db723..e03c201c2c0db 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 cbb3f2bfcedff..7d8095936de60 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 7fbab2592c988..48168f4ee76b8 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 823a75101cfd9..aa2e4ce127371 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 00baeb74700bc..b70d26344c89b 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 2993a98f6fb6c..8dff1e58cf78e 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 d0d92ab8682ce..afefb7a4fdeb6 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 b140512de99bb..1187130b5aaa1 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 8e47f09dd4858..46fd9cc48db7f 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 8e509bd356a8d..c7c5bf5f83cdc 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 76bef62ae716a..ecee9fc385253 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 ae86f7e6fb293..c200978711427 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 99e8647c90c6d..fc7eefad993a7 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 512eded033420..a2fa3f655114c 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 e1f59297946a3..ad1851d97a91e 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 4d0dfbdac8034..a2974969715e4 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 603607b9e49eb..d022835499355 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 b01e12688a4eb..4024dc05baff3 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 19991a03d0384..2b7df4833a7f8 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 465eca5fba4be..c946c2e89667b 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 32e2dcef87db8..ecafc778a16af 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 bc011a8a600f3..d6ebfb0081296 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 ac64827c2db2e..f4e04daaae500 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 7a2afe9fda68e..d54fcd8a3e9ae 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 9e517c1c2ddbb..9424f519025ab 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 ed5c68c860fa3..3c181df35e462 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 37bd485fcf20b..3ed8b1f1e208e 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 51fbcbfc19567..4d09a6c19547f 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 c83d53bcbc1f7..fc4332176a240 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 684b36c6d3d4c..25c3668059d99 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 b3723431805c7..ded390e98331a 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 210f60e5f8515..0a36ff6d36a45 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 00effdc6e8edc..d077d6620693c 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 60c713c88940c..ccdaf0c39a38e 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 c66085039e231..074f952826da4 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 95c61b1b05073..bbe56c8bcd5c1 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 33b538779f0b8..6ac4a8a6e6553 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 6aca13e92bc10..65d5ca651db72 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 61a21bfe4137a..6f0b7704b575f 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 e759e2e2c7462..d5a37e1959d30 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 c0a1415b6443e..5c138fd1e7063 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 52d31dadd2f2f..aa98afd27a62a 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 8b6a516050e97..6ef5e0b26a62c 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 3e229dab9dbfc..b4289a0b76f8b 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 0848baf8593e4..efa3935a0cc7e 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 7d8b2a10a31c0..b24b75e761f06 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 3e8f62b3e0a4b..8bcbe0dcc2818 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 3d6024763b0f9..cafe0ea419cad 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 c9e738a178ca6..c0307cd12b362 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 524f71be9ff14..593371e69c01c 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 a9ccee0c8f13d..2d29b16a2ecb8 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 588a6f2bee96e..8c038bccb8db4 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 444e454c2061b..895af7d5e6306 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 f95030266bb6e..97c6ec77b66e2 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 145dfb80552c7..716fd9b61c64f 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 a126141d38944..f303ab5d18cc7 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 0b9794019aab7..39f01ebf214e4 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 a0ec478d9e757..e9447a9440013 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 855f2e4c78c0a..41e10bc7b8bbb 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 49418d33d23ac..4bffb7255fbf8 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 6946d30d5f444..57c7acab5567e 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 55a28abfb1314..f0de4a24f8121 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 4d2bf68208acb..485b109679db6 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 ab5a079cee6f8..19e0b041086df 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 55a28abfb1314..f0de4a24f8121 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 9484e6d8f712e..0de8b1276501f 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 a2a49b0f93ea2..67c4fa3620772 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 9188f97550f9c..3914e46b82119 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 bdc0ecda6877e..94dfc37ac53ab 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 b1cba57976007..3981c8a0f2a96 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 6cbb86d94e7f5..4d6cfc2410c76 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 89ce6193cacbd..1b8b651d74cc9 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 f312b67ebcac4..7f6732875e3c5 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 b049dcfbabb05..10b11cd843f80 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 7a47bb9266de6..3313ea53023d4 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 f300b10f672f5..e48ab8cd28770 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 1244f95b6a7ce..8585752889c34 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 39e0c59c5b31c..f347ff69c6a1c 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 6ef2f973eb814..97f84e34bebe9 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 c240fd2e56499..27557752e3137 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 5fa714cb5dda9..db74a66be45b5 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 b3d05df7e698d..c7386e7de3306 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 8a0edff833487..c129179b999b7 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 f3dd10250bae2..24d6a0cb72a48 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 d63dd835f0029..57cb7be1c175f 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 c634fbbb11426..eda4d70bde2da 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 4ec5bb08044cc..3eb9b10fb8ef2 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 281c43fd390f0..d09ffadace18e 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 7fde247fea586..29b8159ce3a32 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 ca9552dc7812c..78b1b08bbbfd9 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 cd0aa2d29c8d4..178befbaed9bf 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 d9b860872c057..e4d28d6235995 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 79e1cf744b5b7..c5f6be1a98cec 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 ffaacba0b2d39..201549b23c2df 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 1375f924693a0..8a39086e1e11e 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 e19f6fe8a57c7..92c1e8885600f 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 5041a48ab715a..59aea45cbe0e4 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 0d8a4b912760c..47e536a995e61 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 f90a6db6b8399..6f72500c94912 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 352b14c84b610..b70323c49cace 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 148ed610058a9..2cdbe1ddf132c 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 d07138dc0408c..f56c320ec48d4 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 9e996f24f8e98..78073132763bb 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 b578af1d70599..c926b276bad50 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 0094f3400d5d3..922046e4f0281 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 3b217db87e0b9..65fb1d576b185 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 b0c5f1e8027d1..2876262864398 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 8e4d07d868c33..b085c257e6d0a 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 6d476413fa739..944edb3d584e5 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 171821831ce85..07d0394c2528f 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 c4f2c4832f444..a9c8c4769c3fb 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 015f877349507..60afd232745fb 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 2e959f5dd7e31..cbe5485996866 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 b776d8922f4d6..e7b5afc82098d 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 20b340b6e194d..9c3215821bbc7 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 81ea1713e6f9a..06c2fbe7bef7b 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 ed252f5785a65..927f4ab0167f1 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 325554801b3e4..5b09e9e5cc3ca 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 324e64fe7dbbf..e2b03a1e23eef 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 63b799dc835d0..e156a911555be 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 4b156e7bcbcba..a7fdfc0892208 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 2dab7ef85c990..351c72c3ca025 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 1a85e4fd2dac2..ad51d8f96dc57 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 6eb87775938e6..0680248f63b12 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 51f2103defba7..6b40dadd57854 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 457e4af6e29c8..88ecb83bf1abb 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 425d6254d077a..8fa76e8717595 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 faa66ac84e133..222e6e4c4f53f 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