Skip to content

Fix global state corruption in EditorConfig UI#53487

Merged
jmarolf merged 4 commits intodotnet:release/dev16.10from
sharwell:fix-state
May 19, 2021
Merged

Fix global state corruption in EditorConfig UI#53487
jmarolf merged 4 commits intodotnet:release/dev16.10from
sharwell:fix-state

Conversation

@sharwell
Copy link
Contributor

@sharwell sharwell commented May 18, 2021

Fixes #52802
Closes #42550

@sharwell sharwell requested a review from a team as a code owner May 18, 2021 16:54
@ghost ghost added the Area-IDE label May 18, 2021
@sharwell sharwell marked this pull request as draft May 18, 2021 16:54
@sharwell sharwell changed the title Fix state corruption in EditorConfig UI Fix global state corruption in EditorConfig UI May 18, 2021
@sharwell sharwell changed the base branch from main to release/dev16.10 May 18, 2021 17:17
@sharwell sharwell force-pushed the fix-state branch 2 times, most recently from 5ddece9 to fc36df0 Compare May 18, 2021 17:28
@sharwell sharwell marked this pull request as ready for review May 19, 2021 06:06
@jmarolf jmarolf merged commit 28511a6 into dotnet:release/dev16.10 May 19, 2021
@Youssef1313
Copy link
Member

@sharwell the issues didn't get closed as the target branch isn't main.

@Cosifne
Copy link
Member

Cosifne commented May 19, 2021

@sharwell the issues didn't get closed as the target branch isn't main.

@Youssef1313
This fix needs to go to 16.10 first. We have an auto pipeline to flow changes to main.

@Youssef1313
Copy link
Member

@sharwell the issues didn't get closed as the target branch isn't main.

@Youssef1313
This fix needs to go to 16.10 first. We have an auto pipeline to flow changes to main.

@Cosifne Yeah I know they will flow to main. But I think this won't close the linked issues?

@Cosifne
Copy link
Member

Cosifne commented May 19, 2021

@sharwell the issues didn't get closed as the target branch isn't main.

@Youssef1313
This fix needs to go to 16.10 first. We have an auto pipeline to flow changes to main.

@Cosifne Yeah I know they will flow to main. But I think this won't close the linked issues?

Do you mean #42550?

@Cosifne
Copy link
Member

Cosifne commented May 19, 2021

My understanding is this PR has sealed the CodeStyleOption & mark it as obsolete in this PR.
Anything else is needed?
Or do you mean this should be fixed by the PR which flows the change to main? @Youssef1313

@Youssef1313
Copy link
Member

My understanding is this PR has sealed the CodeStyleOption & mark it as obsolete in this PR.
Anything else is needed?
Or do you mean this should be fixed by the PR which flows the change to main? @Youssef1313

I meant that both #42550 and #52802 should be closed (usually this is done automatically, but GitHub doesn't do that when PRs doesn't target the default branch).

But @sharwell has done that, so nothing is needed now.

@sharwell sharwell deleted the fix-state branch January 13, 2022 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests are extremely flaky

7 participants