Skip to content

Commit c7b6ccf

Browse files
alexyakuninalexyakunin
committedDec 24, 2020
misc: Update Fusion to the latest version.
1 parent 5e5846c commit c7b6ccf

File tree

17 files changed

+29
-36
lines changed

17 files changed

+29
-36
lines changed
 

‎docs/tutorial/Tutorial.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.10" />
25-
<PackageReference Include="Stl.Fusion.Client" Version="0.8.3" />
26-
<PackageReference Include="Stl.Fusion.Server" Version="0.8.3" />
27-
<PackageReference Include="Stl.Fusion.Blazor" Version="0.8.3" />
25+
<PackageReference Include="Stl.Fusion.Client" Version="0.8.7" />
26+
<PackageReference Include="Stl.Fusion.Server" Version="0.8.7" />
27+
<PackageReference Include="Stl.Fusion.Blazor" Version="0.8.7" />
2828
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20303.1" />
2929
<PackageReference Include="System.CommandLine.DragonFruit" Version="0.3.0-alpha.20303.1" />
3030
</ItemGroup>

‎src/Blazor/Abstractions/Abstractions.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.0" />
15-
<PackageReference Include="Stl.Fusion.Client" Version="0.8.3" />
15+
<PackageReference Include="Stl.Fusion.Client" Version="0.8.7" />
1616
</ItemGroup>
1717

1818
</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.0" />
15-
<PackageReference Include="Stl.Fusion.Client" Version="0.8.3" />
15+
<PackageReference Include="Stl.Fusion.Client" Version="0.8.7" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Blazor/ConsoleUI/ConsoleUI.csproj

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

1212
<ItemGroup>
1313
<PackageReference Include="Pluralize.NET" Version="1.0.2" />
14-
<PackageReference Include="Stl.Fusion.Client" Version="0.8.3" />
14+
<PackageReference Include="Stl.Fusion.Client" Version="0.8.7" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎src/Blazor/Server/Server.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.1" />
1515
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.1" />
1616
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.1" />
17-
<PackageReference Include="Stl.Fusion.Server" Version="0.8.3" />
17+
<PackageReference Include="Stl.Fusion.Server" Version="0.8.7" />
1818
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
1919
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
2020
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.2" />

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using Microsoft.EntityFrameworkCore;
22
using Samples.Blazor.Abstractions;
3-
using Samples.Helpers;
43

