Merge branch 'main' into dev/russellben/config-jsonc

Author: benrr101

…pipelines/steps/install-dotnet-arm64.ps1 …es/common/steps/install-dotnet-arm64.ps1eng/pipelines/steps/install-dotnet-arm64.ps1 renamed to eng/pipelines/common/steps/install-dotnet-arm64.ps1 eng/pipelines/steps/install-dotnet-arm64.ps1 renamed to eng/pipelines/common/steps/install-dotnet-arm64.ps1

@@ -69,6 +69,7 @@ steps:
         env:
           PROCESSOR_ARCHITECTURE: x86
 
+
     # Install the desired Runtimes, if any.
     - ${{ each version in parameters.runtimes }}:
       - task: UseDotNet@2
@@ -96,7 +97,7 @@ steps:
       inputs:
         targetType: filePath
         pwsh: true
-        filePath: $(Build.SourcesDirectory)/eng/pipelines/steps/install-dotnet-arm64.ps1
+        filePath: $(Build.SourcesDirectory)/eng/pipelines/common/steps/install-dotnet-arm64.ps1
         # Arguments:
         #
         # -Debug:

eng/pipelines/steps/install-dotnet.yml …ipelines/common/steps/install-dotnet.ymleng/pipelines/steps/install-dotnet.yml renamed to eng/pipelines/common/steps/install-dotnet.yml eng/pipelines/steps/install-dotnet.yml renamed to eng/pipelines/common/steps/install-dotnet.yml

@@ -132,10 +132,10 @@ jobs:
         targetPath: $(localFeedPath)
 
   # Install the .NET SDK.
-  - template: /eng/pipelines/steps/install-dotnet.yml@self
+  - template: /eng/pipelines/common/steps/install-dotnet.yml@self
 
   # Restore dotnet CLI tools (e.g. pwsh, apicompat) before building.
-  - template: /eng/pipelines/steps/restore-dotnet-tools.yml@self
+  - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
 
   # When we're performing a Debug build, we still want to try _compiling_ the
   # code in Release mode to ensure downstream pipelines don't encounter

…pipelines/steps/restore-dotnet-tools.yml …es/common/steps/restore-dotnet-tools.ymleng/pipelines/steps/restore-dotnet-tools.yml renamed to eng/pipelines/common/steps/restore-dotnet-tools.yml eng/pipelines/steps/restore-dotnet-tools.yml renamed to eng/pipelines/common/steps/restore-dotnet-tools.yml

@@ -44,7 +44,7 @@ jobs:
           displayName: '[Debug] List Environment Variables'
 
       # Install the .NET SDK.
-      - template: /eng/pipelines/steps/install-dotnet.yml@self
+      - template: /eng/pipelines/common/steps/install-dotnet.yml@self
         parameters:
           debug: ${{ parameters.debug }}
 

eng/pipelines/common/templates/jobs/ci-build-nugets-job.yml

@@ -209,7 +209,7 @@ jobs:
         targetPath: $(Build.SourcesDirectory)/packages
 
   # Install the .NET SDK and Runtimes.
-  - template: /eng/pipelines/steps/install-dotnet.yml@self
+  - template: /eng/pipelines/common/steps/install-dotnet.yml@self
     parameters:
       debug: ${{ parameters.debug }}
       ${{ if parameters.isArm64 }}:
@@ -221,7 +221,7 @@ jobs:
         runtimes: [8.x, 9.x]
 
   # Restore dotnet CLI tools (e.g. pwsh, apicompat) before building.
-  - template: /eng/pipelines/steps/restore-dotnet-tools.yml@self
+  - template: /eng/pipelines/common/steps/restore-dotnet-tools.yml@self
 
   - ${{ if ne(parameters.prebuildSteps, '') }}:
     - ${{ parameters.prebuildSteps }} # extra steps to run before the build like downloading sni and the required configuration
@@ -346,7 +346,7 @@ jobs:
   - ${{ if and(eq(parameters.enableX86Test, true), eq(parameters.operatingSystem, 'Windows')) }}:
     - ${{ if ne(variables['dotnetx86RootPath'], '') }}:
       # Install the .NET SDK and Runtimes for x86.
-      - template: /eng/pipelines/steps/install-dotnet.yml@self
+      - template: /eng/pipelines/common/steps/install-dotnet.yml@self
         parameters:
           architecture: x86
           debug: ${{ parameters.debug }}

eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml

@@ -5,7 +5,7 @@
 #################################################################################
 steps:
   # Install the .NET SDK and Runtimes.
-  - template: /eng/pipelines/steps/install-dotnet.yml@self
+  - template: /eng/pipelines/common/steps/install-dotnet.yml@self
     parameters:
       runtimes: [8.x, 9.x]
 

eng/pipelines/common/templates/jobs/ci-run-tests-job.yml

@@ -34,7 +34,7 @@ parameters:
 
 steps:
   # Install the .NET SDK, required by the PowerShell script.
-  - template: /eng/pipelines/steps/install-dotnet.yml@self
+  - template: /eng/pipelines/common/steps/install-dotnet.yml@self
 
   # Invoke the script with the path to the packages to verify.
   - task: PowerShell@2

eng/pipelines/common/templates/steps/pre-build-step.yml

@@ -4,11 +4,9 @@
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
 
-# Common variables shared across all OneBranch Official pipelines.
+# Common variables shared across all pipelines.
 
 variables:
-  - name: CommitHead
-    value: '' # the value will be extracted from the repo's head
 
   ##########################################################################
   # "Well-Known" Variables that are ok to use directly, anywhere in the pipeline.
@@ -21,15 +19,3 @@ variables:
   # <ArtifactsPath>).
   - name: BUILD_OUTPUT
     value: $(REPO_ROOT)/artifacts
-
-  # Directory where downloaded pipeline artifacts (NuGet packages from earlier
-  # stages) are placed. Build jobs use this as a local NuGet package source so
-  # that downstream packages can resolve dependencies on packages built by
-  # upstream stages.
-  - name: JOB_INPUT
-    value: $(REPO_ROOT)/packages
-
-  # Root directory for all job output artifacts (NuGet packages, symbols, etc.). OneBranch auto
-  # publishes everything under this directory as the artifact for the job.
-  - name: JOB_OUTPUT
-    value: $(REPO_ROOT)/output

eng/pipelines/common/templates/steps/verify-nuget-package-step.yml

@@ -103,7 +103,7 @@ jobs:
           displayName: '[Debug] Print Environment Variables'
 
       # Install the .NET SDK.
-      - template: /eng/pipelines/steps/install-dotnet.yml@self
+      - template: /eng/pipelines/common/steps/install-dotnet.yml@self
         parameters:
           debug: ${{ parameters.debug }}