Skip to content

Commit e133b78

Browse files
TaoyuesongTaoyuesong
authored
feat: support .NET 9.0 and update dependence packages (#357)
* feat: support .NET 9.0 and update dependence packages Signed-off-by: Taoyuesong <634774653@qq.com> * fix: azure pipeline error Signed-off-by: Taoyuesong <634774653@qq.com> --------- Signed-off-by: Taoyuesong <634774653@qq.com>
1 parent 9429ca7 commit e133b78

7 files changed

Lines changed: 53 additions & 28 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
6.0.x
3131
7.0.x
3232
8.0.x
33+
9.0.x
3334
include-prerelease: true
3435

3536
- name: Check .NET info
@@ -115,6 +116,7 @@ jobs:
115116
6.0.x
116117
7.0.x
117118
8.0.x
119+
9.0.x
118120
include-prerelease: true
119121

120122
- name: Check .NET info

‎.github/workflows/infersharp.yml‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
6.0.x
2323
7.0.x
2424
8.0.x
25+
9.0.x
2526
include-prerelease: true
2627

2728
- name: Check .NET info
@@ -33,11 +34,11 @@ jobs:
3334
- name: Build solution
3435
run: dotnet build -c Release --no-restore
3536

36-
- name: Run net8.0 Infer#
37+
- name: Run net8.0 Infer#
3738
uses: microsoft/infersharpaction@v1.5
3839
with:
3940
binary-path: ./Casbin/bin/Release/net8.0
40-
41+
4142
- name: Print net8.0 Infer# analysis results
4243
run: cat infer-out/report.txt
4344

@@ -47,11 +48,11 @@ jobs:
4748
name: "infersharp-net8.0-results"
4849
path: './infer-out/report.txt'
4950

50-
- name: Run net7.0 Infer#
51+
- name: Run net7.0 Infer#
5152
uses: microsoft/infersharpaction@v1.5
5253
with:
5354
binary-path: ./Casbin/bin/Release/net7.0
54-
55+
5556
- name: Print net7.0 Infer# analysis results
5657
run: cat infer-out/report.txt
5758

@@ -61,44 +62,44 @@ jobs:
6162
name: "infersharp-net7.0-results"
6263
path: './infer-out/report.txt'
6364

64-
- name: Run net6.0 Infer#
65+
- name: Run net6.0 Infer#
6566
uses: microsoft/infersharpaction@v1.5
6667
with:
6768
binary-path: ./Casbin/bin/Release/net6.0
68-
69+
6970
- name: Print net6.0 Infer# analysis results
7071
run: cat infer-out/report.txt
71-
72+
7273
- name: Upload net6.0 infer# results artefacts
7374
uses: actions/upload-artifact@v1.0.0
7475
with:
7576
name: "infersharp-net6.0-results"
7677
path: './infer-out/report.txt'
7778

78-
- name: Run net5.0 Infer#
79+
- name: Run net5.0 Infer#
7980
uses: microsoft/infersharpaction@v1.5
8081
with:
8182
binary-path: ./Casbin/bin/Release/net5.0
82-
83+
8384
- name: Print net5.0 Infer# analysis results
8485
run: cat infer-out/report.txt
85-
86+
8687
- name: Upload net5.0 infer# results artefacts
8788
uses: actions/upload-artifact@v1.0.0
8889
with:
8990
name: "infersharp-net5.0-results"
9091
path: './infer-out/report.txt'
9192

92-
- name: Run net3.1 Infer#
93+
- name: Run net3.1 Infer#
9394
uses: microsoft/infersharpaction@v1.5
9495
with:
9596
binary-path: ./Casbin/bin/Release/netcoreapp3.1
96-
97+
9798
- name: Print net3.1 Infer# analysis results
9899
run: cat infer-out/report.txt
99100

100101
- name: Upload net3.1 infer# results artefacts
101102
uses: actions/upload-artifact@v1.0.0
102103
with:
103104
name: "infersharp-net3.1-results"
104-
path: './infer-out/report.txt'
105+
path: './infer-out/report.txt'

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
6.0.x
3838
7.0.x
3939
8.0.x
40+
9.0.x
4041
include-prerelease: true
4142

4243
- name: Check .NET info
@@ -120,6 +121,7 @@ jobs:
120121
6.0.x
121122
7.0.x
122123
8.0.x
124+
9.0.x
123125
include-prerelease: true
124126

125127
- name: Check .NET info

‎Casbin.NET.sln‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2020
LICENSE = LICENSE
2121
README.md = README.md
2222
.github\workflows\release.yml = .github\workflows\release.yml
23+
.github\workflows\infersharp.yml = .github\workflows\infersharp.yml
24+
.github\workflows\semantic.yml = .github\workflows\semantic.yml
2325
EndProjectSection
2426
EndProject
2527
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Casbin.Benchmark", "Casbin.Benchmark\Casbin.Benchmark.csproj", "{1DBC2931-4981-4DB5-A30B-FF6EB8622B04}"

‎Casbin.UnitTests/Casbin.UnitTests.csproj‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net461;net452</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;net462;net461;net452</TargetFrameworks>
55
<DebugType>full</DebugType>
66
<IsPackable>false</IsPackable>
77
<LangVersion>10.0</LangVersion>
@@ -19,7 +19,7 @@
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>
2121
</PackageReference>
22-
<PackageReference Include="coverlet.collector" Version="3.1.2">
22+
<PackageReference Include="coverlet.collector" Version="6.0.2">
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
<PrivateAssets>all</PrivateAssets>
2525
</PackageReference>
@@ -34,9 +34,5 @@
3434
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3535
</None>
3636
</ItemGroup>
37-
38-
<ItemGroup>
39-
<Folder Include="Mock\" />
40-
</ItemGroup>
41-
37+
4238
</Project>

‎Casbin/Casbin.csproj‎

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33

44
<PropertyGroup>
5-
<TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0;net462;net461;net452;</TargetFrameworks>
5+
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0;net5.0;netcoreapp3.1;netstandard2.1;netstandard2.0;net462;net461;net452;</TargetFrameworks>
66
<NoWarn>$(NoWarn);CS1591;CS0618</NoWarn>
77
<LangVersion>11</LangVersion>
88
</PropertyGroup>
@@ -42,73 +42,89 @@
4242
</ItemGroup>
4343

4444
<ItemGroup>
45-
<PackageReference Include="CsvHelper" Version="30.0.1" />
4645
<PackageReference Include="DotNet.Glob" Version="3.1.3" />
4746
<PackageReference Include="System.Memory" Version="4.5.5" />
48-
<PackageReference Include="JetBrains.Annotations" Version="2023.2.0" PrivateAssets="All" />
49-
<PackageReference Include="Microsoft.SourceLink.Github" Version="1.1.1" PrivateAssets="All" />
47+
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" PrivateAssets="All" />
48+
<PackageReference Include="Microsoft.SourceLink.Github" Version="8.0.0" PrivateAssets="All" />
49+
</ItemGroup>
50+
51+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
52+
<PackageReference Include="CsvHelper" Version="32.0.3" />
53+
<PackageReference Include="DynamicExpresso.Core" Version="2.16.1" />
54+
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.0-preview.4.24266.19" />
55+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0-preview.4.24266.19" />
5056
</ItemGroup>
5157

5258
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
59+
<PackageReference Include="CsvHelper" Version="32.0.3" />
5360
<PackageReference Include="DynamicExpresso.Core" Version="2.16.1" />
54-
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0-rc.1.23419.4" />
55-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0-rc.1.23419.4" />
61+
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" />
62+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
5663
</ItemGroup>
5764

5865
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
66+
<PackageReference Include="CsvHelper" Version="32.0.3" />
5967
<PackageReference Include="DynamicExpresso.Core" Version="2.16.1" />
6068
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="7.0.0" />
6169
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
6270
</ItemGroup>
6371

6472
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
73+
<PackageReference Include="CsvHelper" Version="32.0.3" />
6574
<PackageReference Include="DynamicExpresso.Core" Version="2.16.1" />
6675
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="6.0.0" />
6776
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
6877
</ItemGroup>
6978

7079
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
80+
<PackageReference Include="CsvHelper" Version="32.0.3" />
7181
<PackageReference Include="DynamicExpresso.Core" Version="2.16.1" />
7282
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="5.0.0" />
7383
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
7484
</ItemGroup>
7585

7686
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
87+
<PackageReference Include="CsvHelper" Version="32.0.3" />
7788
<PackageReference Include="DynamicExpresso.Core" Version="2.16.1" />
7889
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="3.1.32" />
7990
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.32" />
8091
<PackageReference Include="IsExternalInit" Version="1.0.3" PrivateAssets="all" />
8192
</ItemGroup>
8293

8394
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
95+
<PackageReference Include="CsvHelper" Version="32.0.3" />
8496
<PackageReference Include="DynamicExpresso.Core" Version="2.16.1" />
8597
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="6.0.0" />
8698
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
8799
<PackageReference Include="IsExternalInit" Version="1.0.3" PrivateAssets="all" />
88100
</ItemGroup>
89101

90102
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
103+
<PackageReference Include="CsvHelper" Version="32.0.3" />
91104
<PackageReference Include="DynamicExpresso.Core" Version="2.16.1" />
92105
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="6.0.0" />
93106
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
94107
<PackageReference Include="IsExternalInit" Version="1.0.3" PrivateAssets="all" />
95108
</ItemGroup>
96109

97110
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
111+
<PackageReference Include="CsvHelper" Version="32.0.3" />
98112
<PackageReference Include="DynamicExpresso.Core" Version="2.16.1" />
99113
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="6.0.0" />
100114
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
101115
<PackageReference Include="IsExternalInit" Version="1.0.3" PrivateAssets="all" />
102116
</ItemGroup>
103117

104118
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
119+
<PackageReference Include="CsvHelper" Version="32.0.3" />
105120
<PackageReference Include="DynamicExpresso.Core" Version="2.16.1" />
106121
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="6.0.0" />
107122
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
108123
<PackageReference Include="IsExternalInit" Version="1.0.3" PrivateAssets="all" />
109124
</ItemGroup>
110125

111126
<ItemGroup Condition="'$(TargetFramework)' == 'net452'">
127+
<PackageReference Include="CsvHelper" Version="30.0.1" />
112128
<PackageReference Include="DynamicExpresso.Core" Version="2.10.0" />
113129
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
114130
<PackageReference Include="IsExternalInit" Version="1.0.3" PrivateAssets="all" />
@@ -118,6 +134,5 @@
118134
<None Include="../README.md" Pack="true" PackagePath="" />
119135
<None Include="casbin.png" Pack="true" Visible="false" PackagePath="" />
120136
</ItemGroup>
121-
122-
137+
123138
</Project>

‎azure-pipelines.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@ stages:
4646
version: '8.0.x'
4747
includePreviewVersions: true
4848

49+
- task: UseDotNet@2
50+
displayName: Setup 9.0.x .NET SDKs
51+
inputs:
52+
packageType: 'sdk'
53+
version: '9.0.x'
54+
includePreviewVersions: true
55+
4956
- task: DotNetCoreCLI@2
5057
displayName: Restore projects
5158
inputs:

0 commit comments

Comments
 (0)