Merge pull request #1946 from PowerShell/andschwa/omnisharp-update

andyleejordan · web-flow · commit e6488b290897 · 2022-11-07T13:59:58.000-08:00
Bump OmniSharp to `v0.19.6`
diff --git a/PowerShellEditorServices.Common.props b/PowerShellEditorServices.Common.props
@@ -17,7 +17,5 @@
     <!-- Required to enable IDE0005 as error -->
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <!-- TODO: Enable <AnalysisMode>All</AnalysisMode> -->
-    <!-- See: https://docs.microsoft.com/en-us/dotnet/core/compatibility/sdk/6.0/implicit-namespaces -->
-    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
   </PropertyGroup>
 </Project>
diff --git a/src/PowerShellEditorServices/PowerShellEditorServices.csproj b/src/PowerShellEditorServices/PowerShellEditorServices.csproj
@@ -30,8 +30,8 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <!-- Manually pull in the updated version of Newtonsoft.Json. -->
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.5" />
-    <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.5" />
+    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.6" />
+    <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.6" />
     <PackageReference Include="PowerShellStandard.Library" Version="5.1.1" />
     <PackageReference Include="Serilog" Version="2.12.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
diff --git a/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj b/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj
@@ -10,8 +10,8 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="OmniSharp.Extensions.LanguageClient" Version="0.19.5" />
-    <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.5" />
+    <PackageReference Include="OmniSharp.Extensions.LanguageClient" Version="0.19.6" />
+    <PackageReference Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.6" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
diff --git a/test/PowerShellEditorServices.Test.Shared/PowerShellEditorServices.Test.Shared.csproj b/test/PowerShellEditorServices.Test.Shared/PowerShellEditorServices.Test.Shared.csproj
@@ -8,10 +8,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\PowerShellEditorServices\PowerShellEditorServices.csproj" />
   </ItemGroup>
-  <PropertyGroup>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-  </PropertyGroup>
   <ItemGroup>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
       <_Parameter1>Microsoft.PowerShell.EditorServices.Test</_Parameter1>
diff --git a/test/PowerShellEditorServices.Test/Language/CompletionHandlerTests.cs b/test/PowerShellEditorServices.Test/Language/CompletionHandlerTests.cs
@@ -53,17 +53,19 @@ private Task<CompletionResults> GetCompletionResultsAsync(ScriptRegion scriptReg
                 CancellationToken.None);
         }
 
-        [Fact]
+        [SkippableFact]
         public async Task CompletesCommandInFile()
         {
+            Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
             (_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteCommandInFile.SourceDetails).ConfigureAwait(true);
             CompletionItem actual = Assert.Single(results);
             Assert.Equal(CompleteCommandInFile.ExpectedCompletion, actual);
         }
 
-        [Fact]
+        [SkippableFact]
         public async Task CompletesCommandFromModule()
         {
+            Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
             (_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteCommandFromModule.SourceDetails).ConfigureAwait(true);
             CompletionItem actual = Assert.Single(results);
             // NOTE: The tooltip varies across PowerShell and OS versions, so we ignore it.
@@ -74,6 +76,7 @@ public async Task CompletesCommandFromModule()
         [SkippableFact]
         public async Task CompletesTypeName()
         {
+            Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
             Skip.If(VersionUtils.PSEdition == "Desktop", "Windows PowerShell has trouble with this test right now.");
             (_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteTypeName.SourceDetails).ConfigureAwait(true);
             CompletionItem actual = Assert.Single(results);
@@ -95,23 +98,26 @@ public async Task CompletesTypeName()
         [SkippableFact]
         public async Task CompletesNamespace()
         {
+            Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
             Skip.If(VersionUtils.PSEdition == "Desktop", "Windows PowerShell has trouble with this test right now.");
             (_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteNamespace.SourceDetails).ConfigureAwait(true);
             CompletionItem actual = Assert.Single(results);
             Assert.Equal(CompleteNamespace.ExpectedCompletion, actual);
         }
 
-        [Fact]
+        [SkippableFact]
         public async Task CompletesVariableInFile()
         {
+            Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
             (_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteVariableInFile.SourceDetails).ConfigureAwait(true);
             CompletionItem actual = Assert.Single(results);
             Assert.Equal(CompleteVariableInFile.ExpectedCompletion, actual);
         }
 
-        [Fact]
+        [SkippableFact]
         public async Task CompletesAttributeValue()
         {
+            Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
             (_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteAttributeValue.SourceDetails).ConfigureAwait(true);
             // NOTE: Since the completions come through un-ordered from PowerShell, their SortText
             // (which has an index prepended from the original order) will mis-match our assumed
@@ -122,9 +128,10 @@ public async Task CompletesAttributeValue()
                 actual => Assert.Equal(actual with { Data = null, SortText = null }, CompleteAttributeValue.ExpectedCompletion3));
         }
 
-        [Fact]
+        [SkippableFact]
         public async Task CompletesFilePath()
         {
+            Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
             (_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteFilePath.SourceDetails).ConfigureAwait(true);
             Assert.NotEmpty(results);
             CompletionItem actual = results.First();
diff --git a/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj b/test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj
@@ -7,11 +7,6 @@
     <TargetPlatform>x64</TargetPlatform>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\PowerShellEditorServices\PowerShellEditorServices.csproj" />
     <ProjectReference Include="..\PowerShellEditorServices.Test.Shared\PowerShellEditorServices.Test.Shared.csproj" />
@@ -36,7 +31,7 @@
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
-    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.5" />
+    <PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.6" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/PowerShellEditorServices.Test/Services/Symbols/PSScriptAnalyzerTests.cs b/test/PowerShellEditorServices.Test/Services/Symbols/PSScriptAnalyzerTests.cs
@@ -8,6 +8,7 @@
 using Microsoft.PowerShell.EditorServices.Services;
 using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using Microsoft.PowerShell.EditorServices.Test;
+using Microsoft.PowerShell.EditorServices.Utility;
 using Xunit;
 
 namespace PowerShellEditorServices.Test.Services.Symbols
@@ -65,9 +66,10 @@ public async Task CanLoadPSScriptAnalyzerAsync()
             });
         }
 
