[.NET Core] Change the default qualifier to DebugDotNetCore (#309)

RunCheckInTests.cmd

@@ -70,7 +70,7 @@ if EXIST %ENLISTMENTROOT%\Out\frontend\Nuget\specs (
 )
 
 set start=%time%
-set stepName=Building 'debug\net472' & 'debug\win-x64' using Lkg and deploying to RunCheckinTests
+set stepName=Building 'debug\net472' and 'debug\win-x64' using Lkg and deploying to RunCheckinTests
 call :StatusMessage %stepName%
     call :RunBxl -Use LKG -Deploy RunCheckinTests /q:DebugNet472 /q:DebugDotNetCore /f:output='%ENLISTMENTROOT%\Out\Bin\debug\net472\*'oroutput='%ENLISTMENTROOT%\Out\Bin\debug\win-x64\*'oroutput='%ENLISTMENTROOT%\Out\Bin\tests\debug\*' %BUILDXL_ARGS% /enableLazyOutputs- /TraceInfo:RunCheckinTests=LKG /useCustomPipDescriptionOnConsole-
     if %ERRORLEVEL% NEQ 0 goto BadLKGMessage
@@ -170,7 +170,7 @@ endlocal && exit /b 0
         REM Incremental scheduling is disabled so we can deterministically get all pip fingerprints exported.
         REM This build and the next are disconnected from the shared cache to ensure that they don't converge with a remote build happening at the same time.
         set COMPARE_FINGERPRINTS_LOGS_DIR=%ENLISTMENTROOT%\Out\Logs\CompareFingerprints\
-        call :RunBxl -Use RunCheckinTests -minimal /q:Debug %BUILDXL_ARGS% /incrementalscheduling- /TraceInfo:RunCheckinTests=CompareFingerprints1 /logsDirectory:!COMPARE_FINGERPRINTS_LOGS_DIR! -SharedCacheMode disable
+        call :RunBxl -Use RunCheckinTests -minimal %BUILDXL_ARGS% /incrementalScheduling- /TraceInfo:RunCheckinTests=CompareFingerprints1 /logsDirectory:!COMPARE_FINGERPRINTS_LOGS_DIR! -SharedCacheMode disable
         if !ERRORLEVEL! NEQ 0 (exit /b 1)
 
         REM Produce a fingerprint file of the first run.
@@ -187,7 +187,7 @@ endlocal && exit /b 0
         REM Graph caching is disabled in case there is nondeterminism during graph construction.
         REM We use the same logs directory but with different prefix.
         set SECOND_PREFIX=BuildXL.2
-        call :RunBxl -Use RunCheckinTests -minimal /q:DebugNet472 %BUILDXL_ARGS% /logsDirectory:!COMPARE_FINGERPRINTS_LOGS_DIR! /logPrefix:!SECOND_PREFIX! /IncrementalScheduling- /TraceInfo:RunCheckinTests=CompareFingerprints2 /cachegraph- -SharedCacheMode disable
+        call :RunBxl -Use RunCheckinTests -minimal %BUILDXL_ARGS% /incrementalScheduling- /TraceInfo:RunCheckinTests=CompareFingerprints2 /logsDirectory:!COMPARE_FINGERPRINTS_LOGS_DIR! -SharedCacheMode disable /logPrefix:!SECOND_PREFIX!
         if !ERRORLEVEL! NEQ 0 (exit /b 1)
 
         REM Produce a fingerprint file of the second run.
@@ -244,6 +244,7 @@ endlocal && exit /b 0
         REM populate Release\*
         set start=!time!
         set stepName=Populating release for distribution tests
+        call :StatusMessge !stepName!
             call :RunBxl -Use RunCheckinTests /q:ReleaseNet472 /f:output='%ENLISTMENTROOT%\Out\Bin\release\net472\*' %BUILDXL_ARGS%
             if !ERRORLEVEL! NEQ 0 (
                 echo.

Shared/Scripts/bxl.ps1

@@ -60,10 +60,10 @@ param(
     [string]$Use = "LKG",
 
     [ValidateSet("Release", "Debug")]
-    [string]$DeployConfig = "Debug",
+    [string]$DeployConfig = "Debug", # must match defaultQualifier.configuration in config.dsc 
 
-    [ValidateSet("net472", "net461", "win-x64", "osx-x64")]
-    [string]$DeployRuntime = "net472",
+    [ValidateSet("net472", "win-x64", "osx-x64")]
+    [string]$DeployRuntime = "win-x64", # must correspond to defaultQualifier.targetFramework in config.dsc 
 
     [Parameter(Mandatory=$false)]
     [string]$DominoDeploymentRoot = "Out\Bin",
@@ -476,24 +476,28 @@ if (! (Test-Path -PathType Leaf $useDeployment.domino)) {
     throw "The BuildXL executable was not found at $($useDeployment.domino). Maybe you need to build and deploy with -Deploy $Use first?";
 }
 
+# It's important that when neither -DeployConfig nor -DeployRuntime is explicitly provided
+# (i.e., the default values are used) we don't add any additional qualifiers here.  The
+# reason is because we don't want to add extra qualifiers when the user explicitly 
+# specifies which qualifiers to build (using the /q switch).
+#
+# This basically means that the default values for -DeployConfig and -DeployRuntime
+# must correspond to default qualifier in config.dsc.
 if ($DeployConfig -eq "Release") {
-    if ($DeployRuntime -eq "win-x64") {
-        $AdditionalBuildXLArguments += "/q:ReleaseDotNetCore"
+    if ($DeployRuntime -eq "net472") {
+        $AdditionalBuildXLArguments += "/q:ReleaseNet472"
     }
-    elseif ($DeployRuntime -eq "osx-x64")
-    {
+    elseif ($DeployRuntime -eq "osx-x64") {
         $AdditionalBuildXLArguments += "/q:ReleaseDotNetCoreMac"
     }
-    else
-    {
+    else {
         $AdditionalBuildXLArguments += "/q:Release"
     }
 } else {
-    if ($DeployRuntime -eq "win-x64") {
-        $AdditionalBuildXLArguments += "/q:DebugDotNetCore"
+    if ($DeployRuntime -eq "net472") {
+        $AdditionalBuildXLArguments += "/q:DebugNet472"
     }
-    elseif ($DeployRuntime -eq "osx-x64")
-    {
+    elseif ($DeployRuntime -eq "osx-x64") {
         $AdditionalBuildXLArguments += "/q:DebugDotNetCoreMac"
     }
 }

config.dsc

@@ -527,13 +527,13 @@ config({
     qualifiers: {
         defaultQualifier: {
             configuration: "debug",
-            targetFramework: Context.getCurrentHost().os === "win" ? "net472" : "netcoreapp3.0",
+            targetFramework: "netcoreapp3.0",
             targetRuntime: Context.getCurrentHost().os === "win" ? "win-x64" : "osx-x64",
         },
         namedQualifiers: {
             Debug: {
                 configuration: "debug",
-                targetFramework: "net472",
+                targetFramework: "netcoreapp3.0",
                 targetRuntime: "win-x64",
             },
             DebugNet472: {
@@ -555,7 +555,7 @@ config({
             // Release
             Release: {
                 configuration: "release",
-                targetFramework: "net472",
+                targetFramework: "netcoreapp3.0",
                 targetRuntime: "win-x64",
             },
             ReleaseNet472: {