Merge pull request #2164 from Analogy-LogViewer/NET9

NET9
Analogy-LogViewer · Nov 16, 2024 · d1433c3 · d1433c3
2 parents ad3fb4f + d8e015a
commit d1433c3
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 72 deletions.
diff --git a/.github/workflows/dotnet-core-desktop.yml b/.github/workflows/dotnet-core-desktop.yml
@@ -35,9 +35,9 @@ jobs:
 
     # Install the .NET Core workload
     - name: Install .NET Core
-      uses: actions/setup-dotnet@v3.2.0
+      uses: actions/setup-dotnet@v4.1.0
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
 
     # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
     - name: Add msbuild to PATH

diff --git a/Analogy.Common/Analogy.Common.csproj b/Analogy.Common/Analogy.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net48;net8.0-windows;net6.0-windows</TargetFrameworks>
+		<TargetFrameworks>net48;net8.0-windows;net9.0-windows</TargetFrameworks>
 		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
 		<NeutralLanguage>en-US</NeutralLanguage>
 		<Authors>Lior Banai</Authors>
@@ -21,12 +21,12 @@
 		<Company>Analogy.LogViewer</Company>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
 	</ItemGroup>
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net471' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
 		<Reference Include="System.ComponentModel.DataAnnotations" />
 		<Reference Include="System.Configuration" />
 		<Reference Include="System.Data.DataSetExtensions" />
@@ -39,13 +39,14 @@
 
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Analogy.CommonUtilities" Version="7.0.0" />
-		<PackageReference Include="Analogy.LogViewer.Interfaces" Version="7.0.0.1" />
-		<PackageReference Include="Analogy.LogViewer.Template" Version="7.0.0" />
+		<PackageReference Include="Analogy.CommonUtilities" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.Interfaces" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.Template" Version="7.1.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="System.Drawing.Common" Version="8.0.10" />
+		<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
 		<PackageReference Include="System.IO.Compression" Version="4.3.0" />
-		<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
+		<PackageReference Include="System.Private.Uri" Version="4.3.2" />
+		<PackageReference Include="System.Resources.Extensions" Version="9.0.0" />
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Update="Properties\Resources.Designer.cs">

diff --git a/Analogy.CommonControls.Example/Analogy.CommonControls.Example.csproj b/Analogy.CommonControls.Example/Analogy.CommonControls.Example.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFrameworks>net48;net8.0-windows;net6.0-windows</TargetFrameworks>
+		<TargetFrameworks>net48;net8.0-windows;net9.0-windows</TargetFrameworks>
 		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
 		<Nullable>enable</Nullable>
 		<UseWindowsForms>true</UseWindowsForms>
@@ -13,13 +13,14 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Analogy.LogViewer.Interfaces" Version="7.0.0.1" />
+	  <PackageReference Include="Analogy.LogViewer.Interfaces" Version="7.1.0" />
+	  <PackageReference Include="System.Private.Uri" Version="4.3.2" />
 	</ItemGroup>
 
 	<ItemGroup>
 	  <ProjectReference Include="..\Analogy.CommonControls\Analogy.CommonControls.csproj" />
 	</ItemGroup>
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-windows'  or '$(TargetFramework)' == 'net7.0-windows'  or '$(TargetFramework)' == 'net8.0-windows'">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0-windows'  or '$(TargetFramework)' == 'net9.0-windows'">
 		<Reference Include="DevExpress.BonusSkins.v24.1">
 			<HintPath>..\DevExpress\.net core\DevExpress.BonusSkins.v24.1.dll</HintPath>
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -182,7 +183,7 @@
 		</Reference>
 	</ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'net471' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
 		<Reference Include="DevExpress.BonusSkins.v24.1">
 			<HintPath>..\DevExpress\.net framework\DevExpress.BonusSkins.v24.1.dll</HintPath>
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>

diff --git a/Analogy.CommonControls/Analogy.CommonControls.csproj b/Analogy.CommonControls/Analogy.CommonControls.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net48;net8.0-windows;net6.0-windows</TargetFrameworks>
+		<TargetFrameworks>net48;net8.0-windows;net9.0-windows</TargetFrameworks>
 		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
 		<UseWindowsForms>true</UseWindowsForms>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
@@ -42,15 +42,16 @@
 		<Company>Analogy.LogViewer</Company>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Analogy.CommonUtilities" Version="7.0.0" />
-		<PackageReference Include="Analogy.LogViewer.Template" Version="7.0.0" />
+		<PackageReference Include="Analogy.CommonUtilities" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.Template" Version="7.1.0" />
 		<PackageReference Include="Markdig" Version="0.38.0" />
