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: 更新单元测试
This commit is contained in:
Argo Zhang
2023-11-15 10:57:18 +08:00
committed by GitHub
parent 0d6f781d5d
commit 9c126ee185
45 changed files with 167 additions and 109 deletions

View File

@@ -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: |

View File

@@ -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:

View File

@@ -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:

View File

@@ -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: |

View File

@@ -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: |
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.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.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.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.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.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

View File

@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
</Project>

View File

@@ -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

View File

@@ -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>

View File

@@ -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'">

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<Version>7.2.0</Version>
<Version>8.0.0</Version>
</PropertyGroup>
<PropertyGroup>
@@ -10,7 +10,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BootstrapBlazor" Version="7.8.0" />
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
</ItemGroup>
</Project>

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<Version>7.0.1</Version>
<Version>8.0.0</Version>
</PropertyGroup>
<PropertyGroup>
@@ -10,7 +10,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BootstrapBlazor" Version="7.8.0" />
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
</ItemGroup>
</Project>

View File

@@ -3,7 +3,7 @@
<Import Project="..\..\..\Bundle.props" />
<PropertyGroup>
<Version>7.2.2</Version>
<Version>8.0.0</Version>
</PropertyGroup>
<PropertyGroup>
@@ -19,7 +19,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BootstrapBlazor" Version="7.6.0" />
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
</ItemGroup>
<ItemGroup>

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<Version>7.4.1</Version>
<Version>8.0.0</Version>
</PropertyGroup>
<PropertyGroup>
@@ -11,7 +11,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BootstrapBlazor" Version="7.11.1" />
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
</ItemGroup>
</Project>

View File

@@ -3,7 +3,7 @@
<Import Project="..\..\..\Bundle.props" />
<PropertyGroup>
<Version>7.0.0</Version>
<Version>8.0.0</Version>
</PropertyGroup>
<PropertyGroup>
@@ -24,7 +24,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BootstrapBlazor" Version="7.0.0" />
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
</ItemGroup>
</Project>

View File

@@ -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>
</Project>

View File

@@ -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>
</Project>

View File

@@ -3,7 +3,7 @@
<Import Project="..\..\..\Bundle.props" />
<PropertyGroup>
<Version>7.3.4</Version>
<Version>8.0.0</Version>
</PropertyGroup>
<PropertyGroup>
@@ -19,7 +19,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BootstrapBlazor" Version="7.6.3" />
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
</ItemGroup>
<ItemGroup>

View File

@@ -1,13 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<Version>7.6.1</Version>
<Version>8.0.0</Version>
</PropertyGroup>
<PropertyGroup>
<PackageTags>Bootstrap Blazor WebAssembly wasm UI Components Table Export</PackageTags>
<Description>Bootstrap UI components extensions of export</Description>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BootstrapBlazor" Version="7.11.1" />
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
<PackageReference Include="MiniExcel" Version="1.31.2" />
</ItemGroup>

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<Version>7.4.6</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>

View File

@@ -1,7 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Version>7.2.0</Version>
<Version>8.0.0</Version>
</PropertyGroup>
<PropertyGroup>
<PackageTags>Bootstrap Blazor WebAssembly wasm UI Components EFCore</PackageTags>
<Description>Bootstrap UI components extensions of EFCore</Description>
</PropertyGroup>
@@ -18,8 +21,12 @@
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.*" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="BootstrapBlazor" Version="7.9.3" />
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
</ItemGroup>
</Project>

View File

@@ -1,14 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Version>7.2.0</Version>
<Version>8.0.0</Version>
</PropertyGroup>
<PropertyGroup>
<PackageTags>Bootstrap Blazor WebAssembly wasm UI Components FreeSql</PackageTags>
<Description>Bootstrap UI components extensions of FreeSql</Description>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BootstrapBlazor" Version="7.9.3" />
<PackageReference Include="FreeSql.Repository" Version="3.2.700" />
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
<PackageReference Include="FreeSql.Repository" Version="3.2.802" />
</ItemGroup>
</Project>

View File

