Skip to content

Merge EditorFeatures.Wpf entirely into EditorFeatures #78494

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

Merged
merged 7 commits into from
May 8, 2025

Conversation

CyrusNajmabadi
Copy link
Member

@CyrusNajmabadi CyrusNajmabadi commented May 7, 2025

@CyrusNajmabadi CyrusNajmabadi requested review from a team as code owners May 7, 2025 19:51
@ghost ghost added Area-Infrastructure untriaged Issues and PRs which have not yet been triaged by a lead labels May 7, 2025
@dotnet-policy-service dotnet-policy-service bot added the Needs API Review Needs to be reviewed by the API review council label May 7, 2025
@CyrusNajmabadi
Copy link
Member Author

@jasonmalinowski ptal

Undo automatic VS changes to version 18
Copy link
Member

@jasonmalinowski jasonmalinowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One change required: don't remove it in PublishData.json or that breaks servicing.

Comment on lines -42 to -43
"filename": "/Microsoft.CodeAnalysis.EditorFeatures.Wpf.dll",
"testCases":[ "WinForms.OptProfTests.winforms_largeform_vb" , "WinForms.OptProfTests.winforms_largeform_cs"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI to @ryzngard and @phil-allen-msft since this might fix that issue that came by earlier today about IBC.

@@ -44,7 +44,6 @@
"Microsoft.CodeAnalysis.CSharp.EditorFeatures": "vssdk",
"Microsoft.CodeAnalysis.InteractiveHost": "vssdk",
"Microsoft.CodeAnalysis.VisualBasic.EditorFeatures": "vssdk",
"Microsoft.CodeAnalysis.EditorFeatures.Wpf": "vssdk",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to leave this around since this file still gets used for other feature branches for servicing. It's OK if it's there but the file doesn't exist in main.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

undid.

@@ -0,0 +1,22 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you added this in your other PR, so you can remove it here if this gets folks confused looking at history.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah. this is forked off that branch, so ti won't be confusing.

@CyrusNajmabadi
Copy link
Member Author

@jasonmalinowski this is ready for another look.

@CyrusNajmabadi
Copy link
Member Author

Doing a test insertion to ensure no breaks in VS.

@CyrusNajmabadi CyrusNajmabadi enabled auto-merge May 8, 2025 06:56
@CyrusNajmabadi
Copy link
Member Author

Test insertion is clean.

@CyrusNajmabadi CyrusNajmabadi merged commit bbde146 into dotnet:main May 8, 2025
27 of 28 checks passed
@CyrusNajmabadi CyrusNajmabadi deleted the removeEditorFeaturesWPF branch May 8, 2025 08:19
@dotnet-policy-service dotnet-policy-service bot added this to the Next milestone May 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure Needs API Review Needs to be reviewed by the API review council untriaged Issues and PRs which have not yet been triaged by a lead
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants