diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index bc0928a..7bedc99 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -1,4 +1,4 @@
-name: Stravaig Test Capture Logger V3
+name: Stravaig Test Capture Logger V4
 on:
   push:
     branches:
@@ -42,17 +42,12 @@ jobs:
         run: ./Set-Version.ps1
 
       - name: Display workflow state
-        run: |
-          echo "Package version: $STRAVAIG_PACKAGE_VERSION"
-          echo "Version Suffix:  $STRAVAIG_PACKAGE_VERSION_SUFFIX"
-          echo "Stable Version:  $STRAVAIG_STABLE_VERSION"
-          echo "Preview Version: $STRAVAIG_PREVIEW_VERSION"
+        run: env | sort
 
       - uses: actions/setup-dotnet@v4
-        name: Setup .NET 6.0, 8.0 & 9.0
+        name: Setup .NET 8.0 & 9.0
         with:
           dotnet-version: |
-            6.0.x
             8.0.x
             9.0.x
 
@@ -62,14 +57,14 @@ jobs:
       - name: Package Preview Release
         run: |
           export STRAVAIG_NUGET_VERSION=$STRAVAIG_PREVIEW_VERSION
-          dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj --configuration Release --output ./out/preview --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" --version-suffix "$STRAVAIG_PACKAGE_VERSION_SUFFIX" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg
-          dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj --configuration Release --output ./out/preview --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" --version-suffix "$STRAVAIG_PACKAGE_VERSION_SUFFIX" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg
+          dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj --configuration Release --output ./out/preview --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" --version-suffix "$STRAVAIG_PACKAGE_VERSION_SUFFIX" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg /p:AssemblyVersion=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION /p:FileVersion=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION
+          dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj --configuration Release --output ./out/preview --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" --version-suffix "$STRAVAIG_PACKAGE_VERSION_SUFFIX" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg /p:AssemblyVersion=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION /p:FileVersion=$STRAVAIG_PREVIEW_ASSEMBLY_VERSION
 
       - name: Package Stable Release
         run: |
           export STRAVAIG_NUGET_VERSION=$STRAVAIG_STABLE_VERSION
-          dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj --configuration Release --output ./out/stable --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg
-          dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj --configuration Release --output ./out/stable --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg
+          dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj --configuration Release --output ./out/stable --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg /p:AssemblyVersion=$STRAVAIG_ASSEMBLY_VERSION /p:FileVersion=$STRAVAIG_ASSEMBLY_VERSION
+          dotnet pack ./src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj --configuration Release --output ./out/stable --include-symbols --include-source /p:VersionPrefix="$STRAVAIG_PACKAGE_VERSION" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg /p:AssemblyVersion=$STRAVAIG_ASSEMBLY_VERSION /p:FileVersion=$STRAVAIG_ASSEMBLY_VERSION
 
       - name: Archive Packages
         uses: actions/upload-artifact@v4
diff --git a/README.md b/README.md
index 6c99426..c4ac1c5 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ A logger for use in tests so that the messages logged can be examined in tests.
 * 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, 8.0 & 9.0
+* v4.x supports .NET 8.0 & 9.0
 
 ## Why test logs?
 
diff --git a/Set-Version.ps1 b/Set-Version.ps1
index 334cf63..e77219f 100644
--- a/Set-Version.ps1
+++ b/Set-Version.ps1
@@ -56,10 +56,13 @@ $suffix = "preview."
 $suffix += $runNumber.ToString();
 
 $previewVersion = "$nextVersion-$suffix";
+$assemblyVersion = "$nextVersion.$runNumber"
 $envContent = "STRAVAIG_PACKAGE_VERSION=$nextVersion" + [System.Environment]::NewLine +
 "STRAVAIG_PACKAGE_VERSION_SUFFIX=$suffix" + [System.Environment]::NewLine +
 "STRAVAIG_STABLE_VERSION=$nextVersion" + [System.Environment]::NewLine +
-"STRAVAIG_PREVIEW_VERSION=$previewVersion";
+"STRAVAIG_PREVIEW_VERSION=$previewVersion" + [System.Environment]::NewLine +
+"STRAVAIG_PREVIEW_ASSEMBLY_VERSION=$assemblyVersion" + [System.Environment]::NewLine +
+"STRAVAIG_ASSEMBLY_VERSION=$nextVersion"
 
 Write-Host $envContent;
 
diff --git a/docs/index.md b/docs/index.md
index 37db9b7..8e57736 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -57,6 +57,8 @@ v2.x supports: .NET 6.0, 7.0 and 8.0
 
 v3.x supports: .NET 6.0, 8.0 & 9.0
 
+v4.x supports: .NET 8.0 & 9.0
+
 ## Other Stuff
 
 * [Contributors](contributors.md)
diff --git a/release-notes/wip-release-notes.md b/release-notes/wip-release-notes.md
index 07fba35..f55dadf 100644
--- a/release-notes/wip-release-notes.md
+++ b/release-notes/wip-release-notes.md
@@ -4,18 +4,11 @@
 
 Date: ???
 
-### Bug Fixes
-
-### Features
-
 ### Miscellaneous
 
+- Drop support for .NET 6.0
+
 ### Dependencies
 
-- All targets:
-- .NET 6.0 targets:
-- .NET 8.0 targets:
 - .NET 9.0 targets:
