feat: support .NET 11 preview

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

@@ -17,7 +17,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 10.0.x
+          global-json-file: global.json
 
       - 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: 10.0.x
+        global-json-file: global.json
 
     - name: Cache NuGet packages
       uses: actions/cache@v4

.github/workflows/pack.yml

@@ -20,7 +20,7 @@ jobs:
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 10.0.x
+        global-json-file: global.json
 
     - 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: 10.0.x
+        global-json-file: global.json
 
     - name: Publish wasm
       run: |

Version.props

@@ -1,8 +1,8 @@
 <Project>
 
   <PropertyGroup>
-    <RunTargetFramework>net10.0</RunTargetFramework>
-    <RunTargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</RunTargetFrameworks>
+    <RunTargetFramework>net11.0</RunTargetFramework>
+    <RunTargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0;net11.0</RunTargetFrameworks>
   </PropertyGroup>
 
 </Project>

global.json

@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "11.0.100-preview.7.26381.103",
+    "rollForward": "latestPatch",
+    "allowPrerelease": true
+  }
+}

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

@@ -16,9 +16,11 @@
 &lt/div>
 
 // add ReconnectorOutlet component
-<b><i>&lt;component type="typeof(ReconnectorOutlet)" param-AutoReconnect="true" render-mode="ServerPrerendered" /&gt;</i></b></Pre>
+<b><i>&lt;ReconnectorOutlet AutoReconnect="true" ReconnectInterval="5000" @@rendermode="new InteractiveServerRenderMode(false)" /&gt;</i></b></Pre>
 
-<p>组件参数 <code>AutoReconnect</code> 用于控制是否开启网络重连，默认 <code>true</code> 已开启，可以通过 <code>param-AutoReconnect="false"</code> 关闭</p>
+<p><code>AutoReconnect</code> 用于控制是否在连接中断后自动检测服务是否恢复。默认 <code>true</code>；检测到服务恢复时，页面会自动重新加载。设置为 <code>false</code> 可关闭此行为。</p>
+
+<p><code>ReconnectInterval</code> 用于设置检测间隔，默认 <code>5000</code> 毫秒，最小值为 <code>1000</code> 毫秒。</p>
 
 <p>@((MarkupString)Localizer["Step2"].Value)</p>
 
@@ -269,3 +271,5 @@
 &lt;/ReconnectRejectedTemplate&gt;</Pre>
 
 <AttributeTable Type="typeof(Reconnector)" />
+
+<AttributeTable Type="typeof(ReconnectorOutlet)" />

src/BootstrapBlazor.Server/Dockerfile

@@ -1,7 +1,7 @@
 #Depending on the operating system of the host machines(s) that will build or run the containers, the image specified in the FROM statement may need to be changed.
 #For more information, please see https://aka.ms/containercompat
 
-FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:11.0-preview AS base
 WORKDIR /app
 EXPOSE 8080
 
@@ -11,7 +11,7 @@ RUN apt install -y ./google-chrome-stable_current_amd64.deb
 RUN rm ./google-chrome-stable_current_amd64.deb
 RUN apt install -y fonts-wqy-microhei
 
-FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:11.0-preview AS build
 WORKDIR /
 COPY . .
 

src/BootstrapBlazor/Components/Reconnector/ReconnectorContent.razor

@@ -1,6 +1,6 @@
 @namespace BootstrapBlazor.Components
 @inherits BootstrapModuleComponentBase
-@attribute [BootstrapModuleAutoLoader("Reconnector/ReconnectorContent.razor.js", AutoInvokeDispose = false)]
+@attribute [BootstrapModuleAutoLoader("Reconnector/ReconnectorContent.razor.js")]
 
 <div id="components-reconnect-modal" data-nosnippet>
     <div class="reconnect-state show">

src/BootstrapBlazor/Components/Reconnector/ReconnectorContent.razor.cs

@@ -67,7 +67,7 @@ protected override async Task InvokeInitAsync()
     {
         if (AutoReconnect)
         {
-            await InvokeVoidAsync("reconnect", Math.Max(1000, ReconnectInterval));
+            await InvokeVoidAsync("init", Id, Math.Max(1000, ReconnectInterval));
         }
     }
 

