Skip to content

Migrate Codelens provider to .NET #74321

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.

Sign up for GitHub

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
genlu merged 10 commits into from
Oct 24, 2024
Merged

Migrate Codelens provider to .NET #74321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8a4d90a
Refactor for codelens to remvoe VS dependency
genlu Jul 9, 2024
f0c7b84
Reference ImageCatalog
genlu Jul 9, 2024
267e84b
Target CodeLens to .NET
genlu Jul 10, 2024
9ecc616
Fix
genlu Jul 10, 2024
47db759
Merge remote-tracking branch 'dotnet/main' into codelens
genlu Aug 9, 2024
e8448ed
add dotnet codelens assembly to vsixmanifest
genlu Aug 10, 2024
37eb8ed
Remove netfx codelens from vsix
genlu Aug 12, 2024
41c76f6
Merge remote-tracking branch 'dotnet/main' into codelens
genlu Aug 12, 2024
fb950ee
Move UnitTestingReferencesService to EditorFeatures layer
genlu Aug 21, 2024
15c7ce8
Merge remote-tracking branch 'dotnet/main' into codelens
genlu Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" />
</ItemGroup>
<ItemGroup>
<InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.CodeLens" />
<InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices" />
<InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.CSharp" />
<InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Implementation" />
Expand Down
0 ...dio/Core/Def/CodeLens/ICodeLensContext.cs → ...eatures/Core/CodeLens/ICodeLensContext.cs
View file
Open in desktop
File renamed without changes.
0 ...ditorFeatures/Core.Wpf/GlyphExtensions.cs → ...atures/Core/Extensions/GlyphExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...itTesting/UnitTestingReferencesService.cs → ...itTesting/UnitTestingReferencesService.cs
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Language.StandardClassification" />
<!-- The ImageCatalog reference is only used at compile time, not at runtime, because it is not supported on Mac.
There is a test to ensure this doesn't regress in src\EditorFeatures\Test\AssemblyReferenceTests.cs -->
<PackageReference Include="Microsoft.VisualStudio.ImageCatalog" PrivateAssets="all" />
<PackageReference Include="Microsoft.VisualStudio.ImageCatalog" />
<PackageReference Include="Microsoft.VisualStudio.Language" />
<PackageReference Include="Microsoft.VisualStudio.LanguageServer.Client" PrivateAssets="all" />
<PackageReference Include="Microsoft.ServiceHub.Client" />
Expand All @@ -42,6 +40,7 @@
<ItemGroup>
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="$(MoqPublicKey)" LoadsWithinVisualStudio="false" />
<InternalsVisibleTo Include="IdeBenchmarks" />
<InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.CodeLens" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.EditorFeatures" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests" />
<InternalsVisibleTo Include="Microsoft.CodeAnalysis.EditorFeatures.DiagnosticsTests.Utilities" />
Expand Down Expand Up @@ -83,6 +82,7 @@
<InternalsVisibleTo Include="Roslyn.VisualStudio.DiagnosticsWindow" />
<InternalsVisibleTo Include="Roslyn.VisualStudio.Next.UnitTests" />
<InternalsVisibleTo Include="Roslyn.VisualStudio.Setup" />
<InternalsVisibleTo Include="Microsoft.VisualStudio.TestWindow.CodeLens" Key="$(UnitTestingKey)" />
<!-- Eventually a bunch of these unit tests should move into Roslyn.Services.Implementation.UnitTests
and this should be removed. -->
<RestrictedInternalsVisibleTo Include="Microsoft.CodeAnalysis.LiveUnitTesting.BuildManager" Partner="UnitTesting" Key="$(UnitTestingKey)" />
Expand Down
34 changes: 0 additions & 34 deletions src/EditorFeatures/Test/AssemblyReferenceTests.cs
View file
Open in desktop

This file was deleted.

