From 5e5158aac584b786c66ce874827a8005d9ed43c2 Mon Sep 17 00:00:00 2001
From: Balaji Soundrarajan <basoundr@microsoft.com>
Date: Thu, 28 Apr 2016 15:22:37 -0700
Subject: [PATCH] Install Vsix as part of Automation

---
 src/Test/Perf/infra/automation.csx                          | 3 +++
 .../{util/InstallVsixes.csx => infra/install_vsixes.csx}    | 6 +++---
 src/Test/PerformanceTesting.csproj                          | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
 rename src/Test/Perf/{util/InstallVsixes.csx => infra/install_vsixes.csx} (71%)

diff --git a/src/Test/Perf/infra/automation.csx b/src/Test/Perf/infra/automation.csx
index cc8220e5341..78b9d0e23ff 100644
--- a/src/Test/Perf/infra/automation.csx
+++ b/src/Test/Perf/infra/automation.csx
@@ -14,5 +14,8 @@ ShellOutVital(Path.Combine(directoryUtil.RoslynDirectory, "Restore.cmd"), "", wo
 // Build Roslyn in Release Mode
 ShellOutVital("msbuild", "./Roslyn.sln /p:Configuration=Release", workingDirectory: directoryUtil.RoslynDirectory);
 
+// Install the Vsixes to RoslynPerf hive
+await RunFile(Path.Combine(directoryUtil.MyWorkingDirectory, "install_vsixes.csx"));
+
 // Run run_and_report.csx
 await RunFile(Path.Combine(directoryUtil.MyWorkingDirectory, "run_and_report.csx"));
diff --git a/src/Test/Perf/util/InstallVsixes.csx b/src/Test/Perf/infra/install_vsixes.csx
similarity index 71%
rename from src/Test/Perf/util/InstallVsixes.csx
rename to src/Test/Perf/infra/install_vsixes.csx
index 0d3c81cda57..ee24c3898af 100644
--- a/src/Test/Perf/util/InstallVsixes.csx
+++ b/src/Test/Perf/infra/install_vsixes.csx
@@ -1,6 +1,6 @@
 #load "test_util.csx"
 
-var binaries = new RelativeDirectory().MyBinaries();
+var binariesDirectory = new RelativeDirectory().MyBinaries();
 var vsixes = new[]
 {
     "Roslyn.VisualStudio.Setup.vsix",
@@ -12,11 +12,11 @@ var vsixes = new[]
     "Microsoft.VisualStudio.LanguageServices.Telemetry.vsix"
 };
 
-var installer = Path.Combine(binaries, "VSIXExpInstaller.exe");
+var installer = Path.Combine(binariesDirectory, "VSIXExpInstaller.exe");
 
 foreach (var vsix in vsixes)
 {
-    ShellOutVital(installer, $"/rootSuffix:RoslynPerf {vsix}", binaries, System.Threading.CancellationToken.None);
+    ShellOutVital(installer, $"/rootSuffix:RoslynPerf {vsix}", binariesDirectory, System.Threading.CancellationToken.None);
 }
 
 
diff --git a/src/Test/PerformanceTesting.csproj b/src/Test/PerformanceTesting.csproj
index 2d56e94eb6d..2d8c2dc17ab 100644
--- a/src/Test/PerformanceTesting.csproj
+++ b/src/Test/PerformanceTesting.csproj
@@ -121,7 +121,7 @@
     <Content Include="Perf\util\trace_manager_util.csx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Perf\util\InstallVsixes.csx">
+    <Content Include="Perf\infra\install_vsixes.csx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-- 
GitLab