Skip to content

Add Copilot semantic search #79673

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
merged 4 commits into from
Aug 2, 2025
Merged

Add Copilot semantic search #79673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e88f0d
Add Copilot semantic search
tmat Jul 25, 2025
25e7e49
Clear
tmat Jul 30, 2025
5ef062a
18.0.533-alpha
tmat Aug 1, 2025
9a7ceec
Remove EA.Copilot from ExternalApi
tmat Aug 1, 2025
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: 1 addition & 0 deletions eng/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
<PackageVersion Include="Microsoft.VisualStudio.Search" Version="17.10.961-preview.2" />
<PackageVersion Include="Microsoft.VisualStudio.WinForms.Interfaces" Version="17.0.0-previews-4-31709-430" />
<PackageVersion Include="Microsoft.VisualStudio.Workspace.VSIntegration" Version="17.9.29-preview-0001" />
<PackageVersion Include="Microsoft.VisualStudio.Copilot.Roslyn.SemanticSearch" Version="18.0.533-alpha" />
<PackageVersion Include="VsWebSite.Interop" Version="8.0.50727" />
<PackageVersion Include="NuGet.VisualStudio" Version="6.0.0-preview.0.15" />
<PackageVersion Include="NuGet.VisualStudio.Contracts" Version="6.0.0-preview.0.15" />
Expand Down
2 changes: 1 addition & 1 deletion src/Features/ExternalAccess/Copilot/Microsoft.CodeAnalysis.ExternalAccess.Copilot.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.CodeAnalysis.ExternalAccess.Copilot</RootNamespace>
<TargetFrameworks>$(NetVSShared);net472</TargetFrameworks>
<TargetFrameworks>$(NetVSShared);netstandard2.0</TargetFrameworks>
<ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>

