Skip to content

Commit 896a3ba

Browse files
ArgoZhangArgoZhang
authored
feat(net9): support net9.0 framework (#4585)
* chore: 更新框架到 net9.0 * doc: 格式化单元格 * chore: 更新打包脚本移除 BuildBundlerMinifierPlus 工具 * chore: 更新配置消除警告信息 * chore: 更新打包脚本移除 BuildBundlerMinifierPlus 工具 # Conflicts: # src/Bundle.props * chore: 更新 scss 目录打包不输出 * chore: 更新开发模式脚本 * chore: 更新打包脚本 * refactor: 增加包私有化 * doc: 格式化单元格 * style: 更新 scroll 样式 * chore: 更新忽略配置 * chore: 更新工具链 * chore: 更改文件名 * chore: 移除代码拷贝脚本 * chore: 更新配置启用压缩 * chore: 开启 scss 脚本实时更新 * chore: 更新依赖包 * chore: 更新忽略文件 * chore: 更新拷贝任务名称 * chore: 增加警告忽略配置 * chore: 更新工具链配置 * refactor: 使用 Assets 特性 * refactor: 更新自动化 dotnet 版本 * chore: 更新框架 * refactor: 更新包消除警告信息 * chore: 更新依赖包 * chore: 更新依赖消除警告信息 * chore: 调整依赖 * refactor: 移除 Sass 打包工具 * refactor: 移动 sass 工具到 targets 配置文件中 * chore: 更新依赖包 * chore: 更新项目配置文件 * chore: 移除 version 相关配置 * refactor: 移除 Title 组件 * doc(ErrorLogger): 更新参数说明文档 * chore: bump version 9.0.0-rc03 * chore: 更新字典 * chore: 更新依赖 * doc: 更新命名空间 * refactor: 移除冗余样式 * refactor: 移除 ThemeLoader 组件 * refactor: 移除 ThemeLoader 组件
1 parent 79b0e24 commit 896a3ba

22 files changed

+93
-133
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup .NET SDK
1919
uses: actions/setup-dotnet@v4
2020
with:
21-
dotnet-version: 8.0.x
21+
dotnet-version: 9.0.x
2222

2323
- name: Test
2424
run: |

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup .NET Core SDK
1818
uses: actions/setup-dotnet@v4
1919
with:
20-
dotnet-version: 8.0.x
20+
dotnet-version: 9.0.x
2121

2222
- name: Build
2323
env:

‎.github/workflows/pack.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup .NET Core SDK
1717
uses: actions/setup-dotnet@v4
1818
with:
19-
dotnet-version: 8.0.x
19+
dotnet-version: 9.0.x
2020

2121
- name: Publish to Nuget
2222
env:

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup .NET Core SDK
1616
uses: actions/setup-dotnet@v4
1717
with:
18-
dotnet-version: 8.0.x
18+
dotnet-version: 9.0.x
1919

2020
- name: Publish wasm
2121
run: |

‎Framework.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

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

77
</Project>

‎exclusion.dic‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,3 +108,4 @@ Urls
108108
Pharmacode
109109
bluetooth
110110
iframe
111+
Sqlite

‎src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj‎

Lines changed: 46 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -18,57 +18,55 @@
1818
<EmbeddedResource Include="Locales\en-US.json" />
1919
<EmbeddedResource Include="Locales\zh-CN.json" />
2020
<EmbeddedResource Include="topology.json" />
21-
<None Include="versionconfig.json" />
2221
</ItemGroup>
2322

2423
<ItemGroup>
25-
<PackageReference Include="BootstrapBlazor.AntDesignIcon" Version="8.2.0" />
26-
<PackageReference Include="BootstrapBlazor.AzureOpenAI" Version="8.2.0" />
27-
<PackageReference Include="BootstrapBlazor.AzureTranslator" Version="8.1.1" />
28-
<PackageReference Include="BootstrapBlazor.BaiduSpeech" Version="8.1.1" />
29-
<PackageReference Include="BootstrapBlazor.BaiduOcr" Version="8.2.0" />
30-
<PackageReference Include="BootstrapBlazor.BarCode" Version="8.2.0" />
31-
<PackageReference Include="BootstrapBlazor.BarcodeGenerator" Version="8.4.0" />
32-
<PackageReference Include="BootstrapBlazor.BootstrapIcon" Version="8.0.3" />
33-
<PackageReference Include="BootstrapBlazor.BootstrapIcon.Extensions" Version="8.2.0" />
34-
<PackageReference Include="BootstrapBlazor.Chart" Version="8.4.0" />
35-
<PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="8.2.0" />
36-
<PackageReference Include="BootstrapBlazor.CodeEditor" Version="8.2.0" />
37-
<PackageReference Include="BootstrapBlazor.Dock" Version="8.3.0" />
38-
<PackageReference Include="BootstrapBlazor.DockView" Version="8.4.0" />
39-
<PackageReference Include="BootstrapBlazor.DriverJs" Version="8.2.0" />
40-
<PackageReference Include="BootstrapBlazor.ElementIcon" Version="8.2.0" />
41-
<PackageReference Include="BootstrapBlazor.FileViewer" Version="8.3.0" />
42-
<PackageReference Include="BootstrapBlazor.FontAwesome" Version="8.2.0" />
43-
<PackageReference Include="BootstrapBlazor.Gantt" Version="8.2.0" />
44-
<PackageReference Include="BootstrapBlazor.Holiday" Version="8.2.0" />
45-
<PackageReference Include="BootstrapBlazor.Html2Pdf" Version="8.3.0" />
46-
<PackageReference Include="BootstrapBlazor.IconPark" Version="8.2.0" />
47-
<PackageReference Include="BootstrapBlazor.ImageCropper" Version="8.3.0" />
48-
<PackageReference Include="BootstrapBlazor.Live2DDisplay" Version="8.2.0" />
49-
<PackageReference Include="BootstrapBlazor.Markdown" Version="8.2.1" />
50-
<PackageReference Include="BootstrapBlazor.MaterialDesign" Version="8.1.0" />
51-
<PackageReference Include="BootstrapBlazor.MaterialDesign.Extensions" Version="8.2.0" />
52-
<PackageReference Include="BootstrapBlazor.MeiliSearch" Version="8.0.0" />
53-
<PackageReference Include="BootstrapBlazor.Middleware" Version="8.0.0" />
54-
<PackageReference Include="BootstrapBlazor.MindMap" Version="8.0.7" />
55-
<PackageReference Include="BootstrapBlazor.MouseFollower" Version="8.2.0" />
56-
<PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="8.0.4" />
57-
<PackageReference Include="BootstrapBlazor.PdfReader" Version="8.0.4" />
58-
<PackageReference Include="BootstrapBlazor.Player" Version="8.3.0" />
59-
<PackageReference Include="BootstrapBlazor.SignaturePad" Version="8.2.0" />
60-
<PackageReference Include="BootstrapBlazor.Sortable" Version="8.2.0" />
61-
<PackageReference Include="BootstrapBlazor.Splitting" Version="8.2.0" />
62-
<PackageReference Include="BootstrapBlazor.SvgEditor" Version="8.1.0" />
63-
<PackageReference Include="BootstrapBlazor.SummerNote" Version="8.2.0" />
64-
<PackageReference Include="BootstrapBlazor.TableExport" Version="8.4.0" />
65-
<PackageReference Include="BootstrapBlazor.TagHelper" Version="8.2.0" />
66-
<PackageReference Include="BootstrapBlazor.Topology" Version="8.2.0" />
67-
<PackageReference Include="BootstrapBlazor.VideoPlayer" Version="8.0.7" />
68-
<PackageReference Include="BootstrapBlazor.WebAPI" Version="8.0.5" />
69-
<PackageReference Include="BootstrapBlazor.WinBox" Version="8.2.0" />
70-
<PackageReference Include="Longbow.Logging" Version="8.1.0" />
71-
<PackageReference Include="Longbow.Tasks" Version="8.2.0" />
24+
<PackageReference Include="BootstrapBlazor.AntDesignIcon" Version="9.0.0-beta01" />
25+
<PackageReference Include="BootstrapBlazor.AzureOpenAI" Version="9.0.0-beta01" />
26+
<PackageReference Include="BootstrapBlazor.AzureTranslator" Version="9.0.0-beta01" />
27+
<PackageReference Include="BootstrapBlazor.BaiduSpeech" Version="9.0.0-beta01" />
28+
<PackageReference Include="BootstrapBlazor.BaiduOcr" Version="9.0.0-beta01" />
29+
<PackageReference Include="BootstrapBlazor.BarCode" Version="9.0.0-beta01" />
30+
<PackageReference Include="BootstrapBlazor.BarcodeGenerator" Version="9.0.0-beta01" />
31+
<PackageReference Include="BootstrapBlazor.BootstrapIcon" Version="9.0.0-beta01" />
32+
<PackageReference Include="BootstrapBlazor.BootstrapIcon.Extensions" Version="9.0.0-beta01" />
33+
<PackageReference Include="BootstrapBlazor.Chart" Version="9.0.0-beta01" />
34+
<PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="9.0.0-beta01" />
35+
<PackageReference Include="BootstrapBlazor.CodeEditor" Version="9.0.0-beta01" />
36+
<PackageReference Include="BootstrapBlazor.Dock" Version="9.0.0-beta01" />
37+
<PackageReference Include="BootstrapBlazor.DockView" Version="9.0.0-beta01" />
38+
<PackageReference Include="BootstrapBlazor.DriverJs" Version="9.0.0-beta01" />
39+
<PackageReference Include="BootstrapBlazor.ElementIcon" Version="9.0.0-beta01" />
40+
<PackageReference Include="BootstrapBlazor.FileViewer" Version="9.0.0-beta01" />
41+
<PackageReference Include="BootstrapBlazor.FontAwesome" Version="9.0.0-beta01" />
42+
<PackageReference Include="BootstrapBlazor.Gantt" Version="9.0.0-beta01" />
43+
<PackageReference Include="BootstrapBlazor.Holiday" Version="9.0.0-beta01" />
44+
<PackageReference Include="BootstrapBlazor.Html2Pdf" Version="9.0.0-beta01" />
45+
<PackageReference Include="BootstrapBlazor.IconPark" Version="9.0.0-beta01" />
46+
<PackageReference Include="BootstrapBlazor.ImageCropper" Version="9.0.0-beta01" />
47+
<PackageReference Include="BootstrapBlazor.Live2DDisplay" Version="9.0.0-beta01" />
48+
<PackageReference Include="BootstrapBlazor.Markdown" Version="9.0.0-beta01" />
49+
<PackageReference Include="BootstrapBlazor.MaterialDesign" Version="9.0.0-beta01" />
50+
<PackageReference Include="BootstrapBlazor.MaterialDesign.Extensions" Version="9.0.0-beta01" />
51+
<PackageReference Include="BootstrapBlazor.MeiliSearch" Version="9.0.0-beta01" />
52+
<PackageReference Include="BootstrapBlazor.Middleware" Version="9.0.0-beta01" />
53+
<PackageReference Include="BootstrapBlazor.MindMap" Version="9.0.0-beta01" />
54+
<PackageReference Include="BootstrapBlazor.MouseFollower" Version="9.0.0-beta01" />
55+
<PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="9.0.0-beta01" />
56+
<PackageReference Include="BootstrapBlazor.PdfReader" Version="9.0.0-beta01" />
57+
<PackageReference Include="BootstrapBlazor.Player" Version="9.0.0-beta01" />
58+
<PackageReference Include="BootstrapBlazor.SignaturePad" Version="9.0.0-beta01" />
59+
<PackageReference Include="BootstrapBlazor.Sortable" Version="9.0.0-beta01" />
60+
<PackageReference Include="BootstrapBlazor.Splitting" Version="9.0.0-beta01" />
61+
<PackageReference Include="BootstrapBlazor.SvgEditor" Version="9.0.0-beta01" />
62+
<PackageReference Include="BootstrapBlazor.SummerNote" Version="9.0.0-beta01" />
63+
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.0.0-beta01" />
64+
<PackageReference Include="BootstrapBlazor.TagHelper" Version="9.0.0-beta01" />
65+
<PackageReference Include="BootstrapBlazor.Topology" Version="9.0.0-beta01" />
66+
<PackageReference Include="BootstrapBlazor.VideoPlayer" Version="9.0.0-beta01" />
67+
<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.0-beta01" />
68+
<PackageReference Include="Longbow.Logging" Version="9.0.0-beta01" />
69+
<PackageReference Include="Longbow.Tasks" Version="9.0.0-beta01" />
7270
</ItemGroup>
7371

7472
<ItemGroup>

‎src/BootstrapBlazor.Server/Components/App.razor‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@
1717
<link rel="icon" href="favicon.ico" type="image/x-icon">
1818
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
1919
<link rel="apple-touch-icon" href="favicon.png">
20-
<Link Href="_content/BootstrapBlazor.FontAwesome/css/font-awesome.min.css" />
21-
<Link Href="_content/BootstrapBlazor.MaterialDesign/css/md.min.css" />
22-
<Link Href="_content/BootstrapBlazor.BootstrapIcon/css/bootstrap.min.css" />
23-
<Link Href="_content/BootstrapBlazor/css/bootstrap.blazor.bundle.min.css" />
24-
<Link Href="_content/BootstrapBlazor/css/motronic.min.css" />
25-
<Link Href="BootstrapBlazor.Server.styles.css" />
26-
<Link Href="css/site.css" />
20+
<link rel="stylesheet" href="@Assets["_content/BootstrapBlazor.FontAwesome/css/font-awesome.min.css"]" />
21+
<link rel="stylesheet" href="@Assets["_content/BootstrapBlazor.MaterialDesign/css/md.min.css"]" />
22+
<link rel="stylesheet" href="@Assets["_content/BootstrapBlazor.BootstrapIcon/css/bootstrap.min.css"]" />
23+
<link rel="stylesheet" href="@Assets["_content/BootstrapBlazor/css/bootstrap.blazor.bundle.min.css"]" />
24+
<link rel="stylesheet" href="@Assets["_content/BootstrapBlazor/css/motronic.min.css"]" />
25+
<link rel="stylesheet" href="@Assets["BootstrapBlazor.Server.styles.css"]" />
26+
<link rel="stylesheet" href="@Assets["css/site.css"]" />
27+
<ImportMap></ImportMap>
2728
<HeadOutlet @rendermode="new InteractiveServerRenderMode(false)" />
2829
</head>
2930

‎src/BootstrapBlazor.Server/Components/Samples/MindMaps.razor‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@page "/mind-map"
2-
@using BootstrapBlazor.Components.MindMaps
32
@inject IStringLocalizer<MindMaps> Localizer
43

54
<h3>@Localizer["MindMapTitle"]</h3>

‎src/BootstrapBlazor.Server/Components/Samples/MindMaps.razor.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
// See the LICENSE file in the project root for more information.
44
// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone
55

6-
using BootstrapBlazor.Components.MindMaps;
7-
86
namespace BootstrapBlazor.Server.Components.Samples;
97

108
/// <summary>

0 commit comments

Comments
 (0)