Revert 860d6a1 (#3222)

* Revert "Cleanup tool build changes (#3179)"

This reverts commit 860d6a1.

Author: LoopedBard3

eng/performance/scenarios.yml

@@ -129,6 +129,20 @@ jobs:
             displayName: Get dotnetVersion to use
           - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --dotnet-versions $(DotnetVersion) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet $(runEnvVarsParam) $(AffinityParam)
             displayName: Run ci_setup.py with dotnetVersionsLinks
+        - powershell: |
+            Write-Host "##vso[task.setvariable variable=DOTNET_ROOT;]$(CorrelationStaging)dotnet"
+            Write-Host "Set DOTNET_ROOT to $(CorrelationStaging)dotnet"
+          displayName: Explicitly set DOTNET_ROOT
+        - script: |
+            echo "##vso[task.setvariable variable=PATH;]$(DOTNET_ROOT):$(PATH)"
+            echo "Set PATH to $(DOTNET_ROOT):$(PATH)"
+          displayName: Explicitly set PATH (Non-Windows)
+          condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
+        - powershell: |
+            Write-Host "##vso[task.setvariable variable=PATH;]$(DOTNET_ROOT);$(PATH)"
+            Write-Host "Set PATH to $(DOTNET_ROOT);$(PATH)"
+          displayName: Explicitly set PATH (Windows)
+          condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'))
         - ${{ if eq(parameters.osName, 'windows') }}:
           - script: xcopy .\NuGet.config $(CorrelationStaging) && xcopy .\scripts $(CorrelationStaging)scripts\/e && xcopy .\src\scenarios\shared $(CorrelationStaging)shared\/e && xcopy .\src\scenarios\staticdeps $(CorrelationStaging)staticdeps\/e
             displayName: Copy python libraries and NuGet.config