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: 更新单元测试
dotnetcore · Nov 15, 2023 · 9c126ee · 9c126ee
1 parent 0d6f781
commit 9c126ee
Show file tree

Hide file tree

Showing 45 changed files with 167 additions and 109 deletions.
diff --git a/.github/workflows/auto-pull-request-checks.yml b/.github/workflows/auto-pull-request-checks.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Test
         run: |

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Build
       env: 

diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Publish to Nuget
       env: 

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Publish wasm
       run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,24 +15,78 @@ jobs:
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Publish to Nuget
       env: 
         NUGET_API_KEY: ${{secrets.NUGET_API_KEY}}
         Bundle: True
-      run: |      
+      run: |
+        dotnet pack src/Extensions/Components/BootstrapBlazor.AzureOpenAI -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.AzureOpenAI.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+
+        dotnet pack src/Extensions/Components/BootstrapBlazor.AzureSpeech -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.AzureSpeech.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+        
+        dotnet pack src/Extensions/Components/BootstrapBlazor.BaiduOcr -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.BaiduOcr.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+        
+        dotnet pack src/Extensions/Components/BootstrapBlazor.BaiduSpeech -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.BaiduSpeech.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+        
+        dotnet pack src/Extensions/Components/BootstrapBlazor.BarCode -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.BarCode.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+
         dotnet pack src/Extensions/Components/BootstrapBlazor.Chart -c Release -o publish
         dotnet nuget push publish/BootstrapBlazor.Chart.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+
+        dotnet pack src/Extensions/Components/BootstrapBlazor.CherryMarkdown -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.CherryMarkdown.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+
+        dotnet pack src/Extensions/Components/BootstrapBlazor.CodeEditor -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.CodeEditor.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+
+        dotnet pack src/Extensions/Components/BootstrapBlazor.Dock -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.Dock.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+
+        dotnet pack src/Extensions/Components/BootstrapBlazor.FloatingUI -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.FloatingUI.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+
+        dotnet pack src/Extensions/Components/BootstrapBlazor.FontAwesome -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.FontAwesome.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+
+        dotnet pack src/Extensions/Components/BootstrapBlazor.Grantt -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.Grantt.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+
+        dotnet pack src/Extensions/Components/BootstrapBlazor.Html2Pdf -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.Html2Pdf.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+
+        dotnet pack src/Extensions/Components/BootstrapBlazor.Live2DDisplay -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.Live2DDisplay.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+
+        dotnet pack src/Extensions/Components/BootstrapBlazor.Markdown -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.Markdown.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+
+        dotnet pack src/Extensions/Components/BootstrapBlazor.MaterialDesign -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.MaterialDesign.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+
+        dotnet pack src/Extensions/Components/BootstrapBlazor.MaterialDesign.Extensions -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.MaterialDesign.Extensions.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+
+        dotnet pack src/Extensions/Components/BootstrapBlazor.MouseFollower -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.MouseFollower.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+
+        dotnet pack src/Extensions/Components/BootstrapBlazor.Splitting -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.Splitting.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+
+        dotnet pack src/Extensions/Components/BootstrapBlazor.SummerNote -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.SummerNote.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
         
         dotnet pack src/Extensions/Components/BootstrapBlazor.TableExport -c Release -o publish
         dotnet nuget push publish/BootstrapBlazor.TableExport.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
         
-        dotnet pack src/Extensions/Components/BootstrapBlazor.Markdown -c Release -o publish
-        dotnet nuget push publish/BootstrapBlazor.Markdown.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
-        
-        dotnet pack src/Extensions/Components/BootstrapBlazor.FontAwesome -c Release -o publish
-        dotnet nuget push publish/BootstrapBlazor.FontAwesome.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
+        dotnet pack src/Extensions/Components/BootstrapBlazor.Topology -c Release -o publish
+        dotnet nuget push publish/BootstrapBlazor.Topology.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
         
         dotnet pack src/Extensions/DataServices/BootstrapBlazor.DataAcces.PetaPoco -c Release -o publish
         dotnet nuget push publish/BootstrapBlazor.DataAcces.PetaPoco.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate

diff --git a/Framework.props b/Framework.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/scripts/linux/deploy-blazor.sh b/scripts/linux/deploy-blazor.sh
@@ -6,6 +6,6 @@ dotnet restore --no-cache
 dotnet publish src/BootstrapBlazor.Server -c Release
 
 systemctl stop ba.blazor
