Skip to content

Commit d14544e

Browse files
alexyakuninalexyakunin
committed
misc: update Fusion to v1.10.6
1 parent 72ef60f commit d14544e

37 files changed

+133
-119
lines changed

‎docs/tutorial/Tutorial.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Stl.Fusion.Client" Version="1.9.1" />
22-
<PackageReference Include="Stl.Fusion.Server" Version="1.9.1" />
21+
<PackageReference Include="Stl.Fusion.Client" Version="1.10.6" />
22+
<PackageReference Include="Stl.Fusion.Server" Version="1.10.6" />
2323
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20303.1" />
2424
<PackageReference Include="System.CommandLine.DragonFruit" Version="0.3.0-alpha.20303.1" />
2525
</ItemGroup>

‎src/Blazor/Abstractions/Abstractions.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="5.0.9" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="5.0.10" />
1414
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
1515
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
16-
<PackageReference Include="Stl.Fusion.Client" Version="1.9.1" />
16+
<PackageReference Include="Stl.Fusion.Client" Version="1.10.6" />
1717
</ItemGroup>
1818

1919
</Project>

‎src/Blazor/Client/Client.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
1414
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
15-
<PackageReference Include="Stl.Fusion.Client" Version="1.9.1" />
15+
<PackageReference Include="Stl.Fusion.Client" Version="1.10.6" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Blazor/ConsoleClient/ConsoleClient.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Stl.Fusion.Client" Version="1.9.1" />
13+
<PackageReference Include="Stl.Fusion.Client" Version="1.10.6" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎src/Blazor/Server/Pages/_Host.cshtml

+15-10
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
@page "/"
22
@namespace Samples.Blazor.Server.Pages
33
@using Samples.Blazor.UI
4-
@using Stl.Async
4+
@using Stl.Fusion.Blazor
55
@using Stl.Fusion.Server.Authentication
66
@using Stl.Fusion.Server.Controllers
77
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
8-
@inject ServerAuthHelper ServerAuthHelper
9-
@inject ServerSettings ServerSettings
8+
@inject ServerAuthHelper _serverAuthHelper
9+
@inject ServerSettings _serverSettings
10+
@inject BlazorCircuitContext _blazorCircuitContext
1011
@{
11-
await Task.Run(() => ServerAuthHelper.UpdateAuthState(HttpContext));
12-
var authSchemas = await ServerAuthHelper.GetSchemas(HttpContext);
13-
var sessionId = ServerAuthHelper.Session.Id.Value;
12+
await _serverAuthHelper.UpdateAuthState(HttpContext);
13+
var authSchemas = await _serverAuthHelper.GetSchemas(HttpContext);
14+
var sessionId = _serverAuthHelper.Session.Id.Value;
1415
var isServerSideBlazor = BlazorModeController.IsServerSideBlazor(HttpContext);
15-
var isCloseWindowRequest = ServerAuthHelper.IsCloseWindowRequest(HttpContext, out var closeWindowFlowName);
16+
var isCloseWindowRequest = _serverAuthHelper.IsCloseWindowRequest(HttpContext, out var closeWindowFlowName);
1617
Layout = null;
1718
}
1819

