Skip to content

Commit 9c126ee

Browse files
ArgoZhangArgoZhang
authored
chore(NET8): support net8.0 (#2371)
* refactor: 更新框架为 net8 * chore: 单元测试更新依赖包到最新 * chore: wasm 支持 net8 * chore: bump version 8.0.0 * chore: shared 工程更新依赖包 * chore: 发布脚本更改路径 * chore: 组件包更新到 8.0 * refactor: 中间件重构代码提高性能 * refactor: 支持 net8.0 * chore: 更新自动化脚本 * test: 更新单元测试
1 parent 0d6f781 commit 9c126ee

File tree

45 files changed

+167
-109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+167
-109
lines changed

‎.github/workflows/auto-pull-request-checks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup .NET SDK
1818
uses: actions/setup-dotnet@v3
1919
with:
20-
dotnet-version: 7.0.x
20+
dotnet-version: 8.0.x
2121

2222
- name: Test
2323
run: |

‎.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup .NET Core SDK
1717
uses: actions/setup-dotnet@v3
1818
with:
19-
dotnet-version: 7.0.x
19+
dotnet-version: 8.0.x
2020

2121
- name: Build
2222
env:

‎.github/workflows/pack.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup .NET Core SDK
1717
uses: actions/setup-dotnet@v3
1818
with:
19-
dotnet-version: 7.0.x
19+
dotnet-version: 8.0.x
2020

2121
- name: Publish to Nuget
2222
env:

‎.github/workflows/publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup .NET Core SDK
1616
uses: actions/setup-dotnet@v3
1717
with:
18-
dotnet-version: 7.0.x
18+
dotnet-version: 8.0.x
1919

2020
- name: Publish wasm
2121
run: |

‎.github/workflows/release.yml

+61-7
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,78 @@ jobs:
1515
- name: Setup .NET Core SDK
1616
uses: actions/setup-dotnet@v3
1717
with:
18-
dotnet-version: 7.0.x
18+
dotnet-version: 8.0.x
1919

2020
- name: Publish to Nuget
2121
env:
2222
NUGET_API_KEY: ${{secrets.NUGET_API_KEY}}
2323
Bundle: True
24-
run: |
24+
run: |
25+
dotnet pack src/Extensions/Components/BootstrapBlazor.AzureOpenAI -c Release -o publish
26+
dotnet nuget push publish/BootstrapBlazor.AzureOpenAI.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
27+
28+
dotnet pack src/Extensions/Components/BootstrapBlazor.AzureSpeech -c Release -o publish
29+
dotnet nuget push publish/BootstrapBlazor.AzureSpeech.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
30+
31+
dotnet pack src/Extensions/Components/BootstrapBlazor.BaiduOcr -c Release -o publish
32+
dotnet nuget push publish/BootstrapBlazor.BaiduOcr.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
33+
34+
dotnet pack src/Extensions/Components/BootstrapBlazor.BaiduSpeech -c Release -o publish
35+
dotnet nuget push publish/BootstrapBlazor.BaiduSpeech.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
36+
37+
dotnet pack src/Extensions/Components/BootstrapBlazor.BarCode -c Release -o publish
38+
dotnet nuget push publish/BootstrapBlazor.BarCode.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
39+
2540
dotnet pack src/Extensions/Components/BootstrapBlazor.Chart -c Release -o publish
2641
dotnet nuget push publish/BootstrapBlazor.Chart.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
42+
43+
dotnet pack src/Extensions/Components/BootstrapBlazor.CherryMarkdown -c Release -o publish
44+
dotnet nuget push publish/BootstrapBlazor.CherryMarkdown.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
45+
46+
dotnet pack src/Extensions/Components/BootstrapBlazor.CodeEditor -c Release -o publish
47+
dotnet nuget push publish/BootstrapBlazor.CodeEditor.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
48+
49+
dotnet pack src/Extensions/Components/BootstrapBlazor.Dock -c Release -o publish
50+
dotnet nuget push publish/BootstrapBlazor.Dock.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
51+
52+
dotnet pack src/Extensions/Components/BootstrapBlazor.FloatingUI -c Release -o publish
53+
dotnet nuget push publish/BootstrapBlazor.FloatingUI.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
54+
55+
dotnet pack src/Extensions/Components/BootstrapBlazor.FontAwesome -c Release -o publish
56+
dotnet nuget push publish/BootstrapBlazor.FontAwesome.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
57+
58+
dotnet pack src/Extensions/Components/BootstrapBlazor.Grantt -c Release -o publish
59+
dotnet nuget push publish/BootstrapBlazor.Grantt.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
60+
61+
dotnet pack src/Extensions/Components/BootstrapBlazor.Html2Pdf -c Release -o publish
62+
dotnet nuget push publish/BootstrapBlazor.Html2Pdf.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
63+
64+
dotnet pack src/Extensions/Components/BootstrapBlazor.Live2DDisplay -c Release -o publish
65+
dotnet nuget push publish/BootstrapBlazor.Live2DDisplay.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
66+
67+
dotnet pack src/Extensions/Components/BootstrapBlazor.Markdown -c Release -o publish
68+
dotnet nuget push publish/BootstrapBlazor.Markdown.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
69+
70+
dotnet pack src/Extensions/Components/BootstrapBlazor.MaterialDesign -c Release -o publish
71+
dotnet nuget push publish/BootstrapBlazor.MaterialDesign.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
72+
73+
dotnet pack src/Extensions/Components/BootstrapBlazor.MaterialDesign.Extensions -c Release -o publish
74+
dotnet nuget push publish/BootstrapBlazor.MaterialDesign.Extensions.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
75+
76+
dotnet pack src/Extensions/Components/BootstrapBlazor.MouseFollower -c Release -o publish
77+
dotnet nuget push publish/BootstrapBlazor.MouseFollower.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
78+
79+
dotnet pack src/Extensions/Components/BootstrapBlazor.Splitting -c Release -o publish
80+
dotnet nuget push publish/BootstrapBlazor.Splitting.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
81+
82+
dotnet pack src/Extensions/Components/BootstrapBlazor.SummerNote -c Release -o publish
83+
dotnet nuget push publish/BootstrapBlazor.SummerNote.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
2784
2885
dotnet pack src/Extensions/Components/BootstrapBlazor.TableExport -c Release -o publish
2986
dotnet nuget push publish/BootstrapBlazor.TableExport.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
3087
31-
dotnet pack src/Extensions/Components/BootstrapBlazor.Markdown -c Release -o publish
32-
dotnet nuget push publish/BootstrapBlazor.Markdown.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
33-
34-
dotnet pack src/Extensions/Components/BootstrapBlazor.FontAwesome -c Release -o publish
35-
dotnet nuget push publish/BootstrapBlazor.FontAwesome.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
88+
dotnet pack src/Extensions/Components/BootstrapBlazor.Topology -c Release -o publish
89+
dotnet nuget push publish/BootstrapBlazor.Topology.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
3690
3791
dotnet pack src/Extensions/DataServices/BootstrapBlazor.DataAcces.PetaPoco -c Release -o publish
3892
dotnet nuget push publish/BootstrapBlazor.DataAcces.PetaPoco.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate

‎Framework.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
</Project>

‎scripts/linux/deploy-blazor.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ dotnet restore --no-cache
66
dotnet publish src/BootstrapBlazor.Server -c Release
77

88
systemctl stop ba.blazor
9-
\cp -fr ~/BootstrapBlazor/src/BootstrapBlazor.Server/bin/Release/net7.0/publish/* /usr/local/ba/blazor
9+
\cp -fr ~/BootstrapBlazor/src/BootstrapBlazor.Server/bin/Release/net8.0/publish/* /usr/local/ba/blazor
1010
systemctl start ba.blazor
1111
systemctl status ba.blazor -l --no-pager

‎src/BootstrapBlazor.Shared/BootstrapBlazor.Shared.csproj

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
<Import Project="..\..\Framework.props" />
44

5-
<PropertyGroup>
6-
<Version>7.0.5</Version>
7-
</PropertyGroup>
8-
95
<ItemGroup>
106
<SupportedPlatform Include="browser" />
117
</ItemGroup>
@@ -50,7 +46,7 @@
5046
<PackageReference Include="BootstrapBlazor.Topology" Version="7.4.6" />
5147
<PackageReference Include="BootstrapBlazor.VideoPlayer" Version="7.0.4" />
5248
<PackageReference Include="BootstrapBlazor.MouseFollower" Version="7.0.0" />
53-
<PackageReference Include="BootstrapBlazor.WebAPI" Version="7.5.0" />
49+
<PackageReference Include="BootstrapBlazor.WebAPI" Version="7.5.3" />
5450
<PackageReference Include="BootstrapBlazor.MindMap" Version="7.0.1" />
5551
</ItemGroup>
5652

‎src/BootstrapBlazor/BootstrapBlazor.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>7.12.2-beta03</Version>
4+
<Version>8.0.0</Version>
55
</PropertyGroup>
66

77
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">

‎src/Extensions/Components/BootstrapBlazor.AzureOpenAI/BootstrapBlazor.AzureOpenAI.csproj

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
5-
<Version>7.0.0</Version>
4+
<Version>8.0.0</Version>
65
</PropertyGroup>
76

87
<PropertyGroup>
@@ -12,10 +11,7 @@
1211

1312
<ItemGroup>
1413
<PackageReference Include="Azure.AI.OpenAI" Version="1.0.0-beta.5" />
15-
<PackageReference Include="BootstrapBlazor" Version="7.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
18-
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
14+
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
1915
</ItemGroup>
2016

2117
</Project>

‎src/Extensions/Components/BootstrapBlazor.AzureSpeech/BootstrapBlazor.AzureSpeech.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>7.0.0</Version>
4+
<Version>8.0.0</Version>
55
</PropertyGroup>
66

77
<PropertyGroup>
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="BootstrapBlazor" Version="7.0.0" />
14+
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
1515
</ItemGroup>
1616

1717
</Project>

‎src/Extensions/Components/BootstrapBlazor.BaiduOcr/BootstrapBlazor.BaiduOcr.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>7.1.1</Version>
4+
<Version>8.0.0</Version>
55
</PropertyGroup>
66

77
<PropertyGroup>
@@ -11,8 +11,8 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Baidu.AI" Version="4.15.10" />
15-
<PackageReference Include="BootstrapBlazor" Version="7.0.0" />
14+
<PackageReference Include="Baidu.AI" Version="4.15.13" />
15+
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/Extensions/Components/BootstrapBlazor.BaiduSpeech/BootstrapBlazor.BaiduSpeech.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>7.1.0</Version>
4+
<Version>8.0.0</Version>
55
</PropertyGroup>
66

77
<PropertyGroup>
@@ -11,8 +11,8 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Baidu.AI" Version="4.15.10" />
15-
<PackageReference Include="BootstrapBlazor" Version="7.0.0" />
14+
<PackageReference Include="Baidu.AI" Version="4.15.13" />
15+
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/Extensions/Components/BootstrapBlazor.BarCode/BootstrapBlazor.BarCode.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>7.1.5</Version>
4+
<Version>8.0.0</Version>
55
</PropertyGroup>
66

77
<PropertyGroup>
@@ -15,7 +15,7 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="BootstrapBlazor" Version="7.6.1" />
18+
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

‎src/Extensions/Components/BootstrapBlazor.Chart/BootstrapBlazor.Chart.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>7.6.1</Version>
4+
<Version>8.0.0</Version>
55
<PackageTags>Bootstrap Blazor WebAssembly wasm UI Components Chart</PackageTags>
66
<Description>Bootstrap UI components extensions of Chart.js</Description>
77
</PropertyGroup>
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="BootstrapBlazor" Version="7.5.4" />
15+
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/Extensions/Components/BootstrapBlazor.CherryMarkdown/BootstrapBlazor.CherryMarkdown.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>7.2.1</Version>
4+
<Version>8.0.0</Version>
55
</PropertyGroup>
66

77
<PropertyGroup>
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="BootstrapBlazor" Version="7.5.4" />
13+
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎src/Extensions/Components/BootstrapBlazor.CodeEditor/BootstrapBlazor.CodeEditor.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>7.0.0</Version>
4+
<Version>8.0.0</Version>
55
</PropertyGroup>
66

77
<PropertyGroup>
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="BootstrapBlazor" Version="7.11.2" />
13+
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎src/Extensions/Components/BootstrapBlazor.Dock/BootstrapBlazor.Dock.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>7.0.12</Version>
4+
<Version>8.0.0</Version>
55
</PropertyGroup>
66

77
<PropertyGroup>
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="BootstrapBlazor" Version="7.7.0" />
13+
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎src/Extensions/Components/BootstrapBlazor.FloatingUI/BootstrapBlazor.FloatingUI.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>7.0.0</Version>
4+
<Version>8.0.0</Version>
55
</PropertyGroup>
66

77
<PropertyGroup>
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="BootstrapBlazor" Version="7.7.0" />
13+
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎src/Extensions/Components/BootstrapBlazor.FontAwesome/BootstrapBlazor.FontAwesome.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\Bundle.props" />
44

55
<PropertyGroup>
6-
<Version>7.5.0</Version>
6+
<Version>8.0.0</Version>
77
</PropertyGroup>
88

99
<PropertyGroup>
@@ -22,7 +22,7 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="BootstrapBlazor" Version="7.10.0" />
25+
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
2626
</ItemGroup>
2727

2828
</Project>

‎src/Extensions/Components/BootstrapBlazor.Grantt/BootstrapBlazor.Gantt.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>7.0.0</Version>
4+
<Version>8.0.0</Version>
55
</PropertyGroup>
66

77
<PropertyGroup>
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="BootstrapBlazor" Version="7.7.0" />
13+
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

0 commit comments

Comments
 (0)