diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index 38b5109..77c60e1 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -31,7 +31,7 @@ jobs:
     - name: Install .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
 
     # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
     - name: Setup MSBuild.exe
diff --git a/Analogy.Interfaces.UnitTests/Analogy.Interfaces.UnitTests.csproj b/Analogy.Interfaces.UnitTests/Analogy.Interfaces.UnitTests.csproj
index c87ad1f..8704105 100644
--- a/Analogy.Interfaces.UnitTests/Analogy.Interfaces.UnitTests.csproj
+++ b/Analogy.Interfaces.UnitTests/Analogy.Interfaces.UnitTests.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-windows</TargetFrameworks>
+		<TargetFrameworks>net8.0-windows</TargetFrameworks>
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-		<PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
-		<PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
+		<PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
+		<PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/Analogy.Interfaces/Analogy.Interfaces.csproj b/Analogy.Interfaces/Analogy.Interfaces.csproj
index 00861c4..f55038e 100644
--- a/Analogy.Interfaces/Analogy.Interfaces.csproj
+++ b/Analogy.Interfaces/Analogy.Interfaces.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0-windows;net6.0-windows;net48</TargetFrameworks>
+		<TargetFrameworks>net9.0-windows;net8.0-windows;net48</TargetFrameworks>
 		<UseWindowsForms>true</UseWindowsForms>
 		<Description>Interfaces assembly for creating custom data providers for Analogy Log Viewer</Description>
 		<PackageReleaseNotes></PackageReleaseNotes>
@@ -9,11 +9,11 @@
 		<AssemblyName>Analogy.Interfaces</AssemblyName>
 		<RootNamespace>Analogy.Interfaces</RootNamespace>
 		<PackageId>Analogy.LogViewer.Interfaces</PackageId>
-		<VersionPrefix>7.0.0.1</VersionPrefix>
+		<VersionPrefix>7.1.0</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
 		<Authors>Lior Banai</Authors>
 		<Product>Analogy.LogViewer.Interfaces</Product>
-		<Copyright>Lior Banai @ 2018-2024</Copyright>
+		<Copyright>Lior Banai 2018-2025</Copyright>
 		<PackageIcon>icon.png</PackageIcon>
 		<RepositoryUrl>https://github.com/Analogy-LogViewer/Analogy.Interfaces</RepositoryUrl>
 		<Company>Analogy.LogViewer</Company>
@@ -26,7 +26,7 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Analogy.Interfaces.DataTypes" Version="1.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
-		<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+		<PackageReference Include="System.Resources.Extensions" Version="9.0.0" />
 	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Analogy.Types/Analogy.Interfaces.DataTypes.csproj b/Analogy.Types/Analogy.Interfaces.DataTypes.csproj
index b11b69f..407055c 100644
--- a/Analogy.Types/Analogy.Interfaces.DataTypes.csproj
+++ b/Analogy.Types/Analogy.Interfaces.DataTypes.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net6.0;net48</TargetFrameworks>
+		<TargetFrameworks>net9.0;net8.0;net48</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<Description>Data Types assembly for creating custom data providers for Analogy Log Viewer</Description>
@@ -10,10 +10,10 @@
 		<AssemblyName>Analogy.Interfaces.DataTypes</AssemblyName>
 		<RootNamespace>Analogy.Interfaces.DataTypes</RootNamespace>
 		<PackageId>Analogy.Interfaces.DataTypes</PackageId>
-		<VersionPrefix>1.0.0.0</VersionPrefix>
+		<VersionPrefix>1.1.0</VersionPrefix>
 		<Authors>Lior Banai</Authors>
 		<Product>Analogy.Interfaces.DataTypes</Product>
-		<Copyright>Lior Banai @ 2024</Copyright>
+		<Copyright>Lior Banai 2024-2025</Copyright>
 		<PackageIcon>icon.png</PackageIcon>
 		<RepositoryUrl>https://github.com/Analogy-LogViewer/Analogy.Interfaces</RepositoryUrl>
 		<Company>Analogy.LogViewer</Company>
diff --git a/Analogy.Types/AnalogyLogMessage.cs b/Analogy.Types/AnalogyLogMessage.cs
index 6df2ac2..536f028 100644
--- a/Analogy.Types/AnalogyLogMessage.cs
+++ b/Analogy.Types/AnalogyLogMessage.cs
@@ -1,4 +1,5 @@
-using System;
+#pragma warning disable SA1402
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
diff --git a/Directory.Build.props b/Directory.Build.props
index 9c5dd72..6af4fa9 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -34,7 +34,7 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Meziantou.Analyzer" Version="2.0.178">
+		<PackageReference Include="Meziantou.Analyzer" Version="2.0.179">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
@@ -50,8 +50,8 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
 	</ItemGroup>
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net471' ">
-		<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
+		<PackageReference Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
 		<PackageReference Include="PolySharp" Version="1.14.1 ">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>