Skip to content

Commit ef60af2

Browse files
dharmaturtledharmaturtle
authored
Merge pull request #19 from AlexeyRaga/upgrade-to-net-8
Upgrade to .NET 8
2 parents fad70bd + a6fdf4a commit ef60af2

File tree

8 files changed

+35
-43
lines changed

8 files changed

+35
-43
lines changed

‎.github/workflows/main.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v2
14-
- name: Setup .NET Core
15-
uses: actions/setup-dotnet@v3
13+
- uses: actions/checkout@v4
14+
- name: Setup .NET
15+
uses: actions/setup-dotnet@v4
16+
with:
17+
dotnet-version: 8.0.x
1618
- name: Build
1719
run: dotnet build -c Release "src/Hedgehog.Xunit"
1820
- name: Test F#

‎.github/workflows/pull_request.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v2
14-
- name: Setup .NET Core
15-
uses: actions/setup-dotnet@v3
13+
- uses: actions/checkout@v4
14+
- name: Setup .NET
15+
uses: actions/setup-dotnet@v4
16+
with:
17+
dotnet-version: 8.0.x
1618
- name: Build
1719
run: dotnet build -c Release "src/Hedgehog.Xunit"
1820
- name: Test F#

‎examples/Hedgehog.Xunit.Examples.CSharp/Hedgehog.Xunit.Examples.CSharp.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

88
<IsPackable>false</IsPackable>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
13-
<PackageReference Include="xunit" Version="2.4.2" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
13+
<PackageReference Include="xunit" Version="2.9.3" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
<PrivateAssets>all</PrivateAssets>
1717
</PackageReference>
18-
<PackageReference Include="coverlet.collector" Version="6.0.0">
18+
<PackageReference Include="coverlet.collector" Version="6.0.4">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>
2121
</PackageReference>

‎examples/Hedgehog.Xunit.Examples.FSharp/Hedgehog.Xunit.Examples.FSharp.fsproj‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
@@ -11,13 +11,13 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
15-
<PackageReference Include="xunit" Version="2.4.2" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
15+
<PackageReference Include="xunit" Version="2.9.3" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
<PrivateAssets>all</PrivateAssets>
1919
</PackageReference>
20-
<PackageReference Include="coverlet.collector" Version="6.0.0">
20+
<PackageReference Include="coverlet.collector" Version="6.0.4">
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
<PrivateAssets>all</PrivateAssets>
2323
</PackageReference>
@@ -27,8 +27,4 @@
2727
<ProjectReference Include="..\..\src\Hedgehog.Xunit\Hedgehog.Xunit.fsproj" />
2828
</ItemGroup>
2929

30-
<ItemGroup>
31-
<PackageReference Update="FSharp.Core" Version="7.0.300" />
32-
</ItemGroup>
33-
3430
</Project>

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
33
"rollForward": "feature",
4-
"version": "6.0.411"
4+
"version": "8.0.0"
55
}
6-
}
6+
}

‎src/Hedgehog.Xunit/Hedgehog.Xunit.fsproj‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<IsPackable>true</IsPackable>
5-
<TargetFramework>netstandard2.0</TargetFramework>
5+
<TargetFramework>netstandard2.1</TargetFramework>
66
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -28,8 +28,8 @@ Docs at https://github.com/hedgehogqa/fsharp-hedgehog-xunit
2828
</PropertyGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="Hedgehog.Experimental" Version="0.7.0" />
32-
<PackageReference Include="xunit.core" Version="2.4.2" />
31+
<PackageReference Include="Hedgehog.Experimental" Version="0.9.0" />
32+
<PackageReference Include="xunit.core" Version="2.9.3" />
3333
</ItemGroup>
3434

3535
<ItemGroup>
@@ -39,10 +39,6 @@ Docs at https://github.com/hedgehogqa/fsharp-hedgehog-xunit
3939
<Compile Include="XunitOverrides.fs" />
4040
</ItemGroup>
4141

42-
<ItemGroup>
43-
<PackageReference Update="FSharp.Core" Version="7.0.300" />
44-
</ItemGroup>
45-
4642
<ItemGroup>
4743
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
4844
<_Parameter1>$(AssemblyName).Tests.FSharp</_Parameter1>

‎tests/Hedgehog.Xunit.Tests.CSharp/Hedgehog.Xunit.Tests.CSharp.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

@@ -10,13 +10,13 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
14-
<PackageReference Include="xunit" Version="2.4.2" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
14+
<PackageReference Include="xunit" Version="2.9.3" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
<PrivateAssets>all</PrivateAssets>
1818
</PackageReference>
19-
<PackageReference Include="coverlet.collector" Version="6.0.0">
19+
<PackageReference Include="coverlet.collector" Version="6.0.4">
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
<PrivateAssets>all</PrivateAssets>
2222
</PackageReference>

‎tests/Hedgehog.Xunit.Tests.FSharp/Hedgehog.Xunit.Tests.FSharp.fsproj‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,30 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<Compile Include="PropertyTests.fs" />
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
12+
<PackageReference Include="coverlet.msbuild" Version="6.0.4">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1717
<PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
18-
<PackageReference Include="xunit" Version="2.4.2" />
18+
<PackageReference Include="xunit" Version="2.9.3" />
1919
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
20-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
20+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
<PrivateAssets>all</PrivateAssets>
2323
</PackageReference>
2424
</ItemGroup>
2525

2626
<ItemGroup>
2727
<ProjectReference Include="..\..\src\Hedgehog.Xunit\Hedgehog.Xunit.fsproj" />
28-
</ItemGroup>
29-
30-
<ItemGroup>
31-
<PackageReference Update="FSharp.Core" Version="7.0.300" />
3228
</ItemGroup>
3329

3430
</Project>

0 commit comments

Comments
 (0)