Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[automated] Merge branch 'main' => 'release/dev18.0' #77226

Merged
merged 94 commits into from
Feb 19, 2025

Conversation

github-actions[bot]
Copy link
Contributor

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

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

  • CyrusNajmabadi
  • tmat
  • ToddGrun
  • dibarbet
  • JoeRobich
  • akhera99

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 release/dev18.0
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/roslyn HEAD:merge/main-to-release/dev18.0
or if you are using SSH
git push git@github.com:dotnet/roslyn HEAD:merge/main-to-release/dev18.0

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-release/dev18.0'. 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-release/dev18.0 origin/release/dev18.0
git pull https://github.com/dotnet/roslyn merge/main-to-release/dev18.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/roslyn HEAD:merge/main-to-release/dev18.0
or if you are using SSH
git fetch
git checkout -b merge/main-to-release/dev18.0 origin/release/dev18.0
git pull git@github.com:dotnet/roslyn merge/main-to-release/dev18.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/roslyn HEAD:merge/main-to-release/dev18.0

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.

davidwengier and others added 30 commits August 21, 2024 11:16
…211.5

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.25077.4 -> To Version 9.0.0-beta.25111.5
…s.cs

Co-authored-by: Joey Robichaud <jorobich@microsoft.com>
Previously, all LSP tests ran against net472 only, even though the LSP
code running in VSCode ran against .NET9. So we've had a test gap here
for a while.

But some refactorings Tomas did a couple weeks ago to TestWorkspace now
make it relatively straightforward to multi-target these tests. This
gets us both CI coverage on .NET core as well as the ability to debug
these tests using VSCode (it only ships with a .net core debugger).

The changes in the PR fit a few categories
1. Removing EditorFeatures dependencies from the Protocol unit tests.
This generally resulted in removing usages of EditorTestWorkspace and
text buffers. Text buffers were previously mostly used as a proxy for
opening a file in the workspace, and didn't actually require text
buffers.
2.  Fixing new nullable warnings that came from bumping the tfm
3. Refactoring the TestLspServer type a little bit to allow either the
`LspTestWorkspace` or `EditorTestWorkspace` (for tests in EditorFeatures
that require text buffers, like the document outline tests).

CI:

![image](https://github.com/user-attachments/assets/cfd60a35-4177-4361-9cd4-f7d687b63147)
CyrusNajmabadi and others added 21 commits February 14, 2025 19:56
…ider. (#77244)

Extracted out all the cleanup and simplification i did in
#77239

This allows changing 'rename type to file' (and vice versa) to operate
entirely syntactically. This is important for fix all performance.
…ion>` (#77137)

* Make `InterceptableLocation` implement `IEquatable<InterceptableLocation>`

* Update src/Compilers/CSharp/Portable/Utilities/InterceptableLocation.cs

Co-authored-by: Jan Jones <jan.jones.cz@gmail.com>

* Update src/Compilers/CSharp/Portable/Utilities/InterceptableLocation.cs

Co-authored-by: Jan Jones <jan.jones.cz@gmail.com>

* Record public API change

---------

Co-authored-by: Jan Jones <jan.jones.cz@gmail.com>
@github-actions github-actions bot requested a review from a team as a code owner February 17, 2025 13:11
@dotnet-policy-service dotnet-policy-service bot added the Needs API Review Needs to be reviewed by the API review council label Feb 17, 2025
davidwengier and others added 2 commits February 18, 2025 10:14
Once Web Tools has moved to System.Text.Json, we on Razor can move off
of Visual Studio Lsp types, which resolves a licensing mismatch in the
C# extension. To do this, we just need a bit more access to the Roslyn
Lsp types.

There was a couple of things missing, presumably added after forking, so
I went ahead and added them, but only the minimum that Razor actually
needs. Mikayla's PR probably already covers these too, and more
obviously.
* Add missing word the documentation file

A sentence in `Compiler Breaking Changes - DotNet 8.md` is because of a missing word.

* Improve wording

---------

Co-authored-by: Jan Jones <jan.jones.cz@gmail.com>
akhera99 and others added 2 commits February 18, 2025 16:59
This pull request updates the following dependencies

[marker]: <> (Begin:111cfc79-5f9f-4acd-d8a2-08dc0c5899fd)
## From https://github.com/dotnet/arcade
- **Subscription**: 111cfc79-5f9f-4acd-d8a2-08dc0c5899fd
- **Build**: 20250211.5
- **Date Produced**: February 11, 2025 11:57:34 PM UTC
- **Commit**: 5da211e1c42254cb35e7ef3d5a8428fb24853169
- **Branch**: refs/heads/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
- **Microsoft.SourceBuild.Intermediate.arcade**: [from
9.0.0-beta.25077.4 to 9.0.0-beta.25111.5][1]
- **Microsoft.DotNet.Arcade.Sdk**: [from 9.0.0-beta.25077.4 to
9.0.0-beta.25111.5][1]
- **Microsoft.DotNet.Helix.Sdk**: [from 9.0.0-beta.25077.4 to
9.0.0-beta.25111.5][1]
- **Microsoft.DotNet.XliffTasks**: [from 9.0.0-beta.25077.4 to
9.0.0-beta.25111.5][1]

[1]: dotnet/arcade@bac7e1c...5da211e

[DependencyUpdate]: <> (End)

- **Updates to .NET SDKs:**
  - Updates sdk.version to 9.0.103
  - Updates tools.dotnet to 9.0.103

[marker]: <> (End:111cfc79-5f9f-4acd-d8a2-08dc0c5899fd)
Co-authored-by: Cyrus Najmabadi <cyrus.najmabadi@gmail.com>
@akhera99 akhera99 merged commit fc18ffb into release/dev18.0 Feb 19, 2025
39 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure Needs API Review Needs to be reviewed by the API review council untriaged Issues and PRs which have not yet been triaged by a lead VSCode
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants