Skip to content

Commit

Permalink
remove .build.ps1 and various cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
bergmeister committed Jun 3, 2018
1 parent 162c584 commit 0378f8d
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 250 deletions.
233 changes: 0 additions & 233 deletions .build.ps1

This file was deleted.

7 changes: 5 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// Place your settings in this file to overwrite default and user settings.
{
"editor.tabSize": 4,
"powershell.codeFormatting.preset": "Allman"
}
"powershell.codeFormatting.preset": "Allman",
"[powershell]": {
"files.trimTrailingWhitespace": true
}
}
6 changes: 3 additions & 3 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
param(

[Parameter(ParameterSetName='Build')]
[ValidateSet('PSV3 Debug','PSV3 Release','Debug','Release')]
[ValidateSet('PSV3 Debug','PSV3 Release', 'Debug','Release')]
[string] $Configuration = 'Debug',

[Parameter(ParameterSetName='Build')]
Expand Down Expand Up @@ -77,7 +77,7 @@ if ($BuildDocs)
{
"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"
}
if ((Get-Module platyPS -Verbose:$verbosity) -eq $null)
if ($null -eq (Get-Module platyPS -Verbose:$verbosity))
{
Import-Module platyPS -Verbose:$verbosity
}
Expand All @@ -90,7 +90,7 @@ if ($BuildDocs)

# Appveyor errors out due to $profile being null. Hence...
$moduleRootPath = "$HOME/Documents/WindowsPowerShell/Modules"
if ($profile -ne $null)
if ($null -eq $profile)
{
$moduleRootPath = Join-Path (Split-Path $profile) 'Modules'
}
Expand Down
8 changes: 1 addition & 7 deletions buildCoreClr.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[string]$Configuration = "Debug"
)

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

if ($build)
{

Write-Progress "Building Engine"
Push-Location Engine\
dotnet build Engine.csproj --framework $Framework --configuration $Configuration
Pop-Location

Write-Progress "Building for framework $Framework, configuration $Configuration"
Push-Location Rules\
dotnet build Rules.csproj --framework $Framework --configuration $Configuration
Expand Down
4 changes: 2 additions & 2 deletions tools/appveyor.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function Invoke-AppVeyorBuild {
[Parameter(Mandatory)]
[ValidateSet('FullCLR', 'NetStandard')]
$BuildType,

[Parameter(Mandatory)]
[ValidateSet('Release', 'PSv3Release', 'PSv4Release')]
$BuildConfiguration,
Expand All @@ -51,7 +51,7 @@ function Invoke-AppVeyorBuild {
[ValidateScript( {Test-Path $_})]
$CheckoutPath
)

$PSVersionTable
Write-Verbose "Pester version: $((Get-Command Invoke-Pester).Version)" -Verbose
Write-Verbose ".NET SDK version: $(dotnet --version)" -Verbose
Expand Down
6 changes: 3 additions & 3 deletions tools/releaseBuild/vstsbuild.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ End {
ReleaseTag = $ReleaseTag
}
$buildArgs = @{
RepoPath = $resolvedRepoRoot
BuildJsonPath = './tools/releaseBuild/build.json'
Parameters = $buildParameters
RepoPath = $resolvedRepoRoot
BuildJsonPath = './tools/releaseBuild/build.json'
Parameters = $buildParameters
AdditionalFiles = $AdditionalFiles
Name = "win7-x64"
}
Expand Down

0 comments on commit 0378f8d

Please sign in to comment.