Add support for .NET 8

FoundatioFx · Jan 4, 2024 · 8abd9e1 · 8abd9e1
1 parent 1c12ac4
commit 8abd9e1
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 15 deletions.
diff --git a/.github/workflows/build-workflow.yml b/.github/workflows/build-workflow.yml
@@ -37,7 +37,6 @@ jobs:
       with:
         dotnet-version: |
           6.0.x
-          7.0.x
           8.0.x
     - name: Build Reason
       run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/samples/Foundatio.HostingSample/bin/Debug/net6.0/Foundatio.HostingSample.dll",
+            "program": "${workspaceFolder}/samples/Foundatio.HostingSample/bin/Debug/net8.0/Foundatio.HostingSample.dll",
             "args": [ ],
             "cwd": "${workspaceFolder}/samples/Foundatio.HostingSample",
             // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window

diff --git a/build/common.props b/build/common.props
@@ -10,7 +10,7 @@
     <MinVerSkip Condition="'$(Configuration)' == 'Debug'">true</MinVerSkip>
     <MinVerTagPrefix>v</MinVerTagPrefix>
 
-    <Copyright>Copyright (c) 2023 Foundatio.  All rights reserved.</Copyright>
+    <Copyright>Copyright (c) 2024 Foundatio.  All rights reserved.</Copyright>
     <Authors>FoundatioFx</Authors>
     <NoWarn>$(NoWarn);CS1591;NU1701</NoWarn>
     <WarningsAsErrors>true</WarningsAsErrors>

diff --git a/global.json b/global.json
@@ -1,8 +1,7 @@
 {
   "sdk": {
-    "version": "6.0.100",
+    "version": "8.0.100",
     "rollForward": "latestMinor",
     "allowPrerelease": false
   }
 }
-
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <Import Project="..\build\common.props" />
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <IsPackable>False</IsPackable>
   </PropertyGroup>

diff --git a/samples/Foundatio.HostingSample/Foundatio.HostingSample.csproj b/samples/Foundatio.HostingSample/Foundatio.HostingSample.csproj
@@ -4,8 +4,8 @@
     <ProjectReference Include="..\..\src\Foundatio\Foundatio.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
   </ItemGroup>
 </Project>
diff --git a/src/Foundatio.Extensions.Hosting/Foundatio.Extensions.Hosting.csproj b/src/Foundatio.Extensions.Hosting/Foundatio.Extensions.Hosting.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />

diff --git a/src/Foundatio.TestHarness/Foundatio.TestHarness.csproj b/src/Foundatio.TestHarness/Foundatio.TestHarness.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
     <PackageReference Include="Exceptionless.RandomData" Version="1.2.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0" />
     <PackageReference Include="xunit" Version="2.6.4" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <Import Project="..\build\common.props" />
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <IsPackable>False</IsPackable>
     <NoWarn>$(NoWarn);CS1591;NU1701</NoWarn>
   </PropertyGroup>

diff --git a/tests/Foundatio.Tests/Foundatio.Tests.csproj b/tests/Foundatio.Tests/Foundatio.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
     <PackageReference Include="Exceptionless.RandomData" Version="1.2.2" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Foundatio.Extensions.Hosting\Foundatio.Extensions.Hosting.csproj" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,6 @@ jobs: @@
           with:
             dotnet-version: |
 .0.x
-.0.x
 .0.x
         - name: Build Reason
           run: "echo ref: ${{github.ref}} event: ${{github.event_name}}"
@@ Expand Down @@