[main] Update dependencies from dotnet/arcade#12748
Merged
Conversation
…204.6 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26080.4 -> To Version 10.0.0-beta.26104.6
![dotnet-policy-service[bot]](https://avatars.githubusercontent.com/in/285228?s=60&v=4){kind=small}
…206.4 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26080.4 -> To Version 10.0.0-beta.26106.4
…210.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26080.4 -> To Version 10.0.0-beta.26110.1
akhera99
approved these changes
Feb 11, 2026
This was referenced Feb 11, 2026
Member
|
/backport to release/stable |
Contributor
|
Started backporting to |
Contributor
|
@akhera99 backporting to git am output$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Update dependencies from https://github.com/dotnet/arcade build 20260204.6 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26080.4 -> To Version 10.0.0-beta.26104.6
Using index info to reconstruct a base tree...
M eng/Version.Details.props
M eng/Version.Details.xml
M global.json
Falling back to patching base and 3-way merge...
Auto-merging eng/Version.Details.props
CONFLICT (content): Merge conflict in eng/Version.Details.props
Auto-merging eng/Version.Details.xml
CONFLICT (content): Merge conflict in eng/Version.Details.xml
Auto-merging global.json
CONFLICT (content): Merge conflict in global.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Update dependencies from https://github.com/dotnet/arcade build 20260204.6 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26080.4 -> To Version 10.0.0-beta.26104.6
Error: The process '/usr/bin/git' failed with exit code 128 |
jjonescz
added a commit
that referenced
this pull request
Mar 31, 2026
* Update post 18.4 snap * Fix indentation following self closing tag with lambda attribute * Change insertionCreateDraftPR to false * Upgrade dotnet version to 10.0.102 * Update dependencies from https://github.com/dotnet/arcade build 20260130.4 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26066.3 -> To Version 10.0.0-beta.26080.4 * Initial plan * Add html.autoClosingTags setting support in VS Code Cohosting Co-authored-by: davidwengier <754264+davidwengier@users.noreply.github.com> * Fix: Use snake_case for html.auto_closing_tags setting name Changed from html.autoClosingTags to html.auto_closing_tags to match VS Code's snake_case naming convention. Added comment explaining the naming pattern for future setting additions. Co-authored-by: davidwengier <754264+davidwengier@users.noreply.github.com> * Update to net10.0 and packages to .NET 10 * Update docs * Use net10 for tests * Remove unnecessary code block * Fix CA warning * Fix document symbol tests Responding to changes in Roslyn in dotnet/roslyn#81993 * Fix settings.json for this repo * Create integration test project, and services for installing and running VS Code * Add formatting tests and services * Add go to def and FAR tests and services * Add diagnostics tests and services * Add completion tests and services * Add hover tests and services * Add code action tests and services * Add some docs * Use Playwright locator API * Move method to services * Remove a few delays * Remove unused methods * Simplify selector * Simplify get problems code * Various test fixes * Fix select word * Improve TestServices access * Misc bits of PR feedback * Revamp special key handling * Don't assume source mappings are in order of their original spans * Improve the "next" C# position logic * Move First to after Count * Consolidate all timeout waits to a helper method * PR feedback * PR Feedback * Use Razor.slnx by default, and remove old setting * Add some follow up tests * Dont run in CI * Create specific syntax node type for using directives * Parse using directives as using directives * Update code that deals with using directives to handle the new type, simplifying a bunch of it * Add a strongly typed property for the directive body, to simplify code This has always annoyed that we had to cast this, so thought I'd twaek it while we're here. * Fix semantic tokens * Clean up a few other spots I missed earlier * Update compiler test baselines * Use the VS2022 release image in CI * [main] Update dependencies from dotnet/arcade (#12748) * Update dependencies from https://github.com/dotnet/arcade build 20260204.6 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26080.4 -> To Version 10.0.0-beta.26104.6 * Update dependencies from https://github.com/dotnet/arcade build 20260206.4 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26080.4 -> To Version 10.0.0-beta.26106.4 * Update dependencies from https://github.com/dotnet/arcade build 20260210.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26080.4 -> To Version 10.0.0-beta.26110.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Handle when formatters insert entirely blank lines between original lines * Consume original and formatter lines to correctly handle VS Code moving attributes around in various ways. * Simplify and extract to separate methods (with annoyingly long parameter lists) * Reduce string allocations in ParseUsingDeclaration by replacing LINQ + Concat(this WorkspaceEdit, WorkspaceEdit?) with StringBuilder loop * Use pooled StringBuilders as per feedback * remove unused using * Modify RazorCSharpDocument to keep SourceMappings sorted by both original and generated document positions (#12772) * Modify RazorCSharpDocument to keep sourcemappings sorted by both Original and Generated document indices This class previously just kept an array that was sorted by generated positions. Many callers would benefit instead from an array sorted by original (html) posititions. This allows many loops to short-circuit once they've moved beyond any mappings that could be of interest to them. This also renamed the original array to indicate it's sorted by generated positions, and to validate that upon it's input, as some callers were assuming that. By renaming this variable, it will hopefully make callers 1) Aware that the input is sorted and may be short-circuited or binary searched 2) Aware what it is sorted by (eg: formatting had some code that was assuming the array was sorted by original position) * Be more resilient to bad input * Use Debug.Fail * Fix test to do different validation in debug/release * Initial plan * Add UTF-8 string literal support and comprehensive tests Co-authored-by: davidwengier <754264+davidwengier@users.noreply.github.com> * Address code review: Fix length check for UTF-8 string validation Co-authored-by: davidwengier <754264+davidwengier@users.noreply.github.com> * Fix length check: Use expectedPostfix.Length + 2 for proper UTF-8 validation Co-authored-by: davidwengier <754264+davidwengier@users.noreply.github.com> * Improve comments in IsStringProperlyTerminated for clarity Co-authored-by: davidwengier <754264+davidwengier@users.noreply.github.com> * Use a non-capturing group so as not to break things * Address PR feedback: Add UTF-8 raw string literal tests and fix .cshtml test file Co-authored-by: davidwengier <754264+davidwengier@users.noreply.github.com> * Fix RazorFormattingPass when multiple markup blocks are on the same line * Don't crash if we produce bad data in document generation * Add obsolete attribute tests * Add new helper methods and simplify code * Futile update to copilot instructions * PR Feedback * Add theme info for leading whitespace to a comment (#12791) * Initial plan * Fix formatting for void tag helpers by moving IsVoidElement to base class and fixing CSharpDocumentGenerator and FormattingVisitor Co-authored-by: davidwengier <754264+davidwengier@users.noreply.github.com> * Revert changes to FormattingVisitor.cs Co-authored-by: davidwengier <754264+davidwengier@users.noreply.github.com> * Revert changes to LanguageServer HtmlFormattingTest.cs Co-authored-by: davidwengier <754264+davidwengier@users.noreply.github.com> * Pass fromPaste through to OOP * Make tests fail when an error is logged, just like in VS * Add failing test * Swallow exceptions during format on paste * Fix workitem attribute * Create failing test * Ensure Roslyn knows we're emitting expressions, so it doesn't get confused * Create test to demonstrate the bug is fixed * Make it easier to diagnose test failures due to Web Tools formatting * Use the Roslyn tokenizer in tests * Fix test * Format (or don't!) pre tags like textarea tags * Emit initial whitespace to stop multiline if statements migrating right * Fix `@@` escape handling in component attribute values (#12754) * Initial plan * Fix @@ escape handling in component attribute values The issue was that @@ escape sequences were being parsed correctly but then treated as "complex content" during code generation, causing them to fail when used in component attributes. The fix modifies the VisitAttributeValue method to extract the literal @ token from the escaped @@ pattern and merge it with the rest of the attribute value as a simple string, rather than creating separate HTML content nodes. This allows component attributes to accept literal @ characters using the @@ escape syntax, e.g. <Weather Value="@@currentCount" /> now correctly passes the string "@currentCount" to the component. Co-authored-by: chsienki <16246502+chsienki@users.noreply.github.com> * Update test baselines after @@ escape fix The fix for @@ escape handling changed how source positions are tracked for escaped @ tokens in attribute values. The ComplexTagHelpers test baselines needed to be updated to reflect the new positions. Co-authored-by: chsienki <16246502+chsienki@users.noreply.github.com> * Address code review feedback - formatting improvements Co-authored-by: chsienki <16246502+chsienki@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: chsienki <16246502+chsienki@users.noreply.github.com> * Apply suggestion from @davidwengier Co-authored-by: David Wengier <david.wengier@microsoft.com> * Update vsBranch and insertionTitlePrefix values * [release/insiders] Update dependencies from dotnet/arcade (#12829) * Update dependencies from https://github.com/dotnet/arcade build 20260223.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26110.1 -> To Version 10.0.0-beta.26123.2 * update package versions * Update dependencies from https://github.com/dotnet/arcade build 20260302.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26110.1 -> To Version 10.0.0-beta.26152.1 * Update dependencies from https://github.com/dotnet/arcade build 20260303.3 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26110.1 -> To Version 10.0.0-beta.26153.3 * Update dependencies from https://github.com/dotnet/arcade build 20260309.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26110.1 -> To Version 10.0.0-beta.26159.1 * Fixup versions --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Ankita Khera <ankitakhera@microsoft.com> Co-authored-by: Jan Jones <janjones@microsoft.com> * Update dependencies from https://github.com/dotnet/arcade build 20260310.1 (#12889) [release/insiders] Update dependencies from dotnet/arcade * Update dependencies from https://github.com/dotnet/arcade build 20260314.1 (#12900) [release/insiders] Update dependencies from dotnet/arcade * Update dependencies from https://github.com/dotnet/arcade build 20260318.1 (#12925) [release/insiders] Update dependencies from dotnet/arcade * Update dependencies from https://github.com/dotnet/arcade build 20260327.7 (#12967) [release/insiders] Update dependencies from dotnet/arcade * Update PublishData.json for release/stable --------- Co-authored-by: David Wengier <david.wengier@microsoft.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: davidwengier <754264+davidwengier@users.noreply.github.com> Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Naresh Joshi <Naresh.Joshi@microsoft.com> Co-authored-by: Todd Grunke <toddgrun@microsoft.com> Co-authored-by: chsienki <16246502+chsienki@users.noreply.github.com> Co-authored-by: Ankita Khera <ankitakhera@microsoft.com> Co-authored-by: Ankita Khera <40616383+akhera99@users.noreply.github.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This pull request updates the following dependencies
From https://github.com/dotnet/arcade