feat: Support .NET 8.0 target

Signed-off-by: sagilio <sagilio@outlook.com>
casbin · Jul 9, 2023 · 04b5605 · 04b5605
1 parent 2884c22
commit 04b5605
Show file tree

Hide file tree

Showing 13 changed files with 242 additions and 249 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,20 +22,16 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Setup .NET Core 3.1.x SDK
+    - name: Setup .NET SDK
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.x
-
-    - name: Setup .NET 5.0.x SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 5.0.x
-
-    - name: Setup .NET 6.0.x SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+          3.1.x
+          5.0.x
+          6.0.x
+          7.0.x
+          8.0.x
+        include-prerelease: true
 
     - name: Setup .NET 7.0.x SDK
       uses: actions/setup-dotnet@v1
@@ -93,25 +89,15 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
 
-    - name: Setup .NET 3.1.x SDK
+    - name: Setup .NET SDK
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.x
-
-    - name: Setup .NET 5.0.x SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 5.0.x
-
-    - name: Setup .NET 6.0.x SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 6.0.x
-
-    - name: Setup .NET 7.0.x SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 7.0.x
+        dotnet-version: |
+          3.1.x
+          5.0.x
+          6.0.x
+          7.0.x
+          8.0.x
         include-prerelease: true
 
     - name: Check .NET info
@@ -169,25 +155,15 @@ jobs:
     - name: Check tags
       run: git tag -l -n
 
-    - name: Setup .NET Core 3.1.x SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.x
-
-    - name: Setup .NET 5.0.x SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 5.0.x
-
-    - name: Setup .NET 6.0.x SDK
+    - name: Setup .NET SDK
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
-
-    - name: Setup .NET 7.0.x SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 7.0.x
+        dotnet-version: |
+          3.1.x
+          5.0.x
+          6.0.x
+          7.0.x
+          8.0.x
         include-prerelease: true
 
     - name: Check .NET info

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,25 +23,15 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Setup .NET Core 3.1.x SDK
+    - name: Setup .NET SDK
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.x
-
-    - name: Setup .NET 5.0.x SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 5.0.x
-
-    - name: Setup .NET 6.0.x SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 6.0.x
-
-    - name: Setup .NET 7.0.x SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 7.0.x
+        dotnet-version: |
+          3.1.x
+          5.0.x
+          6.0.x
+          7.0.x
+          8.0.x
         include-prerelease: true
 
     - name: Check .NET info

