Skip to content

Remove usage of old NuGet tools #496

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
AArnott merged 5 commits into from
Apr 7, 2026
Merged

Remove usage of old NuGet tools #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
618b29d
Remove usage of old NuGet tools
AndreyTretyak Apr 7, 2026
251d367
Add source for procdump package
AndreyTretyak Apr 7, 2026
5ac7e63
Add feed for getting Microsoft.DiaSymReader.Pdb2Pdb
AndreyTretyak Apr 7, 2026
765e11c
try Copilot suggested fixes
AndreyTretyak Apr 7, 2026
6fdb900
Add pre-release support
AndreyTretyak Apr 7, 2026
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
14 changes: 7 additions & 7 deletions init.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,40 +126,40 @@ try {
}
}

$InstallNuGetPkgScriptPath = "$PSScriptRoot\tools\Install-NuGetPackage.ps1"
$DownloadNuGetPkgScriptPath = "$PSScriptRoot\tools\Download-NuGetPackage.ps1"
$nugetVerbosity = 'quiet'
if ($Verbose) { $nugetVerbosity = 'normal' }
$MicroBuildPackageSource = 'https://pkgs.dev.azure.com/devdiv/_packaging/MicroBuildToolset%40Local/nuget/v3/index.json'
if ($Signing) {
Write-Host "Installing MicroBuild signing plugin" -ForegroundColor $HeaderColor
& $InstallNuGetPkgScriptPath MicroBuild.Plugins.Signing -source $MicroBuildPackageSource -Verbosity $nugetVerbosity
& $DownloadNuGetPkgScriptPath -PackageId MicroBuild.Plugins.Signing -Source $MicroBuildPackageSource -Verbosity $nugetVerbosity
$EnvVars['SignType'] = "Test"
}

if ($Setup) {
Write-Host "Installing MicroBuild SwixBuild plugin..." -ForegroundColor $HeaderColor
& $InstallNuGetPkgScriptPath Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild -source $MicroBuildPackageSource -Verbosity $nugetVerbosity
& $DownloadNuGetPkgScriptPath -PackageId Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild -Source $MicroBuildPackageSource -Verbosity $nugetVerbosity
}

if ($OptProf) {
Write-Host "Installing MicroBuild OptProf plugin" -ForegroundColor $HeaderColor
& $InstallNuGetPkgScriptPath MicroBuild.Plugins.OptProf -source $MicroBuildPackageSource -Verbosity $nugetVerbosity
& $DownloadNuGetPkgScriptPath -PackageId MicroBuild.Plugins.OptProf -Source $MicroBuildPackageSource -Verbosity $nugetVerbosity
$EnvVars['OptProfEnabled'] = '1'
}

if ($Localization) {
Write-Host "Installing MicroBuild localization plugin" -ForegroundColor $HeaderColor
& $InstallNuGetPkgScriptPath MicroBuild.Plugins.Localization -source $MicroBuildPackageSource -Verbosity $nugetVerbosity
& $DownloadNuGetPkgScriptPath -PackageId MicroBuild.Plugins.Localization -Source $MicroBuildPackageSource -Verbosity $nugetVerbosity
$EnvVars['LocType'] = "Pseudo"
$EnvVars['LocLanguages'] = "JPN"
}

if ($SBOM) {
Write-Host "Installing MicroBuild SBOM plugin" -ForegroundColor $HeaderColor
& $InstallNuGetPkgScriptPath MicroBuild.Plugins.Sbom -source $MicroBuildPackageSource -Verbosity $nugetVerbosity
& $DownloadNuGetPkgScriptPath -PackageId MicroBuild.Plugins.Sbom -Source $MicroBuildPackageSource -Verbosity $nugetVerbosity
# The feed with the latest versions of the tool is at 'https://1essharedassets.pkgs.visualstudio.com/1esPkgs/_packaging/SBOMTool/nuget/v3/index.json',
# but we'll use the feed that the SBOM task itself uses to install the tool for consistency.
$PkgMicrosoft_ManifestTool_CrossPlatform = & $InstallNuGetPkgScriptPath Microsoft.ManifestTool.CrossPlatform -source $MicroBuildPackageSource -Verbosity $nugetVerbosity
$PkgMicrosoft_ManifestTool_CrossPlatform = & $DownloadNuGetPkgScriptPath -PackageId Microsoft.ManifestTool.CrossPlatform -Source $MicroBuildPackageSource -Verbosity $nugetVerbosity
$EnvVars['GenerateSBOM'] = "true"
$EnvVars['PkgMicrosoft_ManifestTool_CrossPlatform'] = $PkgMicrosoft_ManifestTool_CrossPlatform
}
Expand Down
22 changes: 12 additions & 10 deletions tools/Convert-PDB.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#>
[CmdletBinding()]
Param(
[Parameter(Mandatory=$true,Position=0)]
[Parameter(Mandatory = $true, Position = 0)]
[string]$DllPath,
[Parameter()]
[string]$PdbPath,
[Parameter(Mandatory=$true,Position=1)]
[Parameter(Mandatory = $true, Position = 1)]
[string]$OutputPath
)

