Initialize naming style preferences when language is added to workspace #76795
Conversation
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
ghost
added
Area-IDE
untriaged
arunchndr
approved these changes
Jan 17, 2025
tmat
force-pushed
the
NamingPreferencesInit
branch
from
e148710 to
d24ddec
Compare
|
/backport to release/dev17.12 |
|
Started backporting to release/dev17.12: https://github.com/dotnet/roslyn/actions/runs/12836854107 |
|
@tmat backporting to "release/dev17.12" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Initialize naming style preferences when language is added to workspace
Using index info to reconstruct a base tree...
M src/Features/Core/Portable/Options/EditorConfig/EditorConfigFileGenerator.cs
M src/Features/Core/Portable/Options/EditorConfig/EditorConfigOptionsEnumerator.cs
M src/LanguageServer/Protocol/Features/Options/ClientFallbackAnalyzerConfigOptionsProvider.cs
M src/LanguageServer/Protocol/Features/Options/SolutionAnalyzerConfigOptionsUpdater.cs
M src/LanguageServer/ProtocolUnitTests/Options/SolutionAnalyzerConfigOptionsUpdaterTests.cs
M src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/NamingStyleOptions.cs
M src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfigValueSerializer.cs
Falling back to patching base and 3-way merge...
Auto-merging src/LanguageServer/ProtocolUnitTests/Options/SolutionAnalyzerConfigOptionsUpdaterTests.cs
Auto-merging src/Features/Core/Portable/Options/EditorConfig/EditorConfigFileGenerator.cs
CONFLICT (content): Merge conflict in src/Features/Core/Portable/Options/EditorConfig/EditorConfigFileGenerator.cs
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 advice.mergeConflict false"
Patch failed at 0001 Initialize naming style preferences when language is added to workspace
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
This was referenced Jan 22, 2025
tmat
added a commit
that referenced
this pull request
Feb 12, 2025
|
/backport to release/dev17.13 |
|
Started backporting to release/dev17.13: https://github.com/dotnet/roslyn/actions/runs/14365291104 |
|
@tmat backporting to "release/dev17.13" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Initialize naming style preferences when language is added to workspace
Using index info to reconstruct a base tree...
M src/Features/Core/Portable/Options/EditorConfig/EditorConfigFileGenerator.cs
M src/Features/Core/Portable/Options/EditorConfig/EditorConfigOptionsEnumerator.cs
M src/LanguageServer/Protocol/Features/Options/ClientFallbackAnalyzerConfigOptionsProvider.cs
M src/LanguageServer/Protocol/Features/Options/SolutionAnalyzerConfigOptionsUpdater.cs
M src/LanguageServer/ProtocolUnitTests/Options/SolutionAnalyzerConfigOptionsUpdaterTests.cs
M src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/NamingStyles/NamingStyleOptions.cs
M src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfigValueSerializer.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfigValueSerializer.cs
CONFLICT (content): Merge conflict in src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Options/EditorConfigValueSerializer.cs
Auto-merging src/LanguageServer/ProtocolUnitTests/Options/SolutionAnalyzerConfigOptionsUpdaterTests.cs
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 Initialize naming style preferences when language is added to workspace
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
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.
Fixes https://dev.azure.com/devdiv/DevDiv/_workitems/edit/2297536