From 19c89c72f3a589229e4dbdbdabe4b5584d494bf9 Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Wed, 17 Apr 2024 14:24:36 -0700
Subject: [PATCH 01/26] Update dotnet-monitor-public.yml

---
 eng/pipelines/dotnet-monitor-public.yml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/eng/pipelines/dotnet-monitor-public.yml b/eng/pipelines/dotnet-monitor-public.yml
index b00de6ae00c..d044c9ac87f 100644
--- a/eng/pipelines/dotnet-monitor-public.yml
+++ b/eng/pipelines/dotnet-monitor-public.yml
@@ -48,17 +48,6 @@ extends:
     - stage: Build
       displayName: Build and Test
       jobs:
-      # Build and (optionally) test binaries
-      - template: /eng/pipelines/jobs/platform-matrix.yml@self
-        parameters:
-          jobTemplate: /eng/pipelines/jobs/build-binaries.yml@self
-          includeArm64: true
-          includeDebug: true
-          jobParameters:
-            publishBinaries: true
-            is1ESPipeline: false
-            commonTemplatesFolderName: 'templates'
-
       - ${{ if ne(parameters.testGroup, 'None') }}:
         - template: /eng/pipelines/jobs/platform-matrix.yml@self
           parameters:

From 73bd4fe6c50ae35aac86f8a552082ecf646f2c1f Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Wed, 17 Apr 2024 14:26:21 -0700
Subject: [PATCH 02/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index 92602d5f3e2..7e6b661dbfd 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -76,12 +76,13 @@ jobs:
       inputs:
         artifactName: Build_Binaries_${{ parameters.configuration }}_${{ parameters.osGroup }}_${{ parameters.architecture }}
         targetPath: '$(Build.SourcesDirectory)/artifacts'
+        pipelineId: 646778
 
     - ${{ if eq(parameters.useHelix, 'true')}}:
       - ${{ if ne(parameters.osGroup, 'Linux_Musl')}}:
         # Linux builds (of all variants) run in Mariner containers and do not include pwsh by default
         - ${{ if eq(parameters.osGroup, 'Linux') }}:
-          - script: sudo -n tdnf install -y --refresh powershell
+          - script: dotnet tool install --global PowerShell
             displayName: Install pwsh
 
         # Calculate the fully qualified Nodejs version first so that any new releases will result in a new cache key

From 555c079a59cbe94f7acd9c9a28d68ed5affad6db Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Wed, 17 Apr 2024 17:12:29 -0700
Subject: [PATCH 03/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 34 ++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index 7e6b661dbfd..3ca4038e95a 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -76,13 +76,43 @@ jobs:
       inputs:
         artifactName: Build_Binaries_${{ parameters.configuration }}_${{ parameters.osGroup }}_${{ parameters.architecture }}
         targetPath: '$(Build.SourcesDirectory)/artifacts'
-        pipelineId: 646778
+        pipelineId: 645559
 
     - ${{ if eq(parameters.useHelix, 'true')}}:
       - ${{ if ne(parameters.osGroup, 'Linux_Musl')}}:
         # Linux builds (of all variants) run in Mariner containers and do not include pwsh by default
         - ${{ if eq(parameters.osGroup, 'Linux') }}:
-          - script: dotnet tool install --global PowerShell
+          - script: |
+              $(Build.SourcesDirectory)/artifacts/restore.sh
+              export DOTNET_ROOT="$Build.SourcesDirectory/artifacts/.dotnet"
+              $(Build.SourcesDirectory)/artifacts/.dotnet/dotnet tool install PowerShell --tool-path $(Build.SourcesDirectory)/artifacts/tools
+              export PATH=$PATH:$(Build.SourcesDirectory)/artifacts/tools
+
+            const branchName = `bot/${process.env.TARGET_BRANCH_POSTFIX}`;
+
+            const prs = await github.paginate(github.rest.pulls.list, {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              state: 'open',
+              head: `${context.repo.owner}:${branchName}`,
+              base: process.env.BASE_BRANCH
+            });
+
+            if (prs !== undefined && prs.length > 0) {
+              return;
+            }
+
+            const baseRefName = `heads/${process.env.BASE_BRANCH}`
+
+            const baseRef = await github.rest.git.getRef({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                ref: baseRefName
+            });
+
+            const createOrUpdateRef = require('./.github/actions/gh-script-utils/create-or-update-ref.js');
+            await createOrUpdateRef(github, context, baseRef.data.object.sha, branchName);
+
             displayName: Install pwsh
 
         # Calculate the fully qualified Nodejs version first so that any new releases will result in a new cache key

From f1421b3fb0947e260c17f8a5468ddfaee2a20820 Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Thu, 18 Apr 2024 08:50:53 -0700
Subject: [PATCH 04/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index 3ca4038e95a..9e56ed20e1a 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -83,10 +83,25 @@ jobs:
         # Linux builds (of all variants) run in Mariner containers and do not include pwsh by default
         - ${{ if eq(parameters.osGroup, 'Linux') }}:
           - script: |
-              $(Build.SourcesDirectory)/artifacts/restore.sh
-              export DOTNET_ROOT="$Build.SourcesDirectory/artifacts/.dotnet"
-              $(Build.SourcesDirectory)/artifacts/.dotnet/dotnet tool install PowerShell --tool-path $(Build.SourcesDirectory)/artifacts/tools
-              export PATH=$PATH:$(Build.SourcesDirectory)/artifacts/tools
+              echo "Before Restore"
+              ls
+              $(Build.SourcesDirectory)/restore.sh
+              echo "After Restore"
+              ls
+              export DOTNET_ROOT="$Build.SourcesDirectory/.dotnet"
+              echo "After Dotnet Root"
+              ls
+              $(Build.SourcesDirectory)/.dotnet/dotnet tool install PowerShell --tool-path $(Build.SourcesDirectory)/tools
+              echo "After Pwsh"
+              ls
+              cd tools
+              echo "After CD 1"
+              ls
+              echo "After CD 2"
+              cd ..
+              export PATH=$PATH:$(Build.SourcesDirectory)/tools
+              echo "After PATH"
+              echo "$PATH"
 
             const branchName = `bot/${process.env.TARGET_BRANCH_POSTFIX}`;
 

From e0c814d6291d4bb01208a6aa3bd6230263380682 Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Thu, 18 Apr 2024 08:52:53 -0700
Subject: [PATCH 05/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index 9e56ed20e1a..341ee56aa23 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -102,32 +102,6 @@ jobs:
               export PATH=$PATH:$(Build.SourcesDirectory)/tools
               echo "After PATH"
               echo "$PATH"
-
-            const branchName = `bot/${process.env.TARGET_BRANCH_POSTFIX}`;
-
-            const prs = await github.paginate(github.rest.pulls.list, {
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              state: 'open',
-              head: `${context.repo.owner}:${branchName}`,
-              base: process.env.BASE_BRANCH
-            });
-
-            if (prs !== undefined && prs.length > 0) {
-              return;
-            }
-
-            const baseRefName = `heads/${process.env.BASE_BRANCH}`
-
-            const baseRef = await github.rest.git.getRef({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                ref: baseRefName
-            });
-
-            const createOrUpdateRef = require('./.github/actions/gh-script-utils/create-or-update-ref.js');
-            await createOrUpdateRef(github, context, baseRef.data.object.sha, branchName);
-
             displayName: Install pwsh
 
         # Calculate the fully qualified Nodejs version first so that any new releases will result in a new cache key

From 551404e156b58128d8ec1f0b71760a31a00d8f3f Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Thu, 18 Apr 2024 09:37:09 -0700
Subject: [PATCH 06/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index 341ee56aa23..1f739e187f1 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -33,7 +33,6 @@ jobs:
     architecture: ${{ parameters.architecture }}
     enableCrossBuild: ${{ parameters.useHelix }}
     timeoutInMinutes: 120
-    dependsOn: Build_${{ parameters.configuration }}_${{ parameters.osGroup }}_${{ parameters.architecture }}
     disableComponentGovernance: true
     disableSbom: true
     is1ESPipeline: ${{ parameters.is1ESPipeline }}

From adc7fa3fa4f2ed880b23a3209f84012b849b14df Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Thu, 18 Apr 2024 09:49:11 -0700
Subject: [PATCH 07/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index 1f739e187f1..5e6b9fe6cbb 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -73,8 +73,10 @@ jobs:
     - task: DownloadPipelineArtifact@2
       displayName: Download Binaries
       inputs:
+        buildType: 'specific'
         artifactName: Build_Binaries_${{ parameters.configuration }}_${{ parameters.osGroup }}_${{ parameters.architecture }}
         targetPath: '$(Build.SourcesDirectory)/artifacts'
+        buildVersionToDownload: 'specific'
         pipelineId: 645559
 
     - ${{ if eq(parameters.useHelix, 'true')}}:

From 305a4aa4c22608a076aad6bdd8d1c5ece71121c4 Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Thu, 18 Apr 2024 09:54:54 -0700
Subject: [PATCH 08/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index 5e6b9fe6cbb..17ce820aa0c 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -75,6 +75,7 @@ jobs:
       inputs:
         buildType: 'specific'
         artifactName: Build_Binaries_${{ parameters.configuration }}_${{ parameters.osGroup }}_${{ parameters.architecture }}
+        project: 'dotnet-monitor'
         targetPath: '$(Build.SourcesDirectory)/artifacts'
         buildVersionToDownload: 'specific'
         pipelineId: 645559

From c9b34af59182e22fedd7434f51892e31a0bda1c3 Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Thu, 18 Apr 2024 10:07:33 -0700
Subject: [PATCH 09/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index 17ce820aa0c..95818fa8ba1 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -75,7 +75,7 @@ jobs:
       inputs:
         buildType: 'specific'
         artifactName: Build_Binaries_${{ parameters.configuration }}_${{ parameters.osGroup }}_${{ parameters.architecture }}
-        project: 'dotnet-monitor'
+        project: 'dotnet/dotnet-monitor'
         targetPath: '$(Build.SourcesDirectory)/artifacts'
         buildVersionToDownload: 'specific'
         pipelineId: 645559

From 058b8c7221f8bc4ce7e0d6134c71fd8eb033eec4 Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Thu, 18 Apr 2024 10:16:01 -0700
Subject: [PATCH 10/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index 95818fa8ba1..6d4a2d80a01 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -75,7 +75,7 @@ jobs:
       inputs:
         buildType: 'specific'
         artifactName: Build_Binaries_${{ parameters.configuration }}_${{ parameters.osGroup }}_${{ parameters.architecture }}
-        project: 'dotnet/dotnet-monitor'
+        project: 'dotnet-monitor-ci'
         targetPath: '$(Build.SourcesDirectory)/artifacts'
         buildVersionToDownload: 'specific'
         pipelineId: 645559

From b92bb488841621d736d63337bcd44bf249f29d17 Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Thu, 18 Apr 2024 10:25:50 -0700
Subject: [PATCH 11/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index 6d4a2d80a01..dc4a5479850 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -75,7 +75,7 @@ jobs:
       inputs:
         buildType: 'specific'
         artifactName: Build_Binaries_${{ parameters.configuration }}_${{ parameters.osGroup }}_${{ parameters.architecture }}
-        project: 'dotnet-monitor-ci'
+        project: 'public'
         targetPath: '$(Build.SourcesDirectory)/artifacts'
         buildVersionToDownload: 'specific'
         pipelineId: 645559

From 071a06c797aac9e733b714ac0efb9dd01fef07ae Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Thu, 18 Apr 2024 10:38:34 -0700
Subject: [PATCH 12/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index dc4a5479850..d3c427a30ee 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -79,6 +79,7 @@ jobs:
         targetPath: '$(Build.SourcesDirectory)/artifacts'
         buildVersionToDownload: 'specific'
         pipelineId: 645559
+        definition: 78
 
     - ${{ if eq(parameters.useHelix, 'true')}}:
       - ${{ if ne(parameters.osGroup, 'Linux_Musl')}}:

From d156ce98bce10ca169633477bc11d7948e442b19 Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Thu, 18 Apr 2024 10:45:36 -0700
Subject: [PATCH 13/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index d3c427a30ee..e3c305f9616 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -33,6 +33,7 @@ jobs:
     architecture: ${{ parameters.architecture }}
     enableCrossBuild: ${{ parameters.useHelix }}
     timeoutInMinutes: 120
+    dependsOn: Build_${{ parameters.configuration }}_${{ parameters.osGroup }}_${{ parameters.architecture }}
     disableComponentGovernance: true
     disableSbom: true
     is1ESPipeline: ${{ parameters.is1ESPipeline }}
@@ -73,13 +74,8 @@ jobs:
     - task: DownloadPipelineArtifact@2
       displayName: Download Binaries
       inputs:
-        buildType: 'specific'
         artifactName: Build_Binaries_${{ parameters.configuration }}_${{ parameters.osGroup }}_${{ parameters.architecture }}
-        project: 'public'
         targetPath: '$(Build.SourcesDirectory)/artifacts'
-        buildVersionToDownload: 'specific'
-        pipelineId: 645559
-        definition: 78
 
     - ${{ if eq(parameters.useHelix, 'true')}}:
       - ${{ if ne(parameters.osGroup, 'Linux_Musl')}}:

From 66006ab916e2a73b8758686cc7a365cb9e0571ad Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Thu, 18 Apr 2024 10:46:04 -0700
Subject: [PATCH 14/26] Update dotnet-monitor-public.yml

---
 eng/pipelines/dotnet-monitor-public.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/eng/pipelines/dotnet-monitor-public.yml b/eng/pipelines/dotnet-monitor-public.yml
index d044c9ac87f..b00de6ae00c 100644
--- a/eng/pipelines/dotnet-monitor-public.yml
+++ b/eng/pipelines/dotnet-monitor-public.yml
@@ -48,6 +48,17 @@ extends:
     - stage: Build
       displayName: Build and Test
       jobs:
+      # Build and (optionally) test binaries
+      - template: /eng/pipelines/jobs/platform-matrix.yml@self
+        parameters:
+          jobTemplate: /eng/pipelines/jobs/build-binaries.yml@self
+          includeArm64: true
+          includeDebug: true
+          jobParameters:
+            publishBinaries: true
+            is1ESPipeline: false
+            commonTemplatesFolderName: 'templates'
+
       - ${{ if ne(parameters.testGroup, 'None') }}:
         - template: /eng/pipelines/jobs/platform-matrix.yml@self
           parameters:

From b0ec0011d36f5ac0da97a9c074e0a5b2021ac11f Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Thu, 18 Apr 2024 11:14:18 -0700
Subject: [PATCH 15/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index e3c305f9616..fc01fb35701 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -82,6 +82,7 @@ jobs:
         # Linux builds (of all variants) run in Mariner containers and do not include pwsh by default
         - ${{ if eq(parameters.osGroup, 'Linux') }}:
           - script: |
+              pwd
               echo "Before Restore"
               ls
               $(Build.SourcesDirectory)/restore.sh
@@ -90,17 +91,9 @@ jobs:
               export DOTNET_ROOT="$Build.SourcesDirectory/.dotnet"
               echo "After Dotnet Root"
               ls
-              $(Build.SourcesDirectory)/.dotnet/dotnet tool install PowerShell --tool-path $(Build.SourcesDirectory)/tools
+              $(Build.SourcesDirectory)/.dotnet/dotnet tool install --global PowerShell
               echo "After Pwsh"
               ls
-              cd tools
-              echo "After CD 1"
-              ls
-              echo "After CD 2"
-              cd ..
-              export PATH=$PATH:$(Build.SourcesDirectory)/tools
-              echo "After PATH"
-              echo "$PATH"
             displayName: Install pwsh
 
         # Calculate the fully qualified Nodejs version first so that any new releases will result in a new cache key

From db0f2f0cf2deafb4fcde048a90edbd3fca0d1770 Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Thu, 18 Apr 2024 12:41:21 -0700
Subject: [PATCH 16/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index fc01fb35701..9edf40f4589 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -94,6 +94,10 @@ jobs:
               $(Build.SourcesDirectory)/.dotnet/dotnet tool install --global PowerShell
               echo "After Pwsh"
               ls
+              export PATH="$PATH:/home/cloudtest_azpcontainer/.dotnet/tools"
+              echo "After PATH"
+              echo "$PATH"
+              ls
             displayName: Install pwsh
 
         # Calculate the fully qualified Nodejs version first so that any new releases will result in a new cache key

From 56125c6f892a2fb8127a182d8e779309d39d91e3 Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Thu, 18 Apr 2024 13:36:36 -0700
Subject: [PATCH 17/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index 9edf40f4589..32ef13a1894 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -84,26 +84,27 @@ jobs:
           - script: |
               pwd
               echo "Before Restore"
-              ls
+              ls -a
               $(Build.SourcesDirectory)/restore.sh
               echo "After Restore"
-              ls
+              ls -a
               export DOTNET_ROOT="$Build.SourcesDirectory/.dotnet"
               echo "After Dotnet Root"
-              ls
+              ls -a
               $(Build.SourcesDirectory)/.dotnet/dotnet tool install --global PowerShell
               echo "After Pwsh"
-              ls
+              ls -a
               export PATH="$PATH:/home/cloudtest_azpcontainer/.dotnet/tools"
               echo "After PATH"
               echo "$PATH"
-              ls
+              ls -a
             displayName: Install pwsh
 
         # Calculate the fully qualified Nodejs version first so that any new releases will result in a new cache key
-        - pwsh: eng/helix/GetNodejsVersion.ps1
-              -MajorVersion $(NodeMajorVersion)
-              -TaskVariableName 'FqNodejsVersion'
+        - script: |
+            cd $Build.SourcesDirectory/.dotnet
+            pwsh ../eng/helix/GetNodejsVersion.ps1 -MajorVersion $(NodeMajorVersion) -TaskVariableName 'FqNodejsVersion'
+            cd $Build.SourcesDirectory
           displayName: Calculate Node.js version
 
         - task: Cache@2
@@ -113,10 +114,10 @@ jobs:
             key: 'nodejs | ${{ parameters.osGroup }} | ${{ parameters.architecture }} | "$(FqNodejsVersion)"'
             path: $(HelixNodejsPayloadPath)
 
-        - pwsh: eng/helix/InstallNodejs.ps1
-            -Version $(FqNodejsVersion)
-            -Architecture ${{ parameters.architecture }}
-            -DestinationFolder "$(HelixNodejsPayloadPath)"
+        - script: |
+            cd $Build.SourcesDirectory/.dotnet
+            pwsh ../eng/helix/InstallNodejs.ps1 -Version $(FqNodejsVersion) -Architecture ${{ parameters.architecture }} -DestinationFolder "$(HelixNodejsPayloadPath)"
+            cd $Build.SourcesDirectory
           displayName: Hydrate Node.js Installation
 
     - ${{ else }}:

From 775f382451a55504b16e100811c764d1fc0a9e6e Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Thu, 18 Apr 2024 13:57:48 -0700
Subject: [PATCH 18/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index 32ef13a1894..5ed67fb8e48 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -94,7 +94,7 @@ jobs:
               $(Build.SourcesDirectory)/.dotnet/dotnet tool install --global PowerShell
               echo "After Pwsh"
               ls -a
-              export PATH="$PATH:/home/cloudtest_azpcontainer/.dotnet/tools"
+              ##vso[task.prependpath]/home/cloudtest_azpcontainer/.dotnet/tools
               echo "After PATH"
               echo "$PATH"
               ls -a
@@ -102,9 +102,12 @@ jobs:
 
         # Calculate the fully qualified Nodejs version first so that any new releases will result in a new cache key
         - script: |
-            cd $Build.SourcesDirectory/.dotnet
+            pwd
+            ls -a
+            cd .dotnet
+            ls -a
             pwsh ../eng/helix/GetNodejsVersion.ps1 -MajorVersion $(NodeMajorVersion) -TaskVariableName 'FqNodejsVersion'
-            cd $Build.SourcesDirectory
+            cd ..
           displayName: Calculate Node.js version
 
         - task: Cache@2
@@ -115,9 +118,12 @@ jobs:
             path: $(HelixNodejsPayloadPath)
 
         - script: |
-            cd $Build.SourcesDirectory/.dotnet
+            pwd
+            ls -a
+            cd .dotnet
+            ls -a
             pwsh ../eng/helix/InstallNodejs.ps1 -Version $(FqNodejsVersion) -Architecture ${{ parameters.architecture }} -DestinationFolder "$(HelixNodejsPayloadPath)"
-            cd $Build.SourcesDirectory
+            cd ..
           displayName: Hydrate Node.js Installation
 
     - ${{ else }}:

From b6bf951c78a3188c474b2f21b76024bea68af39c Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Thu, 18 Apr 2024 14:23:50 -0700
Subject: [PATCH 19/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index 5ed67fb8e48..d65f3f355b0 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -94,7 +94,8 @@ jobs:
               $(Build.SourcesDirectory)/.dotnet/dotnet tool install --global PowerShell
               echo "After Pwsh"
               ls -a
-              ##vso[task.prependpath]/home/cloudtest_azpcontainer/.dotnet/tools
+              echo ##vso[task.prependpath]/home/cloudtest_azpcontainer/.dotnet/tools
+              echo ##vso[task.prependpath]home/cloudtest_azpcontainer/.dotnet/tools
               echo "After PATH"
               echo "$PATH"
               ls -a
@@ -102,6 +103,7 @@ jobs:
 
         # Calculate the fully qualified Nodejs version first so that any new releases will result in a new cache key
         - script: |
+            echo "$PATH"
             pwd
             ls -a
             cd .dotnet
@@ -118,6 +120,7 @@ jobs:
             path: $(HelixNodejsPayloadPath)
 
         - script: |
+            echo "$PATH"
             pwd
             ls -a
             cd .dotnet

From 5f4ee590e4a09ee20e428b9cc67c1661751175f3 Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Thu, 18 Apr 2024 15:00:46 -0700
Subject: [PATCH 20/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index d65f3f355b0..42b1bc13fff 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -94,8 +94,8 @@ jobs:
               $(Build.SourcesDirectory)/.dotnet/dotnet tool install --global PowerShell
               echo "After Pwsh"
               ls -a
-              echo ##vso[task.prependpath]/home/cloudtest_azpcontainer/.dotnet/tools
-              echo ##vso[task.prependpath]home/cloudtest_azpcontainer/.dotnet/tools
+              echo "##vso[task.prependpath]/home/cloudtest_azpcontainer/.dotnet/tools"
+              echo "##vso[task.prependpath]home/cloudtest_azpcontainer/.dotnet/tools"
               echo "After PATH"
               echo "$PATH"
               ls -a
@@ -103,6 +103,8 @@ jobs:
 
         # Calculate the fully qualified Nodejs version first so that any new releases will result in a new cache key
         - script: |
+            echo "$PATH"
+            export PATH="$PATH:/home/cloudtest_azpcontainer/.dotnet/tools"
             echo "$PATH"
             pwd
             ls -a
@@ -120,6 +122,8 @@ jobs:
             path: $(HelixNodejsPayloadPath)
 
         - script: |
+            echo "$PATH"
+            export PATH="$PATH:/home/cloudtest_azpcontainer/.dotnet/tools"
             echo "$PATH"
             pwd
             ls -a

From 7cd4ed7c7d4e26ac744b98c25d4a086ed29b246d Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Thu, 18 Apr 2024 15:22:26 -0700
Subject: [PATCH 21/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index 42b1bc13fff..69ed5f88716 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -88,14 +88,10 @@ jobs:
               $(Build.SourcesDirectory)/restore.sh
               echo "After Restore"
               ls -a
-              export DOTNET_ROOT="$Build.SourcesDirectory/.dotnet"
-              echo "After Dotnet Root"
-              ls -a
               $(Build.SourcesDirectory)/.dotnet/dotnet tool install --global PowerShell
               echo "After Pwsh"
               ls -a
               echo "##vso[task.prependpath]/home/cloudtest_azpcontainer/.dotnet/tools"
-              echo "##vso[task.prependpath]home/cloudtest_azpcontainer/.dotnet/tools"
               echo "After PATH"
               echo "$PATH"
               ls -a
@@ -104,6 +100,7 @@ jobs:
         # Calculate the fully qualified Nodejs version first so that any new releases will result in a new cache key
         - script: |
             echo "$PATH"
+            export DOTNET_ROOT="$Build.SourcesDirectory/.dotnet"
             export PATH="$PATH:/home/cloudtest_azpcontainer/.dotnet/tools"
             echo "$PATH"
             pwd
@@ -123,6 +120,7 @@ jobs:
 
         - script: |
             echo "$PATH"
+            export DOTNET_ROOT="$Build.SourcesDirectory/.dotnet"
             export PATH="$PATH:/home/cloudtest_azpcontainer/.dotnet/tools"
             echo "$PATH"
             pwd

From e646b3c5580b0bf20208b551d84440f186d9617e Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Thu, 18 Apr 2024 15:53:08 -0700
Subject: [PATCH 22/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index 69ed5f88716..77239408d09 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -100,7 +100,8 @@ jobs:
         # Calculate the fully qualified Nodejs version first so that any new releases will result in a new cache key
         - script: |
             echo "$PATH"
-            export DOTNET_ROOT="$Build.SourcesDirectory/.dotnet"
+            export DOTNET_ROOT="$(Build.SourcesDirectory)/.dotnet"
+            echo "$DOTNET_ROOT"
             export PATH="$PATH:/home/cloudtest_azpcontainer/.dotnet/tools"
             echo "$PATH"
             pwd
@@ -120,7 +121,8 @@ jobs:
 
         - script: |
             echo "$PATH"
-            export DOTNET_ROOT="$Build.SourcesDirectory/.dotnet"
+            export DOTNET_ROOT="$(Build.SourcesDirectory)/.dotnet"
+            echo "$DOTNET_ROOT"
             export PATH="$PATH:/home/cloudtest_azpcontainer/.dotnet/tools"
             echo "$PATH"
             pwd

From b5cff6801d0633c624150d13f2cdc7c807a2ac1a Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Fri, 19 Apr 2024 09:23:54 -0700
Subject: [PATCH 23/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 48 ++++++++--------------------
 1 file changed, 13 insertions(+), 35 deletions(-)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index 77239408d09..d70ef7e239d 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -82,34 +82,17 @@ jobs:
         # Linux builds (of all variants) run in Mariner containers and do not include pwsh by default
         - ${{ if eq(parameters.osGroup, 'Linux') }}:
           - script: |
-              pwd
-              echo "Before Restore"
-              ls -a
               $(Build.SourcesDirectory)/restore.sh
-              echo "After Restore"
-              ls -a
               $(Build.SourcesDirectory)/.dotnet/dotnet tool install --global PowerShell
-              echo "After Pwsh"
-              ls -a
               echo "##vso[task.prependpath]/home/cloudtest_azpcontainer/.dotnet/tools"
-              echo "After PATH"
-              echo "$PATH"
-              ls -a
             displayName: Install pwsh
 
-        # Calculate the fully qualified Nodejs version first so that any new releases will result in a new cache key
-        - script: |
-            echo "$PATH"
-            export DOTNET_ROOT="$(Build.SourcesDirectory)/.dotnet"
-            echo "$DOTNET_ROOT"
-            export PATH="$PATH:/home/cloudtest_azpcontainer/.dotnet/tools"
-            echo "$PATH"
-            pwd
-            ls -a
-            cd .dotnet
-            ls -a
-            pwsh ../eng/helix/GetNodejsVersion.ps1 -MajorVersion $(NodeMajorVersion) -TaskVariableName 'FqNodejsVersion'
-            cd ..
+        - pwsh: eng/helix/GetNodejsVersion.ps1
+              -MajorVersion $(NodeMajorVersion)
+              -TaskVariableName 'FqNodejsVersion'
+          ${{ if eq(parameters.osGroup, 'Linux') }}:
+            env:
+              DOTNET_ROOT: "$(Build.SourcesDirectory)/.dotnet"
           displayName: Calculate Node.js version
 
         - task: Cache@2
@@ -119,18 +102,13 @@ jobs:
             key: 'nodejs | ${{ parameters.osGroup }} | ${{ parameters.architecture }} | "$(FqNodejsVersion)"'
             path: $(HelixNodejsPayloadPath)
 
-        - script: |
-            echo "$PATH"
-            export DOTNET_ROOT="$(Build.SourcesDirectory)/.dotnet"
-            echo "$DOTNET_ROOT"
-            export PATH="$PATH:/home/cloudtest_azpcontainer/.dotnet/tools"
-            echo "$PATH"
-            pwd
-            ls -a
-            cd .dotnet
-            ls -a
-            pwsh ../eng/helix/InstallNodejs.ps1 -Version $(FqNodejsVersion) -Architecture ${{ parameters.architecture }} -DestinationFolder "$(HelixNodejsPayloadPath)"
-            cd ..
+        - pwsh: eng/helix/InstallNodejs.ps1
+            -Version $(FqNodejsVersion)
+            -Architecture ${{ parameters.architecture }}
+            -DestinationFolder "$(HelixNodejsPayloadPath)"
+          ${{ if eq(parameters.osGroup, 'Linux') }}:
+            env:
+              DOTNET_ROOT: "$(Build.SourcesDirectory)/.dotnet"
           displayName: Hydrate Node.js Installation
 
     - ${{ else }}:

From 7f979de268bc18caf710c9aaf33c6090e2515a53 Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Fri, 19 Apr 2024 09:47:37 -0700
Subject: [PATCH 24/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 62 +++++++++++++++++-----------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index d70ef7e239d..c49134416e4 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -87,29 +87,45 @@ jobs:
               echo "##vso[task.prependpath]/home/cloudtest_azpcontainer/.dotnet/tools"
             displayName: Install pwsh
 
-        - pwsh: eng/helix/GetNodejsVersion.ps1
-              -MajorVersion $(NodeMajorVersion)
-              -TaskVariableName 'FqNodejsVersion'
-          ${{ if eq(parameters.osGroup, 'Linux') }}:
-            env:
-              DOTNET_ROOT: "$(Build.SourcesDirectory)/.dotnet"
-          displayName: Calculate Node.js version
-
-        - task: Cache@2
-          displayName: Node.js Cache
-          inputs:
-            # Wrap FqNodejsVersion in quotes to prevent it being interpreted as a file
-            key: 'nodejs | ${{ parameters.osGroup }} | ${{ parameters.architecture }} | "$(FqNodejsVersion)"'
-            path: $(HelixNodejsPayloadPath)
-
-        - pwsh: eng/helix/InstallNodejs.ps1
-            -Version $(FqNodejsVersion)
-            -Architecture ${{ parameters.architecture }}
-            -DestinationFolder "$(HelixNodejsPayloadPath)"
-          ${{ if eq(parameters.osGroup, 'Linux') }}:
-            env:
-              DOTNET_ROOT: "$(Build.SourcesDirectory)/.dotnet"
-          displayName: Hydrate Node.js Installation
+          # Calculate the fully qualified Nodejs version first so that any new releases will result in a new cache key
+          - script: |
+              export DOTNET_ROOT="$(Build.SourcesDirectory)/.dotnet"
+              cd .dotnet
+              pwsh ../eng/helix/GetNodejsVersion.ps1 -MajorVersion $(NodeMajorVersion) -TaskVariableName 'FqNodejsVersion'
+              cd ..
+            displayName: Calculate Node.js version Linux
+  
+          - task: Cache@2
+            displayName: Node.js Cache Linux
+            inputs:
+              # Wrap FqNodejsVersion in quotes to prevent it being interpreted as a file
+              key: 'nodejs | ${{ parameters.osGroup }} | ${{ parameters.architecture }} | "$(FqNodejsVersion)"'
+              path: $(HelixNodejsPayloadPath)
+  
+          - script: |
+              export DOTNET_ROOT="$(Build.SourcesDirectory)/.dotnet"
+              cd .dotnet
+              pwsh ../eng/helix/InstallNodejs.ps1 -Version $(FqNodejsVersion) -Architecture ${{ parameters.architecture }} -DestinationFolder "$(HelixNodejsPayloadPath)"
+              cd ..
+            displayName: Hydrate Node.js Installation Linux
+        - ${{ else }}:
+          - pwsh: eng/helix/GetNodejsVersion.ps1
+                -MajorVersion $(NodeMajorVersion)
+                -TaskVariableName 'FqNodejsVersion'
+            displayName: Calculate Node.js version Non-Linux
+  
+          - task: Cache@2
+            displayName: Node.js Cache Non-Linux
+            inputs:
+              # Wrap FqNodejsVersion in quotes to prevent it being interpreted as a file
+              key: 'nodejs | ${{ parameters.osGroup }} | ${{ parameters.architecture }} | "$(FqNodejsVersion)"'
+              path: $(HelixNodejsPayloadPath)
+  
+          - pwsh: eng/helix/InstallNodejs.ps1
+              -Version $(FqNodejsVersion)
+              -Architecture ${{ parameters.architecture }}
+              -DestinationFolder "$(HelixNodejsPayloadPath)"
+            displayName: Hydrate Node.js Installation Non-Linux
 
     - ${{ else }}:
       - ${{ if ne(parameters.osGroup, 'Windows') }}:

From 0c961f3a279f650ec486f6088e18c87855600221 Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Fri, 19 Apr 2024 12:20:22 -0700
Subject: [PATCH 25/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index c49134416e4..e692fd15acd 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -89,11 +89,10 @@ jobs:
 
           # Calculate the fully qualified Nodejs version first so that any new releases will result in a new cache key
           - script: |
-              export DOTNET_ROOT="$(Build.SourcesDirectory)/.dotnet"
-              cd .dotnet
               pwsh ../eng/helix/GetNodejsVersion.ps1 -MajorVersion $(NodeMajorVersion) -TaskVariableName 'FqNodejsVersion'
-              cd ..
             displayName: Calculate Node.js version Linux
+            env:
+              DOTNET_ROOT: "$(Build.SourcesDirectory)/.dotnet"
   
           - task: Cache@2
             displayName: Node.js Cache Linux
@@ -103,11 +102,11 @@ jobs:
               path: $(HelixNodejsPayloadPath)
   
           - script: |
-              export DOTNET_ROOT="$(Build.SourcesDirectory)/.dotnet"
-              cd .dotnet
               pwsh ../eng/helix/InstallNodejs.ps1 -Version $(FqNodejsVersion) -Architecture ${{ parameters.architecture }} -DestinationFolder "$(HelixNodejsPayloadPath)"
-              cd ..
             displayName: Hydrate Node.js Installation Linux
+            env:
+              DOTNET_ROOT: "$(Build.SourcesDirectory)/.dotnet"
+
         - ${{ else }}:
           - pwsh: eng/helix/GetNodejsVersion.ps1
                 -MajorVersion $(NodeMajorVersion)

From babd8e7c1305b82f909382d97ed85ed1094738b1 Mon Sep 17 00:00:00 2001
From: kkeirstead <85592574+kkeirstead@users.noreply.github.com>
Date: Fri, 19 Apr 2024 12:46:13 -0700
Subject: [PATCH 26/26] Update test-binaries.yml

---
 eng/pipelines/jobs/test-binaries.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eng/pipelines/jobs/test-binaries.yml b/eng/pipelines/jobs/test-binaries.yml
index e692fd15acd..2e1a251315b 100644
--- a/eng/pipelines/jobs/test-binaries.yml
+++ b/eng/pipelines/jobs/test-binaries.yml
@@ -91,6 +91,7 @@ jobs:
           - script: |
               pwsh ../eng/helix/GetNodejsVersion.ps1 -MajorVersion $(NodeMajorVersion) -TaskVariableName 'FqNodejsVersion'
             displayName: Calculate Node.js version Linux
+            workingDirectory: "$(Build.SourcesDirectory)/.dotnet"
             env:
               DOTNET_ROOT: "$(Build.SourcesDirectory)/.dotnet"
   
@@ -104,6 +105,7 @@ jobs:
           - script: |
               pwsh ../eng/helix/InstallNodejs.ps1 -Version $(FqNodejsVersion) -Architecture ${{ parameters.architecture }} -DestinationFolder "$(HelixNodejsPayloadPath)"
             displayName: Hydrate Node.js Installation Linux
+            workingDirectory: "$(Build.SourcesDirectory)/.dotnet"
             env:
               DOTNET_ROOT: "$(Build.SourcesDirectory)/.dotnet"