[automated] Merge branch 'release/6.0.4xx' => 'release/8.0.1xx' (#19960)

.github/workflows/inter-branch-merge-flow.yml

@@ -0,0 +1,15 @@
+name: Inter-branch merge workflow
+on:
+  push:
+    branches:
+      - release/**
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  Merge:
+    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
+    with: 
+      configuration_file_branch: 'release/8.0.4xx'

.vsts-ci.yml

@@ -110,7 +110,6 @@ extends:
             buildArchitecture: x64
             additionalBuildParameters: '/p:PublishInternalAsset=true'
             runTests: true
-
         # Linux
         - template: eng/build.yml@self
           parameters:
@@ -214,7 +213,6 @@ extends:
             buildConfiguration: Release
             buildArchitecture: arm64
             runTests: false
-
         # Linux
         - template: eng/build.yml@self
           parameters:

.vsts-pr.yml

@@ -53,10 +53,8 @@ stages:
   
   ## PR-only jobs
   
-  - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
-    
+  - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: 
     ## Windows
-
     - template: eng/build-pr.yml
       parameters:
         agentOs: Windows_NT
@@ -136,8 +134,8 @@ stages:
         linuxPortable: true
         runTests: true
 
-    # MacOS
 
+    # MacOS
     - template: eng/build-pr.yml
       parameters:
         agentOs: Darwin