Merge pull request #271 from Stravaig-Projects/#269/support-dotnet8

#269: Support .NET 8.0

Author: colinangusmackay

.github/workflows/build.yml

@@ -63,15 +63,13 @@ jobs:
           echo "Is Preview: $STRAVAIG_IS_PREVIEW"
           echo "Is Stable: $STRAVAIG_IS_STABLE"
           
-      - uses: actions/setup-dotnet@v3
-        name: Setup .NET 6.0
-        with:
-          dotnet-version: 6.0.x # Always the latest patch version.
-
-      - uses: actions/setup-dotnet@v3
-        name: Setup .NET 7.0
-        with:
-          dotnet-version: 7.0.x # Always the latest patch version.
+      - uses: actions/setup-dotnet@v3 
+        name: Setup .NET 6.0, 7.0 & 8.0 
+        with: 
+          dotnet-version: | 
+            6.0.x 
+            7.0.x 
+            8.0.x 
           
       - name: .NET State
         run: dotnet --info

Example/Example.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <UserSecretsId>5a1a71a3-bb52-41d2-8656-db4e35ab8e2a</UserSecretsId>
   </PropertyGroup>
 
@@ -13,9 +13,9 @@
         <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
         <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
-        <PackageReference Include="Stravaig.Configuration.Diagnostics.Core" Version="1.2.0" />
-        <PackageReference Include="Stravaig.Configuration.Diagnostics.Logging" Version="1.2.0" />
-        <PackageReference Include="Stravaig.Configuration.Diagnostics.Serilog" Version="1.2.0" />
+        <PackageReference Include="Stravaig.Configuration.Diagnostics.Core" Version="2.1.0-preview.580" />
+        <PackageReference Include="Stravaig.Configuration.Diagnostics.Logging" Version="2.1.0-preview.580" />
+        <PackageReference Include="Stravaig.Configuration.Diagnostics.Serilog" Version="2.1.0-preview.580" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
     </ItemGroup>
 

README.md

@@ -16,7 +16,7 @@ Provides logged diagnostics for the app configuration.
 
 The `Stravaig.Extensions.Configuration.Diagnostics` package is now deprecated. It is replaced by the `Stravaig.Configuration.Diagnostics.Logging` package (which references the `Stravaig.Configuration.Diagnostics.Core` package.)
 
-Supported frameworks: 6.0, & 7.0
+Supported frameworks: 6.0, 7.0 & 8.0
 
 Use version 1.x for .NET Core 3.1 and .NET 5.0
 

release-notes/wip-release-notes.md

@@ -10,18 +10,7 @@ Date: ???
 
 ### Miscellaneous
 
-### Dependent Packages
-
-- .NET 7.0
-  - No changes
-- .NET 6.0
-  - No changes
-- .NET 5.0
-  - No changes
-- .NET Core 3.1
-  - No changes
-- General
-  - No changes
+- #269: Add support for .NET 8.0
 
 ---
 

src/Stravaig.Configuration.Diagnostics.AdHocTests/Stravaig.Configuration.Diagnostics.AdHocTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
         <RootNamespace>Stravaig.Extensions.Configuration.Diagnostics.AdHocTests</RootNamespace>
         <LangVersion>11</LangVersion>
@@ -25,6 +25,15 @@
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
     </ItemGroup>
 
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="NUnit" Version="3.14.0" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />

src/Stravaig.Configuration.Diagnostics.Core/Stravaig.Configuration.Diagnostics.Core.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <LangVersion>11</LangVersion>
         <Title>Stravaig Configuration Diagnostics Core</Title>
         <Authors>Stravaig Projects</Authors>
@@ -41,7 +41,7 @@ Release notes at: $(StravaigReleaseNotes)
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
@@ -52,4 +52,7 @@ Release notes at: $(StravaigReleaseNotes)
         <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
     </ItemGroup>
 
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+    </ItemGroup>
 </Project>

src/Stravaig.Configuration.Diagnostics.Logging/Stravaig.Configuration.Diagnostics.Logging.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <LangVersion>11</LangVersion>
         <Title>Stravaig Configuration Diagnostics (Logging Extensions)</Title>
         <Authors>Stravaig Projects</Authors>
@@ -40,7 +40,7 @@ Release notes at: $(StravaigReleaseNotes)
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
@@ -53,6 +53,11 @@ Release notes at: $(StravaigReleaseNotes)
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
     </ItemGroup>
 
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+        <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    </ItemGroup>
+
     <ItemGroup>
       <ProjectReference Include="..\Stravaig.Configuration.Diagnostics.Core\Stravaig.Configuration.Diagnostics.Core.csproj" />
     </ItemGroup>

src/Stravaig.Configuration.Diagnostics.Serilog/Stravaig.Configuration.Diagnostics.Serilog.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <LangVersion>11</LangVersion>
         <Title>Stravaig Configuration Diagnostics (Serilog Extensions)</Title>
         <Authors>Stravaig Projects</Authors>
@@ -40,7 +40,7 @@ Release notes at: $(StravaigReleaseNotes)
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
     </ItemGroup>
 
     <ItemGroup>

src/Stravaig.Configuration.Diagnostics.Tests/Stravaig.Configuration.Diagnostics.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
         <RootNamespace>Stravaig.Extensions.Configuration.Diagnostics.Tests</RootNamespace>
         <LangVersion>11</LangVersion>
@@ -16,7 +16,7 @@
         <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" /> 
         <PackageReference Include="Serilog.Sinks.TextWriter" Version="2.1.0" />
         <PackageReference Include="Shouldly" Version="4.2.1" />
-        <PackageReference Include="Stravaig.Extensions.Logging.Diagnostics" Version="2.1.0" />
+        <PackageReference Include="Stravaig.Extensions.Logging.Diagnostics" Version="2.2.0" />
         <PackageReference Include="Stravaig.Jailbreak" Version="0.1.0" />
     </ItemGroup>
 
@@ -48,6 +48,20 @@
         <PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
     </ItemGroup>
 
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+        <PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
+    </ItemGroup>
+
     <ItemGroup>
       <ProjectReference Include="..\Stravaig.Configuration.Diagnostics.Logging\Stravaig.Configuration.Diagnostics.Logging.csproj" />
       <ProjectReference Include="..\Stravaig.Configuration.Diagnostics.Serilog\Stravaig.Configuration.Diagnostics.Serilog.csproj" />

version.txt

@@ -1 +1 @@
-2.0.1
+2.1.0