Swich away from VSIXExpInstaller

Just use the real installer rather than our own.

Author: jasonmalinowski

eng/Directory.Packages.props

@@ -311,7 +311,6 @@
     <PackageVersion Include="Mono.Options" Version="6.6.0.161" />
     <PackageVersion Include="Roslyn.Diagnostics.Analyzers" Version="$(RoslynDiagnosticsNugetPackageVersion)" />
     <PackageVersion Include="SourceBrowser" Version="1.0.21" />
-    <PackageVersion Include="RoslynTools.VSIXExpInstaller" Version="1.1.0-beta3.22474.1" />
     <PackageVersion Include="MicroBuildPluginsSwixBuild" Version="1.1.87" />
     <PackageVersion Include="vswhere" Version="$(vswhereVersion)" />
     <!--

eng/build.ps1

@@ -556,13 +556,6 @@ function EnablePreviewSdks() {
 # deploying at build time.
 function Deploy-VsixViaTool() {
 
-  $vsixExe = Join-Path $ArtifactsDir "bin\RunTests\$configuration\net9.0\VSIXExpInstaller\VSIXExpInstaller.exe"
-  Write-Host "VSIX EXE path: " $vsixExe
-  if (-not (Test-Path $vsixExe)) {
-    Write-Host "VSIX EXE not found: '$vsixExe'." -ForegroundColor Red
-    ExitWithExitCode 1
-  }
-
   $vsInfo = LocateVisualStudio
   if ($vsInfo -eq $null) {
     throw "Unable to locate required Visual Studio installation"
@@ -575,7 +568,7 @@ function Deploy-VsixViaTool() {
 
   $hive = "RoslynDev"
   Write-Host "Using VS Instance $vsId ($displayVersion) at `"$vsDir`""
-  $baseArgs = "/rootSuffix:$hive /vsInstallDir:`"$vsDir`""
+  $baseArgs = "/rootSuffix:$hive /quiet /shutdownprocesses"
 
   Write-Host "Uninstalling old Roslyn VSIX"
 
@@ -604,9 +597,10 @@ function Deploy-VsixViaTool() {
 
   foreach ($vsixFileName in $orderedVsixFileNames) {
     $vsixFile = Join-Path $VSSetupDir $vsixFileName
+    $vsixInstallerExe = Join-Path $vsDir "Common7\IDE\VSIXInstaller.exe"
     $fullArg = "$baseArgs $vsixFile"
     Write-Host "`tInstalling $vsixFileName"
-    Exec-Command $vsixExe $fullArg
+    Exec-Command $vsixInstallerExe $fullArg
   }
 
   # Set up registry

eng/test-rebuild.ps1

@@ -69,8 +69,6 @@ try {
   " --exclude net9.0\Microsoft.CodeAnalysis.Threading.Package.dll" +
   " --exclude netstandard2.0\Microsoft.CodeAnalysis.Extensions.Package.dll" +
   " --exclude netcoreapp3.1\Microsoft.CodeAnalysis.Workspaces.UnitTests.dll" +
-  " --exclude net472\Zip\tools\vsixexpinstaller\System.ValueTuple.dll" +
-  " --exclude net472\Zip\tools\vsixexpinstaller\VSIXExpInstaller.exe" +
 
   # Semantic Search reference assemblies can't be reconstructed from source.
   # The assemblies are not marked with ReferenceAssemblyAttribute attribute.

src/Setup/Installer/Installer.Package.csproj

@@ -6,7 +6,6 @@
 
   <ItemGroup>
     <PackageReference Include="vswhere" />
-    <PackageReference Include="RoslynTools.VSIXExpInstaller" />
     <ProjectReference Include="..\..\Deployment\RoslynDeployment.csproj"/>
   </ItemGroup>
 
@@ -29,7 +28,6 @@
       <_Files Include="$(MSBuildProjectDirectory)\tools\*.*" TargetDir="tools"/>
       <_Files Include="$(MSBuildProjectDirectory)\scripts\*.*" TargetDir=""/>
       <_Files Include="$(NuGetPackageRoot)vswhere\$(vswhereVersion)\tools\*.*" TargetDir="tools\vswhere"/>
-      <_Files Include="$(NuGetPackageRoot)roslyntools.vsixexpinstaller\$(RoslynToolsVSIXExpInstallerVersion)\tools\*.*" TargetDir="tools\vsixexpinstaller"/>
       <_Files Include="$(_DeploymentVsixPath)" TargetDir="vsix"/>
     </ItemGroup>
 

src/Setup/Installer/tools/utils.ps1

@@ -128,7 +128,7 @@ function Uninstall-VsixViaTool([string]$vsDir, [string]$vsId, [string]$rootSuffi
 }
 
 function Use-VsixTool([string]$vsDir, [string]$vsId, [string]$rootSuffix, [string]$additionalArgs = "") {
-  $installerExe = Join-Path $PSScriptRoot "vsixexpinstaller\VsixExpInstaller.exe"
+  $installerExe = Join-Path $vsDir "Common7\IDE\VSIXInstaller.exe"
   Write-Host "Using VS Instance $vsId at `"$vsDir`"" -ForegroundColor Gray
 
   $vsixFileNames = @("RoslynDeployment.vsix")

src/Tools/Source/RunTests/RunTests.csproj

@@ -17,16 +17,4 @@
     <PackageReference Include="Microsoft.TeamFoundationServer.Client" />
     <ProjectReference Include="..\..\..\Compilers\Test\Core\Microsoft.CodeAnalysis.Test.Utilities.csproj" />
   </ItemGroup>
-
-  
-  <!-- Include the VSIX installer so we have it in the build payload for integration tests -->
-  <ItemGroup>
-    <PackageReference Include="RoslynTools.VSIXExpInstaller" GeneratePathProperty="true" />
-  </ItemGroup>
-  <ItemGroup>
-    <_CopyItems Include="$(PkgRoslynTools_VSIXExpInstaller)\tools\*.*" />
-  </ItemGroup>
-  <Target Name="CopyCustomContent" AfterTargets="AfterBuild" Condition="$([MSBuild]::IsOSPlatform('Windows'))">
-    <Copy SourceFiles="@(_CopyItems)" DestinationFolder="$(OutDir)/VSIXExpInstaller" />
-  </Target>
 </Project>