Skip to content

Commit bbc28a7

Browse files
authored
Revert "Add Copilot semantic search (#79673)"
This reverts commit a6b4e7f.
1 parent a6b4e7f commit bbc28a7

File tree

9 files changed

+9
-15
lines changed

9 files changed

+9
-15
lines changed

eng/Directory.Packages.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
<PackageVersion Include="Microsoft.VisualStudio.Search" Version="17.10.961-preview.2" />
7878
<PackageVersion Include="Microsoft.VisualStudio.WinForms.Interfaces" Version="17.0.0-previews-4-31709-430" />
7979
<PackageVersion Include="Microsoft.VisualStudio.Workspace.VSIntegration" Version="17.9.29-preview-0001" />
80-
<PackageVersion Include="Microsoft.VisualStudio.Copilot.Roslyn.SemanticSearch" Version="18.0.533-alpha" />
8180
<PackageVersion Include="VsWebSite.Interop" Version="8.0.50727" />
8281
<PackageVersion Include="NuGet.VisualStudio" Version="6.0.0-preview.0.15" />
8382
<PackageVersion Include="NuGet.VisualStudio.Contracts" Version="6.0.0-preview.0.15" />

src/Features/ExternalAccess/Copilot/Microsoft.CodeAnalysis.ExternalAccess.Copilot.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<OutputType>Library</OutputType>
66
<RootNamespace>Microsoft.CodeAnalysis.ExternalAccess.Copilot</RootNamespace>
7-
<TargetFrameworks>$(NetVSShared);netstandard2.0</TargetFrameworks>
7+
<TargetFrameworks>$(NetVSShared);net472</TargetFrameworks>
88
<ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
99

1010
<!-- NuGet -->

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<ProjectReference Include="..\..\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj" PrivateAssets="all" />
4343
<ProjectReference Include="..\..\Features\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Features.csproj" PrivateAssets="all" />
4444
<ProjectReference Include="..\..\Features\ExternalAccess\AspNetCore\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj" PrivateAssets="all" />
45+
<ProjectReference Include="..\..\Features\ExternalAccess\Copilot\Microsoft.CodeAnalysis.ExternalAccess.Copilot.csproj" PrivateAssets="all" />
4546
<ProjectReference Include="..\..\Features\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.Features.vbproj" PrivateAssets="all" />
4647
<ProjectReference Include="..\..\Interactive\Host\Microsoft.CodeAnalysis.InteractiveHost.csproj" PrivateAssets="all" />
4748
<ProjectReference Include="..\..\LanguageServer\Protocol\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj" PrivateAssets="all" />
@@ -82,6 +83,7 @@
8283
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.EditorFeatures\$(Configuration)\net472\Microsoft.CodeAnalysis.EditorFeatures.dll" TargetDir="" />
8384
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Apex\$(Configuration)\net472\Microsoft.CodeAnalysis.ExternalAccess.Apex.dll" TargetDir="" />
8485
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.AspNetCore\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.dll" TargetDir="" />
86+
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Copilot\$(Configuration)\net472\Microsoft.CodeAnalysis.ExternalAccess.Copilot.dll" TargetDir="" />
8587
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Debugger\$(Configuration)\net472\Microsoft.CodeAnalysis.ExternalAccess.Debugger.dll" TargetDir="" />
8688
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.EditorConfigGenerator\$(Configuration)\net472\Microsoft.CodeAnalysis.ExternalAccess.EditorConfigGenerator.dll" TargetDir="" />
8789
<_File Include="$(ArtifactsBinDir)Microsoft.CodeAnalysis.ExternalAccess.Extensions\$(Configuration)\netstandard2.0\Microsoft.CodeAnalysis.ExternalAccess.Extensions.dll" TargetDir="" />

src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,6 @@
354354
<PackageReference Include="SQLitePCLRaw.bundle_green" ForceIncludeInVsix="true" PkgDefEntry="CodeBase" />
355355
<PackageReference Include="SQLitePCLRaw.provider.dynamic_cdecl" ForceIncludeInVsix="true" PkgDefEntry="CodeBase" />
356356
<PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" GeneratePathProperty="true" ExcludeAssets="all" PrivateAssets="all" />
357-
<PackageReference Include="Microsoft.VisualStudio.Copilot.Roslyn.SemanticSearch" ForceIncludeInVsix="true" />
358357
</ItemGroup>
359358
<ItemGroup>
360359
<Content Include="$(PkgSQLitePCLRaw_lib_e_sqlite3)\runtimes\win-x64\native\e_sqlite3.dll">

src/VisualStudio/Setup/source.extension.vsixmanifest

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.VisualStudio.LanguageServices.ExternalAccess.Copilot.dll" />
7171
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CodeAnalysis.LanguageServer.Protocol.dll" />
7272
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.CommonLanguageServerProtocol.Framework.dll" />
73-
<Asset Type="Microsoft.VisualStudio.MefComponent" Path="Microsoft.VisualStudio.Copilot.Roslyn.SemanticSearch.dll" />
7473
</Assets>
7574
<Prerequisites>
7675
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,19.0)" DisplayName="Visual Studio core editor" />

