Update omnisharp (#591)

* Update omnisharp * Fixes for omnisharp update * Update other dependencies
microsoft · Oct 11, 2023 · 792180d · 792180d
1 parent 607c9a5
commit 792180d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.24] - 2023-10-10
+### Dependencies
+Update OmniSharp language server and App Inspector dependencies.
+
 ## [1.0.23] - 2023-10-05
 ### Miscellaneous
 Update deployment pipeline version

diff --git a/DevSkim-DotNet/Microsoft.DevSkim.CLI/Microsoft.DevSkim.CLI.csproj b/DevSkim-DotNet/Microsoft.DevSkim.CLI/Microsoft.DevSkim.CLI.csproj
@@ -37,9 +37,9 @@
     <ItemGroup>
       <PackageReference Include="CommandLineParser" Version="2.9.1" />
       <PackageReference Include="LibGit2Sharp" Version="0.27.2" />
-      <PackageReference Include="Microsoft.CST.ApplicationInspector.Logging" Version="1.9.12" />
+      <PackageReference Include="Microsoft.CST.ApplicationInspector.Logging" Version="1.9.14" />
       <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
-      <PackageReference Include="Sarif.Sdk" Version="4.3.1" />
+      <PackageReference Include="Sarif.Sdk" Version="4.3.4" />
     </ItemGroup>
 
 </Project>
diff --git a/...tNet/Microsoft.DevSkim.LanguageProtoInterop/Microsoft.DevSkim.LanguageProtoInterop.csproj b/...tNet/Microsoft.DevSkim.LanguageProtoInterop/Microsoft.DevSkim.LanguageProtoInterop.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
 <ItemGroup>
-	<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.7" />
+	<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.9" />
 </ItemGroup>
 
 </Project>
diff --git a/DevSkim-DotNet/Microsoft.DevSkim.LanguageServer/Microsoft.DevSkim.LanguageServer.csproj b/DevSkim-DotNet/Microsoft.DevSkim.LanguageServer/Microsoft.DevSkim.LanguageServer.csproj
@@ -14,7 +14,7 @@
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.7" />
+    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.9" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />

diff --git a/DevSkim-DotNet/Microsoft.DevSkim.LanguageServer/TextDocumentSyncHandler.cs b/DevSkim-DotNet/Microsoft.DevSkim.LanguageServer/TextDocumentSyncHandler.cs
@@ -20,7 +20,7 @@ internal class TextDocumentSyncHandler : TextDocumentSyncHandlerBase
     {
         private readonly ILogger<TextDocumentSyncHandler> _logger;
         private readonly ILanguageServerFacade _facade;
-        private readonly DocumentSelector _documentSelector = DocumentSelector.ForLanguage(StaticScannerSettings.RuleProcessorOptions.Languages.GetNames());
+        private readonly TextDocumentSelector _documentSelector = TextDocumentSelector.ForLanguage(StaticScannerSettings.RuleProcessorOptions.Languages.GetNames());
         private DevSkimRuleProcessor _processor => StaticScannerSettings.Processor;
 
         public TextDocumentSyncHandler(ILogger<TextDocumentSyncHandler> logger, ILanguageServerFacade facade)
@@ -190,13 +190,6 @@ public override async Task<Unit> Handle(DidSaveTextDocumentParams request, Cance
             return Unit.Value;
         }
 
-        protected override TextDocumentSyncRegistrationOptions CreateRegistrationOptions(SynchronizationCapability capability, ClientCapabilities clientCapabilities) => new TextDocumentSyncRegistrationOptions()
-        {
-            DocumentSelector = _documentSelector,
-            Change = Change,
-            Save = new SaveOptions() { IncludeText = true }
-        };
-
         public override TextDocumentAttributes GetTextDocumentAttributes(DocumentUri uri)
         {
             if (StaticScannerSettings.RuleProcessorOptions.Languages.FromFileNameOut(uri.GetFileSystemPath(), out LanguageInfo Info))
@@ -205,5 +198,12 @@ public override TextDocumentAttributes GetTextDocumentAttributes(DocumentUri uri
             }
             return new TextDocumentAttributes(uri, "unknown");
         }
+
+        protected override TextDocumentSyncRegistrationOptions CreateRegistrationOptions(TextSynchronizationCapability capability, ClientCapabilities clientCapabilities) => new TextDocumentSyncRegistrationOptions()
+        {
+            DocumentSelector = _documentSelector,
+            Change = Change,
+            Save = new SaveOptions() { IncludeText = true }
+        };
     }
 }
diff --git a/DevSkim-DotNet/Microsoft.DevSkim/Microsoft.DevSkim.csproj b/DevSkim-DotNet/Microsoft.DevSkim/Microsoft.DevSkim.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.CST.ApplicationInspector.RulesEngine" Version="1.9.13" />
+      <PackageReference Include="Microsoft.CST.ApplicationInspector.RulesEngine" Version="1.9.14" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>