Skip to content

Commit f9297d0

Browse files
authored
.NET 7 support (#35)
- Add net7.0 support to source and unit tests - Use net7.0 when testing F# and VB compatibility - Add net7.0 support to nuspec
1 parent 41c037a commit f9297d0

File tree

10 files changed

+465
-22
lines changed

10 files changed

+465
-22
lines changed

.github/workflows/ci.yml

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ jobs:
1111
runs-on: windows-2022
1212
steps:
1313
- uses: actions/checkout@v3
14+
- name: Install .NET SDK
15+
uses: actions/setup-dotnet@v3
16+
with:
17+
dotnet-version: |
18+
3.1.x
19+
5.x.x
20+
6.x.x
21+
7.x.x
1422
- name: Set up dotnet tools
1523
run: make install-tools
1624
- name: Check dotnet Style
@@ -19,6 +27,14 @@ jobs:
1927
runs-on: windows-2022
2028
steps:
2129
- uses: actions/checkout@v3
30+
- name: Install .NET SDK
31+
uses: actions/setup-dotnet@v3
32+
with:
33+
dotnet-version: |
34+
3.1.x
35+
5.x.x
36+
6.x.x
37+
7.x.x
2238
- name: Set up dotnet tools
2339
run: make install-tools
2440
- name: Run security analysis
@@ -30,6 +46,14 @@ jobs:
3046
runs-on: windows-2022
3147
steps:
3248
- uses: actions/checkout@v3
49+
- name: Install .NET SDK
50+
uses: actions/setup-dotnet@v3
51+
with:
52+
dotnet-version: |
53+
3.1.x
54+
5.x.x
55+
6.x.x
56+
7.x.x
3357
- name: Set up dotnet tools and dependencies
3458
run: make install
3559
- name: Generate coverage report
@@ -44,7 +68,7 @@ jobs:
4468
runs-on: windows-2022
4569
strategy:
4670
matrix:
47-
name: [ 'net462', 'netcoreapp3.1', 'net5.0', 'net6.0' ]
71+
name: [ 'net462', 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0' ]
4872
include:
4973
- name: net462
5074
# This is really a test of .NET Standard, a bridge between .NET Framework and .NET, targeting .NET Framework 4.6.2
@@ -57,10 +81,20 @@ jobs:
5781
framework: net5.0
5882
- name: net6.0
5983
framework: net6.0
84+
- name: net7.0
85+
framework: net7.0
6086
steps:
6187
- uses: actions/checkout@v3
6288
with:
6389
submodules: true
90+
- name: Install .NET SDK
91+
uses: actions/setup-dotnet@v3
92+
with:
93+
dotnet-version: |
94+
3.1.x
95+
5.x.x
96+
6.x.x
97+
7.x.x
6498
# Install MSBuild, used to build the test project
6599
- name: Setup MSBuild
66100
uses: microsoft/[email protected]
@@ -95,6 +129,14 @@ jobs:
95129
- uses: actions/checkout@v3
96130
with:
97131
submodules: true
132+
- name: Install .NET SDK
133+
uses: actions/setup-dotnet@v3
134+
with:
135+
dotnet-version: |
136+
3.1.x
137+
5.x.x
138+
6.x.x
139+
7.x.x
98140
# Set the project name, based on platform version currently selected
99141
- name: Set up variables
100142
id: test_project

EasyVCR.Tests.FSharp/EasyVCR.Tests.FSharp.fsproj

Lines changed: 1 addition & 1 deletion
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>net7.0</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
77
</PropertyGroup>

EasyVCR.Tests.FSharp/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 1,
33
"dependencies": {
4-
"net6.0": {
4+
"net7.0": {
55
"coverlet.collector": {
66
"type": "Direct",
77
"requested": "[3.1.2, 4.0.0)",
@@ -89,8 +89,8 @@
8989
},
9090
"Microsoft.Extensions.Logging.Abstractions": {
9191
"type": "Transitive",
92-
"resolved": "6.0.2",
93-
"contentHash": "pwXCZKaA7m5wgmCj49dW+H1RPSY7U62SKLTQYCcavf/k3Nyt/WnBgAjG4jMGnwy9rElfAZ2KvxvM5CJzJWG0hg=="
92+
"resolved": "6.0.0",
93+
"contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA=="
9494
},
9595
"Microsoft.Extensions.Options": {
9696
"type": "Transitive",

EasyVCR.Tests.VB/EasyVCR.Tests.VB.vbproj

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

33
<PropertyGroup>
44
<RootNamespace>EasyVCR.Tests.VB</RootNamespace>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
77
</PropertyGroup>
88

EasyVCR.Tests.VB/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 1,
33
"dependencies": {
4-
"net6.0": {
4+
"net7.0": {
55
"coverlet.collector": {
66
"type": "Direct",
77
"requested": "[3.1.2, 4.0.0)",
@@ -83,8 +83,8 @@
8383
},
8484
"Microsoft.Extensions.Logging.Abstractions": {
8585
"type": "Transitive",
86-
"resolved": "6.0.2",
87-
"contentHash": "pwXCZKaA7m5wgmCj49dW+H1RPSY7U62SKLTQYCcavf/k3Nyt/WnBgAjG4jMGnwy9rElfAZ2KvxvM5CJzJWG0hg=="
86+
"resolved": "6.0.0",
87+
"contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA=="
8888
},
8989
"Microsoft.Extensions.Options": {
9090
"type": "Transitive",

EasyVCR.Tests/EasyVCR.Tests.csproj

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

33
<Project Sdk="Microsoft.NET.Sdk.Web">
44
<PropertyGroup>
5-
<TargetFrameworks>net462;netstandard2.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
5+
<TargetFrameworks>net462;netstandard2.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
66
<LangVersion>8</LangVersion>
77
<ApplicationIcon />
88
<OutputType>Library</OutputType>

0 commit comments

Comments
 (0)