-
Notifications
You must be signed in to change notification settings - Fork 196
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
Update feature branch #10652
Merged
Merged
Update feature branch #10652
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
# Conflicts: # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpFormatter.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting/FormattingLanguageServerClient.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting/FormattingTestBase.cs
Since we were talking in the working group meeting, thought I'd give it a go and see if it passes
# Conflicts: # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpFormatter.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpOnTypeFormattingPass.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting/FormattingLanguageServerClient.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting/TestRazorFormattingService.cs
* Removing unnecessary Razor Legacy Editor feature flag AFAIK it was introduced for new LSP editor rollout several years ago before we had Tools/Options/HTML Editor/Advanced/Use legacy Razor Editor option. Now that rollout is over, and there is a public non-preview mechanism for users to switch to the old editor if needed, the feature flag is no longer necessary and creates confusion (and extra code to test/maintain). * Fixing a unit test (test matrix) * Fixing spacing per CR suggestion Co-authored-by: David Wengier <[email protected]> --------- Co-authored-by: David Wengier <[email protected]>
This PR is a style-only clean up of our code actions handlers and related code. Definitely could have gone further (more collection pooling, returning concrete types etc.) but I wanted to try to have it serve as an indication for what we consider our current idiomatic coding style* and to avoid conflicts with the extract to component work. <sub>* Current style is subject to change at any time, and are not well documented. To quote a great Australian film, [it's just the vibe](https://www.youtube.com/watch?v=nMuh33BMZYY).</sub>
* Update dependencies from https://github.com/dotnet/arcade build 20240702.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24352.1 -> To Version 9.0.0-beta.24352.2 * Install .NET 8 runtime * Update dependencies from https://github.com/dotnet/arcade build 20240702.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.24352.1 -> To Version 9.0.0-beta.24352.2 * Disable BuildWithNetFrameworkHostedCompiler --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jan Jones <[email protected]>
* Update name away from now-former nation name * Update packages to modern versions * Change package version
…est/Cohost/CohostEndpointTestBase.cs Co-authored-by: Dustin Campbell <[email protected]>
Part of #9519 and #10603 Requires dotnet/roslyn#74402 Removes a little more dodginess in the cohosting tests by actually using the `RazorPinnedSolutionInfoWrapper` for solution checksums, just like the real OOP services.
# Conflicts: # eng/Versions.props
We have tests with baselines that have trailing whitespaces. Our `trimTrailingWhitespace` setting means that those will get modified automatically, breaking those tests. To fix that, I implemented a vscode feature to avoid triming inside regex and strings, so let's use that.
Requires dotnet/roslyn#74280, and won't even compile without it. Part of #9519 This brings signature help to Cohosting. It's a pretty simply PR, for a pretty simple endpoint, as we just delegate, and there is no translation of delegated info. The interesting part here is that we use `System.Text.Json` for the remote signature help service, because it makes more sense to take advantage of the existing Json converters for the potential complexity of the `SignatureHelp` result type.
Having two sln files in the root directory means that `dotnet` CLI commands get confused about what sln to use and need to have it specified. To fix, we just move this solution file into eng, since it's only used for full builds anyways.
* Add tests * Fix attribute parsing recovery * Update new baselines * Fix expected missing source mapping * Update pre-existing baselines * Simplify code
I recommend reviewing this commit-by-commit. I took a look at logging to address an integration test issue where we should ignore any exceptions that occur during logging because xUnit's `ITestOutputHelper` is no longer available. Previously, we had swallowed these exceptions across all unit tests as well. However, in unit tests, these exceptions can be an early warning sign of other problems. While addressing integration tests, I ended up taking a more thorough look at logging and ended up re-implementing the log message formatting to reduce string allocations. In addition, I cleaned up a fair number of redundant "no-op" loggers and did an audit of all ILoggerProviders to determine which ones needed to implement IDisposable.
ryzngard
approved these changes
Jul 19, 2024
ryzngard
merged commit Jul 19, 2024
921aef1
into
features/extract-to-component
10 of 12 checks passed
This was referenced Oct 22, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary of the changes
Update feature branch to keep up with current changes in the main branch.
Fixes: