Skip to content

[automated] Merge branch 'main' => 'prerelease'#8883

Merged
dotnet-policy-service[bot] merged 63 commits intoprereleasefrom
merge/main-to-prerelease
Jan 14, 2026
Merged

[automated] Merge branch 'main' => 'prerelease'#8883
dotnet-policy-service[bot] merged 63 commits intoprereleasefrom
merge/main-to-prerelease

Conversation

@github-actions
Copy link
Contributor

I detected changes in the main branch which have not been merged yet to prerelease. I'm a robot and am configured to help you automatically keep prerelease up to date, so I've opened this PR.

This PR merges commits made on main by the following committers:

  • JoeRobich
  • dotnet-policy-service[bot]
  • dotnet-bot
  • davidwengier
  • Copilot
  • dibarbet
  • dependabot[bot]
  • phil-allen-msft
  • siramvikram

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout main
git pull --ff-only
git checkout prerelease
git pull --ff-only
git merge --no-ff main

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/vscode-csharp HEAD:merge/main-to-prerelease
or if you are using SSH
git push git@github.com:dotnet/vscode-csharp HEAD:merge/main-to-prerelease

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/main-to-prerelease'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/main-to-prerelease origin/prerelease
git pull https://github.com/dotnet/vscode-csharp merge/main-to-prerelease
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/vscode-csharp HEAD:merge/main-to-prerelease
or if you are using SSH
git fetch
git checkout -b merge/main-to-prerelease origin/prerelease
git pull git@github.com:dotnet/vscode-csharp merge/main-to-prerelease
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/vscode-csharp HEAD:merge/main-to-prerelease

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

JoeRobich and others added 30 commits December 10, 2025 05:02
- Modified getCommitFromNugetAsync to accept isPrerelease parameter
- Changed method to fetch package.json from dotnet/roslyn GitHub repo using fetch API
- Uses 'prerelease' or 'release' branch based on isPrerelease parameter
- Updated createTagsAsync to pass isPrerelease to getCommit arrow function
- Moved prerelease constant calculation before getCommit invocation
- Updated all task invocations to match new signature

Co-authored-by: JoeRobich <611219+JoeRobich@users.noreply.github.com>
- Replace 'any' type with explicit interface for packageJson
- Use consistent property access pattern with optional chaining

Co-authored-by: JoeRobich <611219+JoeRobich@users.noreply.github.com>
Updated getCommitFromNugetAsync to fetch package.json from dotnet/vscode-csharp instead of dotnet/roslyn

Co-authored-by: JoeRobich <611219+JoeRobich@users.noreply.github.com>
- Renamed getCommit parameter to getComponentCommit
- Changed parameter from isPrerelease to releaseCommit
- Now fetches package.json from specific commit SHA instead of branch name
- Updated all task invocations to pass releaseCommit

Co-authored-by: JoeRobich <611219+JoeRobich@users.noreply.github.com>
- Updated getCommitFromNugetAsync to accept githubPAT parameter
- Added Authorization header with GitHub token to fetch request
- Updated getComponentCommit callback signature to pass githubPAT
- Moved getGitHubPAT call earlier in createTagsAsync to reuse token

Co-authored-by: JoeRobich <611219+JoeRobich@users.noreply.github.com>
ISSUE:
Make sure the .npmrc is used for all different npm commands.

VALIDATION:
Ran the pipeline with line 45 removed and verified that each specific piece of the change is needed to get to success; removed the commit to restore line 45 for actual submission as a PR.
…ces in Razor files

Co-authored-by: davidwengier <754264+davidwengier@users.noreply.github.com>
Bumps [qs](https://github.com/ljharb/qs) and [body-parser](https://github.com/expressjs/body-parser). These dependencies needed to be updated together.

Updates `qs` from 6.13.0 to 6.14.1
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](ljharb/qs@v6.13.0...v6.14.1)

Updates `body-parser` from 1.20.3 to 1.20.4
- [Release notes](https://github.com/expressjs/body-parser/releases)
- [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md)
- [Commits](expressjs/body-parser@1.20.3...1.20.4)

---
updated-dependencies:
- dependency-name: qs
  dependency-version: 6.14.1
  dependency-type: indirect
- dependency-name: body-parser
  dependency-version: 1.20.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
- Updated findModernNetFrameworkTargetFramework() to correctly detect .NET 10, 11, and future versions
- Fixed regex pattern to match net10.0, net11.0, etc.
- Fixed conversion logic for shortnames without dots (net100 -> net10.0, net110 -> net11.0)
- Added validation to exclude legacy .NET Framework versions (net461, net472, etc.)
- Added comprehensive unit tests for .NET 10 and 11 detection

Co-authored-by: dibarbet <5749229+dibarbet@users.noreply.github.com>
Address code review feedback to use regex literals instead of RegExp constructor

Co-authored-by: dibarbet <5749229+dibarbet@users.noreply.github.com>
JoeRobich and others added 22 commits January 12, 2026 06:27
This PR adds a project context feature which takes enables the client to use the new project context refresh support added to the LSP in dotnet/roslyn#81938. The current method of validating a project context is "up to date" is replaced with waiting to receive refresh notifications from the server.

A Roslyn build with refresh support merged in #8877

Addresses #8849
- Adds select project context commands
- Adds the select command to the Project Context status item
- Updates middleware to send selected context with server requests.
Adds the ability to select a document's project context. Uses the key added in dotnet/roslyn#81940 to ensure all documents that have the same set of contexts use the same active context.

Updates Roslyn to bring in new refresh handler and project context list key
Adds select project context command
Adds the select command to the Project Context status item
Updates middleware to send selected context with server requests
Sends a provider refresh notification when selected context is changed
@github-actions github-actions bot requested review from a team as code owners January 14, 2026 18:44
Copy link
Contributor

@dotnet-policy-service dotnet-policy-service bot left a comment

Choose a reason for hiding this comment

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

Auto-approve

@dotnet-policy-service dotnet-policy-service bot merged commit ab3a21f into prerelease Jan 14, 2026
33 checks passed
@dotnet-policy-service dotnet-policy-service bot deleted the merge/main-to-prerelease branch January 14, 2026 19:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants