Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add net8 to test framework #2817

Merged
merged 6 commits into from
Nov 18, 2023
Merged

add net8 to test framework #2817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3aed40c
add net8 to test framework
TimothyMothra Oct 6, 2023
4661d2f
fix typo
TimothyMothra Nov 17, 2023
9ae6f7d
fix properties
TimothyMothra Nov 17, 2023
e2c4932
update project
TimothyMothra Nov 17, 2023
8727328
update sanity.yml
TimothyMothra Nov 17, 2023
c7e4d54
Merge branch 'main' into tilee/test_net8
TimothyMothra Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/build-and-test-BASE.yml
View file
Open in desktop
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]
TimothyMothra marked this conversation as resolved.
Show resolved Hide resolved
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 4 additions & 0 deletions NETCORE/test/IntegrationTests.Tests/IntegrationTests.Tests.csproj
View file
Open in desktop
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
Loading