-		<PackageReference Include="MessagePack" Version="2.5.187" />
-		<PackageReference Include="System.Drawing.Common" Version="8.0.10" />
+		<PackageReference Include="MessagePack" Version="2.5.192" />
+		<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
 		<PackageReference Include="System.IO.Compression" Version="4.3.0" />
-		<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
+		<PackageReference Include="System.Private.Uri" Version="4.3.2" />
+		<PackageReference Include="System.Resources.Extensions" Version="9.0.0" />
 	</ItemGroup>
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-windows'  or '$(TargetFramework)' == 'net7.0-windows'  or '$(TargetFramework)' == 'net8.0-windows'">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0-windows'  or '$(TargetFramework)' == 'net9.0-windows'">
 		<Reference Include="DevExpress.BonusSkins.v24.1">
 			<HintPath>..\DevExpress\.net core\DevExpress.BonusSkins.v24.1.dll</HintPath>
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -213,7 +214,7 @@
 		</Reference>
 	</ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'net471' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
 		<Reference Include="DevExpress.BonusSkins.v24.1">
 			<HintPath>..\DevExpress\.net framework\DevExpress.BonusSkins.v24.1.dll</HintPath>
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>

diff --git a/Analogy.UnitTests/Analogy.UnitTests.csproj b/Analogy.UnitTests/Analogy.UnitTests.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net8.0-windows</TargetFramework>
+		<TargetFramework>net9.0-windows</TargetFramework>
 		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
 		<IsCodedUITest>False</IsCodedUITest>
 		<TestProjectType>UnitTest</TestProjectType>
 		<AssemblyTitle>Analogy.UnitTests</AssemblyTitle>
 		<Product>Analogy.UnitTests</Product>
-		<Copyright>Copyright © 2019 -2022</Copyright>
+		<Copyright>Copyright © 2019 -2024</Copyright>
 		<Platforms>AnyCPU;x86;x64</Platforms>
 	</PropertyGroup>
 	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -47,11 +47,13 @@
 	</PropertyGroup>
 	<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
 	<ItemGroup>
-		<PackageReference Include="Analogy.LogViewer.Interfaces" Version="7.0.0.1" />
-		<PackageReference Include="Analogy.LogViewer.Serilog" Version="7.0.0" />
+		<PackageReference Include="Analogy.LogViewer.Interfaces" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.Serilog" Version="7.1.0" />
 		<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" />
+		<PackageReference Include="System.Private.Uri" Version="4.3.2" />
+		<PackageReference Include="System.Text.Json" Version="9.0.0" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Analogy\Analogy.csproj" />

diff --git a/Analogy/Analogy.csproj b/Analogy/Analogy.csproj
@@ -4,7 +4,7 @@
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 		<OutputType>WinExe</OutputType>
 		<NeutralLanguage>en-US</NeutralLanguage>
-		<TargetFrameworks>net48;net8.0-windows</TargetFrameworks>
+		<TargetFrameworks>net48;net8.0-windows;net9.0-windows</TargetFrameworks>
 		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
 		<AssemblyName>Analogy</AssemblyName>
 		<RootNamespace>Analogy</RootNamespace>
@@ -16,7 +16,7 @@
 		<PackageProjectUrl>https://github.com/Analogy-LogViewer/Analogy.LogViewer</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/Analogy-LogViewer/Analogy.LogViewer</RepositoryUrl>
 		<PackageIcon>icon.png</PackageIcon>
-		<Copyright>Lior Banai 2019-2024</Copyright>
+		<Copyright>Lior Banai 2019-2025</Copyright>
 		<Product>Analogy Log Viewer</Product>
 		<Company>Analogy.LogViewer</Company>
 		<PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>
@@ -25,40 +25,45 @@
 		<GenerateResourceWarnOnBinaryFormatterUse>false</GenerateResourceWarnOnBinaryFormatterUse>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Analogy.LogViewer.ElasticCommonSchema" Version="7.0.4" />