-\cp -fr ~/BootstrapBlazor/src/BootstrapBlazor.Server/bin/Release/net7.0/publish/* /usr/local/ba/blazor
+\cp -fr ~/BootstrapBlazor/src/BootstrapBlazor.Server/bin/Release/net8.0/publish/* /usr/local/ba/blazor
 systemctl start ba.blazor
 systemctl status ba.blazor -l --no-pager
diff --git a/src/BootstrapBlazor.Shared/BootstrapBlazor.Shared.csproj b/src/BootstrapBlazor.Shared/BootstrapBlazor.Shared.csproj
@@ -2,10 +2,6 @@
 
   <Import Project="..\..\Framework.props" />
 
-  <PropertyGroup>
-    <Version>7.0.5</Version>
-  </PropertyGroup>
-
   <ItemGroup>
     <SupportedPlatform Include="browser" />
   </ItemGroup>
@@ -50,7 +46,7 @@
     <PackageReference Include="BootstrapBlazor.Topology" Version="7.4.6" />
     <PackageReference Include="BootstrapBlazor.VideoPlayer" Version="7.0.4" />
     <PackageReference Include="BootstrapBlazor.MouseFollower" Version="7.0.0" />
-    <PackageReference Include="BootstrapBlazor.WebAPI" Version="7.5.0" />
+    <PackageReference Include="BootstrapBlazor.WebAPI" Version="7.5.3" />
     <PackageReference Include="BootstrapBlazor.MindMap" Version="7.0.1" />
   </ItemGroup>
 

diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>7.12.2-beta03</Version>
+    <Version>8.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">

diff --git a/src/Extensions/Components/BootstrapBlazor.AzureOpenAI/BootstrapBlazor.AzureOpenAI.csproj b/src/Extensions/Components/BootstrapBlazor.AzureOpenAI/BootstrapBlazor.AzureOpenAI.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-    <Version>7.0.0</Version>
+    <Version>8.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -12,10 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.AI.OpenAI" Version="1.0.0-beta.5" />
-    <PackageReference Include="BootstrapBlazor" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
+    <PackageReference Include="BootstrapBlazor" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Extensions/Components/BootstrapBlazor.AzureSpeech/BootstrapBlazor.AzureSpeech.csproj b/src/Extensions/Components/BootstrapBlazor.AzureSpeech/BootstrapBlazor.AzureSpeech.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>7.0.0</Version>
+    <Version>8.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BootstrapBlazor" Version="7.0.0" />
+    <PackageReference Include="BootstrapBlazor" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Extensions/Components/BootstrapBlazor.BaiduOcr/BootstrapBlazor.BaiduOcr.csproj b/src/Extensions/Components/BootstrapBlazor.BaiduOcr/BootstrapBlazor.BaiduOcr.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>7.1.1</Version>
+    <Version>8.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Baidu.AI" Version="4.15.10" />
-    <PackageReference Include="BootstrapBlazor" Version="7.0.0" />
+    <PackageReference Include="Baidu.AI" Version="4.15.13" />
+    <PackageReference Include="BootstrapBlazor" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Extensions/Components/BootstrapBlazor.BaiduSpeech/BootstrapBlazor.BaiduSpeech.csproj b/src/Extensions/Components/BootstrapBlazor.BaiduSpeech/BootstrapBlazor.BaiduSpeech.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>7.1.0</Version>
+    <Version>8.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Baidu.AI" Version="4.15.10" />
-    <PackageReference Include="BootstrapBlazor" Version="7.0.0" />
+    <PackageReference Include="Baidu.AI" Version="4.15.13" />
+    <PackageReference Include="BootstrapBlazor" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Extensions/Components/BootstrapBlazor.BarCode/BootstrapBlazor.BarCode.csproj b/src/Extensions/Components/BootstrapBlazor.BarCode/BootstrapBlazor.BarCode.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>7.1.5</Version>
+    <Version>8.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BootstrapBlazor" Version="7.6.1" />
+    <PackageReference Include="BootstrapBlazor" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Extensions/Components/BootstrapBlazor.Chart/BootstrapBlazor.Chart.csproj b/src/Extensions/Components/BootstrapBlazor.Chart/BootstrapBlazor.Chart.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>7.6.1</Version>
+    <Version>8.0.0</Version>
     <PackageTags>Bootstrap Blazor WebAssembly wasm UI Components Chart</PackageTags>
     <Description>Bootstrap UI components extensions of Chart.js</Description>
   </PropertyGroup>
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BootstrapBlazor" Version="7.5.4" />
+    <PackageReference Include="BootstrapBlazor" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/...xtensions/Components/BootstrapBlazor.CherryMarkdown/BootstrapBlazor.CherryMarkdown.csproj b/...xtensions/Components/BootstrapBlazor.CherryMarkdown/BootstrapBlazor.CherryMarkdown.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>7.2.1</Version>
+    <Version>8.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BootstrapBlazor" Version="7.5.4" />
+    <PackageReference Include="BootstrapBlazor" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Extensions/Components/BootstrapBlazor.CodeEditor/BootstrapBlazor.CodeEditor.csproj b/src/Extensions/Components/BootstrapBlazor.CodeEditor/BootstrapBlazor.CodeEditor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>7.0.0</Version>
+    <Version>8.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BootstrapBlazor" Version="7.11.2" />
+    <PackageReference Include="BootstrapBlazor" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Extensions/Components/BootstrapBlazor.Dock/BootstrapBlazor.Dock.csproj b/src/Extensions/Components/BootstrapBlazor.Dock/BootstrapBlazor.Dock.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>7.0.12</Version>
+    <Version>8.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BootstrapBlazor" Version="7.7.0" />
+    <PackageReference Include="BootstrapBlazor" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Extensions/Components/BootstrapBlazor.FloatingUI/BootstrapBlazor.FloatingUI.csproj b/src/Extensions/Components/BootstrapBlazor.FloatingUI/BootstrapBlazor.FloatingUI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>7.0.0</Version>
+    <Version>8.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BootstrapBlazor" Version="7.7.0" />
+    <PackageReference Include="BootstrapBlazor" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Extensions/Components/BootstrapBlazor.FontAwesome/BootstrapBlazor.FontAwesome.csproj b/src/Extensions/Components/BootstrapBlazor.FontAwesome/BootstrapBlazor.FontAwesome.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\..\Bundle.props" />
 
   <PropertyGroup>
-    <Version>7.5.0</Version>
+    <Version>8.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BootstrapBlazor" Version="7.10.0" />
+    <PackageReference Include="BootstrapBlazor" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Extensions/Components/BootstrapBlazor.Grantt/BootstrapBlazor.Gantt.csproj b/src/Extensions/Components/BootstrapBlazor.Grantt/BootstrapBlazor.Gantt.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>7.0.0</Version>
+    <Version>8.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BootstrapBlazor" Version="7.7.0" />
+    <PackageReference Include="BootstrapBlazor" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>