9 changes: 5 additions & 4 deletions src/VisualStudio/CodeLens/Microsoft.VisualStudio.LanguageServices.CodeLens.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,25 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.VisualStudio.LanguageServices.CodeLens</RootNamespace>
<TargetFramework>net472</TargetFramework>
<TargetFramework>$(NetVS)</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsSymbolPublishingPackage>true</IsSymbolPublishingPackage>
</PropertyGroup>
<ItemGroup Label="Project References">
<ProjectReference Include="..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
<ProjectReference Include="..\..\Workspaces\Core\Portable\Microsoft.CodeAnalysis.Workspaces.csproj" />
<ProjectReference Include="..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" />
<ProjectReference Include="..\..\EditorFeatures\Core\Microsoft.CodeAnalysis.EditorFeatures.csproj" />
<ProjectReference Include="..\..\EditorFeatures\Text\Microsoft.CodeAnalysis.EditorFeatures.Text.csproj" />
<ProjectReference Include="..\..\VisualStudio\Core\Def\Microsoft.VisualStudio.LanguageServices.csproj" />
<ProjectReference Include="..\..\EditorFeatures\Core.Wpf\Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj" />
</ItemGroup>
<ItemGroup Label="Package References">
<PackageReference Include="Microsoft.VisualStudio.Language" />
</ItemGroup>
<ItemGroup>
<PublicAPI Include="PublicAPI.Shipped.txt" />
<PublicAPI Include="PublicAPI.Unshipped.txt" />
</ItemGroup>
<ItemGroup>
<InternalsVisibleTo Include="Roslyn.VisualStudio.Setup" />
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="$(MoqPublicKey)" />
</ItemGroup>
</Project>
2 changes: 0 additions & 2 deletions src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,12 @@
<Reference Include="System.ComponentModel.Composition" />
</ItemGroup>
<ItemGroup>
<InternalsVisibleTo Include="Microsoft.VisualStudio.TestWindow.CodeLens" Key="$(UnitTestingKey)" />
<RestrictedInternalsVisibleTo Include="Microsoft.CodeAnalysis.LiveUnitTesting.BuildManager" Partner="UnitTesting" Key="$(UnitTestingKey)" />
<RestrictedInternalsVisibleTo Include="Microsoft.CodeAnalysis.LiveUnitTesting.BuildManager.Core" Partner="UnitTesting" Key="$(UnitTestingKey)" />
<RestrictedInternalsVisibleTo Include="Microsoft.CodeAnalysis.UnitTesting.SourceBasedTestDiscovery" Partner="UnitTesting" Key="$(UnitTestingKey)" />
<RestrictedInternalsVisibleTo Include="Microsoft.CodeAnalysis.UnitTesting.SourceBasedTestDiscovery.Core" Partner="UnitTesting" Key="$(UnitTestingKey)" />
<RestrictedInternalsVisibleTo Include="Microsoft.VisualStudio.IntelliCode.CSharp" Partner="Pythia" Key="$(IntelliCodeCSharpKey)" />
<RestrictedInternalsVisibleTo Include="Microsoft.VisualStudio.IntelliCode.CSharp.Extraction" Partner="Pythia" Key="$(IntelliCodeCSharpKey)" />
<InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.CodeLens" />
<InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.CSharp" />
<InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.Implementation" />
<InternalsVisibleTo Include="Microsoft.VisualStudio.LanguageServices.ExternalDependencyServices" WorkItem="https://github.com/dotnet/roslyn/issues/35085" />
Expand Down
1 change: 1 addition & 0 deletions src/VisualStudio/Setup.ServiceHub/arm64/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
</Installation>
<Assets>
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.CodeLensComponent.Dotnet" d:Source="File" Path="Microsoft.VisualStudio.LanguageServices.CodeLens.dll" />
<!-- ServiceHub assets are added by msbuild target -->
<!--#SERVICEHUB_ASSETS#-->
</Assets>
Expand Down
1 change: 1 addition & 0 deletions src/VisualStudio/Setup.ServiceHub/x64/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
</Installation>
<Assets>
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
<Asset Type="Microsoft.VisualStudio.CodeLensComponent.Dotnet" d:Source="File" Path="Microsoft.VisualStudio.LanguageServices.CodeLens.dll" />
<!-- ServiceHub assets are added by msbuild target -->
<!--#SERVICEHUB_ASSETS#-->
</Assets>
Expand Down
6 changes: 0 additions & 6 deletions src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,6 @@
<PkgDefEntry>BindingRedirect</PkgDefEntry>
<NgenPriority>1</NgenPriority>
</ProjectReference>
<ProjectReference Include="..\CodeLens\Microsoft.VisualStudio.LanguageServices.CodeLens.csproj">
<Name>CodeAnalysisCodeLensVisualStudio</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;SatelliteDllsProjectOutputGroup</IncludeOutputGroupsInVSIX>
<ForceIncludeInVSIX>true</ForceIncludeInVSIX>
<PkgDefEntry>BindingRedirect</PkgDefEntry>
</ProjectReference>
<ProjectReference Include="..\Core\Impl\Microsoft.VisualStudio.LanguageServices.Implementation.csproj">
<Name>ServicesVisualStudioImpl</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;SatelliteDllsProjectOutputGroup</IncludeOutputGroupsInVSIX>
Expand Down
1 change: 0 additions & 1 deletion src/VisualStudio/Setup/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
<Asset Type="Microsoft.VisualStudio.Analyzer" Path="Microsoft.CodeAnalysis.CSharp.Features.dll" />
<Asset Type="Microsoft.VisualStudio.Analyzer" Path="Microsoft.CodeAnalysis.VisualBasic.Features.dll" />
<Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="XamlVisualStudio" Path="|XamlVisualStudio|" />
<Asset Type="Microsoft.VisualStudio.CodeLensComponent" d:Source="File" Path="Microsoft.VisualStudio.LanguageServices.CodeLens.dll" />
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.ExternalAccess.Apex.dll" />
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.ExternalAccess.Copilot.dll" />
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.ExternalAccess.Debugger.dll" />
Expand Down
2 changes: 2 additions & 0 deletions src/Workspaces/Remote/ServiceHub.CoreComponents/CoreComponents.Shared.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
<ProjectReference Include="$(MSBuildThisFileDirectory)..\ServiceHub\Microsoft.CodeAnalysis.Remote.ServiceHub.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\..\Features\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Features.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\..\Features\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.Features.vbproj" />
<!-- CodeLens provider is not part of Roslyn ServiceHub, we just use the existing ServiceHub package as a delivery vehicle -->
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\..\VisualStudio\CodeLens\Microsoft.VisualStudio.LanguageServices.CodeLens.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down