54
namespace Samples.Blazor.Server.Services
65
{
@@ -9,8 +8,7 @@ public class AppDbContext : DbContext
98
public DbSet<ChatUser> ChatUsers { get; protected set; } = null!;
109
public DbSet<ChatMessage> ChatMessages { get; protected set; } = null!;
1110

12-
public AppDbContext(DbContextOptions options) : base(options)
13-
=> this.DisableChangeTracking();
11+
public AppDbContext(DbContextOptions options) : base(options) { }
1412

1513
protected override void OnModelCreating(ModelBuilder modelBuilder)
1614
{

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Security.Claims;
5+
using System.Security.Principal;
56
using System.Threading;
67
using System.Threading.Tasks;
78
using AspNet.Security.OAuth.GitHub;
@@ -22,7 +23,7 @@ public async Task SyncAsync(ClaimsPrincipal principal, SessionInfo sessionInfo,
2223
CancellationToken cancellationToken = default)
2324
{
2425
var user = await AuthService.GetUserAsync(session, cancellationToken).ConfigureAwait(false);
25-
if (user.Identity.Name == principal.Identity?.Name)
26+
if (((IPrincipal) user).Identity?.Name == principal.Identity?.Name)
2627
return;
2728

2829
var authenticationType = principal.Identity?.AuthenticationType ?? "";

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

+7-9
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,9 @@ public async Task<ChatUser> CreateUserAsync(string name, CancellationToken cance
4646
name = await NormalizeNameAsync(name, cancellationToken).ConfigureAwait(false);
4747
await using var dbContext = CreateDbContext();
4848

49-
var userEntry = dbContext.ChatUsers.Add(new ChatUser() {
50-
Name = name
51-
});
49+
var user = new ChatUser() { Name = name };
50+
await dbContext.ChatUsers.AddAsync(user, cancellationToken).ConfigureAwait(false);
5251
await dbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
53-
var user = userEntry.Entity;
5452

5553
// Invalidation
5654
Computed.Invalidate(() => GetUserAsync(user.Id, CancellationToken.None));
@@ -63,9 +61,9 @@ public async Task<ChatUser> SetUserNameAsync(long id, string name, CancellationT
6361
name = await NormalizeNameAsync(name, cancellationToken).ConfigureAwait(false);
6462
await using var dbContext = CreateDbContext();
6563

66-
var user = await GetUserAsync(id, cancellationToken).ConfigureAwait(false);
64+
var user = await dbContext.ChatUsers.AsQueryable()
65+
.SingleAsync(u => u.Id == id, cancellationToken).ConfigureAwait(false);
6766
user.Name = name;
68-
dbContext.ChatUsers.Update(user);
6967
await dbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
7068

7169
// Invalidation
@@ -79,13 +77,13 @@ public async Task<ChatMessage> AddMessageAsync(long userId, string text, Cancell
7977
await using var dbContext = CreateDbContext();
8078

8179
await GetUserAsync(userId, cancellationToken).ConfigureAwait(false); // Check to ensure the user exists
82-
var messageEntry = dbContext.ChatMessages.Add(new ChatMessage() {
80+
var message = new ChatMessage() {
8381
CreatedAt = DateTime.UtcNow,
8482
UserId = userId,
8583
Text = text,
86-
});
84+
};
85+
await dbContext.ChatMessages.AddAsync(message, cancellationToken).ConfigureAwait(false);
8786
await dbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
88-
var message = messageEntry.Entity;
8987

9088
// Invalidation
9189
Computed.Invalidate(EveryChatTail);

‎src/Blazor/UI/UI.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.1" PrivateAssets="all" />
1414
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
1515
<PackageReference Include="Pluralize.NET" Version="1.0.2" />
16-
<PackageReference Include="Stl.Fusion.Blazor" Version="0.8.3" />
16+
<PackageReference Include="Stl.Fusion.Blazor" Version="0.8.7" />
1717
<PackageReference Include="UAParser" Version="3.1.44" />
1818
</ItemGroup>
1919

‎src/Caching/Common/Common.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
1212
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
13-
<PackageReference Include="Stl.Fusion.Client" Version="0.8.3" />
13+
<PackageReference Include="Stl.Fusion.Client" Version="0.8.7" />
1414
</ItemGroup>
1515
</Project>

‎src/Caching/Server/Server.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
1717
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.1" />
18-
<PackageReference Include="Stl.Fusion.Server" Version="0.8.3" />
18+
<PackageReference Include="Stl.Fusion.Server" Version="0.8.7" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

‎src/HelloBlazorServer/HelloBlazorServer.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Pluralize.NET" Version="1.0.2" />
13-
<PackageReference Include="Stl.Fusion.Blazor" Version="0.8.3" />
14-
<PackageReference Include="Stl.Fusion.Server" Version="0.8.3" />
13+
<PackageReference Include="Stl.Fusion.Blazor" Version="0.8.7" />
14+
<PackageReference Include="Stl.Fusion.Server" Version="0.8.7" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎src/HelloBlazorServer/Models/WeatherForecast.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ public class WeatherForecast
77
public DateTime Date { get; set; }
88
public int TemperatureC { get; set; }
99
public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
10-
public string Summary { get; set; }
10+
public string Summary { get; set; } = "";
1111
}
1212
}

‎src/HelloBlazorServer/Services/TimeService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public virtual Task<string> GetMomentsAgoAsync(DateTime time)
3131
// Invalidate the result when it's supposed to change
3232
var delay = (unitCount + 1) * unit - delta;
3333
var computed = Computed.GetCurrent();
34-
Task.Delay(delay, default).ContinueWith(_ => computed.Invalidate()).Ignore();
34+
Task.Delay(delay, default).ContinueWith(_ => computed!.Invalidate()).Ignore();
3535

3636
return Task.FromResult(result);
3737
}

‎src/HelloBlazorServer/Shared/NavMenu.razor

+3-7
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,8 @@
3131
</div>
3232

3333
@code {
34-
private bool collapseNavMenu = true;
34+
private bool IsNavMenuCollapsed { get; set; } = true;
35+
private string? NavMenuCssClass => IsNavMenuCollapsed ? "collapse" : null;
3536

36-
private string NavMenuCssClass => collapseNavMenu ? "collapse" : null;
37-
38-
private void ToggleNavMenu()
39-
{
40-
collapseNavMenu = !collapseNavMenu;
41-
}
37+
private void ToggleNavMenu() => IsNavMenuCollapsed = !IsNavMenuCollapsed;
4238
}

‎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="0.8.3" />
12+
<PackageReference Include="Stl.Fusion" Version="0.8.7" />
1313
</ItemGroup>
1414
</Project>

‎src/Helpers/Helpers.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" />
12-
<PackageReference Include="Stl.Fusion" Version="0.8.3" />
12+
<PackageReference Include="Stl.Fusion" Version="0.8.7" />
1313
</ItemGroup>
1414
</Project>

0 commit comments

Comments
 (0)