Skip to content

Commit bbad436

Browse files
bump to netcoreapp3.1 for tests
1 parent 44e4f6f commit bbad436

File tree

6 files changed

+21
-11
lines changed

6 files changed

+21
-11
lines changed

sample/SampleServer/SampleServer.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<IsPackable>false</IsPackable>
6-
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<TargetFramework>netcoreapp3.1</TargetFramework>
77
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
88
</PropertyGroup>
99

test/Client.Tests/Client.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<AssemblyName>OmniSharp.Extensions.LanguageClient.Tests</AssemblyName>
66
<RootNamespace>OmniSharp.Extensions.LanguageServerProtocol.Client.Tests</RootNamespace>
77
</PropertyGroup>

test/JsonRpc.Tests/JsonRpc.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.1</TargetFramework>
3+
<TargetFramework>netcoreapp3.1</TargetFramework>
44
<WarningsAsErrors>true</WarningsAsErrors>
55
<PlatformTarget>AnyCPU</PlatformTarget>
66
</PropertyGroup>

test/Lsp.Tests/Lsp.Tests.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.1</TargetFramework>
3+
<TargetFramework>netcoreapp3.1</TargetFramework>
44
<WarningsAsErrors>true</WarningsAsErrors>
55
<PlatformTarget>AnyCPU</PlatformTarget>
66
</PropertyGroup>
@@ -14,6 +14,6 @@
1414
<Compile Include="..\JsonRpc.Tests\AutoNSubstitute\*.cs" />
1515
</ItemGroup>
1616
<ItemGroup>
17-
<Folder Include="obj\Release\netcoreapp2.1\" />
17+
<Folder Include="obj\Release\netcoreapp3.1\" />
1818
</ItemGroup>
19-
</Project>
19+
</Project>

test/Lsp.Tests/Models/TextDocumentIdentifierTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ public void Should_Deserialize_For_Example_Value()
5353
{
5454
var serializer = new Serializer(ClientVersion.Lsp3);
5555
var result = serializer.DeserializeObject<TextDocumentIdentifier>(@"{
56-
""uri"":""file:///Users/tyler/Code/PowerShell/vscode/PowerShellEditorServices/test/PowerShellEditorServices.Test.E2E/bin/Debug/netcoreapp2.1/0b0jnxg2.kgh.ps1""
56+
""uri"":""file:///Users/tyler/Code/PowerShell/vscode/PowerShellEditorServices/test/PowerShellEditorServices.Test.E2E/bin/Debug/netcoreapp3.1/0b0jnxg2.kgh.ps1""
5757
}");
5858

59-
result.Uri.Should().Be(new Uri("file:///Users/tyler/Code/PowerShell/vscode/PowerShellEditorServices/test/PowerShellEditorServices.Test.E2E/bin/Debug/netcoreapp2.1/0b0jnxg2.kgh.ps1", UriKind.Absolute));
59+
result.Uri.Should().Be(new Uri("file:///Users/tyler/Code/PowerShell/vscode/PowerShellEditorServices/test/PowerShellEditorServices.Test.E2E/bin/Debug/netcoreapp3.1/0b0jnxg2.kgh.ps1", UriKind.Absolute));
6060
}
6161
}
6262
}

vscode-testextension/src/extension.ts

+13-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { Trace } from "vscode-jsonrpc";
2020

2121
export function activate(context: ExtensionContext) {
2222
// The server is implemented in node
23-
let serverExe = 'dotnet';
23+
let serverExe = "dotnet";
2424

2525
// let serverExe = 'D:\\Development\\Omnisharp\\csharp-language-server-protocol\\sample\\SampleServer\\bin\\Debug\\netcoreapp2.0\\win7-x64\\SampleServer.exe';
2626
// let serverExe = "D:/Development/Omnisharp/omnisharp-roslyn/artifacts/publish/OmniSharp.Stdio.Driver/win7-x64/OmniSharp.exe";
@@ -31,9 +31,19 @@ export function activate(context: ExtensionContext) {
3131
// Otherwise the run options are used
3232
let serverOptions: ServerOptions = {
3333
// run: { command: serverExe, args: ['-lsp', '-d'] },
34-
run: { command: serverExe, args: ["C:/src/gh/csharp-language-server-protocol/sample/SampleServer/bin/Debug/netcoreapp2.1/win7-x64/SampleServer.dll"] },
34+
run: {
35+
command: serverExe,
36+
args: [
37+
"C:/src/gh/csharp-language-server-protocol/sample/SampleServer/bin/Debug/netcoreapp3.1/win7-x64/SampleServer.dll"
38+
]
39+
},
3540
// debug: { command: serverExe, args: ['-lsp', '-d'] }
36-
debug: { command: serverExe, args: ["C:/src/gh/csharp-language-server-protocol/sample/SampleServer/bin/Debug/netcoreapp2.1/win7-x64/SampleServer.dll"] }
41+
debug: {
42+
command: serverExe,
43+
args: [
44+
"C:/src/gh/csharp-language-server-protocol/sample/SampleServer/bin/Debug/netcoreapp3.1/win7-x64/SampleServer.dll"
45+
]
46+
}
3747
};
3848

3949
// Options to control the language client

0 commit comments

Comments
 (0)