Skip to content

Commit

Permalink
Merge pull request #6128 from dibarbet/use_node_18
Browse files Browse the repository at this point in the history
Upgrade to node 18
  • Loading branch information
dibarbet authored Aug 14, 2023
2 parents 4fca126 + 25b623b commit 6322c77
Show file tree
Hide file tree
Showing 6 changed files with 100 additions and 34 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

First install:

* Node.js ([v16.16 LTS](https://nodejs.org/en/blog/release/v16.16.0) is recommended).
* Npm (The version shipped with node is fine, for example for v16.16.0 it would be 8.19.2)
* Node.js ([v18.17.0 LTS](https://nodejs.org/de/blog/release/v18.17.0) is recommended).
* Npm (The version shipped with node is fine)
* .NET 7.0 SDK (dotnet should be on your path)

### Build and run the extension
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ stages:
prereleaseFlag: $(prereleaseFlag)
pool:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64

# TODO: add compliance, signing.
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ stages:
prereleaseFlag: $(prereleaseFlag)
pool:
name: NetCore-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open

- stage: Test
displayName: Test
Expand All @@ -38,7 +38,7 @@ stages:
strategy:
matrix:
linux:
demandsName: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
demandsName: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
pool:
name: NetCore-Public
demands: $(demandsName)
Expand Down
6 changes: 3 additions & 3 deletions azure-pipelines/prereqs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ steps:
- task: NuGetAuthenticate@1

- task: NodeTool@0
displayName: 'Install Node.js 16.x'
displayName: 'Install Node.js 18.x'
inputs:
versionSpec: '16.x'
versionSpec: '18.x'

- task: UseDotNet@2
displayName: 'Install .NET Core SDKs'
inputs:
version: '7.0.100'
version: '7.x'

# Set the CI build number to the VSIX version we're creating from this build.
- script: |
Expand Down
116 changes: 91 additions & 25 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
"@types/yauzl": "2.10.0",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"@vscode/test-electron": "2.1.3",
"@vscode/test-electron": "2.3.4",
"archiver": "5.3.0",
"chai": "4.3.4",
"chai-arrays": "2.2.0",
Expand Down

0 comments on commit 6322c77

Please sign in to comment.