diff --git a/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj b/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
index d3898b0112583..1562f9717dca0 100644
--- a/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
+++ b/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
@@ -41,7 +41,6 @@
-
diff --git a/src/VisualStudio/Core/Def/CodeLens/ICodeLensContext.cs b/src/EditorFeatures/Core/CodeLens/ICodeLensContext.cs
similarity index 100%
rename from src/VisualStudio/Core/Def/CodeLens/ICodeLensContext.cs
rename to src/EditorFeatures/Core/CodeLens/ICodeLensContext.cs
diff --git a/src/EditorFeatures/Core.Wpf/GlyphExtensions.cs b/src/EditorFeatures/Core/Extensions/GlyphExtensions.cs
similarity index 100%
rename from src/EditorFeatures/Core.Wpf/GlyphExtensions.cs
rename to src/EditorFeatures/Core/Extensions/GlyphExtensions.cs
diff --git a/src/VisualStudio/Core/Def/External/UnitTesting/UnitTestingReferencesService.cs b/src/EditorFeatures/Core/ExternalAccess/UnitTesting/UnitTestingReferencesService.cs
similarity index 100%
rename from src/VisualStudio/Core/Def/External/UnitTesting/UnitTestingReferencesService.cs
rename to src/EditorFeatures/Core/ExternalAccess/UnitTesting/UnitTestingReferencesService.cs
diff --git a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
index 8f371c1d74eb8..4c73a2c02380e 100644
--- a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
+++ b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
@@ -28,9 +28,7 @@
-
-
+
@@ -42,6 +40,7 @@
+
@@ -83,6 +82,7 @@
+
diff --git a/src/EditorFeatures/Test/AssemblyReferenceTests.cs b/src/EditorFeatures/Test/AssemblyReferenceTests.cs
deleted file mode 100644
index 4725d0c1addf5..0000000000000
--- a/src/EditorFeatures/Test/AssemblyReferenceTests.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// 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.
-
-#nullable disable
-
-using System.Linq;
-using Roslyn.Test.Utilities;
-using Xunit;
-
-namespace Microsoft.CodeAnalysis.Editor.UnitTests;
-
-///
-/// VS for mac has some restrictions on the assemblies that they can load.
-/// These tests are created to make sure we don't accidentally add references to the dlls that they cannot load.
-///
-public class AssemblyReferenceTests
-{
- [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/26642")]
- public void TestNoReferenceToImageCatalog()
- {
- var editorsFeatureAssembly = typeof(Microsoft.CodeAnalysis.Editor.Shared.Extensions.GlyphExtensions).Assembly;
- var dependencies = editorsFeatureAssembly.GetReferencedAssemblies();
- Assert.Empty(dependencies.Where(a => a.FullName.Contains("Microsoft.VisualStudio.ImageCatalog")));
- }
-
- [Fact]
- public void TestNoReferenceToImagingInterop()
- {
- var editorsFeatureAssembly = typeof(Microsoft.CodeAnalysis.Editor.Shared.Extensions.GlyphExtensions).Assembly;
- var dependencies = editorsFeatureAssembly.GetReferencedAssemblies();
- Assert.Empty(dependencies.Where(a => a.FullName.Contains("Microsoft.VisualStudio.Imaging.Interop")));
- }
-}
diff --git a/src/VisualStudio/CodeLens/Microsoft.VisualStudio.LanguageServices.CodeLens.csproj b/src/VisualStudio/CodeLens/Microsoft.VisualStudio.LanguageServices.CodeLens.csproj
index 293aa601e30f7..0f58e2bf74514 100644
--- a/src/VisualStudio/CodeLens/Microsoft.VisualStudio.LanguageServices.CodeLens.csproj
+++ b/src/VisualStudio/CodeLens/Microsoft.VisualStudio.LanguageServices.CodeLens.csproj
@@ -4,7 +4,7 @@
Library
Microsoft.VisualStudio.LanguageServices.CodeLens
- net472
+ $(NetVS)
true
true
@@ -12,16 +12,17 @@
+
-
-
+
+
+
-
diff --git a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
index 3e819572f972b..007c55fa569e3 100644
--- a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
+++ b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
@@ -68,14 +68,12 @@
-
-
diff --git a/src/VisualStudio/Setup.ServiceHub/arm64/source.extension.vsixmanifest b/src/VisualStudio/Setup.ServiceHub/arm64/source.extension.vsixmanifest
index 24f5d5a7bdf17..6af0b50fef88c 100644
--- a/src/VisualStudio/Setup.ServiceHub/arm64/source.extension.vsixmanifest
+++ b/src/VisualStudio/Setup.ServiceHub/arm64/source.extension.vsixmanifest
@@ -24,6 +24,7 @@
+
diff --git a/src/VisualStudio/Setup.ServiceHub/x64/source.extension.vsixmanifest b/src/VisualStudio/Setup.ServiceHub/x64/source.extension.vsixmanifest
index d705a91b968d1..dd4a8d56462d7 100644
--- a/src/VisualStudio/Setup.ServiceHub/x64/source.extension.vsixmanifest
+++ b/src/VisualStudio/Setup.ServiceHub/x64/source.extension.vsixmanifest
@@ -24,6 +24,7 @@
+
diff --git a/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj b/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
index da3eccdcc04b8..fc7afbc3b8f0d 100644
--- a/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
+++ b/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
@@ -192,12 +192,6 @@
BindingRedirect
1
-
- CodeAnalysisCodeLensVisualStudio
- BuiltProjectOutputGroup;SatelliteDllsProjectOutputGroup
- true
- BindingRedirect
-
ServicesVisualStudioImpl
BuiltProjectOutputGroup;SatelliteDllsProjectOutputGroup
diff --git a/src/VisualStudio/Setup/source.extension.vsixmanifest b/src/VisualStudio/Setup/source.extension.vsixmanifest
index 5153d20eea9b9..438a34bfc9481 100644
--- a/src/VisualStudio/Setup/source.extension.vsixmanifest
+++ b/src/VisualStudio/Setup/source.extension.vsixmanifest
@@ -58,7 +58,6 @@
-
diff --git a/src/Workspaces/Remote/ServiceHub.CoreComponents/CoreComponents.Shared.targets b/src/Workspaces/Remote/ServiceHub.CoreComponents/CoreComponents.Shared.targets
index 69286dc09a348..2698aed711c6f 100644
--- a/src/Workspaces/Remote/ServiceHub.CoreComponents/CoreComponents.Shared.targets
+++ b/src/Workspaces/Remote/ServiceHub.CoreComponents/CoreComponents.Shared.targets
@@ -19,6 +19,8 @@
+
+