Skip to content

Commit 105b991

Browse files
Fixed dotnet hack (#374)
* Fixed dotnet hack * Updated tests
1 parent e637b3f commit 105b991

File tree

6 files changed

+15
-31
lines changed

6 files changed

+15
-31
lines changed

.build/Solution.cs

-13
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,6 @@ public static RocketSurgeonGitHubActionsConfiguration Middleware(RocketSurgeonGi
6767
new SetupDotNetStep("Use .NET Core 3.1 SDK") {
6868
DotNetVersion = "3.1.x"
6969
},
70-
new RunStep("🪓 **DOTNET HACK** 🪓") {
71-
Shell = GithubActionShell.Pwsh,
72-
Run = @"$version = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Leaf;
73-
$root = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Parent;
74-
$directories = Get-ChildItem $root | Where-Object { $_.Name -ne $version };
75-
foreach ($dir in $directories) {
76-
$from = $dir.FullName;
77-
$to = ""$root/$version"";
78-
Write-Host Copying from $from to $to;
79-
Copy-Item ""$from\*"" $to -Recurse -Force;
80-
}
81-
"
82-
},
8370
}
8471
);
8572

.github/workflows/ci.yml

+2-15
Original file line numberDiff line numberDiff line change
@@ -45,26 +45,13 @@ jobs:
4545
run: |
4646
git fetch --prune
4747
- name: 🔨 Use .NET Core 2.1 SDK
48-
uses: actions/setup-dotnet@v1
48+
uses: actions/setup-dotnet@v1.7.2
4949
with:
5050
dotnet-version: '2.1.x'
5151
- name: 🔨 Use .NET Core 3.1 SDK
52-
uses: actions/setup-dotnet@v1
52+
uses: actions/setup-dotnet@v1.7.2
5353
with:
5454
dotnet-version: '3.1.x'
55-
- name: 🪓 **DOTNET HACK** 🪓
56-
shell: pwsh
57-
run: |
58-
$version = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Leaf;
59-
$root = Split-Path (Split-Path $ENV:DOTNET_ROOT -Parent) -Parent;
60-
$directories = Get-ChildItem $root | Where-Object { $_.Name -ne $version };
61-
foreach ($dir in $directories) {
62-
$from = $dir.FullName;
63-
$to = "$root/$version";
64-
Write-Host Copying from $from to $to;
65-
Copy-Item "$from\*" $to -Recurse -Force;
66-
}
67-
6855
- name: 🎁 dotnet tool restore
6956
run: |
7057
dotnet tool restore

global.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"sdk": {
3+
"version": "3.1.402",
4+
"rollForward": "latestFeature",
5+
"allowPrerelease": false
6+
}
7+
}

test/Lsp.Tests/Integration/TypedCodeLensTests.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using OmniSharp.Extensions.LanguageServer.Protocol.Document;
1313
using OmniSharp.Extensions.LanguageServer.Protocol.Models;
1414
using Serilog.Events;
15+
using TestingUtils;
1516
using Xunit;
1617
using Xunit.Abstractions;
1718
using HandlerIdentity = OmniSharp.Extensions.LanguageServer.Protocol.Models.HandlerIdentity;
@@ -194,7 +195,7 @@ public async Task Should_Resolve_With_Data_Capability()
194195
item.Command.Name.Should().Be("resolved");
195196
}
196197

197-
[Fact]
198+
[FactWithSkipOn(SkipOnPlatform.Mac)]
198199
public async Task Should_Resolve_With_Partial_Data_Capability()
199200
{
200201
var (client, server) = await Initialize(

test/Lsp.Tests/Integration/TypedCompletionTests.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using OmniSharp.Extensions.LanguageServer.Protocol.Document;
1313
using OmniSharp.Extensions.LanguageServer.Protocol.Models;
1414
using Serilog.Events;
15+
using TestingUtils;
1516
using Xunit;
1617
using Xunit.Abstractions;
1718
using HandlerIdentity = OmniSharp.Extensions.LanguageServer.Protocol.Models.HandlerIdentity;
@@ -194,7 +195,7 @@ public async Task Should_Resolve_With_Data_Capability()
194195
item.Detail.Should().Be("resolved");
195196
}
196197

197-
[Fact]
198+
[FactWithSkipOn(SkipOnPlatform.Mac)]
198199
public async Task Should_Resolve_With_Partial_Data_Capability()
199200
{
200201
var (client, server) = await Initialize(

test/Lsp.Tests/Integration/TypedDocumentLinkTests.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using OmniSharp.Extensions.LanguageServer.Protocol.Document;
1212
using OmniSharp.Extensions.LanguageServer.Protocol.Models;
1313
using Serilog.Events;
14+
using TestingUtils;
1415
using Xunit;
1516
using Xunit.Abstractions;
1617

@@ -177,7 +178,7 @@ public async Task Should_Resolve_With_Data_Capability()
177178
item.Tooltip.Should().Be("resolved");
178179
}
179180

180-
[Fact]
181+
[FactWithSkipOn(SkipOnPlatform.Mac)]
181182
public async Task Should_Resolve_With_Partial_Data_Capability()
182183
{
183184
var (client, server) = await Initialize(

0 commit comments

Comments
 (0)