diff --git a/eng/pipelines/templates/jobs/ci.tests.yml b/eng/pipelines/templates/jobs/ci.tests.yml
index b3dfa3d8c620..8e8997d18da3 100644
--- a/eng/pipelines/templates/jobs/ci.tests.yml
+++ b/eng/pipelines/templates/jobs/ci.tests.yml
@@ -157,11 +157,12 @@ jobs:
         parameters:
           LogFilePath: $(Build.ArtifactStagingDirectory)/test.binlog
 
-      - script: >-
+      - pwsh: >
+          ./eng/scripts/runwithdevopslogging.ps1
           dotnet test eng/service.proj
-          --filter "(TestCategory!=Manually) & (TestCategory!=Live) & ($(AdditionalTestFilters))"
+          --filter '"(TestCategory!=Manually) & (TestCategory!=Live) & ($(AdditionalTestFilters))"'
           --framework $(TestTargetFramework)
-          --logger "trx;LogFileName=$(TestTargetFramework).trx" --logger:"console;verbosity=normal"
+          --logger '"trx;LogFileName=$(TestTargetFramework).trx"' --logger:'"console;verbosity=normal"'
           --blame-crash-dump-type full --blame-hang-dump-type full --blame-hang-timeout ${{parameters.TestTimeoutInMinutes}}minutes
           /p:SDKType=${{ parameters.SDKType }}
           /p:ServiceDirectory=$(ServiceDirectory)
diff --git a/eng/pipelines/templates/jobs/live.tests.yml b/eng/pipelines/templates/jobs/live.tests.yml
index 4afb5e3cd00e..eb1197582987 100644
--- a/eng/pipelines/templates/jobs/live.tests.yml
+++ b/eng/pipelines/templates/jobs/live.tests.yml
@@ -161,7 +161,7 @@ jobs:
             azurePowerShellVersion: LatestVersion
             pwsh: true
             ScriptType: InlineScript
-            Inline: >-
+            Inline: >
               . ./eng/common/TestResources/SubConfig-Helpers.ps1
               $serviceDirectoryPrefix = BuildServiceDirectoryPrefix ${{ parameters.ServiceDirectory }};
               $account = (Get-AzContext).Account;
@@ -170,11 +170,12 @@ jobs:
               [Environment]::SetEnvironmentVariable("${serviceDirectoryPrefix}CLIENT_ID", $account.Id);
               [Environment]::SetEnvironmentVariable("${serviceDirectoryPrefix}TENANT_ID", $account.Tenants);
 
+              ./eng/scripts/runwithdevopslogging.ps1
               dotnet test eng/service.proj
               --framework $(TestTargetFramework)
-              --filter "TestCategory!=Manually & ($(AdditionalTestFilters))"
-              --logger "trx"
-              --logger:"console;verbosity=normal"
+              --filter '"TestCategory!=Manually & ($(AdditionalTestFilters))"'
+              --logger trx
+              --logger:'"console;verbosity=normal"'
               --blame-crash-dump-type full --blame-hang-dump-type full --blame-hang-timeout ${{parameters.TimeoutInMinutes}}minutes
               /p:SDKType=${{ parameters.SDKType }}
               /p:ServiceDirectory=${{ parameters.ServiceDirectory }}
@@ -187,6 +188,7 @@ jobs:
               /p:CollectCoverage=$(CollectCoverage) /p:CodeCoverageDirectory=$(Build.SourcesDirectory)\sdk\${{parameters.ServiceDirectory}}
               /p:EnableSourceLink=false
               $(AdditionalTestArguments);
+
               Write-Host "Last exit code: $LASTEXITCODE";
               exit $LASTEXITCODE;
           env:
@@ -198,12 +200,13 @@ jobs:
               ${{ var.key }}: ${{ var.value }}
 
       - ${{ else }}:
-        - script: >-
+        - psws: >
+            ./eng/scripts/runwithdevopslogging.ps1
             dotnet test eng/service.proj
             --framework $(TestTargetFramework)
-            --filter "TestCategory!=Manually & ($(AdditionalTestFilters))"
-            --logger "trx"
-            --logger:"console;verbosity=normal"
+            --filter '"TestCategory!=Manually & ($(AdditionalTestFilters))"'
+            --logger trx
+            --logger:'"console;verbosity=normal"'
             --blame-crash-dump-type full --blame-hang-dump-type full --blame-hang-timeout ${{parameters.TimeoutInMinutes}}minutes
             /p:SDKType=${{ parameters.SDKType }}
             /p:ServiceDirectory=${{ parameters.ServiceDirectory }}
diff --git a/eng/pipelines/templates/steps/build.yml b/eng/pipelines/templates/steps/build.yml
index 20e14fe738a7..22c56f8d248b 100644
--- a/eng/pipelines/templates/steps/build.yml
+++ b/eng/pipelines/templates/steps/build.yml
@@ -94,25 +94,27 @@ steps:
   # surprised by new errors that pop up only in internal when public CI was clean.
   - ${{ if eq(parameters.ServiceDirectory, 'auto') }}:
     # only use the project list override file if the service directory is not auto
-    - pwsh: |
-        dotnet pack eng/service.proj -warnaserror `
-          /p:ValidateRunApiCompat=true `
-          /p:SDKType=${{ parameters.SDKType }} `
-          /p:IncludeTests=false `
-          /p:PublicSign=false $(VersioningProperties) `
-          /p:Configuration=Release `
-          /p:CommitSHA=$(Build.SourceVersion) `
-          /p:ArtifactsPackagesDir=$(Build.ArtifactStagingDirectory) `
-          /p:ServiceDirectory=* `
-          /p:ProjectListOverrideFile=$(ProjectListOverrideFile) `
-          /p:IncludePerf=false `
-          /p:IncludeStress=false `
-          /p:IncludeIntegrationTests=false `
-          /p:EnableOverrideExclusions=true `
-          $(DiagnosticArguments)
+    - pwsh: >
+        ./eng/scripts/runwithdevopslogging.ps1
+        dotnet pack eng/service.proj -warnaserror
+        /p:ValidateRunApiCompat=true
+        /p:SDKType=${{ parameters.SDKType }}
+        /p:IncludeTests=false
+        /p:PublicSign=false $(VersioningProperties)
+        /p:Configuration=Release
+        /p:CommitSHA=$(Build.SourceVersion)
+        /p:ArtifactsPackagesDir=$(Build.ArtifactStagingDirectory)
+        /p:ServiceDirectory=*
+        /p:ProjectListOverrideFile=$(ProjectListOverrideFile)
+        /p:IncludePerf=false
+        /p:IncludeStress=false
+        /p:IncludeIntegrationTests=false
+        /p:EnableOverrideExclusions=true
+        $(DiagnosticArguments)
       displayName: "Build and Package for PR"
   - ${{ else }}:
-    - script: >-
+    - pwsh: >
+        ./eng/scripts/runwithdevopslogging.ps1
         dotnet pack eng/service.proj -warnaserror
         /p:ValidateRunApiCompat=true
         /p:SDKType=${{ parameters.SDKType }}
diff --git a/eng/scripts/runwithdevopslogging.ps1 b/eng/scripts/runwithdevopslogging.ps1
new file mode 100644
index 000000000000..d5ce85fd88a9
--- /dev/null
+++ b/eng/scripts/runwithdevopslogging.ps1
@@ -0,0 +1,3 @@
+. $PSScriptRoot/../common/scripts/Helpers/CommandInvocation-Helpers.ps1
+
+Invoke-LoggedMsbuildCommand "$args"