diff --git a/Casbin.Benchmark/BuildInFunctionsBenchmark.cs b/Casbin.Benchmark/BuildInFunctionsBenchmark.cs
@@ -8,10 +8,10 @@ namespace Casbin.Benchmark
 {
     [MemoryDiagnoser]
     [BenchmarkCategory("Functions")]
-    [SimpleJob(RunStrategy.Throughput, targetCount: 10, runtimeMoniker: RuntimeMoniker.Net48)]
-    [SimpleJob(RunStrategy.Throughput, targetCount: 10, runtimeMoniker: RuntimeMoniker.NetCoreApp31, baseline: true)]
-    [SimpleJob(RunStrategy.Throughput, targetCount: 10, runtimeMoniker: RuntimeMoniker.Net60)]
-    [SimpleJob(RunStrategy.Throughput, targetCount: 10, runtimeMoniker: RuntimeMoniker.Net70)]
+    [SimpleJob(RunStrategy.Throughput, RuntimeMoniker.Net48)]
+    [SimpleJob(RunStrategy.Throughput, RuntimeMoniker.Net60, baseline: true)]
+    [SimpleJob(RunStrategy.Throughput, RuntimeMoniker.Net70)]
+    [SimpleJob(RunStrategy.Throughput, RuntimeMoniker.Net80)]
     public class BuildInFunctionsBenchmark
     {
         public IEnumerable<object[]> KeyMatch4TestData() => new[]

diff --git a/Casbin.Benchmark/Casbin.Benchmark.csproj b/Casbin.Benchmark/Casbin.Benchmark.csproj
@@ -3,13 +3,13 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <ServerGarbageCollection>true</ServerGarbageCollection>
-    <TargetFrameworks>net7.0;net6.0;net5.0;netcoreapp3.1;net48</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0;net48</TargetFrameworks>
     <LangVersion>10.0</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.5"/>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Casbin.Benchmark/DefaultPolicyManagerBenchmark.cs b/Casbin.Benchmark/DefaultPolicyManagerBenchmark.cs
@@ -1,19 +1,19 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Casbin.Model;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Engines;
 using BenchmarkDotNet.Jobs;
+using Casbin.Model;
 
 namespace Casbin.Benchmark
 {
     [MemoryDiagnoser]
     [BenchmarkCategory("Model")]
-    [SimpleJob(RunStrategy.Throughput, targetCount: 10, runtimeMoniker: RuntimeMoniker.Net48)]
-    [SimpleJob(RunStrategy.Throughput, targetCount: 10, runtimeMoniker: RuntimeMoniker.NetCoreApp31, baseline: true)]
-    [SimpleJob(RunStrategy.Throughput, targetCount: 10, runtimeMoniker: RuntimeMoniker.Net50)]
-    [SimpleJob(RunStrategy.Throughput, targetCount: 10, runtimeMoniker: RuntimeMoniker.Net60)]
+    [SimpleJob(RunStrategy.Throughput, RuntimeMoniker.Net48)]
+    [SimpleJob(RunStrategy.Throughput, RuntimeMoniker.Net60, baseline: true)]
+    [SimpleJob(RunStrategy.Throughput, RuntimeMoniker.Net70)]
+    [SimpleJob(RunStrategy.Throughput, RuntimeMoniker.Net80)]
     public class DefaultPolicyManagerBenchmark
     {
         private readonly Enforcer _enforcer;
@@ -22,7 +22,8 @@ public class DefaultPolicyManagerBenchmark
         public DefaultPolicyManagerBenchmark()
         {
             _enforcer = new Enforcer(TestHelper.GetTestFilePath("rbac_model.conf"));
-            _policyManager = (DefaultPolicyManager)_enforcer.Model.Sections.GetPolicyAssertion(PermConstants.DefaultPolicyType).PolicyManager;
+            _policyManager = (DefaultPolicyManager)_enforcer.Model.Sections
+                .GetPolicyAssertion(PermConstants.DefaultPolicyType).PolicyManager;
         }
 
         private string NowTestUserName { get; set; }
@@ -31,10 +32,10 @@ public DefaultPolicyManagerBenchmark()
         private List<IPolicyValues> NowTestExistedPolicyList { get; set; } = new List<IPolicyValues>();
         private List<IPolicyValues> NowTestNullPolicyList { get; set; } = new List<IPolicyValues>();
 
-        [Params(10, 100, 1000, 10000)]
-        public int NowPolicyCount { get; set; }
+        [Params(10, 100, 1000, 10000)] public int NowPolicyCount { get; set; }
 
-        [GlobalSetup(Targets = new[] {
+        [GlobalSetup(Targets = new[]
+        {
             nameof(AddPolicyAsync), nameof(RemovePolicyAsync), nameof(UpdatePolicyAsync),
             nameof(RemovePoliciesAsync), nameof(AddPoliciesAsync), nameof(UpdatePoliciesAsync)
         })]
@@ -47,10 +48,13 @@ public void GlobalSetup()
                 int num = rd.Next(1000);
                 if (num == 0)
                 {
-                    NowTestExistedPolicyList.Add(new PolicyValues<string, string, string>($"group{i}", $"obj{i / 10}", "read"));
-                    NowTestNullPolicyList.Add(new PolicyValues<string, string, string>($"name{i}", $"data{i / 10}", "read"));
+                    NowTestExistedPolicyList.Add(
+                        new PolicyValues<string, string, string>($"group{i}", $"obj{i / 10}", "read"));
+                    NowTestNullPolicyList.Add(
+                        new PolicyValues<string, string, string>($"name{i}", $"data{i / 10}", "read"));
                 }
             }
+
             Console.WriteLine($"// Already set {NowPolicyCount} policies.");
 
             NowTestUserName = $"name{NowPolicyCount / 2 + 1}";
@@ -78,7 +82,8 @@ public async Task RemovePolicyAsync()
         [BenchmarkCategory("ModelManagement")]
         public async Task UpdatePolicyAsync()
         {
-            await _policyManager.UpdatePolicyAsync(NowTestPolicy, new PolicyValues<string, string, string>(NowTestUserName + "up", NowTestDataName + "up", "read"));
+            await _policyManager.UpdatePolicyAsync(NowTestPolicy,
+                new PolicyValues<string, string, string>(NowTestUserName + "up", NowTestDataName + "up", "read"));
         }
 
         [Benchmark]