feat(NET10): add NET10 support

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

@@ -17,7 +17,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
 
       - name: Cache NuGet packages
         uses: actions/cache@v4

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Cache NuGet packages
       uses: actions/cache@v4

.github/workflows/publish.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Publish wasm
       run: |

Version.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <RunTargetFramework>net9.0</RunTargetFramework>
+    <RunTargetFramework>net10.0</RunTargetFramework>
   </PropertyGroup>
 
 </Project>

scripts/linux/ba.blazor.service

@@ -7,7 +7,7 @@ Description=Bootstrap Blazor Application
 Type=simple
 WorkingDirectory=/usr/local/ba/blazor
 Environment=ASPNETCORE_ENVIRONMENT=Production
-ExecStart=/usr/bin/dotnet BootstrapBlazor.Server.dll --urls http://localhost:50853
+ExecStart=dotnet BootstrapBlazor.Server.dll --urls http://localhost:50853
 ExecStop=/bin/kill -2 $MAINPID
 KillMode=process
 Restart=on-failure

scripts/linux/deploy-blazor.sh

@@ -10,6 +10,6 @@ curl https://www.blazor.zone/api/dispatch?token=BootstrapBlazor-Reboot
 dotnet publish src/BootstrapBlazor.Server -c Release
 
 systemctl stop ba.blazor
