Disable node reuse

Commit migrated from https://github.com/dotnet/coreclr/commit/8d46dc0976d15292f60524fa3fcc6408f868ea1e

diff --git a/src/coreclr/BuildToolsVersion.txt b/src/coreclr/BuildToolsVersion.txt
index d2f9c69..acf5f59 100644 (file)
--- a/src/coreclr/BuildToolsVersion.txt
+++ b/src/coreclr/BuildToolsVersion.txt
@@ -1 +1 @@
-1.0.26-prerelease-00718-04
\ No newline at end of file
+1.0.26-prerelease-00719-02
\ No newline at end of file

diff --git a/src/coreclr/config.json b/src/coreclr/config.json
index f2628ee..3a73eed 100644 (file)
--- a/src/coreclr/config.json
+++ b/src/coreclr/config.json
@@ -24,12 +24,6 @@
       "values": [],
       "defaultValue": ""
     },
-    "MsBuildParameters": {
-      "description": "MsBuild building options.",
-      "valueType": "passThrough",
-      "values": [],
-      "defaultValue": "/nologo /verbosity:minimal /clp:Summary"
-    },
     "MsBuildFileLogging": {
       "description": "MsBuild logging options.",
       "valueType": "passThrough",
@@ -228,12 +222,6 @@
       "values": [ "real" ],
       "defaultValue": ""
     },
-    "maxcpucount": {
-      "description": "Msbuild internal command.",
-      "valueType": "internal",
-      "values": [],
-      "defaultValue": ""
-    },
     "CLRTestPriorityToBuild": {
       "description": "Sets priority to build test.",
       "valueType": "property",
@@ -342,12 +330,6 @@
             "CLRTestPriorityToBuild": "default"
           }
         },
-        "sequential": {
-          "description": "Sets sequential build",
-          "settings": {
-            "maxcpucount": "default"
-          }
-        },
         "skipRestore": {
           "description": "Skips restoring packages during build.",
           "settings": {
@@ -364,8 +346,6 @@
       "defaultValues": {
         "toolName": "msbuild",
         "settings": {
-          "maxcpucount": "default",
-          "MsBuildParameters": "default",
           "MsBuildLog": "default",
           "MsBuildWrn": "default",
           "MsBuildErr": "default"
@@ -422,8 +402,6 @@
       "defaultValues": {
         "toolName": "msbuild",
         "settings": {
-          "MsBuildParameters": "default",
-          "maxcpucount": "default",
           "MsBuildFileLogging": "/flp:v=detailed;LogFile=sync.log"
         }
       }
@@ -465,8 +443,6 @@
         "toolName": "msbuild",
         "settings": {
           "Project": "./src/publish.proj",
-          "MsBuildParameters": "default",
-          "maxcpucount": "default",
           "MsBuildFileLogging": "/flp:v=detailed;LogFile=publish-packages.log"
         }
       }
@@ -495,9 +471,7 @@
       "defaultValues": {
         "toolName": "msbuild",
         "settings": {
-          "MsBuildParameters": "default",
           "__BuildOS": "default",
-          "maxcpucount": "default",
           "MsBuildFileLogging": "/flp:v=detailed;Append;LogFile=build-packages.log",
           "MsBuildEventLogging": "default"
         }
@@ -506,9 +480,15 @@
   },
   "tools": {
     "msbuild": {
-      "run": {
-        "windows": "Tools\\msbuild.cmd",
-        "unix": "Tools/msbuild.sh"
+      "osSpecific": {
+        "windows": {
+          "defaultParameters": "/nologo /verbosity:minimal /clp:Summary /maxcpucount /nodeReuse:false",
+          "path": "Tools/msbuild.cmd"
+        },
+        "unix": {
+          "defaultParameters": "/nologo /verbosity:minimal /clp:Summary /maxcpucount",
+          "path": "Tools/msbuild.sh"
+        }
       },
       "valueTypes": {
         "property": "/p:{name}={value}",