Skip to content

Improve Clean and Build tasks #1144

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 13 commits into from
Jan 16, 2020
Merged

Improve Clean and Build tasks #1144

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8ef9d80
Improve clean
Jan 6, 2020
e352fbd
Correct Test-Item
Jan 8, 2020
01bacf8
Correct parameter bug
rjmholt Jan 13, 2020
33c878f
Fix module deletion logic
rjmholt Jan 13, 2020
d66196f
Fix build version in BuildInfo
rjmholt Jan 15, 2020
e1e17b8
Still use <development> version for non AzDO builds
rjmholt Jan 15, 2020
0310c85
Change VSTS to release
rjmholt Jan 15, 2020
2936ff7
Fix origins
rjmholt Jan 15, 2020
5280bd1
Test build vars
rjmholt Jan 15, 2020
c1b7e11
Improve build origin tracking
rjmholt Jan 15, 2020
8f01789
Add job name
rjmholt Jan 15, 2020
2d2fa87
Add more variables to test
rjmholt Jan 15, 2020
85b2308
Use BUILD_DEFINITIONNAME to distinguish CI from release
rjmholt Jan 15, 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
50 changes: 33 additions & 17 deletions PowerShellEditorServices.build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,27 @@ task SetupDotNet -Before Clean, Build, TestHost, TestServer, TestProtocol, TestE
Write-Host "`n### Using dotnet v$(& $script:dotnetExe --version) at path $script:dotnetExe`n" -ForegroundColor Green
}

task Clean {
exec { & $script:dotnetExe restore }
exec { & $script:dotnetExe clean }
task BinClean {
Remove-Item $PSScriptRoot\.tmp -Recurse -Force -ErrorAction Ignore
Remove-Item $PSScriptRoot\module\PowerShellEditorServices\bin -Recurse -Force -ErrorAction Ignore
Remove-Item $PSScriptRoot\module\PowerShellEditorServices.VSCode\bin -Recurse -Force -ErrorAction Ignore
}

task Clean BinClean,{
exec { & $script:dotnetExe restore }
exec { & $script:dotnetExe clean }
Get-ChildItem -Recurse $PSScriptRoot\src\*.nupkg | Remove-Item -Force -ErrorAction Ignore
Get-ChildItem $PSScriptRoot\PowerShellEditorServices*.zip | Remove-Item -Force -ErrorAction Ignore
Get-ChildItem $PSScriptRoot\module\PowerShellEditorServices\Commands\en-US\*-help.xml | Remove-Item -Force -ErrorAction Ignore

# Remove bundled component modules
$moduleJsonPath = "$PSScriptRoot\modules.json"
if (Test-Path $moduleJsonPath) {
Get-Content -Raw $moduleJsonPath |
ConvertFrom-Json |
ForEach-Object { $_.PSObject.Properties.Name } |
ForEach-Object { Remove-Item -Path "$PSScriptRoot/module/$_" -Recurse -Force -ErrorAction Ignore }
}
}

task GetProductVersion -Before PackageModule, UploadArtifacts {
Expand Down Expand Up @@ -156,30 +168,34 @@ task GetProductVersion -Before PackageModule, UploadArtifacts {

task CreateBuildInfo -Before Build {
$buildVersion = "<development-build>"
$buildOrigin = "<development>"
$buildOrigin = "Development"

# Set build info fields on build platforms
if ($env:TF_BUILD) {
if ($env:BUILD_BUILDNUMBER -like "PR-*") {
$buildOrigin = "PR"
} elseif ($env:BUILD_DEFINITIONNAME -like "*-CI") {
$buildOrigin = "CI"
} else {
$buildOrigin = "Release"
}

if ($propsBody.VersionSuffix)
{
$propsXml = [xml](Get-Content -Raw -LiteralPath "$PSScriptRoot/PowerShellEditorServices.Common.props")
$propsBody = $propsXml.Project.PropertyGroup
$buildVersion = $propsBody.VersionPrefix
$buildVersion += '-' + $propsBody.VersionSuffix
}

# Set build info fields on build platforms
if ($env:TF_BUILD)
{
$buildOrigin = "VSTS"
if ($propsBody.VersionSuffix)
{
$buildVersion += '-' + $propsBody.VersionSuffix
}
}

# Allow override of build info fields (except date)
if ($env:PSES_BUILD_VERSION)
{
if ($env:PSES_BUILD_VERSION) {
$buildVersion = $env:PSES_BUILD_VERSION
}

if ($env:PSES_BUILD_ORIGIN)
{
if ($env:PSES_BUILD_ORIGIN) {
$buildOrigin = $env:PSES_BUILD_ORIGIN
}

Expand All @@ -206,7 +222,7 @@ task SetupHelpForTests -Before Test {
}
}

task Build {
task Build BinClean,{
exec { & $script:dotnetExe publish -c $Configuration .\src\PowerShellEditorServices\PowerShellEditorServices.csproj -f $script:NetRuntime.Standard }
exec { & $script:dotnetExe publish -c $Configuration .\src\PowerShellEditorServices.Hosting\PowerShellEditorServices.Hosting.csproj -f $script:NetRuntime.Core }
if (-not $script:IsUnix)
Expand Down