Skip to content

Move tests to PS7 and PS7.1 and fix IsNetCore check #1318

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
merged 15 commits into from
Jul 1, 2020
Merged

Move tests to PS7 and PS7.1 and fix IsNetCore check #1318

Changes from 4 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e2a1bb1
move tests to PS7 and PS7.1
TylerLeonhardt Jun 30, 2020
d20d860
fix up build script
TylerLeonhardt Jun 30, 2020
424c7f0
remove 6.2
TylerLeonhardt Jun 30, 2020
71aab29
change global.json back
TylerLeonhardt Jun 30, 2020
302d603
remove using dotnet already installed
TylerLeonhardt Jun 30, 2020
257d0e4
install ahead of time
TylerLeonhardt Jun 30, 2020
052b89f
remove global.json
TylerLeonhardt Jun 30, 2020
00678bb
continueOnError
TylerLeonhardt Jun 30, 2020
2762146
use different url
TylerLeonhardt Jun 30, 2020
f2c11b2
test new rcedit
TylerLeonhardt Jun 30, 2020
f1e005f
different splat mechanic
TylerLeonhardt Jun 30, 2020
0f69723
move back to aka
TylerLeonhardt Jun 30, 2020
9459f72
Merge branch 'move-tests-to-ps7-and-ps71' of github.com:TylerLeonhard…
TylerLeonhardt Jun 30, 2020
7f359cc
no platform check
TylerLeonhardt Jun 30, 2020
e51395a
use channel only
TylerLeonhardt Jun 30, 2020
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
27 changes: 18 additions & 9 deletions PowerShellEditorServices.build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,22 +72,31 @@ function Install-Dotnet {
Invoke-WebRequest "https://dot.net/v1/dotnet-install.$installScriptExt" -OutFile $installScriptPath
$env:DOTNET_INSTALL_DIR = "$PSScriptRoot/.dotnet"

$args = if($Version) {
'-Version'
$Version
} elseif ($Channel) {
'-Channel'
$Channel
$splat = if ($script:IsUnix) {
if($Version) {
'-Version'
$Version
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is arguably clearer as an array like @('-Version', $Version) so it's obvious that you're using array splatting

} else {
'-Channel'
$Channel
}
} else {
'-JSonFile',
(Join-Path $PSScriptRoot 'global.json')
if($Version) {
@{
Version = $Version
}
} else {
@{
Channel = $Channel
}
}
}

if ($script:IsUnix) {
chmod +x $installScriptPath
}

& $installScriptPath @args -InstallDir "$env:DOTNET_INSTALL_DIR"
& $installScriptPath @splat -InstallDir "$env:DOTNET_INSTALL_DIR"

if ($script:IsUnix) {
$env:PATH = $env:DOTNET_INSTALL_DIR + [System.IO.Path]::PathSeparator + $env:PATH
Expand Down