-
-
-
+  - Bump Microsoft.Extensions.Logging.Abstractions to 9.0.7
diff --git a/src/.idea/.idea.Stravaig.Extensions.Logging.Diagnostics/.idea/projectSettingsUpdater.xml b/src/.idea/.idea.Stravaig.Extensions.Logging.Diagnostics/.idea/projectSettingsUpdater.xml
index a3dafd3..3e83363 100644
--- a/src/.idea/.idea.Stravaig.Extensions.Logging.Diagnostics/.idea/projectSettingsUpdater.xml
+++ b/src/.idea/.idea.Stravaig.Extensions.Logging.Diagnostics/.idea/projectSettingsUpdater.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="RiderProjectSettingsUpdater">
     <option name="singleClickDiffPreview" value="1" />
+    <option name="unhandledExceptionsIgnoreList" value="1" />
     <option name="vcsConfiguration" value="3" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/Stravaig.Extensions.Logging.Diagnostics.Tests/Stravaig.Extensions.Logging.Diagnostics.Tests.csproj b/src/Stravaig.Extensions.Logging.Diagnostics.Tests/Stravaig.Extensions.Logging.Diagnostics.Tests.csproj
index c8c133e..cfb1629 100644
--- a/src/Stravaig.Extensions.Logging.Diagnostics.Tests/Stravaig.Extensions.Logging.Diagnostics.Tests.csproj
+++ b/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;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
 		<LangVersion>12</LangVersion>
     </PropertyGroup>
@@ -9,22 +9,18 @@
     <ItemGroup>
         <PackageReference Include="nunit" Version="4.3.2" />
         <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
         <PackageReference Include="Shouldly" Version="4.3.0" />
     </ItemGroup>
 
-    <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.1" />
-    </ItemGroup>
-
     <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
         <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.3" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.3" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.7" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.7" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj b/src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj
index 5eae679..00f44de 100644
--- a/src/Stravaig.Extensions.Logging.Diagnostics.XUnit/Stravaig.Extensions.Logging.Diagnostics.XUnit.csproj
+++ b/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;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <Title>XUnit extensions for Stravaig Logging Capture for Tests</Title>
         <Version>$(STRAVAIG_NUGET_VERSION)</Version>
         <Authors>Colin Angus Mackay</Authors>
@@ -18,7 +18,8 @@
             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, 8.0 &amp; 9.0 onwards.
+            Use version 3.x for .NET 6.0, 8.0 &amp;amp; 9.0 onwards.
+            Use version 4.x for .NET 8.0 &amp; 9.0 onwards.
         </Description>
         <Nullable>enable</Nullable>
         <LangVersion>12</LangVersion>
diff --git a/src/Stravaig.Extensions.Logging.Diagnostics.XUnit/readme.md b/src/Stravaig.Extensions.Logging.Diagnostics.XUnit/readme.md
index 9c6b3e5..842a831 100644
--- a/src/Stravaig.Extensions.Logging.Diagnostics.XUnit/readme.md
+++ b/src/Stravaig.Extensions.Logging.Diagnostics.XUnit/readme.md
@@ -6,6 +6,7 @@ XUnit extensions for [Stravaig Log Capture](https://www.nuget.org/packages/Strav
 
 * v2.x: Supports .NET 6.0, 7.0 & 8.0
 * v3.x: Supports .NET 6.0, 8.0 & 9.0
+* v4.x: Supports .NET 8.0 & 9.0
 
 
 ## How to use
diff --git a/src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj b/src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj
index c354c4a..f7005e4 100644
--- a/src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj
+++ b/src/Stravaig.Extensions.Logging.Diagnostics/Stravaig.Extensions.Logging.Diagnostics.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <YEAR>$([System.DateTime]::Now.Year)</YEAR>
-        <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <Title>Stravaig Logging Capture for Tests</Title>
         <Version>$(STRAVAIG_NUGET_VERSION)</Version>
         <Authors>Colin Angus Mackay</Authors>
@@ -20,7 +20,8 @@
 
             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, 8.0 &amp; 9.0 onwards.
+            Use version 3.x for .NET 6.0, 8.0 &amp;amp; 9.0 onwards.
+            Use version 4.x for .NET 8.0 &amp; 9.0 onwards.
 	    </Description>
         <Nullable>enable</Nullable>
         <LangVersion>13</LangVersion>
@@ -46,16 +47,12 @@
         <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)' == 'net8.0' ">
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Stravaig.Extensions.Logging.Diagnostics/readme.md b/src/Stravaig.Extensions.Logging.Diagnostics/readme.md
index 556a8c7..79d9c64 100644
--- a/src/Stravaig.Extensions.Logging.Diagnostics/readme.md
+++ b/src/Stravaig.Extensions.Logging.Diagnostics/readme.md
@@ -7,6 +7,7 @@ Stravaig Log Capture is a way to capture the logs in a test and examine them to
 * v1.x: Supports .NET Core 3.1 & .NET 5
 * v2.x: Supports .NET 6.0, 7.0 & 8.0
 * v3.x: Supports .NET 6.0, 8.0 & 9.0
+* v4.x: Supports .NET 8.0 & 9.0
 
 ## Why do I want to test my logs?
 
diff --git a/version.txt b/version.txt
index b0f2dcb..fcdb2e1 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-3.0.4
+4.0.0