Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/branch-snap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
- name: Install NodeJS
uses: actions/setup-node@v4
with:
node-version: '18.x'
- name: Install dependencies
node-version: '24.x'
- name: Install dependencies
run: npm ci
- name: Update version.json
run: |
Expand Down Expand Up @@ -59,8 +59,8 @@ jobs:
- name: Install NodeJS
uses: actions/setup-node@v4
with:
node-version: '18.x'
- name: Install dependencies
node-version: '24.x'
- name: Install dependencies
run: npm ci
- name: Update version.json for release
run: npx gulp updateVersionForStableRelease
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/copilot-setup-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ jobs:
# Install Node.js (required for TypeScript compilation and npm packages)
- uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '24'
cache: 'npm'

# Install .NET SDK (required for some build components and MSBuild tasks)
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'

# Install npm dependencies
- name: Install dependencies
Expand All @@ -52,4 +52,4 @@ jobs:
- name: Install dependencies
run: gulp installDependencies


2 changes: 1 addition & 1 deletion .github/workflows/update-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Install NodeJS
uses: actions/setup-node@v4
with:
node-version: '20.x'
node-version: '24.x'
- name: Install dependencies
run: npm ci
- name: Update CHANGELOG
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ Setting up your local development environment for the vscode-csharp repository i

Before you start, make sure you have the following software installed on your machine:

* Node.js v20 ([v20.17.0 LTS](https://nodejs.org/en/blog/release/v20.17.0)).
* Node.js v24 ([24.13.0 LTS](https://nodejs.org/en/blog/release/v24.13.0)).
* Note - Building with higher major versions of Node.js is not advised - it may work but we do not test it.
* Npm (The version shipped with node is fine)
* .NET 8.0 SDK (dotnet should be on your path)
* .NET 10.0 SDK (dotnet should be on your path)

Once you have these installed, you can navigate to the cloned vscode-csharp repository to proceed with building, running, and testing the repository.

Expand Down
1 change: 0 additions & 1 deletion azure-pipelines/build-vsix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ stages:
displayName: Use .NET Core sdk 8.0.x
inputs:
version: 8.0.x

# If we're in an official build, install the signing plugin
- ${{ if eq(parameters.isOfficial, true) }}:
- task: MicroBuildSigningPlugin@4
Expand Down
6 changes: 1 addition & 5 deletions azure-pipelines/green-insertion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,7 @@ jobs:
vmImage: ubuntu-latest
steps:
- checkout: none
- task: NodeTool@0
displayName: ⚙️ Install Node.js
inputs:
versionSource: spec
versionSpec: 16.x
- template: /azure-pipelines/install-node.yml@self
- powershell: |
"registry=https://pkgs.dev.azure.com/devdiv/DevDiv/_packaging/vs-green/npm/registry/`nalways-auth=true`n" | Tee-Object -FilePath '$(Pipeline.Workspace)/.npmrc'
displayName: ⚙️ Prepare for publish
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines/install-node.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
steps:
- task: NodeTool@0
displayName: 'Install Node.js 20.x'
displayName: 'Install Node.js 24.x'
inputs:
versionSpec: '20.x'
versionSpec: '24.x'
8 changes: 2 additions & 6 deletions azure-pipelines/loc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,13 @@ extends:
condition: ${{ parameters.publishLocalizationFile }}
artifactName: l10n
steps:
- task: NodeTool@0
displayName: 'Install Node.js 18.x'
inputs:
# Octokit client needs 18.x to have 'fetch' function.
versionSpec: '18.x'
- template: /azure-pipelines/install-node.yml@self
- checkout: self
clean: true
submodules: true
fetchTags: false
fetchDepth: 0
- pwsh: |
- pwsh: |
npm install
npm install -g gulp --globalconfig $(Build.SourcesDirectory)/.npmrc
displayName: 'Install tools'
Expand Down
4 changes: 2 additions & 2 deletions msbuild/global.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "8.0.415",
"version": "10.0.101",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

think this is fine, will just double check when CI is done that we ran the tests on the right .NET versions

"rollForward": "latestMajor"
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0"
}
}
}
30 changes: 15 additions & 15 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 @@ -123,7 +123,7 @@
"@types/fs-extra": "11.0.4",
"@types/gulp": "4.0.5",
"@types/minimist": "1.2.1",
"@types/node": "20.14.8",
"@types/node": "24.10.8",
"@types/semver": "7.3.13",
"@types/tmp": "0.0.33",
"@types/uuid": "^9.0.1",
Expand Down
2 changes: 1 addition & 1 deletion tasks/createTagsTasks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ gulp.task('createTags:vscode-csharp', async (): Promise<void> => {
options,
'dotnet',
'vscode-csharp',
async (releaseCommit: string, githubPAT: string) => releaseCommit,
async (releaseCommit: string, _githubPAT: string) => releaseCommit,
(releaseVersion: string, isPrerelease: boolean): [string, string] => {
const prereleaseText = isPrerelease ? '-prerelease' : '';
return [`v${releaseVersion}${prereleaseText}`, releaseVersion];
Expand Down
6 changes: 3 additions & 3 deletions tasks/snapTasks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function addChangelogSection(version: string, additionalLines?: string[]): void
const headerRegex = /^#+\s+.*$/gm;
const matches = [];
for (let i = 0; i < changelogLines.length; i++) {
const line = changelogLines.at(i);
const line = changelogLines[i];
const match = headerRegex.exec(line!);
if (match) {
matches.push({ line: i, text: match[0] });
Expand Down Expand Up @@ -201,7 +201,7 @@ const prRegex = /^\*.+\(PR: \[#(\d+)\]\(/;
function findNextVersionHeaderLine(changelogLines: string[], startLine: number = 0): [number, string] {
const headerRegex = /^#\s(\d+\.\d+)\.(x|\d+)$/;
for (let i = startLine; i < changelogLines.length; i++) {
const line = changelogLines.at(i);
const line = changelogLines[i];
const match = headerRegex.exec(line!);
if (match) {
return [i, match[1]];
Expand All @@ -213,7 +213,7 @@ function findNextVersionHeaderLine(changelogLines: string[], startLine: number =
function getPrIdsBetweenHeaders(changelogLines: string[], startLine: number, endLine: number): string[] {
const prs: string[] = [];
for (let i = startLine; i < endLine; i++) {
const line = changelogLines.at(i);
const line = changelogLines[i];
const match = prRegex.exec(line!);
if (match) {
prs.push(match[1]);
Expand Down
4 changes: 2 additions & 2 deletions test/vscodeLauncher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ export async function prepareVSCodeAndExecuteTests(
// Rather than having to uninstall Dev Kit between different test runs, we use workspace settings
// to control which extensions are active - and we always install Dev Kit.
const extensionsToInstall = [
'ms-dotnettools.vscode-dotnet-runtime@2.3.4',
'ms-dotnettools.vscode-dotnet-runtime@3.0.0',
'ms-dotnettools.csharp',
'ms-dotnettools.csdevkit@1.16.6',
'ms-dotnettools.csdevkit@1.92.5',
];

await installExtensions(extensionsToInstall, cli, args);
Expand Down