Skip to content

Commit 98e900e

Browse files
authored
Merge pull request #416 from LyndonGingerich/feature/upgrade_dotnet
Change .NET runtime targets to current recommendations
2 parents 03c7125 + 55402fc commit 98e900e

File tree

7 files changed

+16
-10
lines changed

7 files changed

+16
-10
lines changed

.github/workflows/master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup .NET Core
1717
uses: actions/setup-dotnet@v1
1818
with:
19-
dotnet-version: 5.0.403
19+
dotnet-version: 6.0.201
2020
- name: Install dependencies
2121
run: dotnet restore
2222
- name: Build

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup .NET Core
1919
uses: actions/setup-dotnet@v1
2020
with:
21-
dotnet-version: 5.0.403
21+
dotnet-version: 6.0.201
2222
- name: Install dependencies
2323
run: dotnet restore
2424
- name: Build

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## Version TBD
22

33
- Fix bug in `Property.recheck` where the result is always `Failed`. ([#415][415], [@TysonMN][TysonMN])
4+
- Runtime targets are now .NET Standard 2.0, .NET 4.8. and .NET 6.0. ([#416][416], [@LyndonGingerich][LyndonGingerich])
45

56
## Version 0.12.1 (2021-12-31)
67

@@ -195,7 +196,11 @@
195196
https://github.com/ploeh
196197
[porges]:
197198
https://github.com/porges
199+
[LyndonGingerich]
200+
https://github.com/LyndonGingerich
198201

202+
[416]:
203+
https://github.com/hedgehogqa/fsharp-hedgehog/pull/416
199204
[415]:
200205
https://github.com/hedgehogqa/fsharp-hedgehog/pull/415
201206
[401]:

src/Hedgehog/Hedgehog.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.6;netstandard2.0;net45</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net48;net6.0</TargetFrameworks>
55
<Version>0.12.1</Version>
66
<Description>Release with confidence.</Description>
77
<Authors>Jacob Stanley;Nikos Baxevanis</Authors>
@@ -60,7 +60,7 @@ https://github.com/hedgehogqa/fsharp-hedgehog/blob/master/doc/index.md
6060
<None Include="Script.fsx" />
6161
</ItemGroup>
6262
<ItemGroup>
63-
<PackageReference Update="FSharp.Core" Version="[4.1.17,)" />
63+
<PackageReference Update="FSharp.Core" Version="[4.3.4, 99]" />
6464
</ItemGroup>
6565
<!-- https://fable.io/docs/your-fable-project/author-a-fable-library.html -->
6666
<ItemGroup>

tests/Hedgehog.Benchmarks/Hedgehog.Benchmarks.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

tests/Hedgehog.Linq.Tests/Hedgehog.Linq.Tests.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net5.0</TargetFrameworks>
4+
<TargetFramework>net6.0</TargetFramework>
55
<LangVersion>8.0</LangVersion>
66
<ApplicationIcon />
77
<OutputType>Library</OutputType>
88
<StartupObject />
99
</PropertyGroup>
1010
<ItemGroup>
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
1112
<PackageReference Include="xunit" Version="2.4.1" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
1314
<PrivateAssets>all</PrivateAssets>
1415
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1516
</PackageReference>

tests/Hedgehog.Tests/Hedgehog.Tests.fsproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<GenerateProgramFile>false</GenerateProgramFile>
77
</PropertyGroup>
@@ -26,7 +26,7 @@
2626
<PackageReference Include="Fable.Core" Version="3.1.5" />
2727
<PackageReference Include="Fable.Mocha" Version="2.9.1" />
2828
<PackageReference Include="YoloDev.Expecto.TestSdk" Version="0.*" />
29-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.*" />
30-
<PackageReference Update="FSharp.Core" Version="4.*" />
29+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
30+
<PackageReference Update="FSharp.Core" Version="6.0.5" />
3131
</ItemGroup>
3232
</Project>

0 commit comments

Comments
 (0)