-        [Fact]
+        [SkippableFact]
         public async Task DoesNotDuplicateScriptMarkersAsync()
         {
+            Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
             ScriptFile scriptFile = workspaceService.GetFileBuffer("untitled:Untitled-1", script);
             ScriptFile[] scriptFiles = { scriptFile };
 
@@ -83,9 +85,10 @@ await analysisService
             Assert.Single(scriptFile.DiagnosticMarkers);
         }
 
-        [Fact]
+        [SkippableFact]
         public async Task DoesNotClearParseErrorsAsync()
         {
+            Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
             // Causing a missing closing } parser error
             ScriptFile scriptFile = workspaceService.GetFileBuffer("untitled:Untitled-2", script.TrimEnd('}'));
             ScriptFile[] scriptFiles = { scriptFile };

Original file line number	Diff line number	Diff line change
`@@ -53,17 +53,19 @@ private Task<CompletionResults> GetCompletionResultsAsync(ScriptRegion scriptReg`
`53`	`53`	`CancellationToken.None);`
`54`	`54`	`}`
`55`	`55`
`56`		`- [Fact]`
	`56`	`+ [SkippableFact]`
`57`	`57`	`public async Task CompletesCommandInFile()`
`58`	`58`	`{`
	`59`	`+ Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");`
`59`	`60`	`(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteCommandInFile.SourceDetails).ConfigureAwait(true);`
`60`	`61`	`CompletionItem actual = Assert.Single(results);`
`61`	`62`	`Assert.Equal(CompleteCommandInFile.ExpectedCompletion, actual);`
`62`	`63`	`}`
`63`	`64`
`64`		`- [Fact]`
	`65`	`+ [SkippableFact]`
`65`	`66`	`public async Task CompletesCommandFromModule()`
`66`	`67`	`{`
	`68`	`+ Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");`
`67`	`69`	`(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteCommandFromModule.SourceDetails).ConfigureAwait(true);`
`68`	`70`	`CompletionItem actual = Assert.Single(results);`
`69`	`71`	`// NOTE: The tooltip varies across PowerShell and OS versions, so we ignore it.`
`@@ -74,6 +76,7 @@ public async Task CompletesCommandFromModule()`
`74`	`76`	`[SkippableFact]`
`75`	`77`	`public async Task CompletesTypeName()`
`76`	`78`	`{`
	`79`	`+ Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");`
`77`	`80`	`Skip.If(VersionUtils.PSEdition == "Desktop", "Windows PowerShell has trouble with this test right now.");`
`78`	`81`	`(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteTypeName.SourceDetails).ConfigureAwait(true);`
`79`	`82`	`CompletionItem actual = Assert.Single(results);`
`@@ -95,23 +98,26 @@ public async Task CompletesTypeName()`
`95`	`98`	`[SkippableFact]`
`96`	`99`	`public async Task CompletesNamespace()`
`97`	`100`	`{`
	`101`	`+ Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");`
`98`	`102`	`Skip.If(VersionUtils.PSEdition == "Desktop", "Windows PowerShell has trouble with this test right now.");`
`99`	`103`	`(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteNamespace.SourceDetails).ConfigureAwait(true);`
`100`	`104`	`CompletionItem actual = Assert.Single(results);`
`101`	`105`	`Assert.Equal(CompleteNamespace.ExpectedCompletion, actual);`
`102`	`106`	`}`
`103`	`107`
`104`		`- [Fact]`
	`108`	`+ [SkippableFact]`
`105`	`109`	`public async Task CompletesVariableInFile()`
`106`	`110`	`{`
	`111`	`+ Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");`
`107`	`112`	`(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteVariableInFile.SourceDetails).ConfigureAwait(true);`
`108`	`113`	`CompletionItem actual = Assert.Single(results);`
`109`	`114`	`Assert.Equal(CompleteVariableInFile.ExpectedCompletion, actual);`
`110`	`115`	`}`
`111`	`116`
`112`		`- [Fact]`
	`117`	`+ [SkippableFact]`
`113`	`118`	`public async Task CompletesAttributeValue()`
`114`	`119`	`{`
	`120`	`+ Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");`
`115`	`121`	`(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteAttributeValue.SourceDetails).ConfigureAwait(true);`
`116`	`122`	`// NOTE: Since the completions come through un-ordered from PowerShell, their SortText`
`117`	`123`	`// (which has an index prepended from the original order) will mis-match our assumed`
`@@ -122,9 +128,10 @@ public async Task CompletesAttributeValue()`
`122`	`128`	`actual => Assert.Equal(actual with { Data = null, SortText = null }, CompleteAttributeValue.ExpectedCompletion3));`
`123`	`129`	`}`
`124`	`130`
`125`		`- [Fact]`
	`131`	`+ [SkippableFact]`
`126`	`132`	`public async Task CompletesFilePath()`
`127`	`133`	`{`
	`134`	`+ Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");`
`128`	`135`	`(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteFilePath.SourceDetails).ConfigureAwait(true);`
`129`	`136`	`Assert.NotEmpty(results);`
`130`	`137`	`CompletionItem actual = results.First();`