Merged PR 771190: Use net8 bits for linux PR validation

Use net8 bits for linux PR validation

.azdo/linux/job-bootstrap.yml

@@ -45,7 +45,7 @@ jobs:
       - bash: |
           set -eu
           # Set a 60m timeout so we can catch hangs *and* get logs collected at the same time. Otherwise the whole job will timeout (check 'timeoutInMinutes' above).
-          timeout --signal 9 60m bash bxl.sh /logsDirectory:"Out/Logs/Build" --minimal --internal --deploy-dev --release /cacheConfigFilePath:Out/CacheConfig.json ${{ parameters.BxlCommonArgs }}
+          timeout --signal 9 60m bash bxl.sh /logsDirectory:"Out/Logs/Build" --minimal --internal --deploy-dev-net8 --release /cacheConfigFilePath:Out/CacheConfig.json ${{ parameters.BxlCommonArgs }}
         displayName: Build
         workingDirectory: /home/subst
         env:

.azdo/linux/pipeline.yml

@@ -69,7 +69,7 @@ extends:
         parameters:
           BxlCommonArgs: ${{ parameters.BxlCommonArgs }}
           ValidationName: InternalRelease
-          BxlExtraArgs: --internal /q:ReleaseLinux
+          BxlExtraArgs: --internal /q:ReleaseLinux /q:ReleaseLinuxNet8
           Role: Orchestrator
     
     - stage: Build_Internal_Workers
@@ -80,7 +80,7 @@ extends:
         parameters:
           BxlCommonArgs: ${{ parameters.BxlCommonArgs }}
           ValidationName: InternalRelease
-          BxlExtraArgs: --internal /q:ReleaseLinux 
+          BxlExtraArgs: --internal /q:ReleaseLinux /q:ReleaseLinuxNet8
           Role: Worker
 
     - stage: Verify_PTrace

bxl.sh

@@ -9,6 +9,8 @@ declare arg_Positional=()
 # stores user-specified args that are not used by this script; added to the end of command line
 declare arg_UserProvidedBxlArguments=()
 declare arg_DeployDev=""
+# a temporary option to deploy net8 bits
+declare arg_DeployDevNet8=""
 declare arg_UseDev=""
 declare arg_Minimal=""
 declare arg_Internal=""
@@ -68,7 +70,12 @@ function getLkg() {
 }
 
 function setMinimal() {
-    arg_Positional+=(/q:${configuration}${HostQualifier} "/f:output='$MY_DIR/Out/Bin/${outputConfiguration}/${DeploymentFolder}/*'")
+    if [[ -n "$arg_DeployDevNet8" ]]; then
+        # Net8 qualifiers are just default ones with 'net8' suffix
+        arg_Positional+=("/q:${configuration}${HostQualifier}Net8 /f:output='$MY_DIR/Out/Bin/${outputConfiguration}/net8.0/${DeploymentFolder}/*'")
+    else
+        arg_Positional+=("/q:${configuration}${HostQualifier} /f:output='$MY_DIR/Out/Bin/${outputConfiguration}/${DeploymentFolder}/*'")
+    fi
 }
 
 function setInternal() {
@@ -106,7 +113,7 @@ function compileWithBxl() {
 }
 
 function printHelp() {
-    echo "${BASH_SOURCE[0]} [--deploy-dev] [--use-dev] [--minimal] [--internal] [--release] [--shared-comp] [--vs] [--use-adobuildrunner] [--runner-arg <arg-to-buildrunner>] [--test-method <full-test-method-name>] [--test-class <full-test-class-name>] <other-arguments>"
+    echo "${BASH_SOURCE[0]} [--deploy-dev] [--deploy-dev-net8] [--use-dev] [--minimal] [--internal] [--release] [--shared-comp] [--vs] [--use-adobuildrunner] [--runner-arg <arg-to-buildrunner>] [--test-method <full-test-method-name>] [--test-class <full-test-class-name>] <other-arguments>"
 }
 
 function parseArgs() {
@@ -124,6 +131,10 @@ function parseArgs() {
             arg_DeployDev="1"
             shift
             ;;
+        --deploy-dev-net8)
+            arg_DeployDevNet8="1"
+            shift
+            ;;
         --use-dev)
             arg_UseDev="1"
             shift
@@ -294,6 +305,11 @@ pushd "$MY_DIR"
 
 parseArgs "$@"
 
+if [[ -n "$arg_DeployDev" && -n "$arg_DeployDevNet8" ]]; then
+    print_error "Conflicting arguments. Cannot use both --deploy-dev and --deploy-dev-net8 at the same time."
+    exit 1
+fi
+
 outputConfiguration=`printf '%s' "$configuration" | awk '{ print tolower($0) }'`
 
 if [[ -n "$arg_Internal" && -n "$TF_BUILD" ]]; then
@@ -302,7 +318,7 @@ fi
 
 findMono
 
-if [[ -n "$arg_DeployDev" || -n "$arg_Minimal" ]]; then
+if [[ -n "$arg_DeployDev" || -n "$arg_DeployDevNet8" || -n "$arg_Minimal" ]]; then
     setMinimal
 fi
 
@@ -386,6 +402,8 @@ compileWithBxl ${arg_Positional[@]} ${arg_UserProvidedBxlArguments[@]}
 
 if [[ -n "$arg_DeployDev" ]]; then
     deployBxl "$MY_DIR/Out/Bin/${outputConfiguration}/${DeploymentFolder}" "$MY_DIR/Out/Selfhost/Dev"
+elif [[ -n "$arg_DeployDevNet8" ]]; then
+    deployBxl "$MY_DIR/Out/Bin/${outputConfiguration}/net8.0/${DeploymentFolder}" "$MY_DIR/Out/Selfhost/Dev"
 fi
 
 popd

config.dsc

@@ -520,6 +520,11 @@ config({
                 targetFramework: "net7.0",
                 targetRuntime: "osx-x64",
             },
+            DebugDotNetCoreMacNet8: {
+                configuration: "debug",
+                targetFramework: "net8.0",
+                targetRuntime: "osx-x64",
+            },
             DebugLinux: {
                 configuration: "debug",
                 targetFramework: "net7.0",
@@ -527,7 +532,7 @@ config({
             },
             DebugLinuxNet8: {
                 configuration: "debug",
-                targetFramework: "net7.0",
+                targetFramework: "net8.0",
                 targetRuntime: "linux-x64",
             },
             // Release
@@ -561,6 +566,11 @@ config({
                 targetFramework: "net7.0",
                 targetRuntime: "osx-x64",
             },
+            ReleaseDotNetCoreMacNet8: {
+                configuration: "release",
+                targetFramework: "net8.0",
+                targetRuntime: "osx-x64",
+            },
             ReleaseLinux: {
                 configuration: "release",
                 targetFramework: "net7.0",