src/Workspaces/Remote/Core/ExportProviderBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ private void ThrowOnUnexpectedErrors(CompositionConfiguration configuration, Com
198198
{
199199
// The ToString for the composition failed exception doesn't output a nice set of errors by default, so log it separately
200200
LogError($"Encountered errors in the MEF composition:{Environment.NewLine}{ex.ErrorsAsString}");
201-
throw new CompositionFailedException(ex.Message + Environment.NewLine + ex.ErrorsAsString);
201+
throw;
202202
}
203203
}
204204
}

src/Workspaces/Remote/ServiceHub.CoreComponents/CoreComponents.Shared.targets

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535
"Microsoft.NETCore.App.Runtime.win-{arch}"
3636
"Microsoft.WindowsDesktop.App.Runtime.win-{arch}"
3737
-->
38-
<PackageReference Include="Microsoft.NETCore.App.crossgen2.win-x64" Condition="'$(GenerateReadyToRun)' == 'true'" ExcludeAssets="all" PrivateAssets="all" GeneratePathProperty="true" />
39-
<PackageReference Include="Microsoft.VisualStudio.Copilot.Roslyn.SemanticSearch" />
38+
<PackageReference Include="Microsoft.NETCore.App.crossgen2.win-x64" Condition="'$(GenerateReadyToRun)' == 'true'" ExcludeAssets="all" PrivateAssets="all" GeneratePathProperty="true" />
4039
</ItemGroup>
4140

4241
<Target Name="CalculateCrossgenInputs" DependsOnTargets="PublishItemsOutputGroup">
@@ -67,7 +66,6 @@
6766
<_R2RAssemblies Include="Microsoft.VisualStudio.Composition.dll" />
6867
<_R2RAssemblies Include="Microsoft.VisualStudio.Telemetry.dll" />
6968
<_R2RAssemblies Include="Microsoft.VisualStudio.Threading.dll" />
70-
<_R2RAssemblies Include="Microsoft.VisualStudio.Copilot.Roslyn.SemanticSearch.dll" />
7169
<_R2RAssemblies Include="MessagePack.dll" />
7270
<_R2RAssemblies Include="Nerdback.Streams.dll" />
7371
<_R2RAssemblies Include="Newtonsoft.Json.dll" />

src/Workspaces/Remote/ServiceHub/Host/RemoteExportProviderBuilder.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@ internal sealed class RemoteExportProviderBuilder : ExportProviderBuilder
2222
{
2323
internal static readonly ImmutableArray<string> RemoteHostAssemblyNames =
2424
MefHostServices.DefaultAssemblyNames
25-
.Add("Microsoft.CodeAnalysis.Remote.ServiceHub")
26-
.Add("Microsoft.CodeAnalysis.Remote.Workspaces")
2725
.Add("Microsoft.CodeAnalysis.ExternalAccess.AspNetCore")
26+
.Add("Microsoft.CodeAnalysis.Remote.ServiceHub")
2827
.Add("Microsoft.CodeAnalysis.ExternalAccess.Razor.Features")
29-
.Add("Microsoft.CodeAnalysis.ExternalAccess.Extensions")
30-
.Add("Microsoft.CodeAnalysis.ExternalAccess.Copilot")
31-
.Add("Microsoft.VisualStudio.Copilot.Roslyn.SemanticSearch");
28+
.Add("Microsoft.CodeAnalysis.Remote.Workspaces")
29+
.Add("Microsoft.CodeAnalysis.ExternalAccess.Extensions");
3230

3331
private static ExportProvider? s_instance;
3432
internal static ExportProvider ExportProvider
@@ -76,7 +74,7 @@ protected override void LogTrace(string message)
7674
protected override bool ContainsUnexpectedErrors(IEnumerable<string> erroredParts, ImmutableList<PartDiscoveryException> partDiscoveryExceptions)
7775
{
7876
// 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.
79-
var expectedErrorPartsSet = new HashSet<string>(["PythiaSignatureHelpProvider", "VSTypeScriptAnalyzerService", "CodeFixService", "CSharpMapCodeService", "CopilotSemanticSearchQueryExecutor"]);
77+
var expectedErrorPartsSet = new HashSet<string>(["PythiaSignatureHelpProvider", "VSTypeScriptAnalyzerService", "CodeFixService"]);
8078
var hasUnexpectedErroredParts = erroredParts.Any(part => !expectedErrorPartsSet.Contains(part));
8179

8280
if (hasUnexpectedErroredParts)

src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<ProjectReference Include="..\..\..\Tools\ExternalAccess\Extensions\Microsoft.CodeAnalysis.ExternalAccess.Extensions.csproj" />
1919
<ProjectReference Include="..\..\..\Tools\ExternalAccess\Razor\Features\Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.csproj" />
2020
<ProjectReference Include="..\..\..\Tools\ExternalAccess\RazorCompiler\Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler.csproj" />
21-
<ProjectReference Include="..\..\..\Features\ExternalAccess\Copilot\Microsoft.CodeAnalysis.ExternalAccess.Copilot.csproj" />
2221
<ProjectReference Include="..\..\..\Features\ExternalAccess\AspNetCore\Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj" />
2322
<ProjectReference Include="..\Core\Microsoft.CodeAnalysis.Remote.Workspaces.csproj" />
2423
</ItemGroup>

0 commit comments

Comments
 (0)