diff --git a/Directory.Build.props b/Directory.Build.props
index a4215ae3bc6c15..5c0df7c37ae704 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -56,6 +56,14 @@
+
+
+ true
+ true
+ true
+
+
11.0
diff --git a/src/coreclr/Directory.Build.props b/src/coreclr/Directory.Build.props
index 233bfbeacebf0c..2eab0816071b96 100644
--- a/src/coreclr/Directory.Build.props
+++ b/src/coreclr/Directory.Build.props
@@ -24,6 +24,5 @@
false
false
- $(NumberOfCores)
diff --git a/src/coreclr/build-runtime.cmd b/src/coreclr/build-runtime.cmd
index b88cd359d6dce9..c373274f39a95d 100644
--- a/src/coreclr/build-runtime.cmd
+++ b/src/coreclr/build-runtime.cmd
@@ -266,18 +266,6 @@ echo %__MsgPrefix%Using CMake from !CMakePath!
:SkipLocateCMake
-REM NumberOfCores is an WMI property providing number of physical cores on machine
-REM processor(s). It is used to set optimal level of CL parallelism during native build step
-if not defined NumberOfCores (
- REM Determine number of physical processor cores available on machine
- set TotalNumberOfCores=0
- for /f "tokens=*" %%I in (
- 'wmic cpu get NumberOfCores /value ^| find "=" 2^>NUL'
- ) do set %%I & set /a TotalNumberOfCores=TotalNumberOfCores+NumberOfCores
- set NumberOfCores=!TotalNumberOfCores!
-)
-echo %__MsgPrefix%Number of processor cores %NumberOfCores%
-
REM =========================================================================================
REM ===
REM === Start the build steps
diff --git a/src/tests/build.cmd b/src/tests/build.cmd
index 73691be70ac458..beea809039f83f 100644
--- a/src/tests/build.cmd
+++ b/src/tests/build.cmd
@@ -268,18 +268,6 @@ echo %__MsgPrefix%Commencing build of native test components for %__BuildArch%/%
REM Set the environment for the native build
-REM NumberOfCores is an WMI property providing number of physical cores on machine
-REM processor(s). It is used to set optimal level of CL parallelism during native build step
-if not defined NumberOfCores (
- REM Determine number of physical processor cores available on machine
- set TotalNumberOfCores=0
- for /f "tokens=*" %%I in (
- 'wmic cpu get NumberOfCores /value ^| find "=" 2^>NUL'
- ) do set %%I & set /a TotalNumberOfCores=TotalNumberOfCores+NumberOfCores
- set NumberOfCores=!TotalNumberOfCores!
-)
-echo %__MsgPrefix%Number of processor cores %NumberOfCores%
-
@if defined _echo @echo on
set __ExtraCmakeArgs=