-\cp -fr ~/BootstrapBlazor/src/BootstrapBlazor.Server/bin/Release/net9.0/publish/* /usr/local/ba/blazor
+\cp -fr ~/BootstrapBlazor/src/BootstrapBlazor.Server/bin/Release/net10.0/publish/* /usr/local/ba/blazor
 systemctl start ba.blazor
 systemctl status ba.blazor -l --no-pager

scripts/linux/deploy.sh

@@ -27,6 +27,7 @@ sudo systemctl enable ba.blazor
 
 echo "*********************** install nginx ***********************"
 yes|sudo apt install nginx
+mkdir /usr/share/nginx/logs
 
 echo "*********************** copy nginx config ***********************"
 sudo cp BootstrapBlazor/scripts/linux/nginx.conf /etc/nginx/

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

@@ -67,7 +67,7 @@
         <div class="d-flex">
             <div class="flex-fill">
                 <p>一套基于 <b>Bootstrap</b> 样式的企业级 <b>Blazor UI</b> 组件库，支持 Server 与 WebAssembly</p>
-                <p>适配移动端支持各种主流浏览器以及移动端，适配 <b>ABP</b>，同时支持 <b>NET6/NET7/NET8/NET9</b></p>
+                <p>适配移动端支持各种主流浏览器以及移动端，适配 <b>ABP</b>，同时支持 <b>NET6/NET7/NET8/NET9/NET10</b></p>
                 <p></p>
                 <div>已提供项目模板方便快速上手 <a class="connection-link" href="@TemplateUrl" target="_blank">项目模板</a></div>
             </div>

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

@@ -5,7 +5,7 @@
         const el = document.querySelector(anchor)
         if (el) {
             const handler = setTimeout(() => {
-                el.scrollIntoView({ behavior: 'smooth', block: 'center' })
+                el.scrollIntoView({ behavior: 'smooth', block: 'start' })
                 clearTimeout(handler)
             }, 1000)
         }

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

@@ -21,7 +21,7 @@
     </ScriptsTemplate>
     <ServicesTemplate>
         <ul class="ul-demo">
-            <li><code>Program.cs</code> <b>NET6/NET7/NET8/NET9</b></li>
+            <li><code>Program.cs</code> <b>NET6/NET7/NET8/NET9/NET10</b></li>
         </ul>
         <p><b>Startup.cs</b></p>
         <Pre>namespace MyBlazorAppName

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

@@ -46,7 +46,7 @@ static async Task SetCultureAsync(WebAssemblyHost host)
     </ServicesTemplate>
     <RootTemplate>
         <ul class="ul-demo">
-            <li><code>App.razor</code> <b>NET6/NET7/NET8/NET9</b></li>
+            <li><code>App.razor</code> <b>NET6/NET7/NET8/NET9/NET10</b></li>
         </ul>
 
         <Pre>// NET6/NET7

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

@@ -0,0 +1,12 @@
+@page "/not-found"
+@layout MainLayout
+@inject NavigationManager NavigationManager
+
+@code {
+    protected override void OnInitialized()
+    {
+        base.OnInitialized();
+
+        NavigationManager.NavigateTo("/");
+    }
+}

src/BootstrapBlazor.Server/Components/Routes.razor

@@ -1,4 +1,4 @@
-<Router AppAssembly="@typeof(Program).Assembly">
+<Router AppAssembly="@typeof(Program).Assembly" NotFoundPage="typeof(Pages.NotFound)">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
         <FocusOnNavigate RouteData="routeData" Selector="h3" />

src/BootstrapBlazor.Server/Components/Samples/Reconnectors.razor

@@ -97,7 +97,7 @@
                 <div class="d-flex">
                     <div class="flex-fill">
                         <p>基于 <b>Bootstrap</b> 样式的 <b>Blazor UI</b> 组件库</p>
-                        <p>适配移动端支持各种主流浏览器，适配 <b>ABP</b>，同时支持 <b>NET6/NET7/NET8/NET9</b>，交流群 <b>795206915</b></p>
+                        <p>适配移动端支持各种主流浏览器，适配 <b>ABP</b>，同时支持 <b>NET6/NET7/NET8/NET9/NET10</b>，交流群 <b>795206915</b></p>
                         <p>已提供项目模板方便快速上手 <a class="connection-link" href="@TemplateUrl">项目模板</a></p>
                     </div>
                     <div class="connection-body-tail d-none d-sm-block"></div>
@@ -126,7 +126,7 @@
                 &lt;div class="d-flex"&gt;
                     &lt;div class="flex-fill"&gt;
                         &lt;div class="mb-2"&gt;基于 &lt;b&gt;Bootstrap&lt;/b&gt; 样式的 &lt;b&gt;Blazor UI&lt;/b&gt; 组件库&lt;/div&gt;
-                        &lt;div class="mb-2"&gt;适配移动端支持各种主流浏览器，适配 &lt;b&gt;ABP&lt;/b&gt;，同时支持 &lt;b&gt;NET6/NET7/NET8/NET9&lt;/b&gt;，交流群 &lt;b&gt;795206915&lt;/b&gt;&lt;/div&gt;
+                        &lt;div class="mb-2"&gt;适配移动端支持各种主流浏览器，适配 &lt;b&gt;ABP&lt;/b&gt;，同时支持 &lt;b&gt;NET6/NET7/NET8/NET9/NET10&lt;/b&gt;，交流群 &lt;b&gt;795206915&lt;/b&gt;&lt;/div&gt;
                         &lt;div&gt;已提供项目模板方便快速上手 &lt;a class="connection-link" href="@TemplateUrl"&gt;项目模板&lt;/a&gt;&lt;/div&gt;
                     &lt;/div&gt;
                     &lt;div class="connection-body-tail d-none d-sm-block"&gt;&lt;/div&gt;
@@ -187,7 +187,7 @@
                 &lt;div class="d-flex"&gt;
                     &lt;div class="flex-fill"&gt;
                         &lt;div class="mb-2"&gt;基于 &lt;b&gt;Bootstrap&lt;/b&gt; 样式的 &lt;b&gt;Blazor UI&lt;/b&gt; 组件库&lt;/div&gt;
-                        &lt;div class="mb-2"&gt;适配移动端支持各种主流浏览器，适配 &lt;b&gt;ABP&lt;/b&gt;，同时支持 &lt;b&gt;NET6/NET7/NET8/NET9&lt;/b&gt;，交流群 &lt;b&gt;795206915&lt;/b&gt;&lt;/div&gt;
+                        &lt;div class="mb-2"&gt;适配移动端支持各种主流浏览器，适配 &lt;b&gt;ABP&lt;/b&gt;，同时支持 &lt;b&gt;NET6/NET7/NET8/NET9/NET10&lt;/b&gt;，交流群 &lt;b&gt;795206915&lt;/b&gt;&lt;/div&gt;
                         &lt;div&gt;已提供项目模板方便快速上手 &lt;a class="connection-link" href="@TemplateUrl"&gt;项目模板&lt;/a&gt;&lt;/div&gt;
                     &lt;/div&gt;
                     &lt;div class="connection-body-tail d-none d-sm-block"&gt;&lt;/div&gt;
@@ -248,7 +248,7 @@
                 &lt;div class="d-flex"&gt;
                     &lt;div class="flex-fill"&gt;
                         &lt;div class="mb-2"&gt;基于 &lt;b&gt;Bootstrap&lt;/b&gt; 样式的 &lt;b&gt;Blazor UI&lt;/b&gt; 组件库&lt;/div&gt;
-                        &lt;div class="mb-2"&gt;适配移动端支持各种主流浏览器，适配 &lt;b&gt;ABP&lt;/b&gt;，同时支持 &lt;b&gt;NET6/NET7/NET8/NET9&lt;/b&gt;，交流群 &lt;b&gt;795206915&lt;/b&gt;&lt;/div&gt;
+                        &lt;div class="mb-2"&gt;适配移动端支持各种主流浏览器，适配 &lt;b&gt;ABP&lt;/b&gt;，同时支持 &lt;b&gt;NET6/NET7/NET8/NET9/NET10&lt;/b&gt;，交流群 &lt;b&gt;795206915&lt;/b&gt;&lt;/div&gt;
                         &lt;div&gt;已提供项目模板方便快速上手 &lt;a class="connection-link" href="@TemplateUrl"&gt;项目模板&lt;/a&gt;&lt;/div&gt;
                     &lt;/div&gt;
                     &lt;div class="connection-body-tail d-none d-sm-block"&gt;&lt;/div&gt;

src/BootstrapBlazor.Server/Locales/en-US.json

@@ -34,7 +34,7 @@
     "CopiedText": "Copied"
   },
   "BootstrapBlazor.Server.Components.Pages.Index": {
-    "Support": "Support NET6.0 & NET7.0 & NET8.0 & NET9.0",
+    "Support": "Support NET6.0 & NET7.0 & NET8.0 & NET9.0 & NET10.0",
     "Title": "Bootstrap Blazor UI",
     "SubTitle": "BootstrapBlazor is an enterprise-grade library that fuses Bootstrap with Blazor, offering developers a powerful toolkit for building responsive and interactive web applications effortlessly.",
     "Docs": "Read the docs",

src/BootstrapBlazor.Server/Locales/zh-CN.json

@@ -34,7 +34,7 @@
     "CopiedText": "复制代码成功"
   },
   "BootstrapBlazor.Server.Components.Pages.Index": {
-    "Support": "支持 NET6.0 & NET7.0 & NET8.0 & NET9.0",
+    "Support": "支持 NET6.0 & NET7.0 & NET8.0 & NET9.0 & NET10.0",
     "Title": "Bootstrap Blazor UI",
     "SubTitle": "BootstrapBlazor 是一套基于 Bootstrap 和 Blazor 的企业级组件库，无缝整合了 Bootstrap 框架与 Blazor 技术。它提供了一整套强大的工具，使开发者能够轻松创建响应式和交互式的 Web 应用程序。",
     "Docs": "阅读文档",

src/BootstrapBlazor/Directory.Build.props

@@ -17,14 +17,15 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
     <NET6Version>6.0.*</NET6Version>
     <NET7Version>7.0.*</NET7Version>
     <NET8Version>8.0.*</NET8Version>
     <NET9Version>9.0.*</NET9Version>
+    <NET10Version>10.0.0-rc*</NET10Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
@@ -69,6 +70,16 @@
     <PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET9Version)" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="$(NET10Version)" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(NET10Version)" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(NET10Version)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(NET10Version)" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="$(NET10Version)" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(NET10Version)" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET10Version)" />
+  </ItemGroup>
+
   <ItemGroup>
     <SupportedPlatform Include="browser" />
   </ItemGroup>

test/UnitTest/Utils/UtilityTest.cs

@@ -393,7 +393,7 @@ public void GetJsonStringByTypeName_UseKeyWhenValueIsNull()
 
         var test1 = items.FirstOrDefault(i => i.Name == "Test-Null");
         Assert.NotNull(test1);
-        Assert.Equal("", test1.Value);
+        Assert.Equal("Test-Null", test1.Value);
 
         var test2 = items.FirstOrDefault(i => i.Name == "Test-Key");
         Assert.NotNull(test2);