Skip to content

Commit e6488b2

Browse files
andyleejordanandyleejordan
authored
Merge pull request #1946 from PowerShell/andschwa/omnisharp-update
Bump OmniSharp to `v0.19.6`
2 parents 7277b2d + 32f6832 commit e6488b2

File tree

7 files changed

+22
-23
lines changed

7 files changed

+22
-23
lines changed

‎PowerShellEditorServices.Common.props

-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,5 @@
1717
<!-- Required to enable IDE0005 as error -->
1818
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1919
<!-- TODO: Enable <AnalysisMode>All</AnalysisMode> -->
20-
<!-- See: https://docs.microsoft.com/en-us/dotnet/core/compatibility/sdk/6.0/implicit-namespaces -->
21-
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
2220
</PropertyGroup>
2321
</Project>

‎src/PowerShellEditorServices/PowerShellEditorServices.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
3131
<!-- Manually pull in the updated version of Newtonsoft.Json. -->
3232
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
33-
<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.5" />
34-
<PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.5" />
33+
<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.6" />
34+
<PackageReference Include="OmniSharp.Extensions.DebugAdapter.Server" Version="0.19.6" />
3535
<PackageReference Include="PowerShellStandard.Library" Version="5.1.1" />
3636
<PackageReference Include="Serilog" Version="2.12.0" />
3737
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />

‎test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
1212
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
13-
<PackageReference Include="OmniSharp.Extensions.LanguageClient" Version="0.19.5" />
14-
<PackageReference Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.5" />
13+
<PackageReference Include="OmniSharp.Extensions.LanguageClient" Version="0.19.6" />
14+
<PackageReference Include="OmniSharp.Extensions.DebugAdapter.Client" Version="0.19.6" />
1515
<PackageReference Include="xunit" Version="2.4.2" />
1616
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
1717
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />

‎test/PowerShellEditorServices.Test.Shared/PowerShellEditorServices.Test.Shared.csproj

-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
<ItemGroup>
99
<ProjectReference Include="..\..\src\PowerShellEditorServices\PowerShellEditorServices.csproj" />
1010
</ItemGroup>
11-
<PropertyGroup>
12-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
13-
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
14-
</PropertyGroup>
1511
<ItemGroup>
1612
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
1713
<_Parameter1>Microsoft.PowerShell.EditorServices.Test</_Parameter1>

‎test/PowerShellEditorServices.Test/Language/CompletionHandlerTests.cs

+12-5
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,19 @@ private Task<CompletionResults> GetCompletionResultsAsync(ScriptRegion scriptReg
5353
CancellationToken.None);
5454
}
5555

56-
[Fact]
56+
[SkippableFact]
5757
public async Task CompletesCommandInFile()
5858
{
59+
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
5960
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteCommandInFile.SourceDetails).ConfigureAwait(true);
6061
CompletionItem actual = Assert.Single(results);
6162
Assert.Equal(CompleteCommandInFile.ExpectedCompletion, actual);
6263
}
6364

64-
[Fact]
65+
[SkippableFact]
6566
public async Task CompletesCommandFromModule()
6667
{
68+
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
6769
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteCommandFromModule.SourceDetails).ConfigureAwait(true);
6870
CompletionItem actual = Assert.Single(results);
6971
// NOTE: The tooltip varies across PowerShell and OS versions, so we ignore it.
@@ -74,6 +76,7 @@ public async Task CompletesCommandFromModule()
7476
[SkippableFact]
7577
public async Task CompletesTypeName()
7678
{
79+
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
7780
Skip.If(VersionUtils.PSEdition == "Desktop", "Windows PowerShell has trouble with this test right now.");
7881
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteTypeName.SourceDetails).ConfigureAwait(true);
7982
CompletionItem actual = Assert.Single(results);
@@ -95,23 +98,26 @@ public async Task CompletesTypeName()
9598
[SkippableFact]
9699
public async Task CompletesNamespace()
97100
{
101+
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
98102
Skip.If(VersionUtils.PSEdition == "Desktop", "Windows PowerShell has trouble with this test right now.");
99103
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteNamespace.SourceDetails).ConfigureAwait(true);
100104
CompletionItem actual = Assert.Single(results);
101105
Assert.Equal(CompleteNamespace.ExpectedCompletion, actual);
102106
}
103107

