diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e3e0bd7..8503a75 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,6 +30,7 @@ jobs: 6.0.x 7.0.x 8.0.x + 9.0.x include-prerelease: true - name: Check .NET info @@ -115,6 +116,7 @@ jobs: 6.0.x 7.0.x 8.0.x + 9.0.x include-prerelease: true - name: Check .NET info diff --git a/.github/workflows/infersharp.yml b/.github/workflows/infersharp.yml index ea82a7b..9f00fbd 100644 --- a/.github/workflows/infersharp.yml +++ b/.github/workflows/infersharp.yml @@ -22,6 +22,7 @@ jobs: 6.0.x 7.0.x 8.0.x + 9.0.x include-prerelease: true - name: Check .NET info @@ -33,11 +34,11 @@ jobs: - name: Build solution run: dotnet build -c Release --no-restore - - name: Run net8.0 Infer# + - name: Run net8.0 Infer# uses: microsoft/infersharpaction@v1.5 with: binary-path: ./Casbin/bin/Release/net8.0 - + - name: Print net8.0 Infer# analysis results run: cat infer-out/report.txt @@ -47,11 +48,11 @@ jobs: name: "infersharp-net8.0-results" path: './infer-out/report.txt' - - name: Run net7.0 Infer# + - name: Run net7.0 Infer# uses: microsoft/infersharpaction@v1.5 with: binary-path: ./Casbin/bin/Release/net7.0 - + - name: Print net7.0 Infer# analysis results run: cat infer-out/report.txt @@ -61,39 +62,39 @@ jobs: name: "infersharp-net7.0-results" path: './infer-out/report.txt' - - name: Run net6.0 Infer# + - name: Run net6.0 Infer# uses: microsoft/infersharpaction@v1.5 with: binary-path: ./Casbin/bin/Release/net6.0 - + - name: Print net6.0 Infer# analysis results run: cat infer-out/report.txt - + - name: Upload net6.0 infer# results artefacts uses: actions/upload-artifact@v1.0.0 with: name: "infersharp-net6.0-results" path: './infer-out/report.txt' - - name: Run net5.0 Infer# + - name: Run net5.0 Infer# uses: microsoft/infersharpaction@v1.5 with: binary-path: ./Casbin/bin/Release/net5.0 - + - name: Print net5.0 Infer# analysis results run: cat infer-out/report.txt - + - name: Upload net5.0 infer# results artefacts uses: actions/upload-artifact@v1.0.0 with: name: "infersharp-net5.0-results" path: './infer-out/report.txt' - - name: Run net3.1 Infer# + - name: Run net3.1 Infer# uses: microsoft/infersharpaction@v1.5 with: binary-path: ./Casbin/bin/Release/netcoreapp3.1 - + - name: Print net3.1 Infer# analysis results run: cat infer-out/report.txt @@ -101,4 +102,4 @@ jobs: uses: actions/upload-artifact@v1.0.0 with: name: "infersharp-net3.1-results" - path: './infer-out/report.txt' \ No newline at end of file + path: './infer-out/report.txt' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3941039..a13aa6a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,6 +37,7 @@ jobs: 6.0.x 7.0.x 8.0.x + 9.0.x include-prerelease: true - name: Check .NET info @@ -120,6 +121,7 @@ jobs: 6.0.x 7.0.x 8.0.x + 9.0.x include-prerelease: true - name: Check .NET info diff --git a/Casbin.NET.sln b/Casbin.NET.sln index 0aad333..0af0f19 100644 --- a/Casbin.NET.sln +++ b/Casbin.NET.sln @@ -20,6 +20,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution LICENSE = LICENSE README.md = README.md .github\workflows\release.yml = .github\workflows\release.yml + .github\workflows\infersharp.yml = .github\workflows\infersharp.yml + .github\workflows\semantic.yml = .github\workflows\semantic.yml EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Casbin.Benchmark", "Casbin.Benchmark\Casbin.Benchmark.csproj", "{1DBC2931-4981-4DB5-A30B-FF6EB8622B04}" diff --git a/Casbin.UnitTests/Casbin.UnitTests.csproj b/Casbin.UnitTests/Casbin.UnitTests.csproj index c1627c7..fa89d12 100644 --- a/Casbin.UnitTests/Casbin.UnitTests.csproj +++ b/Casbin.UnitTests/Casbin.UnitTests.csproj @@ -1,7 +1,7 @@ - net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net461;net452 + net9.0;net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net462;net461;net452 full false 10.0 @@ -19,7 +19,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -34,9 +34,5 @@ PreserveNewest - - - - - + diff --git a/Casbin/Casbin.csproj b/Casbin/Casbin.csproj index e7ac1ba..8d4ca27 100644 --- a/Casbin/Casbin.csproj +++ b/Casbin/Casbin.csproj @@ -2,7 +2,7 @@ - net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0;net462;net461;net452; + net9.0;net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0;net462;net461;net452; $(NoWarn);CS1591;CS0618 11 @@ -42,38 +42,49 @@ - - - + + + + + + + + + + - - + + + + + + @@ -81,6 +92,7 @@ + @@ -88,6 +100,7 @@ + @@ -95,6 +108,7 @@ + @@ -102,6 +116,7 @@ + @@ -109,6 +124,7 @@ + @@ -118,6 +134,5 @@ - - + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e3cb595..6ddf8d7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -46,6 +46,13 @@ stages: version: '8.0.x' includePreviewVersions: true + - task: UseDotNet@2 + displayName: Setup 9.0.x .NET SDKs + inputs: + packageType: 'sdk' + version: '9.0.x' + includePreviewVersions: true + - task: DotNetCoreCLI@2 displayName: Restore projects inputs: