Skip to content

Commit b426e2b

Browse files
author
Timothy Mothra
authored
add net8 to test framework (#2817)
* add net8 to test framework * fix typo * fix properties * update project * update sanity.yml
1 parent de66d67 commit b426e2b

File tree

9 files changed

+18
-8
lines changed

9 files changed

+18
-8
lines changed

.github/workflows/build-and-test-BASE.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
fail-fast: false
2525
matrix:
2626
os: [ubuntu-latest, windows-latest]
27-
framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0]
27+
framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]
2828
include:
2929
- os: ubuntu-latest
3030
args: "--filter TestCategory!=WindowsOnly"
@@ -39,6 +39,7 @@ jobs:
3939
3.1.x
4040
6.0.x
4141
7.0.x
42+
8.0.x
4243
4344
- name: Restore
4445
run: dotnet restore ${{ env.SOLUTION }}

.github/workflows/build-and-test-LOGGING.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
fail-fast: false
2525
matrix:
2626
os: [windows-latest]
27-
framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0]
27+
framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]
2828

2929
steps:
3030
- uses: actions/checkout@v3
@@ -36,6 +36,7 @@ jobs:
3636
3.1.x
3737
6.0.x
3838
7.0.x
39+
8.0.x
3940
4041
- name: Restore
4142
run: dotnet restore ${{ env.SOLUTION }}

.github/workflows/build-and-test-NETCORE.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
fail-fast: false
2525
matrix:
2626
os: [ubuntu-latest, windows-latest]
27-
framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0]
27+
framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]
2828
include:
2929
- os: ubuntu-latest
3030
args: "--filter TestCategory!=WindowsOnly"
@@ -39,6 +39,7 @@ jobs:
3939
3.1.x
4040
6.0.x
4141
7.0.x
42+
8.0.x
4243
4344
- name: Restore
4445
run: dotnet restore ${{ env.SOLUTION }}

.github/workflows/build-and-test-WEB.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
fail-fast: false
2525
matrix:
2626
os: [windows-latest]
27-
framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0]
27+
framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]
2828

2929
steps:
3030
- uses: actions/checkout@v3
@@ -36,6 +36,7 @@ jobs:
3636
3.1.x
3737
6.0.x
3838
7.0.x
39+
8.0.x
3940
4041
- name: Restore
4142
run: dotnet restore ${{ env.SOLUTION }}

.github/workflows/redfield-sanity-check.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
fail-fast: false
2525
matrix:
2626
os: [ubuntu-latest]
27-
framework: [netcoreapp3.1,net6.0,net7.0]
27+
framework: [netcoreapp3.1,net6.0,net7.0,net8.0]
2828
include:
2929
- os: ubuntu-latest
3030
args: "--filter TestCategory!=WindowsOnly"
@@ -39,6 +39,7 @@ jobs:
3939
3.1.x
4040
6.0.x
4141
7.0.x
42+
8.0.x
4243
4344
- name: Restore
4445
run: dotnet restore ${{ env.SOLUTION }}

.github/workflows/sanity.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
3.1.x
3939
6.0.x
4040
7.0.x
41+
8.0.x
4142
4243
- name: Restore
4344
run: dotnet restore ${{ matrix.solution }}

.props/Test.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
- net7.0 (GA Nov 2022)
2121
-->
2222

23-
<SupportedFrameworks_NetCore>net7.0;net6.0;netcoreapp3.1;</SupportedFrameworks_NetCore>
23+
<SupportedFrameworks_NetCore>net8.0;net7.0;net6.0;netcoreapp3.1;</SupportedFrameworks_NetCore>
2424
<SupportedFrameworks_NetFx Condition="$(OS) == 'Windows_NT'">net481;net480;net472;net462;</SupportedFrameworks_NetFx>
2525
<LegacyFrameworks_NetFx Condition="$(OS) == 'Windows_NT'">net46;net452;</LegacyFrameworks_NetFx>
2626

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282
<LangVersion>preview</LangVersion>
8383

8484
<IsNetFramework Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net480' Or '$(TargetFramework)' == 'net481' ">True</IsNetFramework>
85-
<IsNetCore Condition="'$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0'">True</IsNetCore>
86-
<IsNetStandard20 Condition="'$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net480' Or '$(TargetFramework)' == 'net481' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0'">True</IsNetStandard20>
85+
<IsNetCore Condition="'$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0'">True</IsNetCore>
86+
<IsNetStandard20 Condition="'$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net480' Or '$(TargetFramework)' == 'net481' Or '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0'">True</IsNetStandard20>
8787

8888
<!-- .NET 6 introduces implicit global usings.
8989
This causes build errors in our multi-target projects.

NETCORE/test/IntegrationTests.Tests/IntegrationTests.Tests.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
</None>
3232
</ItemGroup>
3333

34+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
35+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[8.*-*,9.0)" />
36+
</ItemGroup>
37+
3438
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
3539
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[7.*-*,8.0)" />
3640
</ItemGroup>

0 commit comments

Comments
 (0)