Skip to content

Fix -vs arg for ilc/crossgen #117268

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
EgorBo merged 3 commits into from
Jul 8, 2025
Merged

Fix -vs arg for ilc/crossgen #117268

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
395f0a1
Fix -vs arg for ilc/crossgen
EgorBo Jul 3, 2025
51ab743
add nativeaot.slnx
EgorBo Jul 3, 2025
c8b97f4
revert nativeaot
EgorBo Jul 3, 2025
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
11 changes: 8 additions & 3 deletions eng/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ if ($vs) {
}

# Auto-generated solution file that still uses the sln format
if ($vs -ieq "coreclr.sln") {
# If someone passes in coreclr.sln (case-insensitive),
if ($vs -ieq "coreclr.sln" -or $vs -ieq "coreclr") {
# If someone passes in coreclr.sln or just coreclr (case-insensitive),
# launch the generated CMake solution.
$vs = Split-Path $PSScriptRoot -Parent | Join-Path -ChildPath "artifacts\obj\coreclr" | Join-Path -ChildPath "windows.$archToOpen.$((Get-Culture).TextInfo.ToTitleCase($configToOpen))" | Join-Path -ChildPath "ide" | Join-Path -ChildPath "CoreCLR.sln"
if (-Not (Test-Path $vs)) {
Expand All @@ -192,7 +192,7 @@ if ($vs) {
}
}
# Auto-generated solution file that still uses the sln format
elseif ($vs -ieq "corehost.sln") {
elseif ($vs -ieq "corehost.sln" -or $vs -ieq "corehost") {
$vs = Split-Path $PSScriptRoot -Parent | Join-Path -ChildPath "artifacts\obj\" | Join-Path -ChildPath "win-$archToOpen.$((Get-Culture).TextInfo.ToTitleCase($configToOpen))" | Join-Path -ChildPath "corehost" | Join-Path -ChildPath "ide" | Join-Path -ChildPath "corehost.sln"
if (-Not (Test-Path $vs)) {
Invoke-Expression "& `"$repoRoot/eng/common/msbuild.ps1`" $repoRoot/src/native/corehost/corehost.proj /clp:nosummary /restore /p:Ninja=false /p:Configuration=$configToOpen /p:TargetArchitecture=$archToOpen /p:ConfigureOnly=true"
Expand All @@ -214,6 +214,11 @@ if ($vs) {
} else {
# Search for the solution in coreclr
$vs = Split-Path $PSScriptRoot -Parent | Join-Path -ChildPath "src\coreclr" | Join-Path -ChildPath $vs | Join-Path -ChildPath "$vs.slnx"

# Also, search for the solution in coreclr\tools\aot
if (-Not (Test-Path $vs)) {
$vs = Split-Path $PSScriptRoot -Parent | Join-Path -ChildPath "src\coreclr\tools\aot\$solution.slnx"
}
}

if (-Not (Test-Path $vs)) {
Expand Down
Loading