Upgrade to .net 8.0

aimenux · Jan 14, 2024 · 284bf12 · 284bf12
1 parent b08042c
commit 284bf12
Show file tree

Hide file tree

Showing 25 changed files with 396 additions and 40 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

diff --git a/Directory.Build.props b/Directory.Build.props
diff --git a/SpectreCliDemo.sln b/SpectreCliDemo.sln
@@ -11,6 +11,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\ci.yml = .github\workflows\ci.yml
 		README.md = README.md
+		.editorconfig = .editorconfig
+		Directory.Build.props = Directory.Build.props
 	EndProjectSection
 EndProject
 Global

diff --git a/src/BasicWay/BasicWay.csproj b/src/BasicWay/BasicWay.csproj
@@ -2,18 +2,18 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
-    <PackageReference Include="Scrutor" Version="4.2.0" />
-    <PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.1" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
-    <PackageReference Include="Spectre.Console" Version="0.45.0" />
-    <PackageReference Include="Spectre.Console.Cli" Version="0.45.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Scrutor" Version="4.2.2" />
+    <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
+    <PackageReference Include="Spectre.Console" Version="0.48.0" />
+    <PackageReference Include="Spectre.Console.Cli" Version="0.48.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...structure/Host/ConfigurationExtensions.cs → ...mon/Extensions/ConfigurationExtensions.cs b/...structure/Host/ConfigurationExtensions.cs → ...mon/Extensions/ConfigurationExtensions.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Configuration;
 
-namespace BasicWay.Infrastructure.Host;
+namespace BasicWay.Common.Extensions;
 
 public static class ConfigurationExtensions
 {

diff --git a/.../Infrastructure/Host/LoggingExtensions.cs → ...ay/Common/Extensions/LoggingExtensions.cs b/.../Infrastructure/Host/LoggingExtensions.cs → ...ay/Common/Extensions/LoggingExtensions.cs
@@ -5,7 +5,7 @@
 using Serilog;
 using Serilog.Debugging;
 
-namespace BasicWay.Infrastructure.Host;
+namespace BasicWay.Common.Extensions;
 
 public static class LoggingExtensions
 {

diff --git a/...Way/Infrastructure/Host/PathExtensions.cs → ...icWay/Common/Extensions/PathExtensions.cs b/...Way/Infrastructure/Host/PathExtensions.cs → ...icWay/Common/Extensions/PathExtensions.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 
-namespace BasicWay.Infrastructure.Host;
+namespace BasicWay.Common.Extensions;
 
 public static class PathExtensions
 {
@@ -18,5 +18,5 @@ public static string GetDirectoryPath()
         }
     }
 
-    public static string GetAssemblyLocation() => Assembly.GetExecutingAssembly().Location;
+    private static string GetAssemblyLocation() => Assembly.GetExecutingAssembly().Location;
 }
diff --git a/...frastructure/Spectre/SpectreCommandApp.cs → ...icWay/Common/Spectre/SpectreCommandApp.cs b/...frastructure/Spectre/SpectreCommandApp.cs → ...icWay/Common/Spectre/SpectreCommandApp.cs
@@ -1,6 +1,6 @@
 using Spectre.Console.Cli;
 
