Skip to content

Fix ImageBuilder test toolset resolution #2105

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
lbussell wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −2
Open

Fix ImageBuilder test toolset resolution #2105

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
19 changes: 17 additions & 2 deletions src/run-tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,23 @@ try {
$globalJson = Get-Content (Join-Path $repoRoot 'global.json') | ConvertFrom-Json
$arcadeSdkVersion = $globalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
# Need to use nested Join-Path calls to support Windows PowerShell, which doesn't support multiple paths in a single Join-Path call
$toolsetLocationFile = Join-Path (Join-Path (Join-Path $repoRoot 'artifacts') 'toolset') "$arcadeSdkVersion.txt"
$buildProj = Get-Content $toolsetLocationFile -TotalCount 1
$toolsetDir = Join-Path (Join-Path (Join-Path $repoRoot 'artifacts') 'toolset') $arcadeSdkVersion
$toolsetBuildProj = Join-Path $toolsetDir 'Build.proj'
$buildProj = $toolsetBuildProj

if (-not (Test-Path $buildProj)) {
$toolsetLocationFile = Join-Path (Join-Path (Join-Path $repoRoot 'artifacts') 'toolset') "$arcadeSdkVersion.txt"
if (Test-Path $toolsetLocationFile) {
$legacyBuildProj = Get-Content $toolsetLocationFile -TotalCount 1
if (-not [string]::IsNullOrWhiteSpace($legacyBuildProj)) {
$buildProj = $legacyBuildProj
}
}
}

if ([string]::IsNullOrWhiteSpace($buildProj) -or -not (Test-Path $buildProj)) {
throw "Failed to locate Arcade toolset Build.proj. Expected '$toolsetBuildProj'."
}

$dotnet = Join-Path $dotnetInstallDir 'dotnet'
& $dotnet msbuild $buildProj /p:Restore=true /p:Build=false /p:RepoRoot="$repoRoot/" /clp:NoSummary
Expand Down
Loading