Skip to content

Swich away from VSIXExpInstaller #80018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2025
Merged

Swich away from VSIXExpInstaller #80018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion eng/Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,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)" />
<PackageVersion Include="CliWrap" Version="3.8.2" />
Expand Down
12 changes: 3 additions & 9 deletions eng/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"

Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions eng/test-rebuild.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 0 additions & 12 deletions src/Tools/Source/RunTests/RunTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>