Skip to content

Commit

Permalink
add net8 to test framework (#2817)
Browse files Browse the repository at this point in the history
* add net8 to test framework

* fix typo

* fix properties

* update project

* update sanity.yml
  • Loading branch information
TimothyMothra authored Nov 18, 2023
1 parent de66d67 commit b426e2b
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build-and-test-BASE.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0]
framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]
include:
- os: ubuntu-latest
args: "--filter TestCategory!=WindowsOnly"
Expand All @@ -39,6 +39,7 @@ jobs:
3.1.x
6.0.x
7.0.x
8.0.x
- name: Restore
run: dotnet restore ${{ env.SOLUTION }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-and-test-LOGGING.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest]
framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0]
framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]

steps:
- uses: actions/checkout@v3
Expand All @@ -36,6 +36,7 @@ jobs:
3.1.x
6.0.x
7.0.x
8.0.x
- name: Restore
run: dotnet restore ${{ env.SOLUTION }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-and-test-NETCORE.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0]
framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]
include:
- os: ubuntu-latest
args: "--filter TestCategory!=WindowsOnly"
Expand All @@ -39,6 +39,7 @@ jobs:
3.1.x
6.0.x
7.0.x
8.0.x
- name: Restore
run: dotnet restore ${{ env.SOLUTION }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-and-test-WEB.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest]
framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0]
framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]

steps:
- uses: actions/checkout@v3
Expand All @@ -36,6 +36,7 @@ jobs:
3.1.x
6.0.x
7.0.x
8.0.x
- name: Restore
run: dotnet restore ${{ env.SOLUTION }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/redfield-sanity-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
framework: [netcoreapp3.1,net6.0,net7.0]
framework: [netcoreapp3.1,net6.0,net7.0,net8.0]
include:
- os: ubuntu-latest
args: "--filter TestCategory!=WindowsOnly"
Expand All @@ -39,6 +39,7 @@ jobs:
3.1.x
6.0.x
7.0.x
8.0.x
- name: Restore
run: dotnet restore ${{ env.SOLUTION }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/sanity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
3.1.x
6.0.x
7.0.x
8.0.x
- name: Restore
run: dotnet restore ${{ matrix.solution }}
Expand Down
2 changes: 1 addition & 1 deletion .props/Test.props
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
- net7.0 (GA Nov 2022)
-->

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

Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
<LangVersion>preview</LangVersion>

<IsNetFramework Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46' Or '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net480' Or '$(TargetFramework)' == 'net481' ">True</IsNetFramework>
<IsNetCore Condition="'$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0'">True</IsNetCore>
<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>
<IsNetCore Condition="'$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0'">True</IsNetCore>
<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>

<!-- .NET 6 introduces implicit global usings.
This causes build errors in our multi-target projects.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
</None>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[8.*-*,9.0)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[7.*-*,8.0)" />
</ItemGroup>
Expand Down

0 comments on commit b426e2b

Please sign in to comment.