@@ -44,9 +45,13 @@
4445
</div>
4546
} else {
4647
<app id="app">
47-
@(await Html.RenderComponentAsync<App>(
48-
isServerSideBlazor ? RenderMode.ServerPrerendered : RenderMode.WebAssemblyPrerendered,
49-
new { SessionId = sessionId }))
48+
@{
49+
using var prerendering = _blazorCircuitContext.Prerendering();
50+
var prerenderedApp = await Html.RenderComponentAsync<App>(
51+
isServerSideBlazor ? RenderMode.ServerPrerendered : RenderMode.WebAssemblyPrerendered,
52+
new { SessionId = sessionId });
53+
}
54+
@(prerenderedApp)
5055
</app>
5156

5257
<div id="blazor-error-ui">

‎src/Blazor/Server/Server.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
<ItemGroup>
1212
<PackageReference Include="AspNet.Security.OAuth.GitHub" Version="5.0.12" />
1313
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.2.0" />
14-
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="5.0.9" />
15-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.9" />
16-
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="5.0.9" />
17-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.9" />
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.9" />
14+
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="5.0.10" />
15+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.10" />
16+
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="5.0.10" />
17+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.10" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.10" />
1919
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.3" />
2020
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta11" />
21-
<PackageReference Include="Stl.Fusion.Server" Version="1.9.1" />
22-
<PackageReference Include="Stl.Fusion.EntityFramework" Version="1.9.1" />
21+
<PackageReference Include="Stl.Fusion.Server" Version="1.10.6" />
22+
<PackageReference Include="Stl.Fusion.EntityFramework" Version="1.10.6" />
2323
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.1" />
2424
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
2525
</ItemGroup>

‎src/Blazor/Server/Services/ChatService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public virtual Task<ChatPage> GetChatPage(long minMessageId, long maxMessageId,
126126
// Helpers
127127

128128
[ComputeMethod]
129-
protected virtual Task<Unit> PseudoGetAnyChatTail() => TaskEx.UnitTask;
129+
protected virtual Task<Unit> PseudoGetAnyChatTail() => TaskExt.UnitTask;
130130

131131
[CommandHandler(IsFilter = true, Priority = 1)]
132132
protected virtual async Task OnSignIn(SignInCommand command, CancellationToken cancellationToken)

‎src/Blazor/Server/Startup.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void ConfigureServices(IServiceCollection services)
6969
ServerSettings = tmpServices.GetRequiredService<ServerSettings>();
7070

7171
// DbContext & related services
72-
var appTempDir = PathEx.GetApplicationTempDirectory("", true);
72+
var appTempDir = PathExt.GetApplicationTempDirectory("", true);
7373
var dbPath = appTempDir & "App_v011.db";
7474
services.AddDbContextFactory<AppDbContext>(dbContext => {
7575
dbContext.UseSqlite($"Data Source={dbPath}");

‎src/Blazor/UI/UI.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
<PackageReference Include="Blazorise.DataGrid" Version="0.9.4.4" />
1515
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.4.4" />
1616
<PackageReference Include="Blazorise.Sidebar" Version="0.9.4.4" />
17-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.9" />
18-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.9" PrivateAssets="all" />
17+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.10" />
18+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.10" PrivateAssets="all" />
1919
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
20-
<PackageReference Include="Stl.Fusion.Blazor" Version="1.9.1" />
20+
<PackageReference Include="Stl.Fusion.Blazor" Version="1.10.6" />
2121
<PackageReference Include="UAParser" Version="3.1.46" />
2222
</ItemGroup>
2323

‎src/Caching/Common/Common.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.9" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.10" />
1212
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
13-
<PackageReference Include="Stl.Fusion.Client" Version="1.9.1" />
13+
<PackageReference Include="Stl.Fusion.Client" Version="1.10.6" />
1414
</ItemGroup>
1515
</Project>

‎src/Caching/Server/Server.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.9" />
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.9" />
19-
<PackageReference Include="Stl.Fusion.Server" Version="1.9.1" />
20-
<PackageReference Include="Stl.Fusion.EntityFramework" Version="1.9.1" />
17+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.10" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.10" />
19+
<PackageReference Include="Stl.Fusion.Server" Version="1.10.6" />
20+
<PackageReference Include="Stl.Fusion.EntityFramework" Version="1.10.6" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎src/HelloBlazorHybrid/Abstractions/Abstractions.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Stl.Fusion.Client" Version="1.9.1" />
14+
<PackageReference Include="Stl.Fusion.Client" Version="1.10.6" />
1515
</ItemGroup>
1616

1717
</Project>

‎src/HelloBlazorHybrid/Server/Server.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="AspNet.Security.OAuth.GitHub" Version="5.0.12" />
14-
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="5.0.9" />
15-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.9" />
16-
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="5.0.9" />
17-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.9" />
18-
<PackageReference Include="Stl.Fusion.EntityFramework" Version="1.9.1" />
19-
<PackageReference Include="Stl.Fusion.Server" Version="1.9.1" />
14+
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="5.0.10" />
15+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.10" />
16+
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="5.0.10" />
17+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.10" />
18+
<PackageReference Include="Stl.Fusion.EntityFramework" Version="1.10.6" />
19+
<PackageReference Include="Stl.Fusion.Server" Version="1.10.6" />
2020
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.1" />
2121
</ItemGroup>
2222

‎src/HelloBlazorHybrid/Services/ChatBotService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected virtual async Task OnChatPost(IChatService.PostCommand command, Cancel
4545
// Now we need to suppress ExecutionContext flow to ensure
4646
// Reaction runs its commands outside of the current command context,
4747
// outside Computed.Invalidate() block, etc.
48-
using var suppressing = ExecutionContextEx.SuppressFlow();
48+
using var suppressing = ExecutionContextExt.SuppressFlow();
4949
_ = Task.Run(() => Reaction(command, default), default);
5050
}
5151
}

‎src/HelloBlazorHybrid/Services/ChatService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ public virtual Task<int> GetMessageCount()
4646
}
4747

4848
[ComputeMethod]
49-
public virtual Task<Unit> GetAnyTail() => TaskEx.UnitTask;
49+
public virtual Task<Unit> GetAnyTail() => TaskExt.UnitTask;
5050
}
5151
}

