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

Merge main to release/dev17.8 #9187

Merged
341 commits merged into from
Aug 28, 2023
Merged

Conversation

dibarbet
Copy link
Member

Summary of the changes

Fixes:

DustinCampbell and others added 30 commits August 1, 2023 09:56
Honour the locale name sent through via the parameters to the Initialize LSP method
Allow documents to have multiple virtual documents of a single virtual document type
…801.3 (#9074)

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23381.1 -> To Version 8.0.0-beta.23401.3

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23374.1 -> To Version 1.0.0-beta.23381.1 (parent: Microsoft.DotNet.Arcade.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This change refactors the various tag helper resolvers to prefer
composition over inheritance and use an `ITagHelperResolver` as the
base type.
davidwengier and others added 20 commits August 25, 2023 17:53
As usual, the Html formatter is doing the right thing here, and our C# adjustments then break things. Essentially it sees `@bind` as a Razor directive, so wants it at column 0. This change simply makes the `@` on an attribute pretend to be Html, so the C# formatter leaves it alone.
…825.2

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23422.1 -> To Version 8.0.0-beta.23425.2

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23418.1 -> To Version 1.0.0-beta.23423.1 (parent: Microsoft.DotNet.Arcade.Sdk
Rework BoundAttributeDescriptionInfo to avoid failures due to unexpected inputs
…5-fc109157ea74

[main] Update dependencies from dotnet/arcade
Fix completion in self closing tags inside C#
Defend against bad input in the Inferred mapping
Fix hover when Roslyn gives us a range that can't be mapped
@dibarbet dibarbet requested review from a team as code owners August 28, 2023 23:25
@dibarbet dibarbet added the auto-merge Squash merge once all PR checks are complete and reviewers have approved label Aug 28, 2023
@ghost
Copy link

ghost commented Aug 28, 2023

Hello @dibarbet!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 12 minutes. No worries though, I will be back when the time is right! 😉

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@dibarbet dibarbet changed the title Merges/main to release/dev17.8 Merge main to release/dev17.8 Aug 28, 2023
@ghost ghost merged commit 340f0a2 into release/dev17.8 Aug 28, 2023
@ghost ghost deleted the merges/main-to-release/dev17.8 branch August 28, 2023 23:43
@jjonescz
Copy link
Member

Looks like this was squash-merged which probably shouldn't have been. I guess that causes the merge conflicts in #9188.

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-merge Squash merge once all PR checks are complete and reviewers have approved
Projects
None yet
Development

Successfully merging this pull request may close these issues.