Update Fork

.dependabot/config.yml

@@ -7,9 +7,3 @@ update_configs:
   - package_manager: "javascript"
     directory: "/"
     update_schedule: "weekly"
-
-  # Will also update legacy branch
-  - package_manager: "javascript"
-    directory: "/"
-    update_schedule: "weekly"
-    target_branch: "legacy/1.x"

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Editor Syntax Colorization bug report 🌈
+    url:  https://github.com/PowerShell/EditorSyntax/issues/new
+    about: Editor syntax colorization bugs are tracked in a separate GitHub repo.
+  - name: Script analysis or formatting bug report 🚦🖌️
+    url: https://github.com/PowerShell/PSScriptAnalyzer/issues/new/choose
+    about: Script analysis and formatting are provided by PSScriptAnalyzer. Before submitting an issue, check to see whether the issue lies with PSScriptAnalyzer or with the VSCode PowerShell extension.
+  - name: General question?
+    url: https://aka.ms/psdiscord
+    about: "You can also ask general Visual Studio Code questions in the #vscode channel of the PowerShell community Discord. Slack is also available at https://aka.ms/psslack"

.poshchan/settings.json

@@ -7,6 +7,7 @@
         "authorized_users": [
             "adityapatwardhan",
             "anmenaga",
+            "bergmeister",
             "daxian-dbw",
             "JamesWTruher",
             "PaulHigin",

.vscode/launch.json

@@ -32,7 +32,13 @@
 			"stopOnEntry": false,
 			"sourceMaps": true,
 			"outFiles": ["${workspaceRoot}/out/test/**/*.js"],
-			"preLaunchTask": "Build"
+			"preLaunchTask": "Build",
+			"skipFiles": [
+				"${workspaceFolder}/node_modules/**/*",
+				"${workspaceFolder}/lib/**/*",
+				"/private/var/folders/**/*",
+				"<node_internals>/**/*"
+			]
 		},
 		{
 			"name": "Attach",

.vscode/tasks.json

@@ -4,7 +4,7 @@
     "windows": {
         "options": {
             "shell": {
-                "executable": "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
+                "executable": "pwsh.exe",
                 "args": [ "-NoProfile", "-ExecutionPolicy", "Bypass", "-Command" ]
             }
         }

.vscodeignore

@@ -15,3 +15,10 @@ out/test/**
 test/**
 sessions/**
 scripts/Install-VSCode.ps1
+tools/**
+.poshchan/**
+.github/**
+.vsts-ci/**
+build.ps1
+tsconfig.json
+tslint.json

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

@@ -41,7 +41,7 @@ jobs:
 
 - job: macOS
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.14'
   steps:
   - template: templates/ci-general.yml
 

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

@@ -0,0 +1,43 @@
+name: PR-$(System.PullRequest.PullRequestNumber)-$(Date:yyyyMMdd)$(Rev:.rr)
+
+variables:
+  # Don't download unneeded packages
+  - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
+    value: 'true'
+  # Improve performance by not sending telemetry
+  - name: DOTNET_CLI_TELEMETRY_OPTOUT
+    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: 'ReleaseBuild'
+  displayName: 'Build release'
+  pool:
+    name: 'Package ES CodeHub Lab E'
+    demands: DotNetFramework
+  steps:
+  - template: templates/release-general.yml

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

@@ -1,10 +1,30 @@
 steps:
   # Setup
+  - powershell: |
+      Write-Host "Installing PowerShell Daily..."
+
+      # Use `AGENT_TEMPDIRECTORY` to make sure the downloaded PowerShell is cleaned up.
+      $powerShellPath = Join-Path -Path $env:AGENT_TEMPDIRECTORY -ChildPath 'powershell'
+      Invoke-WebRequest -Uri https://aka.ms/install-powershell.ps1 -OutFile ./install-powershell.ps1
+
+      ./install-powershell.ps1 -Destination $powerShellPath -Daily
+
+      # Using `prependpath` to update the PATH just for this build.
+      Write-Host "##vso[task.prependpath]$powerShellPath"
+    displayName: Install PowerShell Daily
+  - pwsh: '$PSVersionTable'
+    displayName: Display PowerShell version information
   - pwsh: Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhmmss"))"
     displayName: Set Build Name for Non-PR
     condition: ne(variables['Build.Reason'], 'PullRequest')
+  - task: PowerShell@2
+    displayName: 'Set environment variables for VSTS (Phase 1)'
+    inputs:
+      targetType: filePath
+      filePath: ./tools/releaseBuild/setVstsVariables.ps1
   - pwsh: |
-      git clone https://github.com/PowerShell/PowerShellEditorServices.git ../PowerShellEditorServices
+      Write-Host "Cloning '$env:PSES_BRANCH' branch from '$env:PSES_FORK/PowerShellEditorServices'"
+      git clone --single-branch --branch $env:PSES_BRANCH https://github.com/$env:PSES_FORK/PowerShellEditorServices.git ../PowerShellEditorServices
       Install-Module InvokeBuild -Scope CurrentUser -Force
       Install-Module PlatyPS -Scope CurrentUser -Force
   # Build

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

@@ -0,0 +1,143 @@
+steps:
+- powershell: |
+    Write-Host "Installing pwsh..."
+    if (Get-Command pwsh -ErrorAction Ignore)
+    {
+        Write-Host "pwsh already installed, skipping"
+        return
+    }
+    $powerShellPath = Join-Path -Path $env:AGENT_TEMPDIRECTORY -ChildPath 'powershell'
+    Invoke-WebRequest -Uri https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.ps1 -outfile ./install-powershell.ps1
+    ./install-powershell.ps1 -Destination $powerShellPath
+    $vstsCommandString = "vso[task.setvariable variable=PATH]$powerShellPath;$env:PATH"
+    Write-Host "sending " + $vstsCommandString
+    Write-Host "##$vstsCommandString"
+  displayName: Install PowerShell Core
+
+- pwsh: Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhmmss"))"
+  displayName: Set Build Name for Non-PR
+  condition: ne(variables['Build.Reason'], 'PullRequest')
+
+- pwsh: |
+    Get-ChildItem -Path env:
+  displayName: Capture environment
+  condition: succeededOrFailed()
+
+- task: PkgESSetupBuild@10
+  displayName: 'Package ES - Setup Build'
+  inputs:
+    productName: vscode-powershell
+
+- task: PowerShell@2
+  displayName: 'Set environment variables for VSTS (Phase 1)'
+  inputs:
+    targetType: filePath
+    filePath: ./tools/releaseBuild/setVstsVariables.ps1
+
+- task: PowerShell@2
+  displayName: 'Find PowerShellEditorServices build'
+  env:
+    SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+  inputs:
+    targetType: filePath
+    filePath: ./tools/releaseBuild/findPsesBuild.ps1
+
+- task: DownloadBuildArtifacts@0
+  displayName: 'Download Build Artifacts from PowerShell Editor Services'
+  inputs:
+    buildType: specific
+    project: '8e2735c1-3674-408a-bcab-87f089ea29d5'
+    pipeline: 1056
+    buildVersionToDownload: specific
+    buildId: '$(PSES_BUILDID)'
+    downloadType: single
+    artifactName: 'PowerShellEditorServices'
+    downloadPath: '$(Build.SourcesDirectory)'
+
+- pwsh: |
+    Install-Module InvokeBuild -Force
+    Invoke-Build Release
+
+- task: PublishTestResults@2
+  inputs:
+    testRunner: JUnit
+    testResultsFiles: '**/test-results.xml'
+  condition: succeededOrFailed()
+
+- task: PkgESCodeSign@10
+  displayName: 'CodeSign tools/releaseBuild/signing.xml'
+  env:
+    SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+  inputs:
+    signConfigXml: tools/releaseBuild/signing.xml
+    inPathRoot: '$(Build.ArtifactStagingDirectory)'
+    outPathRoot: '$(Build.ArtifactStagingDirectory)\Signed'
+
+- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+  displayName: 'Component Detection'
+
+- task: AntiMalware@3
+  inputs:
+    InputType: 'Basic'
+    ScanType: 'CustomScan'
+    FileDirPath: '$(Build.ArtifactStagingDirectory)'
+    EnableServices: false
+    SupportLogOnError: false
+    TreatSignatureUpdateFailureAs: 'Warning'
+    SignatureFreshness: 'UpToDate'
+    TreatStaleSignatureAs: 'Error'
+
+- task: PoliCheck@1
+  condition: succeededOrFailed()
+  inputs:
+    targetType: F
+    optionsFC: 0
+    optionsXS: 0
+    optionsPE: '1|2|3|4'
+    optionsHMENABLE: 0
+    optionsFTPATH: '$(Build.SourcesDirectory)\tools\terms\FileTypeSet.xml'
+    # toolVersion: 5.8.2.1
+
+- pwsh: |
+    Get-ChildItem -Exclude node_modules | Get-ChildItem -Recurse | ForEach-Object FullName > "$env:BUILD_SOURCESDIRECTORY/credscan.tsv"
+  displayName: Create credscan.tsv as the list of files to scan
+
+- task: CredScan@2
+  condition: succeededOrFailed()
+  inputs:
+    debugMode: false
+    scanFolder: '$(Build.SourcesDirectory)/credscan.tsv'
+
+# Publish results as artifacts
+- task: PublishSecurityAnalysisLogs@3
+  condition: succeededOrFailed()
+  inputs:
+    ArtifactName: 'CodeAnalysisLogs'
+    ArtifactType: 'Container'
+
+# Publish to TSA server
+- task: TSAUpload@1
+  condition: succeededOrFailed()
+  continueOnError: true
+  inputs:
+    tsaVersion: 'TsaV2'
+    codebase: 'Existing'
+    tsaEnvironment: 'PROD'
+    codeBaseName: 'PowerShell_PowerShellEditorServices_20190917'
+    uploadAPIScan: false
+    uploadBinSkim: false
+    uploadCredScan: true
+    uploadFortifySCA: false
+    uploadFxCop: false
+    uploadModernCop: false
+    uploadPoliCheck: true
+    uploadPREfast: false
+    uploadRoslyn: false
+    uploadTSLint: false
+    uploadAsync: true
+
+- task: PowerShell@1
+  displayName: 'Upload artifacts'
+  inputs:
+    scriptType: inlineScript
+    inlineScript: 'Write-Host "##vso[artifact.upload containerfolder=vscode-powershell;artifactname=vscode-powershell]$(System.ArtifactsDirectory)\Signed"'