-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…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: 
… changes in them. (#77241)
…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>
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>
3 tasks
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
approved these changes
Feb 19, 2025
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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:
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.
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
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.
or if you are using SSH
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.