Skip to content

Commit 0378f8d

Browse files
committed
remove .build.ps1 and various cleanup
1 parent 162c584 commit 0378f8d

File tree

6 files changed

+14
-250
lines changed

6 files changed

+14
-250
lines changed

.build.ps1

Lines changed: 0 additions & 233 deletions
This file was deleted.

.vscode/settings.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
// Place your settings in this file to overwrite default and user settings.
22
{
33
"editor.tabSize": 4,
4-
"powershell.codeFormatting.preset": "Allman"
5-
}
4+
"powershell.codeFormatting.preset": "Allman",
5+
"[powershell]": {
6+
"files.trimTrailingWhitespace": true
7+
}
8+
}

build.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
param(
44

55
[Parameter(ParameterSetName='Build')]
6-
[ValidateSet('PSV3 Debug','PSV3 Release','Debug','Release')]
6+
[ValidateSet('PSV3 Debug','PSV3 Release', 'Debug','Release')]
77
[string] $Configuration = 'Debug',
88

99
[Parameter(ParameterSetName='Build')]
@@ -77,7 +77,7 @@ if ($BuildDocs)
7777
{
7878
"Cannot find required minimum version $requiredVersionOfplatyPS of platyPS. Please install it from https://www.powershellgallery.com/packages/platyPS/ using e.g. the following command: Install-Module platyPS"
7979
}
80-
if ((Get-Module platyPS -Verbose:$verbosity) -eq $null)
80+
if ($null -eq (Get-Module platyPS -Verbose:$verbosity))
8181
{
8282
Import-Module platyPS -Verbose:$verbosity
8383
}
@@ -90,7 +90,7 @@ if ($BuildDocs)
9090

9191
# Appveyor errors out due to $profile being null. Hence...
9292
$moduleRootPath = "$HOME/Documents/WindowsPowerShell/Modules"
93-
if ($profile -ne $null)
93+
if ($null -eq $profile)
9494
{
9595
$moduleRootPath = Join-Path (Split-Path $profile) 'Modules'
9696
}

buildCoreClr.ps1

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[string]$Configuration = "Debug"
1111
)
1212

13-
if ($Configuration -match "PSv3" -and $Framework -eq "netstandard2.0")
13+
if ($Configuration -match "PSv" -and $Framework -eq "netstandard2.0")
1414
{
1515
throw ("{0} configuration is not applicable to {1} framework" -f $Configuration,$Framework)
1616
}
@@ -45,12 +45,6 @@ elseif ($Configuration -match 'PSv4') {
4545

4646
if ($build)
4747
{
48-
49-
Write-Progress "Building Engine"
50-
Push-Location Engine\
51-
dotnet build Engine.csproj --framework $Framework --configuration $Configuration
52-
Pop-Location
53-
5448
Write-Progress "Building for framework $Framework, configuration $Configuration"
5549
Push-Location Rules\
5650
dotnet build Rules.csproj --framework $Framework --configuration $Configuration

tools/appveyor.psm1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function Invoke-AppVeyorBuild {
4242
[Parameter(Mandatory)]
4343
[ValidateSet('FullCLR', 'NetStandard')]
4444
$BuildType,
45-
45+
4646
[Parameter(Mandatory)]
4747
[ValidateSet('Release', 'PSv3Release', 'PSv4Release')]
4848
$BuildConfiguration,
@@ -51,7 +51,7 @@ function Invoke-AppVeyorBuild {
5151
[ValidateScript( {Test-Path $_})]
5252
$CheckoutPath
5353
)
54-
54+
5555
$PSVersionTable
5656
Write-Verbose "Pester version: $((Get-Command Invoke-Pester).Version)" -Verbose
5757
Write-Verbose ".NET SDK version: $(dotnet --version)" -Verbose

tools/releaseBuild/vstsbuild.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ End {
5858
ReleaseTag = $ReleaseTag
5959
}
6060
$buildArgs = @{
61-
RepoPath = $resolvedRepoRoot
62-
BuildJsonPath = './tools/releaseBuild/build.json'
63-
Parameters = $buildParameters
61+
RepoPath = $resolvedRepoRoot
62+
BuildJsonPath = './tools/releaseBuild/build.json'
63+
Parameters = $buildParameters
6464
AdditionalFiles = $AdditionalFiles
6565
Name = "win7-x64"
6666
}

0 commit comments

Comments
 (0)