diff --git a/eng/Packages.props b/eng/Packages.props index a28c757baf1b3..67605ed81bfe7 100644 --- a/eng/Packages.props +++ b/eng/Packages.props @@ -320,7 +320,6 @@ - diff --git a/eng/build.ps1 b/eng/build.ps1 index 5f882c8c67cd2..9bc0123e63989 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -561,13 +561,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" @@ -580,7 +573,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" @@ -609,9 +602,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 diff --git a/eng/test-rebuild.ps1 b/eng/test-rebuild.ps1 index 9b9df00de3437..95cd2f8fcfd28 100644 --- a/eng/test-rebuild.ps1 +++ b/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. diff --git a/src/Tools/Source/RunTests/RunTests.csproj b/src/Tools/Source/RunTests/RunTests.csproj index f88b6a17d7dff..a8e350ff509b5 100644 --- a/src/Tools/Source/RunTests/RunTests.csproj +++ b/src/Tools/Source/RunTests/RunTests.csproj @@ -17,16 +17,4 @@ - - - - - - - - <_CopyItems Include="$(PkgRoslynTools_VSIXExpInstaller)\tools\*.*" /> - - - -