Skip to content

[release/insiders] Source code updates from dotnet/dotnet#13108

Open
dotnet-maestro[bot] wants to merge 1 commit into
release/insidersfrom
darc-release/insiders-d1c1848d-db34-413f-a4bf-30445870546a
Open

[release/insiders] Source code updates from dotnet/dotnet#13108
dotnet-maestro[bot] wants to merge 1 commit into
release/insidersfrom
darc-release/insiders-d1c1848d-db34-413f-a4bf-30445870546a

Conversation

@dotnet-maestro

Copy link
Copy Markdown

Caution

This is an unsafe codeflow update ⚠️ Please review carefully as it may contain undesirable changes and/or reverts.
This PR is a self-corrective attempt most likely caused by a recent change in codeflow subscriptions which results in the currently flown branch release/10.0.3xx being divergent from the previously flown branch.

It may contain both source code changes from the VMR
as well as dependency updates. Learn more here.

If the changes in this PR look wrong, you also have the option to reset the VMR's contents to match the repository:

darc vmr reset --build 312133 razor

This pull request brings the following source code changes

From https://github.com/dotnet/dotnet

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:7cd99d4e04536addfd185d632b239da7fbf352fb..https://github.com/dotnet/razor:darc-release/insiders-d1c1848d-db34-413f-a4bf-30445870546a

@dotnet-maestro

Copy link
Copy Markdown
Author

Caution

🚨 Action Required — Conflict detected

A conflict was detected when trying to update this PR with changes from build 312133 of https://github.com/dotnet/dotnet/tree/7cd99d4e04536addfd185d632b239da7fbf352fb.

The conflicts in the following files need to be manually resolved:

  • eng/config/PublishData.json
    🔍 View file in dotnet/razor vs VMR
  • src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/GenerateMethodCodeActionResolver.cs
    🔍 View file in dotnet/razor vs VMR
  • src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Utilities/StreamExtensions.NetCore.cs
    🔍 View file in dotnet/razor vs VMR
  • src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DocumentMapping/RemoteRazorEditService.cs
    🔍 View file in dotnet/razor vs VMR
  • src/Razor/src/Microsoft.VisualStudio.RazorExtension/SyntaxVisualizerMenu.vsct
    🔍 View file in dotnet/razor vs VMR
  • src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/SyntaxVisualizerMenu.vsct.cs.xlf
    🔍 View file in dotnet/razor vs VMR
  • src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/SyntaxVisualizerMenu.vsct.de.xlf
    🔍 View file in dotnet/razor vs VMR
  • src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/SyntaxVisualizerMenu.vsct.es.xlf
    🔍 View file in dotnet/razor vs VMR
  • src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/SyntaxVisualizerMenu.vsct.fr.xlf
    🔍 View file in dotnet/razor vs VMR
  • src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/SyntaxVisualizerMenu.vsct.it.xlf
    🔍 View file in dotnet/razor vs VMR
  • src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/SyntaxVisualizerMenu.vsct.ja.xlf
    🔍 View file in dotnet/razor vs VMR
  • src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/SyntaxVisualizerMenu.vsct.ko.xlf
    🔍 View file in dotnet/razor vs VMR
  • src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/SyntaxVisualizerMenu.vsct.pl.xlf
    🔍 View file in dotnet/razor vs VMR
  • src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/SyntaxVisualizerMenu.vsct.pt-BR.xlf
    🔍 View file in dotnet/razor vs VMR
  • src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/SyntaxVisualizerMenu.vsct.ru.xlf
    🔍 View file in dotnet/razor vs VMR
  • src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/SyntaxVisualizerMenu.vsct.tr.xlf
    🔍 View file in dotnet/razor vs VMR
  • src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/SyntaxVisualizerMenu.vsct.zh-Hans.xlf
    🔍 View file in dotnet/razor vs VMR
  • src/Razor/src/Microsoft.VisualStudio.RazorExtension/xlf/SyntaxVisualizerMenu.vsct.zh-Hant.xlf
    🔍 View file in dotnet/razor vs VMR
  • src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Utilities/StreamExtensionTests.NetCore.cs
    🔍 View file in dotnet/razor vs VMR
  • src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/Formatting/FormattingLogTest.cs
    🔍 View file in dotnet/razor vs VMR

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository
    git clone https://github.com/dotnet/razor
    cd razor
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26227.1 or higher)
    # Linux / MacOS
    ./eng/common/darc-init.sh
    # or on Windows
    .\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally
    darc vmr resolve-conflict --subscription ffb0ccf2-e472-42ac-8949-855716f0d527 --unsafe

If you don't care about about the changes made in the VMR, and just want the vmr branch to match your repo you can use

darc vmr reset --build 312133 razor

from the local vmr clone.
This should apply the build 312133 with sources from 7cd99d4
4. Resolve the conflicts, commit & push the changes
5. Once pushed, the Codeflow verification check will turn green.
If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants