From 666e105be11cb442c3278e3f2528a82b82eaea80 Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Tue, 21 Aug 2018 18:29:37 -0700 Subject: [PATCH 1/3] [Ignore] Increment version for VSTS build [Ignore] Configure VSTS build for 2.0.0 branch * Add VSTS environment variable setter script * Add PSES source fetch script parameterized on branch name * Add debugging messages to VSTS scripts * Increment version strings in vscode-PowerShell files Update build for v2 branch Remove erroneous file --- .travis.yml | 2 +- appveyor.yml | 4 ++-- package-lock.json | 2 +- package.json | 2 +- src/main.ts | 2 +- tools/releaseBuild/Image/DockerFile | 2 +- tools/releaseBuild/setVstsVariables.ps1 | 2 +- vscode-powershell.build.ps1 | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index a8284f840f..a17142a91f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ before_install: sudo apt-get install libunwind8; fi install: - - git clone https://github.com/PowerShell/PowerShellEditorServices.git ../PowerShellEditorServices + - git clone --single-branch -b 2.0.0 https://github.com/PowerShell/PowerShellEditorServices.git ../PowerShellEditorServices - pushd build - bash <(curl -s https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.sh) - popd diff --git a/appveyor.yml b/appveyor.yml index 8b030e8e86..a21bdcc20b 100644 --- a/appveyor.yml +++ b/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 @@ -13,7 +13,7 @@ environment: DOTNET_CLI_TELEMETRY_OPTOUT: true # Don't send telemetry install: - - git clone https://github.com/PowerShell/PowerShellEditorServices.git ../PowerShellEditorServices + - git clone --single-branch -b 2.0.0 https://github.com/PowerShell/PowerShellEditorServices.git ../PowerShellEditorServices - ps: Install-Product node '6.9.2' - ps: | Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force | Out-Null diff --git a/package-lock.json b/package-lock.json index 104ea3078b..f8dd4768ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "PowerShell", - "version": "1.10.3", + "version": "2.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 94099f6893..97e102cc46 100644 --- a/package.json +++ b/package.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": { diff --git a/src/main.ts b/src/main.ts index 91273319f6..e8a2825f36 100644 --- a/src/main.ts +++ b/src/main.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; diff --git a/tools/releaseBuild/Image/DockerFile b/tools/releaseBuild/Image/DockerFile index 596b61bcd0..14cf3ab753 100644 --- a/tools/releaseBuild/Image/DockerFile +++ b/tools/releaseBuild/Image/DockerFile @@ -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; ` diff --git a/tools/releaseBuild/setVstsVariables.ps1 b/tools/releaseBuild/setVstsVariables.ps1 index afaa5e570a..b90dc57f1a 100644 --- a/tools/releaseBuild/setVstsVariables.ps1 +++ b/tools/releaseBuild/setVstsVariables.ps1 @@ -1,5 +1,5 @@ $vstsVariables = @{ - PSES_BRANCH = 'master' + PSES_BRANCH = '2.0.0' } # Use VSTS's API to set an env vars diff --git a/vscode-powershell.build.ps1 b/vscode-powershell.build.ps1 index 39f20450bd..ed913d8946 100644 --- a/vscode-powershell.build.ps1 +++ b/vscode-powershell.build.ps1 @@ -36,7 +36,7 @@ task GetExtensionVersion -Before Package { } } -task ResolveEditorServicesPath -Before CleanEditorServices, BuildEditorServices { +task ResolveEditorServicesPath -Before CleanEditorServices, BuildEditorServices, Package { $script:psesRepoPath = ` if ($EditorServicesRepoPath) { From a604a5652ccceda918c482ab47c10626442a8343 Mon Sep 17 00:00:00 2001 From: corbob <30301021+corbob@users.noreply.github.com> Date: Thu, 18 Oct 2018 09:56:25 -0700 Subject: [PATCH 2/3] Removed ShowOnlineHelp Command (#1587) * Removed ShowOnlineHelp Message * Remove the command element from package.json [Ignore] Fix typo in package.json --- src/features/ShowHelp.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/features/ShowHelp.ts b/src/features/ShowHelp.ts index e61f74d0a5..756f2f71f7 100644 --- a/src/features/ShowHelp.ts +++ b/src/features/ShowHelp.ts @@ -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() { From 73752d60edf7d380febd3e8f248c9764acca2b58 Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Fri, 18 Jan 2019 13:25:06 -0800 Subject: [PATCH 3/3] [Ignore] Fix CI build to use master again --- .travis.yml | 2 +- appveyor.yml | 2 +- tools/releaseBuild/setVstsVariables.ps1 | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a17142a91f..a8284f840f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ before_install: sudo apt-get install libunwind8; fi install: - - git clone --single-branch -b 2.0.0 https://github.com/PowerShell/PowerShellEditorServices.git ../PowerShellEditorServices + - git clone https://github.com/PowerShell/PowerShellEditorServices.git ../PowerShellEditorServices - pushd build - bash <(curl -s https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.sh) - popd diff --git a/appveyor.yml b/appveyor.yml index a21bdcc20b..5625a9ebf7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,7 +13,7 @@ environment: DOTNET_CLI_TELEMETRY_OPTOUT: true # Don't send telemetry install: - - git clone --single-branch -b 2.0.0 https://github.com/PowerShell/PowerShellEditorServices.git ../PowerShellEditorServices + - git clone https://github.com/PowerShell/PowerShellEditorServices.git ../PowerShellEditorServices - ps: Install-Product node '6.9.2' - ps: | Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force | Out-Null diff --git a/tools/releaseBuild/setVstsVariables.ps1 b/tools/releaseBuild/setVstsVariables.ps1 index b90dc57f1a..f08fcc4a9d 100644 --- a/tools/releaseBuild/setVstsVariables.ps1 +++ b/tools/releaseBuild/setVstsVariables.ps1 @@ -1,5 +1,5 @@ $vstsVariables = @{ - PSES_BRANCH = '2.0.0' + PSES_BRANCH = 'master' } # Use VSTS's API to set an env vars @@ -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" -} \ No newline at end of file +}