104-
[Fact]
108+
[SkippableFact]
105109
public async Task CompletesVariableInFile()
106110
{
111+
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
107112
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteVariableInFile.SourceDetails).ConfigureAwait(true);
108113
CompletionItem actual = Assert.Single(results);
109114
Assert.Equal(CompleteVariableInFile.ExpectedCompletion, actual);
110115
}
111116

112-
[Fact]
117+
[SkippableFact]
113118
public async Task CompletesAttributeValue()
114119
{
120+
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
115121
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteAttributeValue.SourceDetails).ConfigureAwait(true);
116122
// NOTE: Since the completions come through un-ordered from PowerShell, their SortText
117123
// (which has an index prepended from the original order) will mis-match our assumed
@@ -122,9 +128,10 @@ public async Task CompletesAttributeValue()
122128
actual => Assert.Equal(actual with { Data = null, SortText = null }, CompleteAttributeValue.ExpectedCompletion3));
123129
}
124130

125-
[Fact]
131+
[SkippableFact]
126132
public async Task CompletesFilePath()
127133
{
134+
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
128135
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteFilePath.SourceDetails).ConfigureAwait(true);
129136
Assert.NotEmpty(results);
130137
CompletionItem actual = results.First();

‎test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
<TargetPlatform>x64</TargetPlatform>
88
</PropertyGroup>
99

10-
<PropertyGroup>
11-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
12-
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
13-
</PropertyGroup>
14-
1510
<ItemGroup>
1611
<ProjectReference Include="..\..\src\PowerShellEditorServices\PowerShellEditorServices.csproj" />
1712
<ProjectReference Include="..\PowerShellEditorServices.Test.Shared\PowerShellEditorServices.Test.Shared.csproj" />
@@ -36,7 +31,7 @@
3631
<PackageReference Include="xunit" Version="2.4.2" />
3732
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
3833
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
39-
<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.5" />
34+
<PackageReference Include="OmniSharp.Extensions.LanguageServer" Version="0.19.6" />
4035
</ItemGroup>
4136

4237
<ItemGroup>

‎test/PowerShellEditorServices.Test/Services/Symbols/PSScriptAnalyzerTests.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Microsoft.PowerShell.EditorServices.Services;
99
using Microsoft.PowerShell.EditorServices.Services.TextDocument;
1010
using Microsoft.PowerShell.EditorServices.Test;
11+
using Microsoft.PowerShell.EditorServices.Utility;
1112
using Xunit;
1213

1314
namespace PowerShellEditorServices.Test.Services.Symbols
@@ -65,9 +66,10 @@ public async Task CanLoadPSScriptAnalyzerAsync()
6566
});
6667
}
6768

68-
[Fact]
69+
[SkippableFact]
6970
public async Task DoesNotDuplicateScriptMarkersAsync()
7071
{
72+
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
7173
ScriptFile scriptFile = workspaceService.GetFileBuffer("untitled:Untitled-1", script);
7274
ScriptFile[] scriptFiles = { scriptFile };
7375

@@ -83,9 +85,10 @@ await analysisService
8385
Assert.Single(scriptFile.DiagnosticMarkers);
8486
}
8587

86-
[Fact]
88+
[SkippableFact]
8789
public async Task DoesNotClearParseErrorsAsync()
8890
{
91+
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
8992
// Causing a missing closing } parser error
9093
ScriptFile scriptFile = workspaceService.GetFileBuffer("untitled:Untitled-2", script.TrimEnd('}'));
9194
ScriptFile[] scriptFiles = { scriptFile };

0 commit comments

Comments
 (0)