<!-- NuGet -->
Expand Down
2 changes: 0 additions & 2 deletions src/NuGet/VS.ExternalAPIs.Roslyn.Package/VS.ExternalAPIs.Roslyn.Package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<ProjectReference Include="..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" PrivateAssets="all" />
<ProjectReference Include="..\..\Features\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Features.csproj" PrivateAssets="all" />
<ProjectReference Include="..\..\Features\ExternalAccess\AspNetCore\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj" PrivateAssets="all" />
<ProjectReference Include="..\..\Features\ExternalAccess\Copilot\Microsoft.CodeAnalysis.ExternalAccess.Copilot.csproj" PrivateAssets="all" />
<ProjectReference Include="..\..\Features\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.Features.vbproj" PrivateAssets="all" />
<ProjectReference Include="..\..\Interactive\Host\Microsoft.CodeAnalysis.InteractiveHost.csproj" PrivateAssets="all" />
<ProjectReference Include="..\..\LanguageServer\Protocol\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj" PrivateAssets="all" />
Expand Down Expand Up @@ -83,7 +82,6 @@
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.EditorFeatures\$(Configuration)\net472\Microsoft.CodeAnalysis.EditorFeatures.dll" TargetDir="" />
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Apex\$(Configuration)\net472\Microsoft.CodeAnalysis.ExternalAccess.Apex.dll" TargetDir="" />
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.AspNetCore\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.dll" TargetDir="" />
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Copilot\$(Configuration)\net472\Microsoft.CodeAnalysis.ExternalAccess.Copilot.dll" TargetDir="" />
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Debugger\$(Configuration)\net472\Microsoft.CodeAnalysis.ExternalAccess.Debugger.dll" TargetDir="" />
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.EditorConfigGenerator\$(Configuration)\net472\Microsoft.CodeAnalysis.ExternalAccess.EditorConfigGenerator.dll" TargetDir="" />
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Extensions\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.Extensions.dll" TargetDir="" />
Expand Down
1 change: 1 addition & 0 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 @@ -354,6 +354,7 @@
<PackageReference Include="SQLitePCLRaw.bundle_green" ForceIncludeInVsix="true" PkgDefEntry="CodeBase" />
<PackageReference Include="SQLitePCLRaw.provider.dynamic_cdecl" ForceIncludeInVsix="true" PkgDefEntry="CodeBase" />
<PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" GeneratePathProperty="true" ExcludeAssets="all" PrivateAssets="all" />
<PackageReference Include="Microsoft.VisualStudio.Copilot.Roslyn.SemanticSearch" ForceIncludeInVsix="true" />
</ItemGroup>
<ItemGroup>
<Content Include="$(PkgSQLitePCLRaw_lib_e_sqlite3)\runtimes\win-x64\native\e_sqlite3.dll">
Expand Down
1 change: 1 addition & 0 deletions src/VisualStudio/Setup/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.VisualStudio.LanguageServices.ExternalAccess.Copilot.dll" />
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.LanguageServer.Protocol.dll" />
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CommonLanguageServerProtocol.Framework.dll" />
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.VisualStudio.Copilot.Roslyn.SemanticSearch.dll" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,19.0)" DisplayName="Visual Studio core editor" />
Expand Down
2 changes: 1 addition & 1 deletion src/Workspaces/Remote/Core/ExportProviderBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ private void ThrowOnUnexpectedErrors(CompositionConfiguration configuration, Com
{
// The ToString for the composition failed exception doesn't output a nice set of errors by default, so log it separately
LogError($"Encountered errors in the MEF composition:{Environment.NewLine}{ex.ErrorsAsString}");
throw;
throw new CompositionFailedException(ex.Message + Environment.NewLine + ex.ErrorsAsString);
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion 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 @@ -35,7 +35,8 @@
"Microsoft.NETCore.App.Runtime.win-{arch}"
"Microsoft.WindowsDesktop.App.Runtime.win-{arch}"
-->
<PackageReference Include="Microsoft.NETCore.App.crossgen2.win-x64" Condition="'$(GenerateReadyToRun)' == 'true'" ExcludeAssets="all" PrivateAssets="all" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.NETCore.App.crossgen2.win-x64" Condition="'$(GenerateReadyToRun)' == 'true'" ExcludeAssets="all" PrivateAssets="all" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.VisualStudio.Copilot.Roslyn.SemanticSearch" />
</ItemGroup>

<Target Name="CalculateCrossgenInputs" DependsOnTargets="PublishItemsOutputGroup">
Expand Down Expand Up @@ -66,6 +67,7 @@
<_R2RAssemblies Include="Microsoft.VisualStudio.Composition.dll" />
<_R2RAssemblies Include="Microsoft.VisualStudio.Telemetry.dll" />
<_R2RAssemblies Include="Microsoft.VisualStudio.Threading.dll" />
<_R2RAssemblies Include="Microsoft.VisualStudio.Copilot.Roslyn.SemanticSearch.dll" />
<_R2RAssemblies Include="MessagePack.dll" />
<_R2RAssemblies Include="Nerdback.Streams.dll" />
<_R2RAssemblies Include="Newtonsoft.Json.dll" />
Expand Down
10 changes: 6 additions & 4 deletions src/Workspaces/Remote/ServiceHub/Host/RemoteExportProviderBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ internal sealed class RemoteExportProviderBuilder : ExportProviderBuilder
{
internal static readonly ImmutableArray<string> RemoteHostAssemblyNames =
MefHostServices.DefaultAssemblyNames
.Add("Microsoft.CodeAnalysis.ExternalAccess.AspNetCore")
.Add("Microsoft.CodeAnalysis.Remote.ServiceHub")
.Add("Microsoft.CodeAnalysis.ExternalAccess.Razor.Features")
.Add("Microsoft.CodeAnalysis.Remote.Workspaces")
.Add("Microsoft.CodeAnalysis.ExternalAccess.Extensions");
.Add("Microsoft.CodeAnalysis.ExternalAccess.AspNetCore")
.Add("Microsoft.CodeAnalysis.ExternalAccess.Razor.Features")
.Add("Microsoft.CodeAnalysis.ExternalAccess.Extensions")
.Add("Microsoft.CodeAnalysis.ExternalAccess.Copilot")
.Add("Microsoft.VisualStudio.Copilot.Roslyn.SemanticSearch");

private static ExportProvider? s_instance;
internal static ExportProvider ExportProvider
Expand Down Expand Up @@ -74,7 +76,7 @@ protected override void LogTrace(string message)
protected override bool ContainsUnexpectedErrors(IEnumerable<string> erroredParts, ImmutableList<PartDiscoveryException> partDiscoveryExceptions)
{
// Verify that we have exactly the MEF errors that we expect. If we have less or more this needs to be updated to assert the expected behavior.
var expectedErrorPartsSet = new HashSet<string>(["PythiaSignatureHelpProvider", "VSTypeScriptAnalyzerService", "CodeFixService"]);
var expectedErrorPartsSet = new HashSet<string>(["PythiaSignatureHelpProvider", "VSTypeScriptAnalyzerService", "CodeFixService", "CSharpMapCodeService", "CopilotSemanticSearchQueryExecutor"]);
var hasUnexpectedErroredParts = erroredParts.Any(part => !expectedErrorPartsSet.Contains(part));

if (hasUnexpectedErroredParts)
Expand Down
1 change: 1 addition & 0 deletions src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<ProjectReference Include="..\..\..\Tools\ExternalAccess\Extensions\Microsoft.CodeAnalysis.ExternalAccess.Extensions.csproj" />
<ProjectReference Include="..\..\..\Tools\ExternalAccess\Razor\Features\Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.csproj" />
<ProjectReference Include="..\..\..\Tools\ExternalAccess\RazorCompiler\Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler.csproj" />
<ProjectReference Include="..\..\..\Features\ExternalAccess\Copilot\Microsoft.CodeAnalysis.ExternalAccess.Copilot.csproj" />
<ProjectReference Include="..\..\..\Features\ExternalAccess\AspNetCore\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj" />
<ProjectReference Include="..\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" />
</ItemGroup>
Expand Down