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.

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

Update to net8 rtm #558

Merged
merged 1 commit into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 2 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v3
Expand All @@ -25,12 +25,7 @@ jobs:
3.1.x
6.0.x
7.0.x

- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'
dotnet-quality: 'preview'
8.0.x

- name: Restore dependencies
run: dotnet restore
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ on:
jobs:
docs:

runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v3
Expand All @@ -33,14 +33,15 @@ jobs:
3.1.x
6.0.x
7.0.x
8.0.x

- name: Restore dependencies
run: dotnet restore
- name: Build
run: dotnet build -c Release --no-restore

- name: Build documentation
run: dotnet run -f net7.0 -c Release --no-build
run: dotnet run -f net8.0 -c Release --no-build
working-directory: Docs/SuperLinq.Docs

- name: Setup Pages
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v3
Expand All @@ -24,12 +24,7 @@ jobs:
3.1.x
6.0.x
7.0.x

- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'
dotnet-quality: 'preview'
8.0.x

- name: Restore dependencies
run: dotnet restore
Expand Down
2 changes: 1 addition & 1 deletion Docs/SuperLinq.Docs/SuperLinq.Docs.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net7.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<NoWarn>$(NoWarn);CA1852;NU1701</NoWarn>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions Docs/SuperLinq.Docs/docfx.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"src": [
{
"files": [
"SuperLinq/bin/Release/net7.0/SuperLinq.dll",
"SuperLinq.Async/bin/Release/net7.0/SuperLinq.Async.dll"
"SuperLinq/bin/Release/net8.0/SuperLinq.dll",
"SuperLinq.Async/bin/Release/net8.0/SuperLinq.Async.dll"
],
"src": "../../Source"
}
Expand Down
1 change: 1 addition & 0 deletions TargetFrameworks.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFrameworks>netcoreapp3.1;net6.0;</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '7.0'))">$(TargetFrameworks);net7.0</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '8.0'))">$(TargetFrameworks);net8.0</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '9.0'))">$(TargetFrameworks);net9.0</TargetFrameworks>
</PropertyGroup>

</Project>