Merge branch 'main' of https://github.com/kirkey/CleanArchitectureWit…

…hBlazorServer
kirkey · Jan 24, 2024 · 1ca61e3 · 1ca61e3
2 parents a2256d8 + 7c470bb
commit 1ca61e3
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 37 deletions.
diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj
@@ -20,11 +20,11 @@
         <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.0" />
         <PackageReference Include="LazyCache" Version="2.4.0" />
         <PackageReference Include="LazyCache.AspNetCore" Version="2.4.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.1" />
         <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0-preview3.23201.1" />
-        <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.0" />
-        <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.7" />
-        <PackageReference Include="Hangfire.Core" Version="1.8.6" />
+        <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.1" />
+        <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.8" />
+        <PackageReference Include="Hangfire.Core" Version="1.8.7" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Domain\Domain.csproj" />

diff --git a/src/Domain/Domain.csproj b/src/Domain/Domain.csproj
@@ -10,9 +10,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="MediatR" Version="12.2.0"/>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0"/>
-        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0"/>
+        <PackageReference Include="MediatR" Version="12.2.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.1" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Infrastructure/Infrastructure.csproj b/src/Infrastructure/Infrastructure.csproj
@@ -9,31 +9,31 @@
     </PropertyGroup>
     <ItemGroup>
 
-        <PackageReference Include="EFCore.NamingConventions" Version="8.0.0-rc.2" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="8.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
+        <PackageReference Include="EFCore.NamingConventions" Version="8.0.3" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="8.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="8.0.1" />
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
-        <PackageReference Include="QuestPDF" Version="2023.12.1" />
+        <PackageReference Include="QuestPDF" Version="2023.12.4" />
         <PackageReference Include="Serilog.Sinks.MSSqlServer" Version="6.5.0" />
         <PackageReference Include="Serilog.Sinks.Postgresql.Alternative" Version="4.0.2" />
         <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-        <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
+        <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
         <PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.0.3" />
         <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
         <PackageReference Include="Blazor.Serilog.Sinks.SQLite" Version="1.0.6" />

diff --git a/src/Server.UI/Dockerfile b/src/Server.UI/Dockerfile
@@ -1,11 +1,11 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 COPY ["src/Server.UI/Server.UI.csproj", "src/Server.UI/"]
 COPY ["src/Server/Server.csproj", "src/Server/"]

diff --git a/src/Server.UI/Server.UI.csproj b/src/Server.UI/Server.UI.csproj
@@ -20,6 +20,10 @@
 
     <ItemGroup>
       <PackageReference Include="Blazor-ApexCharts" Version="2.2.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Migrators\Migrators.MSSQL\Migrators.MSSQL.csproj" />

diff --git a/src/Server.UI/appsettings.json b/src/Server.UI/appsettings.json
@@ -34,7 +34,7 @@
     "AppFlavor": "Blazor .NET 8.0",
     "AppFlavorSubscript": ".NET 8.0",
     "Company": "Company",
-    "Copyright": "@2023 Copyright"
+    "Copyright": "@2024 Copyright"
   },
   "AllowedHosts": "*",
   "SmtpClientOptions": {

diff --git a/src/Server/Server.csproj b/src/Server/Server.csproj
@@ -11,21 +11,18 @@
     <ItemGroup>
         <PackageReference Include="Fluxor.Blazor.Web" Version="5.9.1" />
         <PackageReference Include="Fluxor.Blazor.Web.ReduxDevTools" Version="5.9.1" />
-        <PackageReference Include="Hangfire.AspNetCore" Version="1.8.6" />
-        <PackageReference Include="Hangfire.InMemory" Version="0.6.0" />
+        <PackageReference Include="Hangfire.AspNetCore" Version="1.8.7" />
+        <PackageReference Include="Hangfire.InMemory" Version="0.7.0" />
         <PackageReference Include="Blazor-Analytics" Version="3.12.0" />
 
         <PackageReference Include="BlazorDownloadFile" Version="2.4.0.2" />
         <PackageReference Include="BlazorTime" Version="1.0.3" />
-        <PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="6.7.0" />
-        <PackageReference Include="MudBlazor" Version="6.11.2" />
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.1" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
+        <PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="6.8.0" />
+        <PackageReference Include="MudBlazor" Version="6.13.0" />
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.1" />
+
         <PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="3.2.1" />
     </ItemGroup>
 

diff --git a/tests/Application.IntegrationTests/Application.IntegrationTests.csproj b/tests/Application.IntegrationTests/Application.IntegrationTests.csproj
@@ -29,7 +29,7 @@
     </PackageReference>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="Respawn" Version="6.1.0" />
+    <PackageReference Include="Respawn" Version="6.2.1" />
   </ItemGroup>
 
   <ItemGroup>