Merge pull request #1706 from PowerShell/2.0.0

Bring master up to 2.0.0

Author: rjmholt

appveyor.yml

@@ -1,4 +1,4 @@
-version: '1.10.3-insiders-{build}'
+version: '2.0.0-insiders-{build}'
 image: Visual Studio 2017
 clone_depth: 10
 skip_tags: true

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "PowerShell",
   "displayName": "PowerShell",
-  "version": "1.10.3",
+  "version": "2.0.0",
   "publisher": "ms-vscode",
   "description": "Develop PowerShell scripts in Visual Studio Code!",
   "engines": {

package.json

@@ -36,12 +36,6 @@ export class ShowHelpFeature implements IFeature {
                 this.languageClient.sendRequest(ShowHelpRequestType, item.Name);
             }
         });
-
-        this.deprecatedCommand = vscode.commands.registerCommand("PowerShell.OnlineHelp", () => {
-            const warnText = "PowerShell.OnlineHelp is being deprecated. Use PowerShell.ShowHelp instead.";
-            vscode.window.showWarningMessage(warnText);
-            vscode.commands.executeCommand("PowerShell.ShowHelp");
-        });
     }
 
     public dispose() {

src/features/ShowHelp.ts

@@ -36,7 +36,7 @@ import utils = require("./utils");
 
 // NOTE: We will need to find a better way to deal with the required
 //       PS Editor Services version...
-const requiredEditorServicesVersion = "1.10.3";
+const requiredEditorServicesVersion = "2.0.0";
 
 let logger: Logger;
 let sessionManager: SessionManager;

src/main.ts

@@ -23,7 +23,7 @@ COPY build.ps1 containerFiles/build.ps1
 
 # Add an environment variable for build versioning
 ENV VSTS_BUILD=1
-ENV VSTS_BUILD_VERSION=1.10.3
+ENV VSTS_BUILD_VERSION=2.0.0
 
 # Uncomment to debug locally
 # RUN Import-Module ./containerFiles/dockerInstall.psm1; `

tools/releaseBuild/Image/DockerFile

@@ -8,4 +8,4 @@ foreach ($var in $vstsVariables.Keys)
     $val = $vstsVariables[$var]
     Write-Host "Setting var '$var' to value '$val'"
     Write-Host "##vso[task.setvariable variable=$var]$val"
-}
+}

tools/releaseBuild/setVstsVariables.ps1

@@ -36,7 +36,7 @@ task GetExtensionVersion -Before Package {
     }
 }
 
-task ResolveEditorServicesPath -Before CleanEditorServices, BuildEditorServices {
+task ResolveEditorServicesPath -Before CleanEditorServices, BuildEditorServices, Package {
 
     $script:psesRepoPath = `
         if ($EditorServicesRepoPath) {