A little more cleanup

Also fixes the endpoing for the PR compliance job.

Author: andyleejordan

.vsts-ci/azure-pipelines-ci.yml

@@ -9,28 +9,9 @@ variables:
     value: 'true'
 
 trigger:
-  batch: true
   branches:
     include:
       - master
-      - legacy/1.x
-  paths:
-    exclude:
-      - /.dependabot/*
-      - /.poshchan/*
-      - /.github/**/*
-      - /.vscode/**/*
-      - /.vsts-ci/misc-analysis.yml
-      - /tools/**/*
-      - .editorconfig
-      - .gitattributes
-      - .gitignore
-      - /docs/**/*
-      - /CHANGELOG.md
-      - /CONTRIBUTING.md
-      - /README.md
-      - /LICENSE
-      - /CODE_OF_CONDUCT.md
 
 jobs:
 - job: PS51_Win2016

.vsts-ci/misc-analysis.yml

@@ -1,31 +1,22 @@
 name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr)
-trigger:
-  # Batch merge builds together while a merge build is running
-  batch: true
-  branches:
-    include:
-    - master
 
-pr:
+trigger:
   branches:
     include:
     - master
-    - legacy/1.x
 
 resources:
   repositories:
   - repository: ComplianceRepo
     type: github
-    endpoint: ComplianceGHRepo
+    endpoint: GitHub
     name: PowerShell/compliance
 
 jobs:
-- job: Compliance_Job
+- job: Compliance
   pool:
     vmImage: windows-latest
   steps:
   - checkout: self
-    clean: true
   - checkout: ComplianceRepo
-    clean: true
   - template: ci-compliance.yml@ComplianceRepo

.vsts-ci/templates/ci-general.yml

@@ -4,7 +4,7 @@ parameters:
   default: true
 
 steps:
-- pwsh: '$PSVersionTable'
+- pwsh: $PSVersionTable
   displayName: PowerShell version
 
 - task: PowerShell@2

.vsts-ci/templates/publish-general.yml

@@ -1,15 +1,23 @@
 steps:
 - checkout: self
+
 - checkout: vscode-powershell
+
 - download: current
   artifact: PowerShellEditorServices
   displayName: Download signed pipeline artifacts
+
 - pwsh: |
+    Write-Host "Install and import PowerShell modules"
     Set-PSRepository -Name PSGallery -InstallationPolicy Trusted | Out-Null
-    Install-Module -Name PowerShellForGitHub -Scope CurrentUser -Force -Confirm:$false
+    Install-Module -Name PowerShellForGitHub -Scope CurrentUser -Force
     Import-Module '$(Build.SourcesDirectory)/vscode-powershell/tools/ReleaseTools.psm1'
+
+    Write-Host "Setup authentication"
     Set-GitHubConfiguration -SuppressTelemetryReminder
     $password = ConvertTo-SecureString -String '$(GitHubToken)' -AsPlainText -Force
     Set-GitHubAuthentication -Credential (New-Object System.Management.Automation.PSCredential ("token", $password))
+
+    Write-Host "Publish draft release"
     New-DraftRelease -RepositoryName PowerShellEditorServices -Assets '$(Pipeline.Workspace)/PowerShellEditorServices/PowerShellEditorServices.zip'
   displayName: Drafting a GitHub Release

.vsts-ci/templates/release-general.yml

@@ -1,5 +1,4 @@
 steps:
-
 - download: current
   displayName: Download unsigned pipeline artifacts
 
@@ -52,10 +51,6 @@ steps:
     replaceExistingArchive: true
     verbose: true
 
-- publish: PowerShellEditorServices.zip
-  artifact: PowerShellEditorServices
-  displayName: Publish signed pipeline artifacts
-
 - checkout: self
 
 - template: assembly-module-compliance.yml@ComplianceRepo
@@ -74,5 +69,9 @@ steps:
     optionsFTPath: $(Build.SourcesDirectory)/PowerShellEditorServices/tools/terms/FileTypeSet.xml
     # tsa-upload
     codeBaseName: PowerShell_PowerShellEditorServices_20210201
-    # selections
+    # We don't use any Windows APIs directly, so we don't need API scan
     APIScan: false
+
+- publish: PowerShellEditorServices.zip
+  artifact: PowerShellEditorServices
+  displayName: Publish signed pipeline artifacts