Skip to content

Commit 75b6063

Browse files
dorthldorthl
authored
Merge pull request #371 from KhanbalaRashidov/main
Update .Net8.0
2 parents ba588fa + f8c5ff8 commit 75b6063

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+272
-593
lines changed

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "7.0.400"
3+
"version": "8.0.101"
44
}
55
}

‎src/Blogifier.Admin/BlogAuthStateProvider.cs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,13 @@
77

88
namespace Blogifier.Admin;
99

10-
public class BlogAuthStateProvider : AuthenticationStateProvider
10+
public class BlogAuthStateProvider(ILogger<BlogAuthStateProvider> logger,
11+
HttpClient httpClient) : AuthenticationStateProvider
1112
{
12-
private readonly ILogger _logger;
13-
protected readonly HttpClient _httpClient;
13+
private readonly ILogger _logger = logger;
14+
protected readonly HttpClient _httpClient = httpClient;
1415
protected AuthenticationState? _state;
1516

16-
public BlogAuthStateProvider(ILogger<BlogAuthStateProvider> logger, HttpClient httpClient)
17-
{
18-
_logger = logger;
19-
_httpClient = httpClient;
20-
}
21-
2217
public override async Task<AuthenticationState> GetAuthenticationStateAsync()
2318
{
2419
if (_state == null)

‎src/Blogifier.Admin/Blogifier.Admin.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<Nullable>enable</Nullable>
55
<!-- <BlazorEnableCompression>false</BlazorEnableCompression> -->
66
<!--<SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>
@@ -11,10 +11,10 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.10" />
15-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.10" />
16-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.10" PrivateAssets="all" />
17-
<PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.10" />
14+
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.6" />
15+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.6" />
16+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.6" PrivateAssets="all" />
17+
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.6" />
1818
<PackageReference Include="Sotsera.Blazor.Toaster" Version="3.0.0" />
1919
</ItemGroup>
2020

‎src/Blogifier.Admin/Interop/CommonJsInterop.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ public class CommonJsInterop : IAsyncDisposable
99
{
1010
private readonly Lazy<Task<IJSObjectReference>> moduleTask;
1111

12-
public CommonJsInterop(IJSRuntime jsRuntime)
13-
{
12+
public CommonJsInterop(IJSRuntime jsRuntime) =>
1413
moduleTask = new(() => jsRuntime.InvokeAsync<IJSObjectReference>("import", "./admin/js/common.js").AsTask());
15-
}
1614

1715
public async ValueTask SetTooltipAsync()
1816
{

‎src/Blogifier.Admin/Interop/EditorJsInterop.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,10 @@
55

66
namespace Blogifier.Admin.Interop;
77

8-
public class EditorJsInterop : IAsyncDisposable
8+
public class EditorJsInterop(IJSRuntime jsRuntime) : IAsyncDisposable
99
{
10-
private readonly Lazy<Task<IJSObjectReference>> moduleTask;
11-
12-
public EditorJsInterop(IJSRuntime jsRuntime)
13-
{
14-
moduleTask = new(() => jsRuntime.InvokeAsync<IJSObjectReference>("import", "./admin/js/editor.js").AsTask());
15-
}
10+
private readonly Lazy<Task<IJSObjectReference>> moduleTask = new(() =>
11+
jsRuntime.InvokeAsync<IJSObjectReference>("import", "./admin/js/editor.js").AsTask());
1612

1713
public async ValueTask LoadEditorAsync(ElementReference? textarea, ElementReference? imageUpload, string toolbar = "fullToolbar")
1814
{

‎src/Blogifier.Admin/Services/ToasterService.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,10 @@
55

66
namespace Blogifier.Admin.Services;
77

8-
public class ToasterService
8+
public class ToasterService(IToaster toaster, IStringLocalizer<Resource> localizer)
99
{
10-
private readonly IToaster _toaster;
11-
private readonly IStringLocalizer<Resource> _localizer;
12-
public ToasterService(IToaster toaster, IStringLocalizer<Resource> localizer)
13-
{
14-
_toaster = toaster;
15-
_localizer = localizer;
16-
}
10+
private readonly IToaster _toaster = toaster;
11+
private readonly IStringLocalizer<Resource> _localizer = localizer;
1712

1813
public bool CheckResponse(HttpResponseMessage response)
1914
{

‎src/Blogifier.Shared/Blogifier.Shared.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.10" />
9+
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.6" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎src/Blogifier.Shared/Helper/DateTimeHelper.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,5 @@ public static string ToFriendlyShortDateString(DateTime? date, string defaultStr
1010
return ToFriendlyShortDateString(date.Value);
1111
}
1212

13-
public static string ToFriendlyShortDateString(DateTime date)
14-
{
15-
return $"{date:MMM dd}, {date.Year}";
16-
}
13+
public static string ToFriendlyShortDateString(DateTime date) => $"{date:MMM dd}, {date.Year}";
1714
}

‎src/Blogifier.Themes.Standard/Blogifier.Themes.Standard.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>

‎src/Blogifier/Blogifier.csproj

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<SelfContained>false</SelfContained>
77
<IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>
@@ -12,27 +12,26 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="AutoMapper" Version="12.0.1" />
16-
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
17-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.10" />
18-
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.10" />
19-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.10" />
20-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.10" />
21-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10">
15+
<PackageReference Include="AutoMapper" Version="13.0.1" />
16+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.6" />
17+
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.6" />
18+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.6" />
19+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.6" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
2221
<PrivateAssets>all</PrivateAssets>
2322
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2423
</PackageReference>
25-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.10" />
26-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.10" />
27-
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.10" />
28-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
29-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
24+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
25+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.6" />
26+
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.6" />
27+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
28+
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
3029
<PackageReference Include="Minio" Version="5.0.0" />
31-
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
32-
<PackageReference Include="ReverseMarkdown" Version="3.25.0" />
33-
<PackageReference Include="Markdig" Version="0.32.0" />
30+
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
31+
<PackageReference Include="ReverseMarkdown" Version="4.6.0" />
32+
<PackageReference Include="Markdig" Version="0.37.0" />
3433
<PackageReference Include="NETCore.MailKit" Version="2.1.0" />
35-
<PackageReference Include="System.ServiceModel.Syndication" Version="7.0.0" />
34+
<PackageReference Include="System.ServiceModel.Syndication" Version="8.0.0" />
3635
<PackageReference Include="Microsoft.SyndicationFeed.ReaderWriter" Version="1.0.2" />
3736
</ItemGroup>
3837

0 commit comments

Comments
 (0)