Merge pull request #371 from KhanbalaRashidov/main

Update .Net8.0
blogifierdotnet · Jul 9, 2024 · 75b6063 · 75b6063
2 parents ba588fa + f8c5ff8
commit 75b6063
Show file tree

Hide file tree

Showing 59 changed files with 272 additions and 593 deletions.
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.400"
+    "version": "8.0.101"
   }
 }
diff --git a/src/Blogifier.Admin/BlogAuthStateProvider.cs b/src/Blogifier.Admin/BlogAuthStateProvider.cs
@@ -7,18 +7,13 @@
 
 namespace Blogifier.Admin;
 
-public class BlogAuthStateProvider : AuthenticationStateProvider
+public class BlogAuthStateProvider(ILogger<BlogAuthStateProvider> logger,
+  HttpClient httpClient) : AuthenticationStateProvider
 {
-  private readonly ILogger _logger;
-  protected readonly HttpClient _httpClient;
+  private readonly ILogger _logger = logger;
+  protected readonly HttpClient _httpClient = httpClient;
   protected AuthenticationState? _state;
 
-  public BlogAuthStateProvider(ILogger<BlogAuthStateProvider> logger, HttpClient httpClient)
-  {
-    _logger = logger;
-    _httpClient = httpClient;
-  }
-
   public override async Task<AuthenticationState> GetAuthenticationStateAsync()
   {
     if (_state == null)

diff --git a/src/Blogifier.Admin/Blogifier.Admin.csproj b/src/Blogifier.Admin/Blogifier.Admin.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <!-- <BlazorEnableCompression>false</BlazorEnableCompression> -->
     <!--<SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>
@@ -11,10 +11,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.10" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.6" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.6" />
     <PackageReference Include="Sotsera.Blazor.Toaster" Version="3.0.0" />
   </ItemGroup>
 

diff --git a/src/Blogifier.Admin/Interop/CommonJsInterop.cs b/src/Blogifier.Admin/Interop/CommonJsInterop.cs
@@ -9,10 +9,8 @@ public class CommonJsInterop : IAsyncDisposable
 {
   private readonly Lazy<Task<IJSObjectReference>> moduleTask;
 
-  public CommonJsInterop(IJSRuntime jsRuntime)
-  {
+  public CommonJsInterop(IJSRuntime jsRuntime) =>
     moduleTask = new(() => jsRuntime.InvokeAsync<IJSObjectReference>("import", "./admin/js/common.js").AsTask());
-  }
 
   public async ValueTask SetTooltipAsync()
   {

diff --git a/src/Blogifier.Admin/Interop/EditorJsInterop.cs b/src/Blogifier.Admin/Interop/EditorJsInterop.cs
@@ -5,14 +5,10 @@
 
 namespace Blogifier.Admin.Interop;
 
-public class EditorJsInterop : IAsyncDisposable
+public class EditorJsInterop(IJSRuntime jsRuntime) : IAsyncDisposable
 {
-  private readonly Lazy<Task<IJSObjectReference>> moduleTask;
-
-  public EditorJsInterop(IJSRuntime jsRuntime)
-  {
-    moduleTask = new(() => jsRuntime.InvokeAsync<IJSObjectReference>("import", "./admin/js/editor.js").AsTask());
-  }
+  private readonly Lazy<Task<IJSObjectReference>> moduleTask = new(() =>
+   jsRuntime.InvokeAsync<IJSObjectReference>("import", "./admin/js/editor.js").AsTask());
 
   public async ValueTask LoadEditorAsync(ElementReference? textarea, ElementReference? imageUpload, string toolbar = "fullToolbar")
   {

diff --git a/src/Blogifier.Admin/Services/ToasterService.cs b/src/Blogifier.Admin/Services/ToasterService.cs
@@ -5,15 +5,10 @@
 
 namespace Blogifier.Admin.Services;
 
-public class ToasterService
+public class ToasterService(IToaster toaster, IStringLocalizer<Resource> localizer)
 {
-  private readonly IToaster _toaster;
-  private readonly IStringLocalizer<Resource> _localizer;
-  public ToasterService(IToaster toaster, IStringLocalizer<Resource> localizer)
-  {
-    _toaster = toaster;
-    _localizer = localizer;
-  }
+  private readonly IToaster _toaster = toaster;
+  private readonly IStringLocalizer<Resource> _localizer = localizer;
 
   public bool CheckResponse(HttpResponseMessage response)
   {

diff --git a/src/Blogifier.Shared/Blogifier.Shared.csproj b/src/Blogifier.Shared/Blogifier.Shared.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.10" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.6" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Blogifier.Shared/Helper/DateTimeHelper.cs b/src/Blogifier.Shared/Helper/DateTimeHelper.cs
@@ -10,8 +10,5 @@ public static string ToFriendlyShortDateString(DateTime? date, string defaultStr
     return ToFriendlyShortDateString(date.Value);
   }
 
-  public static string ToFriendlyShortDateString(DateTime date)
-  {
-    return $"{date:MMM dd}, {date.Year}";
-  }
+  public static string ToFriendlyShortDateString(DateTime date) => $"{date:MMM dd}, {date.Year}";
 }
diff --git a/src/Blogifier.Themes.Standard/Blogifier.Themes.Standard.csproj b/src/Blogifier.Themes.Standard/Blogifier.Themes.Standard.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>

diff --git a/src/Blogifier/Blogifier.csproj b/src/Blogifier/Blogifier.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <SelfContained>false</SelfContained>
     <IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>
@@ -12,27 +12,26 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="12.0.1" />
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10">
+    <PackageReference Include="AutoMapper" Version="13.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.10" />
-    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.10" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.6" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
     <PackageReference Include="Minio" Version="5.0.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
-    <PackageReference Include="ReverseMarkdown" Version="3.25.0" />
-    <PackageReference Include="Markdig" Version="0.32.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
+    <PackageReference Include="ReverseMarkdown" Version="4.6.0" />
+    <PackageReference Include="Markdig" Version="0.37.0" />
     <PackageReference Include="NETCore.MailKit" Version="2.1.0" />
-    <PackageReference Include="System.ServiceModel.Syndication" Version="7.0.0" />
+    <PackageReference Include="System.ServiceModel.Syndication" Version="8.0.0" />
     <PackageReference Include="Microsoft.SyndicationFeed.ReaderWriter" Version="1.0.2" />
   </ItemGroup>
 

diff --git a/src/Blogifier/Blogs/AnalyticsProvider.cs b/src/Blogifier/Blogs/AnalyticsProvider.cs
@@ -12,10 +12,7 @@ public class AnalyticsProvider
 {
   private readonly AppDbContext _dbContext;
 
-  public AnalyticsProvider(AppDbContext dbContext)
-  {
-    _dbContext = dbContext;
-  }
+  public AnalyticsProvider(AppDbContext dbContext) => _dbContext = dbContext;
 
   public async Task<IEnumerable<BlogSumDto>> GetPostSummaryAsync()
   {

diff --git a/src/Blogifier/Blogs/BlogManager.cs b/src/Blogifier/Blogs/BlogManager.cs
@@ -9,23 +9,16 @@
 
 namespace Blogifier.Blogs;
 
-public class BlogManager
+public class BlogManager(
+  ILogger<BlogManager> logger,
+  IDistributedCache distributedCache,
+  OptionProvider optionProvider)
 {
-  private readonly ILogger _logger;
-  private readonly IDistributedCache _distributedCache;
-  private readonly OptionProvider _optionProvider;
+  private readonly ILogger _logger = logger;
+  private readonly IDistributedCache _distributedCache = distributedCache;
+  private readonly OptionProvider _optionProvider = optionProvider;
   private BlogData? _blogData;
 
-  public BlogManager(
-    ILogger<BlogManager> logger,
-    IDistributedCache distributedCache,
-    OptionProvider optionProvider)
-  {
-    _logger = logger;
-    _distributedCache = distributedCache;
-    _optionProvider = optionProvider;
-  }
-
   public async Task<BlogData> GetAsync()
   {
     if (_blogData != null) return _blogData;

diff --git a/src/Blogifier/Blogs/MainMamager.cs b/src/Blogifier/Blogs/MainMamager.cs
@@ -13,26 +13,18 @@
 
 namespace Blogifier.Blogs;
 
-public class MainMamager
+public class MainMamager(
+  IMapper mapper,
+  IDistributedCache distributedCache,
+  IHttpContextAccessor httpContextAccessor,
+  BlogManager blogManager,
+  CategoryProvider categoryProvider)
 {
-  private readonly IMapper _mapper;
-  private readonly IDistributedCache _distributedCache;
-  private readonly IHttpContextAccessor _httpContextAccessor;
-  private readonly BlogManager _blogManager;
-  private readonly CategoryProvider _categoryProvider;
-  public MainMamager(
-    IMapper mapper,
-    IDistributedCache distributedCache,
-    IHttpContextAccessor httpContextAccessor,
-    BlogManager blogManager,
-    CategoryProvider categoryProvider)
-  {
-    _mapper = mapper;
-    _distributedCache = distributedCache;
-    _httpContextAccessor = httpContextAccessor;
-    _blogManager = blogManager;
-    _categoryProvider = categoryProvider;
-  }
+  private readonly IMapper _mapper = mapper;
+  private readonly IDistributedCache _distributedCache = distributedCache;
+  private readonly IHttpContextAccessor _httpContextAccessor = httpContextAccessor;
+  private readonly BlogManager _blogManager = blogManager;
+  private readonly CategoryProvider _categoryProvider = categoryProvider;
 
   public async Task<MainDto> GetAsync()
   {

diff --git a/src/Blogifier/Controllers/AccountController.cs b/src/Blogifier/Controllers/AccountController.cs
@@ -10,24 +10,16 @@
 namespace Blogifier.Controllers;
 
 [Route("account")]
-public class AccountController : Controller
+public class AccountController(
+  ILogger<AccountController> logger,
+  UserManager userManager,
+  SignInManager signInManager,
+  BlogManager blogManager) : Controller
 {
-  protected readonly ILogger _logger;
-  protected readonly UserManager _userManager;
-  protected readonly SignInManager _signInManager;
-  protected readonly BlogManager _blogManager;
-
-  public AccountController(
-    ILogger<AccountController> logger,
-    UserManager userManager,
-    SignInManager signInManager,
-    BlogManager blogManager)
-  {
-    _logger = logger;
-    _userManager = userManager;
-    _signInManager = signInManager;
-    _blogManager = blogManager;
-  }
+  protected readonly ILogger _logger = logger;
+  protected readonly UserManager _userManager = userManager;
+  protected readonly SignInManager _signInManager = signInManager;
+  protected readonly BlogManager _blogManager = blogManager;
 
   [HttpGet]
   [HttpPost]

diff --git a/src/Blogifier/Controllers/CategoryController.cs b/src/Blogifier/Controllers/CategoryController.cs
@@ -7,18 +7,12 @@
 namespace Blogifier.Controllers;
 
 [Route("category")]
-public class CategoryController : Controller
+public class CategoryController(
+  MainMamager mainMamager,
+  PostProvider postProvider) : Controller
 {
-  private readonly MainMamager _mainMamager;
-  private readonly PostProvider _postProvider;
-
-  public CategoryController(
-    MainMamager mainMamager,
-    PostProvider postProvider)
-  {
-    _mainMamager = mainMamager;
-    _postProvider = postProvider;
-  }
+  private readonly MainMamager _mainMamager = mainMamager;
+  private readonly PostProvider _postProvider = postProvider;
 
   [HttpGet("{category}")]
   public async Task<IActionResult> Category([FromRoute] string category, [FromQuery] int page = 1)

diff --git a/src/Blogifier/Controllers/ErrorController.cs b/src/Blogifier/Controllers/ErrorController.cs
@@ -8,21 +8,14 @@
 
 namespace Blogifier.Controllers;
 
-public class ErrorController : Controller
+public class ErrorController(
+  ILogger<ErrorController> logger,
+  IMapper mapper,
+  MainMamager mainMamager) : Controller
 {
-  protected readonly ILogger _logger;
-  protected readonly IMapper _mapper;
-  protected readonly MainMamager _mainMamager;
-
-  public ErrorController(
-    ILogger<ErrorController> logger,
-    IMapper mapper,
-    MainMamager mainMamager)
-  {
-    _logger = logger;
-    _mapper = mapper;
-    _mainMamager = mainMamager;
-  }
+  protected readonly ILogger _logger = logger;
+  protected readonly IMapper _mapper = mapper;
+  protected readonly MainMamager _mainMamager = mainMamager;
 
   [Route("404")]
   public async Task<IActionResult> Error404()

diff --git a/src/Blogifier/Controllers/FeedController.cs b/src/Blogifier/Controllers/FeedController.cs
@@ -12,24 +12,16 @@
 
 namespace Blogifier.Controllers;
 
-public class FeedController : Controller
+public class FeedController(
+  ILogger<FeedController> logger,
+  BlogManager blogManager,
+  PostProvider postProvider,
+  MarkdigProvider markdigProvider) : Controller
 {
-  private readonly ILogger _logger;
-  private readonly BlogManager _blogManager;
-  private readonly PostProvider _postProvider;
-  private readonly MarkdigProvider _markdigProvider;
-
-  public FeedController(
-    ILogger<FeedController> logger,
-    BlogManager blogManager,
-    PostProvider postProvider,
-    MarkdigProvider markdigProvider)
-  {
-    _logger = logger;
-    _blogManager = blogManager;
-    _postProvider = postProvider;
-    _markdigProvider = markdigProvider;
-  }
+  private readonly ILogger _logger = logger;
+  private readonly BlogManager _blogManager = blogManager;
+  private readonly PostProvider _postProvider = postProvider;
+  private readonly MarkdigProvider _markdigProvider = markdigProvider;
 
   [ResponseCache(Duration = 1200)]
   [HttpGet("feed")]