@@ -1,13 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Version>7.3.0</Version>
<Version>8.0.0</Version>
</PropertyGroup>
<PropertyGroup>
<Version>8.0.0</Version>
<PackageTags>Bootstrap Blazor WebAssembly wasm UI Components PetaPoco</PackageTags>
<Description>Bootstrap UI components extensions of PetaPoco</Description>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BootstrapBlazor" Version="7.9.3" />
<PackageReference Include="BootstrapBlazor" Version="8.0.0" />
<PackageReference Include="Longbow.PetaPoco" Version="5.0.1" />
<PackageReference Include="PetaPoco.Extensions" Version="6.0.0" />
</ItemGroup>

View File

@@ -1,18 +1,14 @@
<Project>
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
<TargetFrameworks>net7.0;net6.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'!='Debug'">
<TargetFrameworks>net7.0;net6.0;net5.0</TargetFrameworks>
<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<NET5Version>5.0</NET5Version>
<NET6Version>6.0</NET6Version>
<NET7Version>7.0</NET7Version>
<NET8Version>8.0*-*</NET8Version>
<NET8Version>8.0</NET8Version>
</PropertyGroup>
</Project>

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Version>7.0.0</Version>
<Version>8.0.0</Version>
</PropertyGroup>
<ItemGroup>

View File

@@ -24,10 +24,10 @@ public static class BootstrapBlazorApplicationBuilderExtensions
{
var ip = "";
var headers = context.Request.Headers;
if (headers.ContainsKey("X-Forwarded-For"))
if (headers.TryGetValue("X-Forwarded-For", out var value))
{
var ips = new List<string>();
foreach (var xf in headers["X-Forwarded-For"])
foreach (var xf in value)
{
if (!string.IsNullOrEmpty(xf))
{
@@ -41,7 +41,7 @@ public static class BootstrapBlazorApplicationBuilderExtensions
ip = context.Connection.RemoteIpAddress.ToIPv4String();
}
context.Response.Headers.Add("Content-Type", new Microsoft.Extensions.Primitives.StringValues("application/json; charset=utf-8"));
context.Response.Headers.TryAdd("Content-Type", new Microsoft.Extensions.Primitives.StringValues("application/json; charset=utf-8"));
await context.Response.WriteAsync(JsonSerializer.Serialize(new { Id = context.TraceIdentifier, Ip = ip }));
}));
return builder;

View File

@@ -6,10 +6,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BootstrapBlazor.Shared" Version="7.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.*" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.*" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.*" PrivateAssets="all" />
<PackageReference Include="System.Net.Http.Json" Version="7.*" />
<PackageReference Include="System.Net.Http.Json" Version="8.*" />
</ItemGroup>
<ItemGroup>

View File

@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.*" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.*" />
</ItemGroup>
<ItemGroup>

View File

@@ -2,8 +2,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
@@ -14,10 +14,10 @@
</ItemGroup>
<ItemGroup>
<Using Remove="BootstrapBlazor.Components"/>
<Using Remove="Bunit"/>
<Using Remove="Microsoft.AspNetCore.Components"/>
<Using Remove="UnitTest.Core"/>
<Using Remove="BootstrapBlazor.Components" />
<Using Remove="Bunit" />
<Using Remove="Microsoft.AspNetCore.Components" />
<Using Remove="UnitTest.Core" />
</ItemGroup>
</Project>

View File

@@ -8,14 +8,14 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="bunit" Version="1.10.14" />
<PackageReference Include="bunit" Version="1.25.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.1.2">
<PackageReference Include="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>

View File

@@ -514,7 +514,7 @@ public class MenuItemTest_Ok : DialogTestBase
var nav = Context.Services.GetRequiredService<FakeNavigationManager>();
nav.NavigateTo("/menu22");
cut.SetParametersAndRender();
cut.Contains("<a href=\"menu22\" aria-expanded=\"false\" class=\"nav-link active\">");
cut.Contains("href=\"menu22\"");
nav.NavigateTo("/menu3");
cut.SetParametersAndRender(pb =>

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="bunit" Version="1.24.10" />
<PackageReference Include="bunit" Version="1.25.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">

View File

@@ -12,8 +12,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>

View File

@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="bunit" Version="1.10.14" />
<PackageReference Include="bunit" Version="1.25.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.1.2">
<PackageReference Include="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>