diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 30298dd9..20bb1960 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,6 +37,12 @@ jobs: with: dotnet-version: 6.0.x + - name: Setup .NET 7.0.x SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 7.0.x + include-prerelease: true + - name: Check .NET info run: dotnet --info @@ -47,13 +53,13 @@ jobs: run: dotnet build -c Release --no-restore - name: Test solution - run: dotnet test -c Release --no-build --no-restore --verbosity normal -r test-results --collect:"XPlat Code Coverage" ` + run: dotnet test -c Release --no-build --no-restore --results-directory test-results --verbosity normal --collect:"XPlat Code Coverage" ` -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=json,cobertura,lcov,teamcity,opencover - name: Upload coverage if: github.repository_owner == 'casbin' && github.event_name == 'push' run: | - dotnet tool install coveralls.net --version 2.0.0-beta0002 --tool-path tools; + dotnet tool install coveralls.net --version 3.0.0 --tool-path tools; $CommitAuthor = git show -s --pretty=format:"%cn"; echo "Coomit author is: $CommitAuthor"; $CommitAuthorEmail = git show -s --pretty=format:"%ce"; @@ -102,6 +108,12 @@ jobs: with: dotnet-version: 6.0.x + - name: Setup .NET 7.0.x SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 7.0.x + include-prerelease: true + - name: Check .NET info run: dotnet --info @@ -117,7 +129,7 @@ jobs: - name: Run benchmark run: | cd Casbin.Benchmark - dotnet run -c Release --filter ** -f net5 + dotnet run -c Release --filter ** -f net6.0 - name: Upload benchmark results to artefacts uses: actions/upload-artifact@v1.0.0 @@ -172,6 +184,12 @@ jobs: with: dotnet-version: 6.0.x + - name: Setup .NET 7.0.x SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 7.0.x + include-prerelease: true + - name: Check .NET info run: dotnet --info diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 28e9b57d..e41c99b2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,6 +38,12 @@ jobs: with: dotnet-version: 6.0.x + - name: Setup .NET 7.0.x SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 7.0.x + include-prerelease: true + - name: Check .NET info run: dotnet --info @@ -123,6 +129,12 @@ jobs: with: dotnet-version: 6.0.x + - name: Setup .NET 7.0.x SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 7.0.x + include-prerelease: true + - name: Check .NET info run: dotnet --info diff --git a/Casbin.Benchmark/Casbin.Benchmark.csproj b/Casbin.Benchmark/Casbin.Benchmark.csproj index 0384a181..217dba25 100644 --- a/Casbin.Benchmark/Casbin.Benchmark.csproj +++ b/Casbin.Benchmark/Casbin.Benchmark.csproj @@ -3,7 +3,7 @@ Exe true - net6;net5;netcoreapp3.1;net48 + net7.0;net6.0;net5.0;netcoreapp3.1;net48 10.0 false diff --git a/Casbin.UnitTest/Casbin.UnitTests.csproj b/Casbin.UnitTest/Casbin.UnitTests.csproj index f86c0f94..7d57750c 100644 --- a/Casbin.UnitTest/Casbin.UnitTests.csproj +++ b/Casbin.UnitTest/Casbin.UnitTests.csproj @@ -1,7 +1,7 @@ - net6;net5;netcoreapp3.1;net461;net452 + net7.0;net6.0;net5.0;netcoreapp3.1;net461;net452 full false 10.0 @@ -13,13 +13,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Casbin/Casbin.csproj b/Casbin/Casbin.csproj index 0bcdb432..76192e26 100644 --- a/Casbin/Casbin.csproj +++ b/Casbin/Casbin.csproj @@ -2,7 +2,7 @@ - net6;net5;netcoreapp3.1;netstandard2.1;netstandard2.0;net461;net452; + net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0;net461;net452; $(NoWarn);CS1591;CS0618 10.0 @@ -47,11 +47,15 @@ - - + + - + + + + +