look for benchview files in bin/debug/tools (#14856)

* fail when nuget fails

* update benchview tools location

* use a tools directory

* make tools directory if it doesn't exist

* consolodate path changes

build/scripts/install_benchview_tools.cmd

@@ -9,6 +9,6 @@ call "%~dp0clean_benchview_tools.cmd" "%OUTPUT_DIR%" || exit /b 1
 :: Installing BenchView Tools
 call "%~dp0LoadNuGetInfo.cmd" || (echo Failed to load nuget. & exit /b 1)
 
-call "%NugetExe%" install Microsoft.BenchView.JSONFormat -Source http://benchviewtestfeed.azurewebsites.net/nuget -OutputDirectory "%OUTPUT_DIR%." -Prerelease -ExcludeVersion 1>NUL 2>&1 || echo Failed to install nuget package
+call "%NugetExe%" install Microsoft.BenchView.JSONFormat -Source http://benchviewtestfeed.azurewebsites.net/nuget -OutputDirectory "%OUTPUT_DIR%." -Prerelease -ExcludeVersion || exit /b 1
 
 exit /b 0

cibuild.cmd

@@ -99,9 +99,10 @@ if defined TestPerfRun (
             ) else (
                 set "EXTRA_PERF_RUNNER_ARGS=!EXTRA_PERF_RUNNER_ARGS! --benchview-submission-type rolling"
             )
-
+            mkdir ".\Binaries\%BuildConfiguration%\tools\"
             REM Get the benchview tools - Place alongside Roslyn.Test.Performance.Runner.exe
-            call "%RoslynRoot%\build\scripts\install_benchview_tools.cmd" ".\Binaries\%BuildConfiguration%\" || goto :BuildFailed
+            call "%RoslynRoot%\build\scripts\install_benchview_tools.cmd" ".\Binaries\%BuildConfiguration%\tools\" || goto :BuildFailed
+            dir ".\Binaries\%BuildConfiguration%\"
         )
     )
 

src/Test/Perf/Runner/Benchview.cs

@@ -12,7 +12,8 @@ namespace Roslyn.Test.Performance.Runner
     public static class Benchview
     {
         private const string s_sasEnvironmentVar = "BV_UPLOAD_SAS_TOKEN";
-        private static readonly string s_scriptDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Microsoft.BenchView.JSONFormat", "tools");
+        private static readonly string s_scriptDirectory = Path.Combine(
+                AppDomain.CurrentDomain.BaseDirectory, "..", "..", "tools", "Microsoft.BenchView.JSONFormat", "tools");
         private static readonly string s_outputDirectory = GetCPCDirectoryPath();
         private static readonly string[] s_validSubmissionTypes = new string[] { "rolling", "private", "local" };