-namespace BasicWay.Infrastructure.Spectre
+namespace BasicWay.Common.Spectre
 {
     public class SpectreCommandApp : ICommandApp
     {

diff --git a/...frastructure/Spectre/SpectreExtensions.cs → ...icWay/Common/Spectre/SpectreExtensions.cs b/...frastructure/Spectre/SpectreExtensions.cs → ...icWay/Common/Spectre/SpectreExtensions.cs
@@ -1,6 +1,6 @@
 using Spectre.Console;
 
-namespace BasicWay.Infrastructure.Spectre
+namespace BasicWay.Common.Spectre
 {
     public static class SpectreExtensions
     {

diff --git a/...structure/Spectre/SpectreTypeRegistrar.cs → ...ay/Common/Spectre/SpectreTypeRegistrar.cs b/...structure/Spectre/SpectreTypeRegistrar.cs → ...ay/Common/Spectre/SpectreTypeRegistrar.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Spectre.Console.Cli;
 
-namespace BasicWay.Infrastructure.Spectre;
+namespace BasicWay.Common.Spectre;
 
 public sealed class SpectreTypeRegistrar : ITypeRegistrar
 {

diff --git a/...astructure/Spectre/SpectreTypeResolver.cs → ...Way/Common/Spectre/SpectreTypeResolver.cs b/...astructure/Spectre/SpectreTypeResolver.cs → ...Way/Common/Spectre/SpectreTypeResolver.cs
@@ -1,6 +1,6 @@
 using Spectre.Console.Cli;
 
-namespace BasicWay.Infrastructure.Spectre;
+namespace BasicWay.Common.Spectre;
 
 public sealed class SpectreTypeResolver : ITypeResolver, IDisposable
 {

diff --git a/src/BasicWay/Program.cs b/src/BasicWay/Program.cs
@@ -1,7 +1,7 @@
 using BasicWay.Commands.Math;
 using BasicWay.Commands.Path;
-using BasicWay.Infrastructure.Host;
-using BasicWay.Infrastructure.Spectre;
+using BasicWay.Common.Extensions;
+using BasicWay.Common.Spectre;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;

diff --git a/src/CustomWay/Commands/Math/MathConfigurator.cs b/src/CustomWay/Commands/Math/MathConfigurator.cs
@@ -1,4 +1,4 @@
-using CustomWay.Infrastructure.Spectre;
+using CustomWay.Common.Spectre;
 using Spectre.Console.Cli;
 
 namespace CustomWay.Commands.Math

diff --git a/src/CustomWay/Commands/Path/PathConfigurator.cs b/src/CustomWay/Commands/Path/PathConfigurator.cs
@@ -1,4 +1,4 @@
-using CustomWay.Infrastructure.Spectre;
+using CustomWay.Common.Spectre;
 using Spectre.Console.Cli;
 
 namespace CustomWay.Commands.Path

diff --git a/...structure/Host/ConfigurationExtensions.cs → ...mon/Extensions/ConfigurationExtensions.cs b/...structure/Host/ConfigurationExtensions.cs → ...mon/Extensions/ConfigurationExtensions.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Configuration;
 
-namespace CustomWay.Infrastructure.Host;
+namespace CustomWay.Common.Extensions;
 
 public static class ConfigurationExtensions
 {

diff --git a/.../Infrastructure/Host/LoggingExtensions.cs → ...ay/Common/Extensions/LoggingExtensions.cs b/.../Infrastructure/Host/LoggingExtensions.cs → ...ay/Common/Extensions/LoggingExtensions.cs
@@ -5,7 +5,7 @@
 using Serilog;
 using Serilog.Debugging;
 
-namespace CustomWay.Infrastructure.Host;
+namespace CustomWay.Common.Extensions;
 
 public static class LoggingExtensions
 {

diff --git a/...Way/Infrastructure/Host/PathExtensions.cs → ...omWay/Common/Extensions/PathExtensions.cs b/...Way/Infrastructure/Host/PathExtensions.cs → ...omWay/Common/Extensions/PathExtensions.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 
-namespace CustomWay.Infrastructure.Host;
+namespace CustomWay.Common.Extensions;
 
 public static class PathExtensions
 {
@@ -18,5 +18,5 @@ public static string GetDirectoryPath()
         }
     }
 
-    public static string GetAssemblyLocation() => Assembly.GetExecutingAssembly().Location;
+    private static string GetAssemblyLocation() => Assembly.GetExecutingAssembly().Location;
 }
diff --git a/...structure/Spectre/ISpectreConfigurator.cs → ...ay/Common/Spectre/ISpectreConfigurator.cs b/...structure/Spectre/ISpectreConfigurator.cs → ...ay/Common/Spectre/ISpectreConfigurator.cs
@@ -1,6 +1,6 @@
 using Spectre.Console.Cli;
 
-namespace CustomWay.Infrastructure.Spectre;
+namespace CustomWay.Common.Spectre;
 
 public interface ISpectreConfigurator
 {

diff --git a/...frastructure/Spectre/SpectreCommandApp.cs → ...omWay/Common/Spectre/SpectreCommandApp.cs b/...frastructure/Spectre/SpectreCommandApp.cs → ...omWay/Common/Spectre/SpectreCommandApp.cs
@@ -1,6 +1,6 @@
 using Spectre.Console.Cli;
 
-namespace CustomWay.Infrastructure.Spectre
+namespace CustomWay.Common.Spectre
 {
     public class SpectreCommandApp : ICommandApp
     {

diff --git a/...frastructure/Spectre/SpectreExtensions.cs → ...omWay/Common/Spectre/SpectreExtensions.cs b/...frastructure/Spectre/SpectreExtensions.cs → ...omWay/Common/Spectre/SpectreExtensions.cs
@@ -4,7 +4,7 @@
 using Spectre.Console;
 using Spectre.Console.Cli;
 
-namespace CustomWay.Infrastructure.Spectre
+namespace CustomWay.Common.Spectre
 {
     public static class SpectreExtensions
     {

diff --git a/...structure/Spectre/SpectreTypeRegistrar.cs → ...ay/Common/Spectre/SpectreTypeRegistrar.cs b/...structure/Spectre/SpectreTypeRegistrar.cs → ...ay/Common/Spectre/SpectreTypeRegistrar.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Spectre.Console.Cli;
 
-namespace CustomWay.Infrastructure.Spectre;
+namespace CustomWay.Common.Spectre;
 
 public sealed class SpectreTypeRegistrar : ITypeRegistrar
 {

diff --git a/...astructure/Spectre/SpectreTypeResolver.cs → ...Way/Common/Spectre/SpectreTypeResolver.cs b/...astructure/Spectre/SpectreTypeResolver.cs → ...Way/Common/Spectre/SpectreTypeResolver.cs
@@ -1,6 +1,6 @@
 using Spectre.Console.Cli;
 
-namespace CustomWay.Infrastructure.Spectre;
+namespace CustomWay.Common.Spectre;
 
 public sealed class SpectreTypeResolver : ITypeResolver, IDisposable
 {

diff --git a/src/CustomWay/CustomWay.csproj b/src/CustomWay/CustomWay.csproj
@@ -2,18 +2,18 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
-    <PackageReference Include="Scrutor" Version="4.2.0" />
-    <PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.1" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
-    <PackageReference Include="Spectre.Console" Version="0.45.0" />
-    <PackageReference Include="Spectre.Console.Cli" Version="0.45.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Scrutor" Version="4.2.2" />
+    <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
+    <PackageReference Include="Spectre.Console" Version="0.48.0" />
+    <PackageReference Include="Spectre.Console.Cli" Version="0.48.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/CustomWay/Program.cs b/src/CustomWay/Program.cs
@@ -1,5 +1,5 @@
-using CustomWay.Infrastructure.Host;
-using CustomWay.Infrastructure.Spectre;
+using CustomWay.Common.Extensions;
+using CustomWay.Common.Spectre;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;