diff options
| author | Eric Erhardt <eric.erhardt@microsoft.com> | 2020-02-26 01:02:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-26 01:02:30 +0300 |
| commit | ff8c3b918cd7a2c4a60ceda98584b13489c07566 (patch) | |
| tree | 0dc34ce65f10a461801414a681f08b2792bd1036 /eng/build.ps1 | |
| parent | 359f19db9641bba6e36528a31841f0c7ee6aa93d (diff) | |
Bump DependencyModel reference to Text.Json to 4.7.1 (#32810)
We shipped DependencyModel v3.1.2 that references Text.Json 4.7.1. We shouldn't ship a new version that downgrades that reference.
Also do some clean up in the Tests.
Diffstat (limited to 'eng/build.ps1')
| -rw-r--r-- | eng/build.ps1 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/eng/build.ps1 b/eng/build.ps1 index 8d3e582b8ad..c91295f2fa5 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -70,8 +70,11 @@ if ($vs) { # Microsoft.DotNet.CoreSetup.sln is special - hosting tests are currently meant to run on the # bootstrapped .NET Core, not on the live-built runtime. - if ([System.IO.Path]::GetFileName($vs) -ieq "Microsoft.DotNet.CoreSetup.sln") { + if (([System.IO.Path]::GetFileName($vs) -ieq "Microsoft.DotNet.CoreSetup.sln") -or ($vs -ieq "Microsoft.DotNet.CoreSetup")) { if (-Not (Test-Path $vs)) { + if (-Not ( $vs.endswith(".sln"))) { + $vs = "$vs.sln" + } $vs = Join-Path "$PSScriptRoot\..\src\installer" $vs } |