Merge EditorFeatures.WPF into EditorFeatures #77707

CyrusNajmabadi · 2025-03-20T18:18:40Z

Dependent on #78043
VS PR to remove stale references: https://devdiv.visualstudio.com/DevDiv/_git/VS/pullrequest/627486

PR Validation: https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_build/results?buildId=11379092&view=results
PR: https://dev.azure.com/devdiv/DevDiv/_git/VS/pullrequest/627912

Need to update PR validation to have Xaml remove reference to EditorFeature.Wpf.dll. They should recompile fine though as the one type they need is still available (just moved). May have optprof regressions.

dibarbet

Temporarily blocking from an infra perspective - I don't think we should merge this with our current infra issues, unless we have a PR validation.

Hopefully these issues should be resolve in a couple of days.

jasonmalinowski

Marking request changes because the change to the publish data will break servicing; feel free to dismiss the block once that's addressed and treat this as a soft approval. (That said I'm happy to take another round on it -- the changes I'm mentioning should be quick to review.)

jasonmalinowski · 2025-04-10T21:40:20Z

eng/config/PublishData.json

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


This needs to stay around for servicing, since the file in main is used for servicing branches.

can you clarify? just so i understand?

The main branch PublishData.json is the source of truth for all builds. @dibarbet Recently suggested that release/* branches should simply refer to their own copy.

jasonmalinowski · 2025-04-10T21:41:25Z

src/EditorFeatures/CSharp/Microsoft.CodeAnalysis.CSharp.EditorFeatures.csproj

    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ApplyNgenOptimization Condition="'$(TargetFramework)' == 'netstandard2.0'">full</ApplyNgenOptimization>
+    <!--Temporarily bypass ibcmerge due to an error
+      https://github.com/dotnet/roslyn/issues/57863 -->


This bug has been closed for years. Check with @dotnet/roslyn-infrastructure but maybe we should just delete this.

jasonmalinowski · 2025-04-10T21:42:06Z

src/EditorFeatures/CSharp/StringCopyPaste/StringCopyPasteData.cs

@@ -42,6 +42,8 @@ internal sealed class StringCopyPasteData(ImmutableArray<StringCopyPasteContent>
        if (string.IsNullOrWhiteSpace(json))
            return null;

+        Contract.ThrowIfNull(json);


This might be a side effect of us dropping the net8.0 target. If you're able to add that back in that'd be good, but I imagine there's problems there.

jasonmalinowski · 2025-04-10T21:42:53Z

src/EditorFeatures/Core/EditAndContinue/EditAndContinueLanguageService.cs

@@ -175,7 +175,7 @@ private async ValueTask BreakStateOrCapabilitiesChangedAsync(bool? inBreakState,
                // The tracking session is cancelled when we exit the break state.

                Debug.Assert(solution != null);
-                GetActiveStatementTrackingService().StartTracking(solution, session);
+                GetActiveStatementTrackingService().StartTracking(solution!, session);


See other comment: if we can get a net8.0 build this can be removed again.

(do not spend more than 2 minutes seeing if you can add a net8.0/net9.0 target.)

jasonmalinowski · 2025-04-10T21:43:18Z

src/EditorFeatures/Core/EditorConfigSettings/Updater/SettingsUpdaterBase.cs

    private readonly IAsynchronousOperationListener _listener;
+#pragma warning disable RS0030 // Do not use banned APIs


Why would this be configured to ban this in the first place?

the JTF analyzers seem to hate it. But i'm in the position of: that's too bad, we use this everywhere. :)

jasonmalinowski · 2025-04-10T21:43:42Z

src/EditorFeatures/Core/EditorFeaturesWpfResources.resx

Can we merge the resx files? OK for that to be a follow-up since that can get big.

jasonmalinowski · 2025-04-10T21:46:22Z

src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj

    <PackageReference Include="Microsoft.VisualStudio.LanguageServer.Client" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.VisualStudio.Debugger.Contracts" />
+    <PackageReference Include="Microsoft.VisualStudio.LanguageServer.Client.Implementation" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" />


This reference shouldn't be there -- what's using this?

i moved it down when i merged WPF into this. it was in WPF before. i will remove it and see if that's oik.

removed. it didn't break anything.

jasonmalinowski · 2025-04-10T21:49:07Z

src/EditorFeatures/Core/PublicAPI.Unshipped.txt

@@ -1 +1,2 @@
-
+Microsoft.CodeAnalysis.Editor.Peek.IPeekableItemFactory


Hmm, is this a breaking change since we're moving it from an assembly that doesn't exist anymore? I think I'm OK with that but we should be aware of the potential for having to put a type forward back in.

(or consider making this internal if we're going to break things anyways)

jasonmalinowski · 2025-04-10T21:54:18Z

src/NuGet/VS.ExternalAPIs.Roslyn.Package/VS.ExternalAPIs.Roslyn.Package.csproj

      <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.CSharp.Features\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Features.dll" TargetDir="" />
      <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.CSharp.Scripting\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Scripting.dll" TargetDir="" />
      <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.CSharp.Workspaces\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.CSharp.Workspaces.dll" TargetDir="" />
      <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.CSharp\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll" TargetDir="" />
      <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.EditorFeatures.Text\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.EditorFeatures.Text.dll" TargetDir="" />
-      <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.EditorFeatures.Wpf\$(Configuration)\net472\Microsoft.CodeAnalysis.EditorFeatures.Wpf.dll" TargetDir="" />
-      <_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.EditorFeatures\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.EditorFeatures.dll" TargetDir="" />


You need to leave the regular EditorFeatures in, I think. Or at least until I delete a few more things from the VS repo.

wait. what still needs this in the VS repo?

There's a few places I'm seeing references to it. Those could just be copy/pate things where they're not needed anymore. But your options are:

Keep the deletion in for line 82 and then get to fix the VS build for what's consuming it.

Revert the deletion of line 82, and make sorting those out my problem. 😄 You'll still have to fix one place in the XAML build that references EditorFeatures.Wpf but that'll be easier to remove.

eng/config/PublishData.json

… into mergeWpfDown

CyrusNajmabadi · 2025-04-24T21:48:29Z

@jasonmalinowski if i try to add support for a later netcore version, i get these errors:

CyrusNajmabadi · 2025-04-24T21:48:45Z

i cannot figure out a way to get nuget to find the set of references that will work here.

jasonmalinowski · 2025-04-24T23:42:16Z

@CyrusNajmabadi Ah, Microsoft.VisualStudio.Text.UI.Wpf is still .NET Framework only, so nix that idea. 😦

CyrusNajmabadi · 2025-05-08T17:43:12Z

Closing. Subsumed by #78494.

CyrusNajmabadi added 10 commits March 20, 2025 11:13

Merge EditorFeatures.WPF into EditorFeatures

75fdba3

Move Adornments

0b110f6

Move AsyncCompletion

284e55b

Move BackgroundWorkIndicator

c851fd5

BraceMatching

86df0e3

Move Classification

93a13e8

Move EditAndContinue

c7fb135

Move EditAndContinue

16b9a25

Move InlineHints

94b79a5

Move Rename

a4121b8

ghost added Area-IDE untriaged Issues and PRs which have not yet been triaged by a lead labels Mar 20, 2025

CyrusNajmabadi changed the base branch from main to release/dev18.0 March 20, 2025 18:18

CyrusNajmabadi added 3 commits March 20, 2025 11:19

Move Interactive

a2e9def

Move Lightup

8ed366f

Move LineSeparators

85d7a9e

dotnet-policy-service bot added the Needs UX Triage label Mar 20, 2025

CyrusNajmabadi added 13 commits March 20, 2025 11:20

Move NavigableSymbols

137c40f

Move NavigateTo

5e8f708

Move Notification

e112e08

Move Peek

e29976d

Move Preview

196c9c0

Move QuickInfo

5d9e6f9

Move ReferenceHighlighting

19946ff

Move RenameTracking

879511e

Move SignatureHelp

352bdcb

Move StringCopyPaste

18457eb

Move StringIndentation

b9d0542

Move Structure

24128e9

Move Suggestions

15473c4

CyrusNajmabadi and others added 3 commits April 8, 2025 13:28

Fixes

e2585c5

Update EA.Debugger path

525d8e6

Merge branch 'main' into mergeWpfDown

9c6f05b

CyrusNajmabadi requested a review from JoeRobich April 9, 2025 22:04

CyrusNajmabadi marked this pull request as ready for review April 9, 2025 22:04

CyrusNajmabadi requested review from a team as code owners April 9, 2025 22:04

CyrusNajmabadi added 2 commits April 9, 2025 15:04

Merge remote-tracking branch 'upstream/main' into mergeWpfDown

0bf3c46

Fix

8ae5696

CyrusNajmabadi requested a review from jasonmalinowski April 9, 2025 22:53

CyrusNajmabadi added 3 commits April 9, 2025 20:46

update data

b98a32d

remove

aa09431

Merge remote-tracking branch 'upstream/main' into mergeWpfDown

aaac1b6

dibarbet requested changes Apr 10, 2025

View reviewed changes

jasonmalinowski requested changes Apr 10, 2025

View reviewed changes

Merge remote-tracking branch 'upstream/main' into mergeWpfDown

f53dc7b

CyrusNajmabadi commented Apr 24, 2025

View reviewed changes

eng/config/PublishData.json Outdated Show resolved Hide resolved

CyrusNajmabadi added 3 commits April 24, 2025 14:35

Update eng/config/PublishData.json

aa2ec6f

Remove unused reference

4b9f0ba

Merge branch 'mergeWpfDown' of https://github.com/CyrusNajmabadi/roslyn…

021f7da

… into mergeWpfDown

Remove api

ddb29d1

CyrusNajmabadi mentioned this pull request Apr 24, 2025

Precursor work to merge EditorFeatures.WPF into EditorFeatures. #78308

Merged

CyrusNajmabadi closed this May 8, 2025

CyrusNajmabadi deleted the mergeWpfDown branch May 8, 2025 17:43

		private readonly IAsynchronousOperationListener _listener;
		#pragma warning disable RS0030 // Do not use banned APIs

		@@ -1 +1,2 @@

		Microsoft.CodeAnalysis.Editor.Peek.IPeekableItemFactory

Merge EditorFeatures.WPF into EditorFeatures #77707

Merge EditorFeatures.WPF into EditorFeatures #77707

Uh oh!

Conversation

CyrusNajmabadi commented Mar 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dibarbet left a comment

Choose a reason for hiding this comment

Uh oh!

jasonmalinowski left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

CyrusNajmabadi commented Apr 24, 2025

Uh oh!

CyrusNajmabadi commented Apr 24, 2025

Uh oh!

jasonmalinowski commented Apr 24, 2025

Uh oh!

CyrusNajmabadi commented May 8, 2025

Uh oh!

Uh oh!

CyrusNajmabadi commented Mar 20, 2025 •

edited

Loading