-		<PackageReference Include="Analogy.LogViewer.FFmpeg" Version="7.0.0" />
-		<PackageReference Include="Analogy.LogViewer.Interfaces" Version="7.0.0.1" />
-		<PackageReference Include="Analogy.LogViewer.LiteDB" Version="0.4.0" />
-		<PackageReference Include="Analogy.LogViewer.LoggersTree" Version="4.0.0" />
-		<PackageReference Include="Analogy.LogViewer.Template" Version="7.0.0" />
-		<PackageReference Include="Analogy.CommonUtilities" Version="7.0.0" />
-		<PackageReference Include="Analogy.LogViewer.XMLParser" Version="7.0.0" />
-		<PackageReference Include="Analogy.LogViewer.Example" Version="7.0.0" />
-		<PackageReference Include="Analogy.LogViewer.IISLogsProvider" Version="7.0.0" />
-		<PackageReference Include="Analogy.LogViewer.Log4Net" Version="7.0.0" />
-		<PackageReference Include="Analogy.LogViewer.NLogProvider" Version="7.0.0" />
-		<PackageReference Include="Analogy.LogViewer.PlainTextParser" Version="7.0.0" />
-		<PackageReference Include="Analogy.LogViewer.RegexParser" Version="7.0.0" />
-		<PackageReference Include="Analogy.LogViewer.WindowsEventLogs" Version="7.0.0" />
-		<PackageReference Include="Analogy.LogViewer.Serilog" Version="7.0.0" />
-		<PackageReference Include="Analogy.LogViewer.GitHistory" Version="7.0.0" />
-		<PackageReference Include="Analogy.LogViewer.Github" Version="7.0.0" />
-		<PackageReference Include="Analogy.LogViewer.gRPC" Version="7.0.0" />
-		<PackageReference Include="Analogy.LogViewer.JsonParser" Version="7.0.0" />
-		<PackageReference Include="Analogy.LogViewer.WordsSearch" Version="7.0.0" />
-		<PackageReference Include="Analogy.LogViewer.Sqlite" Version="0.8.0" />
+		<PackageReference Include="Analogy.LogViewer.ElasticCommonSchema" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.FFmpeg" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.Interfaces" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.LiteDB" Version="0.5.0" />
+		<PackageReference Include="Analogy.LogViewer.LoggersTree" Version="4.1.0" />
+		<PackageReference Include="Analogy.LogViewer.Template" Version="7.1.0" />
+		<PackageReference Include="Analogy.CommonUtilities" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.XMLParser" Version="7.1.1" />
+		<PackageReference Include="Analogy.LogViewer.Example" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.IISLogsProvider" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.Log4Net" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.NLogProvider" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.PlainTextParser" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.RegexParser" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.WindowsEventLogs" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.Serilog" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.GitHistory" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.Github" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.gRPC" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.JsonParser" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.WordsSearch" Version="7.1.0" />
+		<PackageReference Include="Analogy.LogViewer.Sqlite" Version="0.9.0" />
 		<PackageReference Include="Grpc.Core" Version="2.46.6" />
 		<PackageReference Include="LiteDB" Version="5.0.21" />
 		<PackageReference Include="Markdig" Version="0.38.0" />
-		<PackageReference Include="MessagePack" Version="2.5.187" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+		<PackageReference Include="MessagePack" Version="2.5.192" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
 		<PackageReference Include="Octokit" Version="13.0.1" />
-		<PackageReference Include="System.Drawing.Common" Version="8.0.10" />
+		<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
 		<PackageReference Include="System.IO.Compression" Version="4.3.0" />
-		<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
+		<PackageReference Include="System.Private.Uri" Version="4.3.2" />
+		<PackageReference Include="System.Resources.Extensions" Version="9.0.0" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\Analogy.CommonControls\Analogy.CommonControls.csproj" />
+		<ProjectReference Include="..\Analogy.Common\Analogy.Common.csproj" />
 	</ItemGroup>
 	<ItemGroup>
 		<EmbeddedResource Update="MainForm.resx">
@@ -73,7 +78,7 @@
 		</None>
 	</ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' or '$(TargetFramework)' == 'net7.0-windows' or '$(TargetFramework)' == 'net8.0-windows'">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0-windows'  or '$(TargetFramework)' == 'net9.0-windows'">
 		<Reference Include="DevExpress.BonusSkins.v24.1">
 			<HintPath>..\DevExpress\.net core\DevExpress.BonusSkins.v24.1.dll</HintPath>
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -236,7 +241,7 @@
 		</Reference>
 	</ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net471' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
 		<Reference Include="DevExpress.BonusSkins.v24.1">
 			<HintPath>..\DevExpress\.net framework\DevExpress.BonusSkins.v24.1.dll</HintPath>
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -410,7 +415,7 @@
 
 	</ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' or '$(TargetFramework)' == 'net471' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
 		<Compile Update="Forms\AboutDataSourceBox.cs" />
 		<Compile Update="Forms\AboutDataSourceBox.Designer.cs">
 			<DependentUpon>AboutDataSourceBox.cs</DependentUpon>
@@ -774,8 +779,4 @@
 	<ItemGroup>
 		<Folder Include="Updater\" />
 	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\Analogy.CommonControls\Analogy.CommonControls.csproj" />
-		<ProjectReference Include="..\Analogy.Common\Analogy.Common.csproj" />
-	</ItemGroup>
 </Project>
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -37,7 +37,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>
@@ -54,7 +54,7 @@
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-		<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
+		<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>