Skip to content

Commit 666e105

Browse files
Robert Holtrjmholt
Robert Holt
authored andcommitted
[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
1 parent 6bda814 commit 666e105

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ before_install:
1616
sudo apt-get install libunwind8;
1717
fi
1818
install:
19-
- git clone https://github.com/PowerShell/PowerShellEditorServices.git ../PowerShellEditorServices
19+
- git clone --single-branch -b 2.0.0 https://github.com/PowerShell/PowerShellEditorServices.git ../PowerShellEditorServices
2020
- pushd build
2121
- bash <(curl -s https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/install-powershell.sh)
2222
- popd

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '1.10.3-insiders-{build}'
1+
version: '2.0.0-insiders-{build}'
22
image: Visual Studio 2017
33
clone_depth: 10
44
skip_tags: true
@@ -13,7 +13,7 @@ environment:
1313
DOTNET_CLI_TELEMETRY_OPTOUT: true # Don't send telemetry
1414

1515
install:
16-
- git clone https://github.com/PowerShell/PowerShellEditorServices.git ../PowerShellEditorServices
16+
- git clone --single-branch -b 2.0.0 https://github.com/PowerShell/PowerShellEditorServices.git ../PowerShellEditorServices
1717
- ps: Install-Product node '6.9.2'
1818
- ps: |
1919
Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force | Out-Null

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "PowerShell",
33
"displayName": "PowerShell",
4-
"version": "1.10.3",
4+
"version": "2.0.0",
55
"publisher": "ms-vscode",
66
"description": "Develop PowerShell scripts in Visual Studio Code!",
77
"engines": {

src/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import utils = require("./utils");
3636

3737
// NOTE: We will need to find a better way to deal with the required
3838
// PS Editor Services version...
39-
const requiredEditorServicesVersion = "1.10.3";
39+
const requiredEditorServicesVersion = "2.0.0";
4040

4141
let logger: Logger;
4242
let sessionManager: SessionManager;

tools/releaseBuild/Image/DockerFile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ COPY build.ps1 containerFiles/build.ps1
2323

2424
# Add an environment variable for build versioning
2525
ENV VSTS_BUILD=1
26-
ENV VSTS_BUILD_VERSION=1.10.3
26+
ENV VSTS_BUILD_VERSION=2.0.0
2727

2828
# Uncomment to debug locally
2929
# RUN Import-Module ./containerFiles/dockerInstall.psm1; `

tools/releaseBuild/setVstsVariables.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$vstsVariables = @{
2-
PSES_BRANCH = 'master'
2+
PSES_BRANCH = '2.0.0'
33
}
44

55
# Use VSTS's API to set an env vars

vscode-powershell.build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ task GetExtensionVersion -Before Package {
3636
}
3737
}
3838

39-
task ResolveEditorServicesPath -Before CleanEditorServices, BuildEditorServices {
39+
task ResolveEditorServicesPath -Before CleanEditorServices, BuildEditorServices, Package {
4040

4141
$script:psesRepoPath = `
4242
if ($EditorServicesRepoPath) {

0 commit comments

Comments
 (0)