Migrate all projects to net8.0 (#54)

* Migrate all projects to net8.0 * Bump version to v4.0.0 * Update package references to latest for net8.0
axuno · Mar 24, 2024 · 01ef2c7 · 01ef2c7
1 parent fe6663c
commit 01ef2c7
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 61 deletions.
diff --git a/DAL/DatabaseGeneric/TournamentCalendarDAL.DbGeneric.csproj b/DAL/DatabaseGeneric/TournamentCalendarDAL.DbGeneric.csproj
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <AssemblyName>TournamentCalendarDAL</AssemblyName>
-        <RootNamespace>TournamentCalendarDAL</RootNamespace>
-        <LangVersion>latest</LangVersion>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-    <ItemGroup>
-        <PackageReference Include="SD.LLBLGen.Pro.ORMSupportClasses" Version="5.9.2" />
-    </ItemGroup>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <AssemblyName>TournamentCalendarDAL</AssemblyName>
+    <RootNamespace>TournamentCalendarDAL</RootNamespace>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="SD.LLBLGen.Pro.ORMSupportClasses" Version="5.11.1" />
+  </ItemGroup>
 </Project>
diff --git a/DAL/DatabaseSpecific/TournamentCalendarDAL.DbSpecific.csproj b/DAL/DatabaseSpecific/TournamentCalendarDAL.DbSpecific.csproj
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <AssemblyName>TournamentCalendarDAL.DbSpecific</AssemblyName>
-        <RootNamespace>TournamentCalendarDAL.DatabaseSpecific</RootNamespace>
-        <LangVersion>latest</LangVersion>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-    <ItemGroup>
-        <PackageReference Include="SD.LLBLGen.Pro.DQE.SqlServer" Version="5.9.2" />
-    </ItemGroup>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <AssemblyName>TournamentCalendarDAL.DbSpecific</AssemblyName>
+    <RootNamespace>TournamentCalendarDAL.DatabaseSpecific</RootNamespace>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="SD.LLBLGen.Pro.DQE.SqlServer" Version="5.11.1" />
+  </ItemGroup>
 </Project>
diff --git a/Data/TournamentCalender.Data.csproj b/Data/TournamentCalender.Data.csproj
@@ -1,20 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
-        <LangVersion>latest</LangVersion>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
-        <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\DAL\DatabaseGeneric\TournamentCalendarDAL.DbGeneric.csproj" />
-        <ProjectReference Include="..\DAL\DatabaseSpecific\TournamentCalendarDAL.DbSpecific.csproj" />
-    </ItemGroup>
-
-</Project>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DAL\DatabaseGeneric\TournamentCalendarDAL.DbGeneric.csproj" />
+    <ProjectReference Include="..\DAL\DatabaseSpecific\TournamentCalendarDAL.DbSpecific.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/TournamentCalendar.Tests/TournamentCalendar.Tests.csproj b/TournamentCalendar.Tests/TournamentCalendar.Tests.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.14" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\TournamentCalendar\TournamentCalendar.csproj" />

diff --git a/TournamentCalendar/Program.cs b/TournamentCalendar/Program.cs
@@ -14,7 +14,7 @@ public class Program
 
     public static async Task Main(string[] args)
     {
-        // NLog: setup the logger first to catch all errors
+        // NLog: set up the logger first to catch all errors
         var currentDir = Directory.GetCurrentDirectory();
         var logConfigFile = Path.Combine(currentDir, ConfigurationFolder, "NLog.Internal.config");
 
@@ -93,7 +93,7 @@ public static WebApplicationBuilder SetupBuilder(string[] args)
             builder.Configuration.AddJsonFile(Path.Combine(secretsFolder, $"credentials.{builder.Environment.EnvironmentName}.json"), false);
         }
 
-        // Use static web assets, also from other referenced projects or packages)
+        // Use static web assets, also from other referenced projects or packages
         builder.WebHost.UseStaticWebAssets();
 
         return builder;

diff --git a/TournamentCalendar/TournamentCalendar.csproj b/TournamentCalendar/TournamentCalendar.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <Product>TournamentCalendar</Product>
-    <TargetFramework>net6.0</TargetFramework>
-    <Version>3.2.5</Version>
-    <FileVersion>3.2.5</FileVersion>
+    <TargetFramework>net8.0</TargetFramework>
+    <Version>4.0.0</Version>
+    <FileVersion>4.0.0</FileVersion>
     <EnableDefaultContentItems>true</EnableDefaultContentItems>
     <Authors>axuno gGmbH</Authors>
     <CurrentYear>$([System.DateTime]::Now.ToString(yyyy))</CurrentYear>
@@ -12,7 +12,8 @@
     <Nullable>enable</Nullable>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageIcon>TournamentCalender-192x192.png</PackageIcon>
-    <AssemblyVersion>3.0.0.0</AssemblyVersion><!--only update AssemblyVersion with major releases -->
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <!--only update AssemblyVersion with major releases -->
     <LangVersion>latest</LangVersion>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AnalysisLevel>latest</AnalysisLevel>
@@ -47,30 +48,32 @@
   <ItemGroup>
     <None Include="TournamentCalender-192x192.png">
       <Pack>True</Pack>
-      <PackagePath></PackagePath>
+      <PackagePath>
+      </PackagePath>
     </None>
   </ItemGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="TournamentCalendar.Tests" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="cloudscribe.Web.Navigation" Version="6.0.3" />
-    <PackageReference Include="JSNLog" Version="3.0.2" />
+    <PackageReference Include="JSNLog" Version="3.0.3" />
     <PackageReference Include="MailMergeLib" Version="5.11.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.25" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.16" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.7" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.8" />
     <PackageReference Include="StackifyMiddleware" Version="3.3.3.4767" />
-    <PackageReference Include="System.Security.Cryptography.Xml" Version="6.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.3" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2" />
+    <PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Models\Error\StatusCodes.de.resx">
-      <Generator></Generator>
+      <Generator>
+      </Generator>
     </EmbeddedResource>
     <EmbeddedResource Update="Models\Error\StatusCodes.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
@@ -81,14 +84,16 @@
       <LastGenOutput>StatusDescriptions.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <EmbeddedResource Update="Resources\DataAnnotationResource.de.resx">
-      <Generator></Generator>
+      <Generator>
+      </Generator>
     </EmbeddedResource>
     <EmbeddedResource Update="Resources\DataAnnotationResource.resx">
       <LastGenOutput>DataAnnotationResource.Designer.cs</LastGenOutput>
       <Generator>PublicResXFileCodeGenerator</Generator>
     </EmbeddedResource>
     <EmbeddedResource Update="Resources\ModelBindingMessageResource.de.resx">
-      <Generator></Generator>
+      <Generator>
+      </Generator>
     </EmbeddedResource>
     <EmbeddedResource Update="Resources\ModelBindingMessageResource.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>

diff --git a/TournamentCalendar/WebAppStartup.cs b/TournamentCalendar/WebAppStartup.cs
@@ -17,7 +17,7 @@
 namespace TournamentCalendar;
 
 /// <summary>
-/// The demo startup class to setup and configure the league.
+/// The demo startup class to set up and configure the tournament calendar.
 /// </summary>
 public static class WebAppStartup
 {