Skip to content

Fix the build.ps1 that does not work well with -RestoreOnly switch #46012

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

Open
raycheung wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix the build.ps1 that does not work well with -RestoreOnly switch #46012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b36ff94
Fix restore
raycheung Mar 5, 2026
7f62c3e
Build .slnf as well
raycheung Mar 5, 2026
be3f427
Merge remote-tracking branch 'origin/main'
raycheung Mar 9, 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
6 changes: 3 additions & 3 deletions tools/build/build-common.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This file provides reusable helper functions used by the build scripts:
- Get-BuildPaths: returns ScriptDir, OriginalCwd, RepoRoot (repo root detection)
- RunMSBuild: wrapper around msbuild.exe (accepts optional Platform/Configuration)
- RestoreThenBuild: performs restore and optionally builds the solution/project
- BuildProjectsInDirectory: discovers and builds local .sln/.csproj/.vcxproj files
- BuildProjectsInDirectory: discovers and builds local .slnx/.csproj/.vcxproj files
- Ensure-VsDevEnvironment: initializes the Visual Studio developer environment when possible.
It prefers the DevShell PowerShell module (Microsoft.VisualStudio.DevShell.dll / Enter-VsDevShell),
falls back to running VsDevCmd.bat and importing its environment into the current PowerShell session,
Expand Down Expand Up @@ -113,7 +113,7 @@ function BuildProjectsInDirectory {

$files = @()
try {
$files = Get-ChildItem -Path (Join-Path $DirectoryPath '*') -Include *.sln,*.slnx,*.csproj,*.vcxproj -File -ErrorAction SilentlyContinue
$files = Get-ChildItem -Path (Join-Path $DirectoryPath '*') -Include *.sln,*.slnx,*.slnf,*.csproj,*.vcxproj -File -ErrorAction SilentlyContinue
} catch {
$files = @()
}
Expand All @@ -130,7 +130,7 @@ function BuildProjectsInDirectory {

foreach ($f in $files) {
Write-Host ("[LOCAL BUILD] Building {0}" -f $f.FullName)
if ($f.Extension -eq '.sln') {
if ($f.Extension -eq '.sln' -or $f.Extension -eq '.slnx') {
RestoreThenBuild $f.FullName $ExtraArgs $Platform $Configuration $RestoreOnly
} else {
$buildArgs = '/m'
Expand Down
2 changes: 1 addition & 1 deletion tools/build/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ if (-not $Platform -or $Platform -eq '') {
}
}

$cwd = if ($Path) {
$cwd = if ($Path -ne '') {
(Resolve-Path $Path).ProviderPath
} else {
(Get-Location).ProviderPath
Expand Down