Improve build script

Restoration of modules including PowerShellEditorServices was made
automatic upon invocation of the `Build` task. This replaced complicated
logic in the package task to restore PSES in CI.

Author: andyleejordan

vscode-powershell.build.ps1

@@ -23,28 +23,22 @@ function Get-EditorServicesPath {
     return Resolve-Path "$psesRepoPath/PowerShellEditorServices.build.ps1" -ErrorAction Continue
 }
 
-#region Restore tasks
-
-task Restore RestoreNodeModules -If { -not (Test-Path "$PSScriptRoot/node_modules") }
-
-task RestoreNodeModules {
-
+task Restore -If { !(Test-Path "$PSScriptRoot/node_modules") } {
     Write-Host "`n### Restoring vscode-powershell dependencies`n" -ForegroundColor Green
-
     # When in a CI build use the --loglevel=error parameter so that
     # package install warnings don't cause PowerShell to throw up
     $logLevelParam = if ($env:TF_BUILD) { "--loglevel=error" } else { "" }
     exec { & npm install $logLevelParam }
 }
 
-#endregion
+
 #region Clean tasks
 
 task Clean {
     Write-Host "`n### Cleaning vscode-powershell`n" -ForegroundColor Green
-    Remove-Item .\modules\* -Exclude "README.md" -Recurse -Force -ErrorAction Ignore
-    Remove-Item .\out -Recurse -Force -ErrorAction Ignore
-    Remove-Item -Force -Recurse node_modules -ErrorAction Ignore
+    Remove-Item ./modules -Exclude "README.md" -Recurse -Force -ErrorAction Ignore
+    Remove-Item ./out -Recurse -Force -ErrorAction Ignore
+    Remove-Item ./node_modules -Recurse -Force -ErrorAction Ignore
 }
 
 task CleanEditorServices -If (Get-EditorServicesPath) {
@@ -57,26 +51,27 @@ task CleanAll CleanEditorServices, Clean
 #endregion
 #region Build tasks
 
-task Build Restore, {
-    Write-Host "`n### Building vscode-powershell" -ForegroundColor Green
-    exec { & npm run compile }
-}
-
 task BuildEditorServices -If (Get-EditorServicesPath) {
     Write-Host "`n### Building PowerShellEditorServices`n" -ForegroundColor Green
     Invoke-Build Build (Get-EditorServicesPath)
 }
 
+task CopyEditorServices -If { !(Test-Path ./modules/PowerShellEditorServices) -and (Get-EditorServicesPath) } BuildEditorServices, {
+    Write-Host "`n### Copying PowerShellEditorServices module files" -ForegroundColor Green
+    Copy-Item -Recurse -Force "$(Split-Path (Get-EditorServicesPath))/module/*" ./modules
+}
+
+task Build CopyEditorServices, Restore, {
+    Write-Host "`n### Building vscode-powershell" -ForegroundColor Green
+    exec { & npm run compile }
+}
+
 task BuildAll BuildEditorServices, Build
 
 #endregion
 #region Test tasks
 
-task Test Build, {
-    if ($env:TF_BUILD -and $global:IsLinux) {
-        Write-Warning "Skipping extension tests in Linux CI because vscode does not support it."
-        return
-    }
+task Test -If (!($env:TF_BUILD -and $global:IsLinux)) Build, {
     Write-Host "`n### Running extension tests" -ForegroundColor Green
     exec { & npm run test }
 }
@@ -109,28 +104,11 @@ task UpdateReadme -If { $script:IsPreviewExtension } {
 }
 
 task Package UpdateReadme, {
-    if (Get-EditorServicesPath -or $env:TF_BUILD) {
-        Write-Host "`n### Copying PowerShellEditorServices module files" -ForegroundColor Green
-        Copy-Item -Recurse -Force ..\PowerShellEditorServices\module\* .\modules
-    } else {
-        throw "Unable to find PowerShell EditorServices"
-    }
-
-    $packageName = "$($script:PackageJson.name)-$($script:PackageJson.version).vsix"
-    Write-Host "`n### Packaging $packageName`n" -ForegroundColor Green
+    assert { Test-Path ./modules/PowerShellEditorServices }
+    Write-Host "`n### Packaging $($script:PackageJson.name)-$($script:PackageJson.version).vsix`n" -ForegroundColor Green
     exec { & node ./node_modules/vsce/out/vsce package --no-gitHubIssueLinking }
-
-    if ($env:TF_BUILD) {
-        $artifactsPath = "$env:BUILD_ARTIFACTSTAGINGDIRECTORY/vscode-powershell/"
-        "./$packageName", "./scripts/Install-VSCode.ps1" | ForEach-Object {
-            Copy-Item -Verbose -Recurse $_ $artifactsPath
-        }
-    }
 }
 
 #endregion
 
-# The set of tasks for a release
-task Release Clean, Build, Package
-# The default task is to run the entire CI build
-task . CleanAll, BuildAll, Test, Package
+task . Build, Test, Package