Keep O# packages for WebTools

NuGet.config

@@ -103,11 +103,12 @@
       <package pattern="omnisharp.abstractions" />
       <!-- The following are all needed because of a single reference to DocumentUri in
       FormattingLanguageServerClient for testing. We should remove them -->
-      <package pattern="mediatr" />
+      <package pattern="omnisharp.abstractions" />
       <package pattern="omnisharp.extensions.jsonrpc" />
       <package pattern="omnisharp.extensions.jsonrpc.generators" />
       <package pattern="omnisharp.extensions.languageprotocol" />
-      <!-- -->
+      <package pattern="omnisharp.extensions.languageserver" />
+      <package pattern="omnisharp.extensions.languageserver.shared" />
       <package pattern="omnisharp.msbuild" />
       <package pattern="omnisharp.roslyn" />
       <package pattern="omnisharp.roslyn.csharp" />
@@ -129,6 +130,7 @@
     <packageSource key="vs-impl">
       <package pattern="microbuild.core.sentinel" />
       <package pattern="microsoft.*" />
+      <package pattern="microsoft.commonlanguageserverProtocol.*" />
     </packageSource>
     <packageSource key="myget-legacy">
       <package pattern="microsoft.*" />

eng/Signing.props

@@ -14,6 +14,8 @@
   -->
   <ItemGroup>
     <FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="3PartySHA2" />
+    <FileSignInfo Include="OmniSharp.Extensions.JsonRpc.dll" CertificateName="3PartySHA2" />
+    <FileSignInfo Include="OmniSharp.Extensions.LanguageProtocol.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="Nerdbank.Streams.dll" CertificateName="3PartySHA2" />
   </ItemGroup>
 

eng/Versions.props

@@ -129,7 +129,9 @@
     <NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
     <NerdbankStreamsPackageVersion>2.8.57</NerdbankStreamsPackageVersion>
     <NuGetSolutionRestoreManagerInteropVersion>4.8.0</NuGetSolutionRestoreManagerInteropVersion>
-    <OmniSharpExtensionsLanguageProtocolPackageVersion>0.19.5</OmniSharpExtensionsLanguageProtocolPackageVersion>
+
+    <OmniSharpExtensionsLanguageServerPackageVersion>0.19.5</OmniSharpExtensionsLanguageServerPackageVersion>
+    <OmniSharpExtensionsLanguageProtocolPackageVersion>$(OmniSharpExtensionsLanguageServerPackageVersion)</OmniSharpExtensionsLanguageProtocolPackageVersion>
     <OmniSharpMSBuildPackageVersion>1.39.1</OmniSharpMSBuildPackageVersion>
     <StreamJsonRpcPackageVersion>2.12.7-alpha</StreamJsonRpcPackageVersion>
     <SystemRuntimeInteropServicesRuntimePackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimePackageVersion>

src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj

@@ -218,6 +218,10 @@
     <PackageReference Include="System.Resources.Extensions" Version="$(SystemResourcesExtensionsPackageVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="$(MicrosoftVisualStudioShell150PackageVersion)" />
 
+    <!-- We need to directly reference the O# language server here because we mark it as PrivateAssets="All" in our language server itself
+    We don't actual use it, but for now WebTools depends on it. -->
+    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="$(OmniSharpExtensionsLanguageServerPackageVersion)" />
+
     <!--
       Pinning packages to avoid misaligned reference CI failures.
       CI builds here: https://github.com/dotnet/razor-tooling/issues/4327