Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

external/corefx/config.json

@@ -24,6 +24,12 @@
       "values": ["x64", "x86", "arm", "arm64"],
       "defaultValue": "x64"
     },
+    "BuildAllConfigurations": {
+      "description": "Builds projects for all BuildConfigurations rather than determining best configuration for TargetGroup/OSGroup.",
+      "valueType": "property",
+      "values": ["True", "False"],
+      "defaultValue": false
+    },
     "RuntimeOS": {
       "description": "The RuntimeOS used for building and restoring native OS dependent assets (i.e. RID specific binaries)",
       "valueType": "property",
@@ -42,17 +48,11 @@
       "values": ["True", "False"],
       "defaultValue": true
     },
-    "RestoreDuringBuild": {
-      "description": "Enables/Disables the restoration of packages.",
-      "valueType": "property",
-      "values": ["True", "False"],
-      "defaultValue": true
-    },
     "BuildPackages": {
       "description": "Enables/Disables building packages.",
       "valueType": "property",
       "values": ["True", "False"],
-      "defaultValue": true
+      "defaultValue": false
     },
     "BuildPackageLibraryReferences": {
       "description": "Enables/Disables building libraries referenced by packages.",
@@ -198,12 +198,6 @@
       "values": [],
       "defaultValue": ""
     },
-    "RestoreForTestsAgainstPackagesOnly": {
-      "description": "MsBuild target that restores the packages.",
-      "valueType": "property",
-      "values": ["true", "false"],
-      "defaultValue": "true"
-    },
     "GenerateVersionHeader": {
       "description": "MsBuild target that generates the version header.",
       "valueType": "target",
@@ -242,6 +236,7 @@
           "description": "Builds the NuGet packages.",
           "settings": {
             "Project": "src/packages.builds",
+            "BuildPackages": "true",
             "MsBuildLogging":"/flp:v=normal;LogFile=build-packages.log"
           }
         },
@@ -256,9 +251,14 @@
           "settings": { }
         },
         "tests": {
-          "description": "Builds the tests that are in the repository, doesn't restore packages.",
+          "description": "Builds src and then builds and runs the tests for the given configuration.",
+          "settings": {
+            "BuildTests": true
+          }
+        },
+        "testsOnly": {
+          "description": "Builds and runs the tests for the given configuration.",
           "settings": {
-            "RestoreDuringBuild": "false",
             "Project": "src/tests.builds",
             "MsBuildLogging":"/flp:v=normal;LogFile=build-tests.log"
           }
@@ -275,6 +275,12 @@
             "ConfigurationGroup": "Release"
           }
         },
+        "allConfigurations": {
+          "description": "Builds all configurations instead of only those specified by framework/os.",
+          "settings": {
+            "BuildAllConfigurations":"true"
+          }
+        },
         "framework": {
           "description": "Sets target framework for managed build configuration and only builds the libraries applicable for that framework. (/p:TargetGroup=[value])",
           "settings": {
@@ -322,6 +328,7 @@
       "defaultValues": {
         "toolName": "msbuild",
         "settings": {
+          "BuildPackages": "default",
           "ConfigurationGroup": "default",
           "MsBuildLogging":"default",
           "MsBuildWarning":"default",
@@ -343,6 +350,12 @@
             "CmakeBuildType": "Release"
           }
         },
+        "allConfigurations": {
+          "description": "Builds all configurations instead of only those specified by framework/os.",
+          "settings": {
+            "BuildAllConfigurations":"true"
+          }
+        },
         "framework": {
           "description": "Sets target framework for native build configuration which is used for copying to the common shared runtime folder.",
           "settings": {
@@ -378,7 +391,11 @@
           "settings": {
             "StripSymbolsAdditionalArg": "stripSymbols"
           }
-        }
+        },
+        "tests": {
+          "description": "No-op for build-native, included just to enable easy combination with build-managed",
+          "settings": { }
+        },
       },
       "defaultValues": {
         "toolName": "terminal",
@@ -471,7 +488,6 @@
         "p": {
           "description": "Restores all NuGet packages for repository.",
           "settings": {
-            "RestoreDuringBuild":  true,
             "Sync": "default"
           }
         },
@@ -484,7 +500,6 @@
         "t": {
           "description": "Deprecated, use sync /p instead.",
           "settings": {
-            "RestoreDuringBuild":  true,
             "Sync": "default"
           }
         },
@@ -544,7 +559,7 @@
     "msbuild": {
       "osSpecific": {
         "windows": {
-          "defaultParameters": "/nologo /verbosity:minimal /clp:Summary /maxcpucount /nodeReuse:false /l:BinClashLogger,Tools\\net45\\Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log",
+          "defaultParameters": "/nologo /verbosity:minimal /clp:Summary /maxcpucount /nodeReuse:false /l:BinClashLogger,Tools\\net46\\Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log",
           "path": "Tools/msbuild.cmd"
         },
         "unix": {