Skip to content

Commit 7c72861

Browse files
authored
feat(NET10): add NET10 support (#6940)
* doc: 增加 nosnippet 标签 * chore: 增加脚本指纹 * chore: 增加 net10 依赖包 * doc: 增加 NotFound 路由 * chore: 更新网站运行时为 net10 * chore: 更新脚本版本 * refactor: 更改滚动条对齐方式 * chore: 增加 logs 目录自动创建脚本 * chore: 更改输出目录 * chore: 更改 dotnet 命令路径 * doc: 更新支持列表 * doc: 增加 NET10 支持列表 * chore: 更新 slnx 解决方案文件 * chore: 增加 AutoRestart 配置 * refactor: 移除配置项 * chore: 更新依赖包 * test: 更新单元测试
1 parent a14b67e commit 7c72861

File tree

18 files changed

+43
-19
lines changed

18 files changed

+43
-19
lines changed

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

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

2222
- name: Cache NuGet packages
2323
uses: actions/cache@v4

.github/workflows/build.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: 9.0.x
19+
dotnet-version: 10.0.x
2020

2121
- name: Cache NuGet packages
2222
uses: actions/cache@v4

.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: 9.0.x
18+
dotnet-version: 10.0.x
1919

2020
- name: Publish wasm
2121
run: |

Version.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-
<RunTargetFramework>net9.0</RunTargetFramework>
4+
<RunTargetFramework>net10.0</RunTargetFramework>
55
</PropertyGroup>
66

77
</Project>

scripts/linux/ba.blazor.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Description=Bootstrap Blazor Application
77
Type=simple
88
WorkingDirectory=/usr/local/ba/blazor
99
Environment=ASPNETCORE_ENVIRONMENT=Production
10-
ExecStart=/usr/bin/dotnet BootstrapBlazor.Server.dll --urls http://localhost:50853
10+
ExecStart=dotnet BootstrapBlazor.Server.dll --urls http://localhost:50853
1111
ExecStop=/bin/kill -2 $MAINPID
1212
KillMode=process
1313
Restart=on-failure

scripts/linux/deploy-blazor.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ curl https://www.blazor.zone/api/dispatch?token=BootstrapBlazor-Reboot
1010
dotnet publish src/BootstrapBlazor.Server -c Release
1111

1212
systemctl stop ba.blazor
13-
\cp -fr ~/BootstrapBlazor/src/BootstrapBlazor.Server/bin/Release/net9.0/publish/* /usr/local/ba/blazor
13+
\cp -fr ~/BootstrapBlazor/src/BootstrapBlazor.Server/bin/Release/net10.0/publish/* /usr/local/ba/blazor
1414
systemctl start ba.blazor
1515
systemctl status ba.blazor -l --no-pager

scripts/linux/deploy.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ sudo systemctl enable ba.blazor
2727

2828
echo "*********************** install nginx ***********************"
2929
yes|sudo apt install nginx
30+
mkdir /usr/share/nginx/logs
3031

3132
echo "*********************** copy nginx config ***********************"
3233
sudo cp BootstrapBlazor/scripts/linux/nginx.conf /etc/nginx/

src/BootstrapBlazor.Server/Components/Components/BlazorReconnector.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<div class="d-flex">
6868
<div class="flex-fill">
6969
<p>一套基于 <b>Bootstrap</b> 样式的企业级 <b>Blazor UI</b> 组件库,支持 ServerWebAssembly</p>
70-
<p>适配移动端支持各种主流浏览器以及移动端,适配 <b>ABP</b>,同时支持 <b>NET6/NET7/NET8/NET9</b></p>
70+
<p>适配移动端支持各种主流浏览器以及移动端,适配 <b>ABP</b>,同时支持 <b>NET6/NET7/NET8/NET9/NET10</b></p>
7171
<p></p>
7272
<div>已提供项目模板方便快速上手 <a class="connection-link" href="@TemplateUrl" target="_blank">项目模板</a></div>
7373
</div>

src/BootstrapBlazor.Server/Components/Layout/ComponentLayout.razor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
const el = document.querySelector(anchor)
66
if (el) {
77
const handler = setTimeout(() => {
8-
el.scrollIntoView({ behavior: 'smooth', block: 'center' })
8+
el.scrollIntoView({ behavior: 'smooth', block: 'start' })
99
clearTimeout(handler)
1010
}, 1000)
1111
}

src/BootstrapBlazor.Server/Components/Pages/Install_Server.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</ScriptsTemplate>
2222
<ServicesTemplate>
2323
<ul class="ul-demo">
24-
<li><code>Program.cs</code> <b>NET6/NET7/NET8/NET9</b></li>
24+
<li><code>Program.cs</code> <b>NET6/NET7/NET8/NET9/NET10</b></li>
2525
</ul>
2626
<p><b>Startup.cs</b></p>
2727
<Pre>namespace MyBlazorAppName

0 commit comments

Comments
 (0)