‎src/HelloBlazorHybrid/Services/Services.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Stl.Fusion.EntityFramework" Version="1.9.1" />
17+
<PackageReference Include="Stl.Fusion.EntityFramework" Version="1.10.6" />
1818
</ItemGroup>
1919

2020
</Project>

‎src/HelloBlazorHybrid/UI/UI.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
<PackageReference Include="Blazorise.DataGrid" Version="0.9.4.4" />
1717
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.4.4" />
1818
<PackageReference Include="Blazorise.Sidebar" Version="0.9.4.4" />
19-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.9" />
20-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.9" PrivateAssets="all" />
19+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.10" />
20+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.10" PrivateAssets="all" />
2121
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
22-
<PackageReference Include="Stl.Fusion.Blazor" Version="1.9.1" />
22+
<PackageReference Include="Stl.Fusion.Blazor" Version="1.10.6" />
2323
<PackageReference Include="UAParser" Version="3.1.47" />
2424
</ItemGroup>
2525

‎src/HelloBlazorServer/HelloBlazorServer.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Stl.Fusion.Blazor" Version="1.9.1" />
13-
<PackageReference Include="Stl.Fusion.Server" Version="1.9.1" />
12+
<PackageReference Include="Stl.Fusion.Blazor" Version="1.10.6" />
13+
<PackageReference Include="Stl.Fusion.Server" Version="1.10.6" />
1414
</ItemGroup>
1515

1616
</Project>

‎src/HelloBlazorServer/Services/ChatBotService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected virtual async Task OnChatPost(ChatService.PostCommand command, Cancell
4444
// Now we need to suppress ExecutionContext flow to ensure
4545
// Reaction runs its commands outside of the current command context,
4646
// outside Computed.Invalidate() block, etc.
47-
using var suppressing = ExecutionContextEx.SuppressFlow();
47+
using var suppressing = ExecutionContextExt.SuppressFlow();
4848
_ = Task.Run(() => Reaction(command, default), default);
4949
}
5050
}

‎src/HelloBlazorServer/Services/ChatService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ public virtual Task<int> GetMessageCount()
5353
}
5454

5555
[ComputeMethod]
56-
protected virtual Task<Unit> PseudoGetAnyTail() => TaskEx.UnitTask;
56+
protected virtual Task<Unit> PseudoGetAnyTail() => TaskExt.UnitTask;
5757
}
5858
}

‎src/HelloCart/HelloCart.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.9" />
13-
<PackageReference Include="Stl.Fusion.Client" Version="1.9.1" />
14-
<PackageReference Include="Stl.Fusion.EntityFramework" Version="1.9.1" />
15-
<PackageReference Include="Stl.Fusion.Server" Version="1.9.1" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.10" />
13+
<PackageReference Include="Stl.Fusion.Client" Version="1.10.6" />
14+
<PackageReference Include="Stl.Fusion.EntityFramework" Version="1.10.6" />
15+
<PackageReference Include="Stl.Fusion.Server" Version="1.10.6" />
1616
</ItemGroup>
1717
</Project>

‎src/HelloCart/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
using var cts = new CancellationTokenSource();
5252
_ = app.Watch(cts.Token);
5353
await Task.Delay(700); // Just to make sure watch tasks print whatever they want before our prompt appears
54-
// await AutoRunner.RunAsync(app);
54+
// await AutoRunner.Run(app);
5555

5656
WriteLine();
5757
WriteLine("Change product price by typing [productId]=[price], e.g. \"apple=0\".");

‎src/HelloCart/v2/AppV2.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public AppV2()
2828
});
2929

