-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
Merge EditorFeatures.Wpf entirely into EditorFeatures #78494
Conversation
@jasonmalinowski ptal |
Undo automatic VS changes to version 18
There was a problem hiding this 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.
"filename": "/Microsoft.CodeAnalysis.EditorFeatures.Wpf.dll", | ||
"testCases":[ "WinForms.OptProfTests.winforms_largeform_vb" , "WinForms.OptProfTests.winforms_largeform_cs"] |
There was a problem hiding this comment.
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.
eng/config/PublishData.json
Outdated
@@ -44,7 +44,6 @@ | |||
"Microsoft.CodeAnalysis.CSharp.EditorFeatures": "vssdk", | |||
"Microsoft.CodeAnalysis.InteractiveHost": "vssdk", | |||
"Microsoft.CodeAnalysis.VisualBasic.EditorFeatures": "vssdk", | |||
"Microsoft.CodeAnalysis.EditorFeatures.Wpf": "vssdk", |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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. --> |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
…mabadi/roslyn into removeEditorFeaturesWPF
@jasonmalinowski this is ready for another look. |
Doing a test insertion to ensure no breaks in VS. |
Test insertion is clean. |
This can happen now that Xaml has moved off of the old peek api to the EA api in https://devdiv.visualstudio.com/DevDiv/_git/VS/pullrequest/633865
Build: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=11553248&view=results
PR: https://dev.azure.com/devdiv/DevDiv/_git/VS/pullrequest/635014