Expand All @@ -25,24 +25,26 @@ if ($IsMacOS -or $IsLinux) {

$version = '1.1.0-beta2-21101-01'
$baseDir = "$PSScriptRoot/../obj/tools"
$pdb2pdbpath = "$baseDir/Microsoft.DiaSymReader.Pdb2Pdb.$version/tools/Pdb2Pdb.exe"
$pdb2pdbpath = "$baseDir/microsoft.diasymreader.pdb2pdb/$version/tools/Pdb2Pdb.exe"
if (-not (Test-Path $pdb2pdbpath)) {
if (-not (Test-Path $baseDir)) { New-Item -Type Directory -Path $baseDir | Out-Null }
$baseDir = (Resolve-Path $baseDir).Path # Normalize it
Write-Verbose "& (& $PSScriptRoot/Get-NuGetTool.ps1) install Microsoft.DiaSymReader.Pdb2Pdb -version $version -PackageSaveMode nuspec -OutputDirectory $baseDir -Source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json | Out-Null"
# This package originally comes from the https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json feed.
# Add this feed as an upstream to whatever feed is in nuget.config if this step fails.
& (& $PSScriptRoot/Get-NuGetTool.ps1) install Microsoft.DiaSymReader.Pdb2Pdb -version $version -PackageSaveMode nuspec -OutputDirectory $baseDir | Out-Null
if ($LASTEXITCODE -ne 0) {
try {
& "$PSScriptRoot/Download-NuGetPackage.ps1" -PackageId Microsoft.DiaSymReader.Pdb2Pdb -Version $version -Source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json -OutputDirectory $baseDir | Out-Null
}
catch {
Write-Error "Failed to install Microsoft.DiaSymReader.Pdb2Pdb. Consider adding https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json as an upstream to your nuget.config feed."
return
}
$pdb2pdbpath = "$baseDir/microsoft.diasymreader.pdb2pdb/$version/tools/Pdb2Pdb.exe"
}

$args = $DllPath,'/out',$OutputPath,'/nowarn','0021'
$arguments = $DllPath, '/out', $OutputPath, '/nowarn', '0021'
if ($PdbPath) {
$args += '/pdb',$PdbPath
$arguments += '/pdb', $PdbPath
}

Write-Verbose "$pdb2pdbpath $args"
& $pdb2pdbpath $args
Write-Verbose "$pdb2pdbpath $arguments"
& $pdb2pdbpath $arguments
4 changes: 3 additions & 1 deletion tools/Download-NuGetPackage.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,16 @@ if ($Version) { $packageArg = "$PackageId@$Version" }

$extraArgs = @()
if ($Source) { $extraArgs += '--source', $Source }
if ($Version -and $Version -match '-') { $extraArgs += '--prerelease' }

$prevErrorActionPreference = $ErrorActionPreference
$ErrorActionPreference = 'Continue'
& dotnet package download $packageArg --configfile $ConfigFile --output $OutputDirectory --verbosity $Verbosity @extraArgs 2>&1 | Out-Null
$downloadOutput = & dotnet package download $packageArg --configfile $ConfigFile --output $OutputDirectory --verbosity $Verbosity @extraArgs 2>&1
$downloadExitCode = $LASTEXITCODE
$ErrorActionPreference = $prevErrorActionPreference

if ($downloadExitCode -ne 0) {
$downloadOutput | Write-Host
throw "Failed to download package $packageArg (exit code $downloadExitCode)."
}

Expand Down