3030
// Add AppDbContext & related services
31-
var appTempDir = PathEx.GetApplicationTempDirectory("", true);
31+
var appTempDir = PathExt.GetApplicationTempDirectory("", true);
3232
var dbPath = appTempDir & "HelloCart_v01.db";
3333
services.AddDbContextFactory<AppDbContext>(dbContext => {
3434
dbContext.UseSqlite($"Data Source={dbPath}");

‎src/HelloCart/v3/AppV3.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public AppV3()
2929
});
3030

3131
// Add AppDbContext & related services
32-
var appTempDir = PathEx.GetApplicationTempDirectory("", true);
32+
var appTempDir = PathExt.GetApplicationTempDirectory("", true);
3333
var dbPath = appTempDir & "HelloCart_v01.db";
3434
services.AddDbContextFactory<AppDbContext>(dbContext => {
3535
dbContext.UseSqlite($"Data Source={dbPath}");

‎src/HelloCart/v4/AppV4.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected IHost BuildHost(Uri baseUri)
4949
});
5050

5151
// Add AppDbContext & related services
52-
var appTempDir = PathEx.GetApplicationTempDirectory("", true);
52+
var appTempDir = PathExt.GetApplicationTempDirectory("", true);
5353
var dbPath = appTempDir & "HelloCart_v01.db";
5454
services.AddDbContextFactory<AppDbContext>(dbContext => {
5555
dbContext.UseSqlite($"Data Source={dbPath}");

‎src/HelloCommandR/HelloCommandR.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Stl.CommandR" Version="1.9.1" />
12+
<PackageReference Include="Stl.CommandR" Version="1.10.6" />
1313
</ItemGroup>
1414
</Project>

‎src/HelloWorld/HelloWorld.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Stl.Fusion" Version="1.9.1" />
12+
<PackageReference Include="Stl.Fusion" Version="1.10.6" />
1313
</ItemGroup>
1414
</Project>

‎templates/TodoApp/Abstractions/Abstractions.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
14-
<PackageReference Include="Stl.Fusion.Client" Version="1.9.1" />
14+
<PackageReference Include="Stl.Fusion.Client" Version="1.10.6" />
1515
</ItemGroup>
1616

1717
</Project>

‎templates/TodoApp/ConsoleClient/ConsoleClient.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Stl.Fusion.Client" Version="1.9.1"/>
13+
<PackageReference Include="Stl.Fusion.Client" Version="1.10.6"/>
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎templates/TodoApp/Host/Host.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
<ItemGroup>
1313
<PackageReference Include="AspNet.Security.OAuth.GitHub" Version="5.0.12" />
1414
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.2.0" />
15-
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="5.0.9" />
16-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.9" />
17-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.9" />
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.9" />
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.9" />
20-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.7" />
21-
<PackageReference Include="Stl.Fusion.Server" Version="1.9.1" />
15+
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="5.0.10" />
16+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.10" />
17+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.10" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.10" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.10" />
20+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.10" />
21+
<PackageReference Include="Stl.Fusion.Server" Version="1.10.6" />
2222
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.1" />
2323
</ItemGroup>
2424

‎templates/TodoApp/Host/Pages/_Host.cshtml

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
@page "/"
22
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
33
@namespace Templates.TodoApp.Host.Pages
4+
@using Stl.Fusion.Blazor
45
@using Templates.TodoApp.UI
56
@using Stl.Fusion.Server.Authentication
67
@using Stl.Fusion.Server.Controllers
78
@inject ServerAuthHelper _serverAuthHelper
89
@inject HostSettings _hostSettings
10+
@inject BlazorCircuitContext _blazorCircuitContext
911
@{
1012
await _serverAuthHelper.UpdateAuthState(HttpContext);
1113
var authSchemas = await _serverAuthHelper.GetSchemas(HttpContext);
@@ -42,9 +44,13 @@
4244
</div>
4345
} else {
4446
<app id="app">
45-
@(await Html.RenderComponentAsync<App>(
46-
isServerSideBlazor ? RenderMode.ServerPrerendered : RenderMode.WebAssemblyPrerendered,
47-
new { SessionId = sessionId }))
47+
@{
48+
using var prerendering = _blazorCircuitContext.Prerendering();
49+
var prerenderedApp = await Html.RenderComponentAsync<App>(
50+
isServerSideBlazor ? RenderMode.ServerPrerendered : RenderMode.WebAssemblyPrerendered,
51+
new { SessionId = sessionId });
52+
}
53+
@(prerenderedApp)
4854
</app>
4955

5056
<div id="blazor-error-ui">

0 commit comments

Comments
 (0)