Fix official builds to work with crossgen -CreatePDB by using run.cmd to build. ...

Commit migrated from https://github.com/dotnet/core-setup/commit/c8c36a21f6d864c9ffbdbf936fcf2c88588b226c

diff --git a/src/installer/buildpipeline/Core-Setup-Signing-Windows-BT.json b/src/installer/buildpipeline/Core-Setup-Signing-Windows-BT.json
index 29e63a6..ffea641 100644 (file)
--- a/src/installer/buildpipeline/Core-Setup-Signing-Windows-BT.json
+++ b/src/installer/buildpipeline/Core-Setup-Signing-Windows-BT.json
@@ -136,24 +136,15 @@
       "displayName": "Build binaries",
       "timeoutInMinutes": 0,
       "task": {
-        "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824",
+        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
         "versionSpec": "1.*",
         "definitionType": "task"
       },
       "inputs": {
-        "solution": "$(PB_SourcesDirectory)/src/src.builds",
-        "platform": "$(PB_TargetArchitecture)",
-        "configuration": "$(BuildConfiguration)",
-        "msbuildArguments": "$(PB_CommonMSBuildArgs)",
-        "clean": "false",
-        "maximumCpuCount": "false",
-        "restoreNugetPackages": "false",
-        "logProjectEvents": "false",
-        "createLogFile": "false",
-        "msbuildLocationMethod": "version",
-        "msbuildVersion": "latest",
-        "msbuildArchitecture": "x64",
-        "msbuildLocation": ""
+        "filename": "$(PB_SourcesDirectory)\\build.cmd",
+        "arguments": "-src-builds -- $(PB_CommonMSBuildArgs)",
+        "workingFolder": "$(PB_SourcesDirectory)",
+        "failOnStandardError": "false"
       }
     },
     {

diff --git a/src/installer/config.json b/src/installer/config.json
index 491ce0f..28ea6a0 100644 (file)
--- a/src/installer/config.json
+++ b/src/installer/config.json
@@ -183,13 +183,19 @@
       }
     },
     "build":{
-      "alias":{
-        "binaries":{
+      "alias": {
+        "binaries": {
           "description": "Only builds binaries. It doesn't restore packages.",
-          "settings":{
+          "settings": {
             "RestoreDuringBuild": false
           }
         },
+        "src-builds": {
+          "description": "Only build src\\src.builds project",
+          "settings": {
+            "Project": "src\\src.builds"
+          }
+        },
         "GenerateVersion": {
           "description": "Generates the version header for native binaries.",
           "settings": {
@@ -197,51 +203,51 @@
             "GenerateVersionHeader": "default"
           }
         },
-        "debug":{
+        "debug": {
           "description": "Sets ConfigurationGroup=Debug or the value passed by the user.",
-          "settings":{
+          "settings": {
             "ConfigurationGroup": "Debug"
           }
         },
-        "release":{
+        "release": {
           "description": "Sets ConfigurationGroup=Release or the value passed by the user.",
-          "settings":{
+          "settings": {
             "ConfigurationGroup": "Release"
           }
         },
-        "verbose":{
+        "verbose": {
           "description": "Passes /flp:v=diag to the msbuild command or the value passed by the user.",
-          "settings":{
+          "settings": {
             "MsBuildLogging": "/flp:v=diag"
           }
         },
-        "cmakelog":{
+        "cmakelog": {
           "description": "Writes msbuild log to cmake.log",
-          "settings":{
+          "settings": {
             "MsBuildLogging": "/flp:v=diag;LogFile=msbuild-cmake.log"
           }
         },
-        "os":{
+        "os": {
           "description": "Sets OSGroup=AnyOS or the value passed by the user.",
-          "settings":{
+          "settings": {
             "OSGroup": "default"
           }
         },
-        "portable":{
+        "portable": {
           "description": "Make the build-native script generate binaries that are portable for the platform.",
           "settings": {
-            "PortableBuild":"true"
+            "PortableBuild": "true"
           }
-        },        
-        "skipTests":{
+        },
+        "skipTests": {
           "description": "Skips running tests",
-          "settings":{
+          "settings": {
             "SkipTests": "true"
           }
         },
-        "disableCrossgen":{
+        "disableCrossgen": {
           "description": "Disable crossgen during the build",
-          "settings":{
+          "settings": {
             "DisableCrossgen": "true"
           }
         }