Skip to content

Commit 915f129

Browse files
authored
Use sln format for coreclr and corehost (#115935)
* Use sln format for coreclr and corehost * Update Program.cs
1 parent 87b35f4 commit 915f129

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

eng/build.ps1

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ function Get-Help() {
5959
Write-Host " [Default: Minimal]"
6060
Write-Host " -vs Open the solution with Visual Studio using the locally acquired SDK."
6161
Write-Host " Path or any project or solution name is accepted."
62-
Write-Host " (Example: -vs Microsoft.CSharp or -vs CoreCLR.slnx)"
62+
Write-Host " (Example: -vs Microsoft.CSharp or -vs CoreCLR.sln)"
6363
Write-Host ""
6464

6565
Write-Host "Actions (defaults to -restore -build):"
@@ -175,10 +175,11 @@ if ($vs) {
175175
$configToOpen = $runtimeConfiguration
176176
}
177177

178-
if ($vs -ieq "coreclr.slnx") {
179-
# If someone passes in coreclr.slnx (case-insensitive),
178+
# Auto-generated solution file that still uses the sln format
179+
if ($vs -ieq "coreclr.sln") {
180+
# If someone passes in coreclr.sln (case-insensitive),
180181
# launch the generated CMake solution.
181-
$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.slnx"
182+
$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"
182183
if (-Not (Test-Path $vs)) {
183184
Invoke-Expression "& `"$repoRoot/eng/common/msbuild.ps1`" $repoRoot/src/coreclr/runtime.proj /clp:nosummary /restore /p:Ninja=false /p:Configuration=$configToOpen /p:TargetArchitecture=$archToOpen /p:ConfigureOnly=true /p:ClrFullNativeBuild=true"
184185
if ($lastExitCode -ne 0) {
@@ -190,8 +191,9 @@ if ($vs) {
190191
}
191192
}
192193
}
193-
elseif ($vs -ieq "corehost.slnx") {
194-
$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.slnx"
194+
# Auto-generated solution file that still uses the sln format
195+
elseif ($vs -ieq "corehost.sln") {
196+
$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"
195197
if (-Not (Test-Path $vs)) {
196198
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"
197199
if ($lastExitCode -ne 0) {

src/libraries/Fuzzing/DotnetFuzzing/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ private static void WorkaroundOneFuzzTaskNotAcceptingMultipleJobs(IFuzzer[] fuzz
363363
string yamlPath = Environment.CurrentDirectory;
364364
while (!File.Exists(Path.Combine(yamlPath, "DotnetFuzzing.slnx")))
365365
{
366-
yamlPath = Path.GetDirectoryName(yamlPath) ?? throw new Exception("Couldn't find DotnetFuzzing.sln");
366+
yamlPath = Path.GetDirectoryName(yamlPath) ?? throw new Exception("Couldn't find DotnetFuzzing.slnx");
367367
}
368368

369369
yamlPath = Path.Combine(yamlPath, "../../../eng/pipelines/libraries/fuzzing/deploy-to-onefuzz.yml");

0 commit comments

Comments
 (0)