src/BootstrapBlazor/Components/Reconnector/ReconnectorContent.razor.js

@@ -1,26 +1,93 @@
-export function reconnect(interval) {
-    const reconnectHandler = setInterval(async () => {
-        const com = document.getElementById('components-reconnect-modal')
-        if (com) {
-            if (com.classList.length === 0 || com.classList.contains('components-reconnect-hide')) {
-                return
-            }
-            else {
-                clearInterval(reconnectHandler)
-
-                async function attemptReload() {
-                    try {
-                        await fetch('')
-                        if (reloadHandler) {
-                            clearInterval(reloadHandler)
-                        }
-                        location.reload()
-                    }
-                    catch { }
-                }
-                await attemptReload()
-                const reloadHandler = setInterval(attemptReload, interval)
+import EventHandler from "../../modules/event-handler.js"
+import Data from "../../modules/data.js"
+
+export function init(id, interval) {
+    dispose(id);
+
+    const modal = document.getElementById('components-reconnect-modal');
+    if (modal === null) {
+        return;
+    }
+
+    let reloadHandler;
+    let reloadInProgress = false;
+    let disposed = false;
+
+    const stopReloading = () => {
+        if (reloadHandler !== undefined) {
+            clearInterval(reloadHandler);
+            reloadHandler = undefined;
+        }
+    };
+
+    const attemptReload = async () => {
+        if (disposed || reloadInProgress) {
+            return;
+        }
+
+        try {
+            const response = await fetch('', { cache: 'no-store' });
+            if (!disposed && response.ok) {
+                reloadInProgress = true;
+                stopReloading();
+                location.reload();
             }
         }
-    }, interval)
+        catch {
+        }
+    };
+
+    const startReloading = () => {
+        if (reloadHandler !== undefined) {
+            return;
+        }
+
+        reloadHandler = setInterval(attemptReload, interval);
+        void attemptReload();
+    };
+
+    const updateReloading = () => {
+        if (modal.classList.length === 0 || modal.classList.contains('components-reconnect-hide')) {
+            stopReloading();
+        }
+        else {
+            startReloading();
+        }
+    };
+
+    const stateChanged = event => {
+        if (event.detail?.state === 'hide') {
+            stopReloading();
+        }
+        else {
+            startReloading();
+        }
+    };
+
+    const observer = new MutationObserver(updateReloading);
+    observer.observe(modal, { attributes: true, attributeFilter: ['class'] });
+    EventHandler.on(modal, 'components-reconnect-state-changed.bb.reconnector', stateChanged);
+
+    Data.set(id, {
+        modal,
+        observer,
+        stateChanged,
+        dispose: () => {
+            disposed = true;
+            stopReloading();
+        }
+    });
+    updateReloading();
+}
+
+export function dispose(id) {
+    const reconnector = Data.get(id);
+    if (reconnector === null) {
+        return;
+    }
+
+    Data.remove(id);
+    reconnector.observer.disconnect();
+    EventHandler.off(reconnector.modal, 'components-reconnect-state-changed.bb.reconnector', reconnector.stateChanged);
+    reconnector.dispose();
 }

src/BootstrapBlazor/Directory.Build.props

@@ -27,6 +27,7 @@
     <NET8Version>8.0.*</NET8Version>
     <NET9Version>9.0.*</NET9Version>
     <NET10Version>10.0.0</NET10Version>
+    <NET11Version>11.0.0-rc.*</NET11Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
@@ -75,7 +76,16 @@
     <PackageReference Include="Microsoft.Extensions.Http" Version="$(NET10Version)" />
     <PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET10Version)" />
   </ItemGroup>
-
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net11.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="$(NET11Version)" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(NET11Version)" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(NET11Version)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(NET11Version)" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="$(NET11Version)" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET11Version)" />
+  </ItemGroup>
+
   <ItemGroup>
     <SupportedPlatform Include="browser" />
   </ItemGroup>