Merge pull request #176 from Stravaig-Projects/#172/drop-dotnet-7

#172: Drop .NET 7.0

Author: colinangusmackay

README.md

@@ -9,9 +9,10 @@ A logger for use in tests so that the messages logged can be examined in tests.
   * ![Nuget (with prereleases)](https://img.shields.io/nuget/vpre/Stravaig.Extensions.Logging.Diagnostics?color=ffffff&label=nuget%20latest&logo=nuget) [View Stravaig.Extensions.Logging.Diagnostics on NuGet](https://www.nuget.org/packages/Stravaig.Extensions.Logging.Diagnostics)
   * ![Nuget (with prereleases)](https://img.shields.io/nuget/vpre/Stravaig.Extensions.Logging.Diagnostics.XUnit?color=ffffff&label=nuget%20latest&logo=nuget) [View Stravaig.Extensions.Logging.Diagnostics.XUnit on NuGet](https://www.nuget.org/packages/Stravaig.Extensions.Logging.Diagnostics.XUnit)
 
-Current version supports: 6.0, 7.0 and 8.0
-
-.NET Core 3.1 and .NET 5.0 support was dropped as of v2.0. Use v1.x when targeting .NET Core 3.1 or .NET 5.0.
+.NET support:
+* v1.x supports .NET Core 3.1 and .NET 5.0
+* v2.x supports .NET 6.0, 7.0 and 8.0
+* v3.x supports .NET 6.0 and 8.0
 
 ## Why test logs?
 

docs/index.md

@@ -51,9 +51,11 @@ This package is designed to hook into the .NET logging framework so that the log
 
 ## Supported .NET Versions
 
+v1.x supports: .NET Core 3.1 and .NET 5.0
+
 v2.x supports: .NET 6.0, 7.0 and 8.0
 
-v1.z supports: .NET Core 3.1 and .NET 5.0
+v3.x supports: .NET 6.0 and 8.0
 
 ## Other Stuff
 

release-notes/wip-release-notes.md

@@ -7,6 +7,7 @@ Date: ???
 ### Breaking Changes
 
 - Feature #123 changes the `TestCaptureLogger<T>` class to encapsulate an instance of `TestCaptureLogger` rather than inherit from it. If you're code relied on `TestCaptureLogger<T>` inheriting from `TestCaptureLogger` then it will likely break.
+- Feature #172 drops support for .NET 7.0. Use .NET 6.0 LTS or .NET 8.0 LTS.
 
 ### Bugs
 
@@ -22,9 +23,12 @@ Date: ???
 ### Miscellaneous
 
 - #164: Update pipeline.
+- #172: Drop support and package targeting for .NET 7.0.
 
 ### Dependencies
 
-- #166 Update package references:
+- #166 & #172 Update package references:
   - .NET 8.0 targets:
-    - Bump Microsoft.Extensions.Logging.Abstractions to 8.0.1
+    - Bump Microsoft.Extensions.Logging.Abstractions to 8.0.2
+  - .NET 7.0 targets:
+    - Dropped

src/Stravaig.Extensions.Logging.Diagnostics.Tests/Stravaig.Extensions.Logging.Diagnostics.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
 		<LangVersion>12</LangVersion>
     </PropertyGroup>

src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <YEAR>$([System.DateTime]::Now.Year)</YEAR>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
         <Title>XUnit extensions for Stravaig Logging Capture for Tests</Title>
         <Authors>Colin Angus Mackay</Authors>
         <Copyright>©$2023-(YEAR) Colin Angus Mackay. See licence for more information.</Copyright>
@@ -14,6 +14,9 @@
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <Description>
             XUnit extensions for Stravaig Logging Capture for Tests.
+
+            Use version 2.x for .NET 6.0 onwards.
+            Use version 3.x for .NET 6.0 &amp; 8.0 onwards.
         </Description>
         <Nullable>enable</Nullable>
         <LangVersion>12</LangVersion>

src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    
+
     <PropertyGroup>
         <YEAR>$([System.DateTime]::Now.Year)</YEAR>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
         <Title>Stravaig Logging Capture for Tests</Title>
         <Authors>Colin Angus Mackay</Authors>
         <Copyright>©2020-$(YEAR) Colin Angus Mackay. See licence for more information.</Copyright>
@@ -15,16 +15,18 @@
 	    <Description>
             A logging provider that hooks into the .NET Logging extensions and captures
             the logs that it receives so they can be examined later by tests.
-            
-            Use version 1.x for .NET prior to 6.0. Use version 2.0 for .NET 6.0 onwards.
+
+            Use version 1.x for .NET prior to 6.0.
+            Use version 2.x for .NET 6.0 onwards.
+            Use version 3.x for .NET 6.0 &amp; 8.0 onwards.
 	    </Description>
         <Nullable>enable</Nullable>
         <LangVersion>12</LangVersion>
     </PropertyGroup>
     <ItemGroup>
         <None Include="stravaig-icon.png" Pack="true" PackagePath="/" />
     </ItemGroup>
-    
+
     <!-- Source link properties -->
     <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -37,16 +39,12 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     </ItemGroup>
-    
+
     <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4" />
     </ItemGroup>
 
-    <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
-    </ItemGroup>
-
     <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
     </ItemGroup>
 </Project>