update nugets

LiorBanai · LiorBanai · commit 7085f4902667 · 2025-11-14T11:28:44.000+02:00
diff --git a/.github/workflows/dotnet-core-desktop.yml b/.github/workflows/dotnet-core-desktop.yml
@@ -23,13 +23,13 @@ jobs:
      
     steps:
     - name: Checkout
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v5
       with:
         fetch-depth: 0
 
     # Install the .NET Core workload
     - name: Install .NET Core
-      uses: actions/setup-dotnet@v4.2.0
+      uses: actions/setup-dotnet@v5.0.0
       with:
         dotnet-version: 9.0.x
 
diff --git a/Analogy.LogViewer.Serilog.AspNet/Analogy.LogViewer.Serilog.AspNet.csproj b/Analogy.LogViewer.Serilog.AspNet/Analogy.LogViewer.Serilog.AspNet.csproj
@@ -1,8 +1,9 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFrameworks>net9.0-windows;net8.0-windows</TargetFrameworks>
-		<Version>8.1.0</Version>
+		<TargetFrameworks>net10.0-windows;net9.0-windows;net8.0-windows</TargetFrameworks>
+		<VersionPrefix>9.0.0</VersionPrefix>
+		<VersionSuffix>rc1</VersionSuffix>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/Analogy.LogViewer.Serilog.Sinks.MongoDB/Analogy.LogViewer.Serilog.Sinks.MongoDB.csproj b/Analogy.LogViewer.Serilog.Sinks.MongoDB/Analogy.LogViewer.Serilog.Sinks.MongoDB.csproj
@@ -14,9 +14,9 @@
 
 
 	<ItemGroup>
-		<PackageReference Include="Analogy.CommonUtilities" Version="9.0.0-rc1" />
+		<PackageReference Include="Analogy.CommonUtilities" Version="9.0.1" />
 		<PackageReference Include="Analogy.LogViewer.Interfaces" Version="9.0.0" />
-		<PackageReference Include="Analogy.LogViewer.Template" Version="9.0.0-rc3" />
+		<PackageReference Include="Analogy.LogViewer.Template" Version="9.0.1" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
 		<PackageReference Include="Serilog" Version="4.3.0" />
 		<PackageReference Include="System.Resources.Extensions" Version="10.0.0" />
diff --git a/Analogy.LogViewer.Serilog.Sinks/AnalogyLogServerSink.cs b/Analogy.LogViewer.Serilog.Sinks/AnalogyLogServerSink.cs
@@ -1,4 +1,5 @@
 ﻿using Analogy.Interfaces;
+using Analogy.Interfaces.DataTypes;
 using Analogy.LogServer.Clients;
 using Serilog.Core;
 using Serilog.Events;
diff --git a/Analogy.LogViewer.Serilog.UnitTests/CompactJsonFormatTests.cs b/Analogy.LogViewer.Serilog.UnitTests/CompactJsonFormatTests.cs
@@ -22,7 +22,7 @@ public class CompactJsonFormatTests
         [DataRow("CompactJsonFormat.gz", 4, "2016-10-12T04:46:58.0554314Z")]
         public async Task OfflineProviderParserTimestampTest(string fileName, int numberOfMessages, string datetimeToParse)
         {
-            OfflineDataProvider parser = new OfflineDataProvider();
+            SerilogOfflineDataProvider parser = new SerilogOfflineDataProvider();
             UserSettingsManager.UserSettings.Settings.SupportFormats= new List<string> { "*.Clef", "*.log", "*.gz", "*.zip" };
             CancellationTokenSource cts = new CancellationTokenSource();
             string file = Path.Combine(Folder, "log files", fileName);
@@ -41,7 +41,7 @@ public async Task OfflineProviderParserTimestampTest(string fileName, int number
         public void CompactJsonFormatTestAutomaticDetection(string fileName)
         {
             string file = Path.Combine(Folder, "log files", fileName);
-            var type = OfflineDataProvider.TryDetectFormat(file);
+            var type = SerilogOfflineDataProvider.TryDetectFormat(file);
             Assert.IsTrue(type == FileFormat.CompactJsonFormatPerLine);
         }
         [TestMethod]
@@ -50,7 +50,7 @@ public void CompactJsonFormatTestAutomaticDetection(string fileName)
         [DataRow("rendered2.clef", 2, "test 2")]
         public async Task OfflineProviderParserAlreadyRenderedTest(string fileName, int numberOfMessages, string text)
         {
-            OfflineDataProvider parser = new OfflineDataProvider();
+            SerilogOfflineDataProvider parser = new SerilogOfflineDataProvider();
             UserSettingsManager.UserSettings.Settings.SupportFormats = new List<string> { "*.Clef", "*.log", "*.gz", "*.zip" };
             CancellationTokenSource cts = new CancellationTokenSource();
             string file = Path.Combine(Folder, "log files", fileName);
diff --git a/Analogy.LogViewer.Serilog.UnitTests/JsonFormatTests.cs b/Analogy.LogViewer.Serilog.UnitTests/JsonFormatTests.cs
@@ -62,7 +62,7 @@ public async Task JsonFilePerFileTest()
         public void CompactJsonFormatTestAutomaticDetection(string fileName, FileFormat format)
         {
             string file = Path.Combine(Folder, "log files", fileName);
-            var type = OfflineDataProvider.TryDetectFormat(file);
+            var type = SerilogOfflineDataProvider.TryDetectFormat(file);
             Assert.IsTrue(type == format);
         }
 
diff --git a/Analogy.LogViewer.Serilog.sln b/Analogy.LogViewer.Serilog.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.2.32602.215
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11205.157 d18.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Analogy.LogViewer.Serilog", "Analogy.LogViewer.Serilog\Analogy.LogViewer.Serilog.csproj", "{495BEFBF-44B2-4F3C-BC5A-ED23298779C0}"
 EndProject
diff --git a/Analogy.LogViewer.Serilog/Analogy.LogViewer.Serilog.csproj b/Analogy.LogViewer.Serilog/Analogy.LogViewer.Serilog.csproj
@@ -2,9 +2,9 @@
 
 	<PropertyGroup>
 		<OutputType>Library</OutputType>
-		<TargetFrameworks>net9.0-windows;net8.0-windows;net48</TargetFrameworks>
+		<TargetFrameworks>net10.0-windows;net9.0-windows;net8.0-windows;net48</TargetFrameworks>
 		<VersionPrefix>9.0.0</VersionPrefix>
-		<VersionSuffix>rc1</VersionSuffix>
+		<VersionSuffix>rc2</VersionSuffix>
 		<UseWindowsForms>true</UseWindowsForms>
 		<Authors>Lior Banai</Authors>
 		<Description>Analogy Serilog Parser for Compact Formatting</Description>
@@ -20,9 +20,11 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Analogy.CommonUtilities" Version="9.0.0-rc1" />
+		<PackageReference Include="Analogy.CommonUtilities" Version="9.0.1" />
 		<PackageReference Include="Analogy.LogViewer.Interfaces" Version="9.0.0" />
-		<PackageReference Include="Analogy.LogViewer.Template" Version="9.0.0-rc3" />
+		<PackageReference Include="Analogy.LogViewer.Interfaces.Winforms" Version="9.0.0" />
+		<PackageReference Include="Analogy.LogViewer.Template" Version="9.0.1" />
+		<PackageReference Include="Analogy.LogViewer.Template.WinForms" Version="9.0.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
 		<PackageReference Include="Serilog" Version="4.3.0" />
 		<PackageReference Include="System.Resources.Extensions" Version="10.0.0" />
diff --git a/Analogy.LogViewer.Serilog/ChangeLogList.cs b/Analogy.LogViewer.Serilog/ChangeLogList.cs
@@ -1,4 +1,5 @@
 ﻿using Analogy.Interfaces;
+using Analogy.Interfaces.DataTypes;
 using System;
 using System.Collections.Generic;
 
diff --git a/Analogy.LogViewer.Serilog/IAnalogy/DataProvidersFactory.cs b/Analogy.LogViewer.Serilog/IAnalogy/DataProvidersFactory.cs
diff --git a/Analogy.LogViewer.Serilog/IAnalogy/SerilogDataProvidersFactory.cs b/Analogy.LogViewer.Serilog/IAnalogy/SerilogDataProvidersFactory.cs
@@ -0,0 +1,16 @@
+﻿using Analogy.Interfaces;
+using Analogy.Interfaces.WinForms;
+using Analogy.LogViewer.Template.WinForms;
+using System;
+using System.Collections.Generic;
+
+namespace Analogy.LogViewer.Serilog.IAnalogy
+{
+    public class SerilogDataProvidersFactory : DataProvidersFactoryWinForms
+    {
+        public override Guid FactoryId { get; set; } = SerilogPrimaryFactory.Id;
+        public override string Title { get; set; } = "Serilog Parser";
+
+        public override IEnumerable<IAnalogyDataProviderWinForms> DataProviders { get; } = new List<IAnalogyDataProviderWinForms> { new SerilogOfflineDataProvider() };
+    }
+}
diff --git a/Analogy.LogViewer.Serilog/IAnalogy/SerilogDownloadInformation.cs b/Analogy.LogViewer.Serilog/IAnalogy/SerilogDownloadInformation.cs
@@ -14,7 +14,7 @@ public class SerilogDownloadInformation : Analogy.LogViewer.Template.AnalogyDown
         protected override string RepositoryURL { get; set; } = "https://api.github.com/repos/Analogy-LogViewer/Analogy.LogViewer.Serilog";
         public override TargetFrameworkAttribute CurrentFrameworkAttribute { get; set; } = (TargetFrameworkAttribute)Assembly.GetExecutingAssembly().GetCustomAttribute(typeof(TargetFrameworkAttribute));
 
-        public override Guid FactoryId { get; set; } = PrimaryFactory.Id;
+        public override Guid FactoryId { get; set; } = SerilogPrimaryFactory.Id;
         public override string Name { get; set; } = "Serilog Data Provider";
 
         private string? _installedVersionNumber;
diff --git a/Analogy.LogViewer.Serilog/IAnalogy/SerilogOfflineDataProvider.cs b/Analogy.LogViewer.Serilog/IAnalogy/SerilogOfflineDataProvider.cs
@@ -2,6 +2,7 @@
 using Analogy.Interfaces.DataTypes;
 using Analogy.LogViewer.Serilog.DataTypes;
 using Analogy.LogViewer.Serilog.Managers;
+using Analogy.LogViewer.Template.WinForms;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using System;
@@ -16,7 +17,7 @@
 
 namespace Analogy.LogViewer.Serilog.IAnalogy
 {
-    public class OfflineDataProvider : Analogy.LogViewer.Template.OfflineDataProviderWinforms
+    public class SerilogOfflineDataProvider : OfflineDataProviderWinForms
     {
         public override Guid Id { get; set; } = new Guid("D89318C6-306A-48D9-90A0-7C2C49EFDA82");
         public override Image LargeImage { get; set; }
@@ -44,7 +45,7 @@ public class OfflineDataProvider : Analogy.LogViewer.Template.OfflineDataProvide
 
         public override (Color BackgroundColor, Color ForegroundColor) GetColorForMessage(IAnalogyLogMessage logMessage)
             => (Color.Empty, Color.Empty);
-        public OfflineDataProvider()
+        public SerilogOfflineDataProvider()
         {
             CompactFormatPerLineParser = new CompactJsonFormatParser();
             CompactJsonFileParser = new JsonFileParser(new CompactJsonFormatMessageFields());
@@ -83,7 +84,7 @@ public override async Task<IEnumerable<IAnalogyLogMessage>> Process(string fileN
                         throw new ArgumentOutOfRangeException($"Invalid format {UserSettingsManager.UserSettings.Settings.Format}");
                 }
             }
-            Template.Managers.LogManager.Instance?.LogError($"Unsupported File {fileName}", nameof(OfflineDataProvider));
+            Template.Managers.LogManager.Instance?.LogError($"Unsupported File {fileName}", nameof(SerilogOfflineDataProvider));
             return new List<AnalogyLogMessage>(0);
         }
 
diff --git a/Analogy.LogViewer.Serilog/IAnalogy/SerilogPrimaryFactory.cs b/Analogy.LogViewer.Serilog/IAnalogy/SerilogPrimaryFactory.cs
@@ -1,13 +1,13 @@
 ﻿using Analogy.Interfaces;
-using Analogy.Interfaces.Factories;
 using Analogy.LogViewer.Serilog.Properties;
+using Analogy.LogViewer.Template.WinForms;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 
 namespace Analogy.LogViewer.Serilog.IAnalogy
 {
-    public class PrimaryFactory : Analogy.LogViewer.Template.PrimaryFactoryWinforms
+    public class SerilogPrimaryFactory : PrimaryFactoryWinForms
     {
         internal static Guid Id { get; } = new Guid("513A4393-425E-4054-92D4-6A816983E51F");
         public override Guid FactoryId { get; set; } = Id;
diff --git a/Analogy.LogViewer.Serilog/IAnalogy/SerilogUserSettingsFactory.cs b/Analogy.LogViewer.Serilog/IAnalogy/SerilogUserSettingsFactory.cs
@@ -1,5 +1,6 @@
 ﻿using Analogy.Interfaces;
 using Analogy.LogViewer.Serilog.Properties;
+using Analogy.LogViewer.Template.WinForms;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Drawing;
@@ -8,13 +9,13 @@
 
 namespace Analogy.LogViewer.Serilog.IAnalogy
 {
-    public class UserSettingsFactory : Analogy.LogViewer.Template.TemplateUserSettingsFactoryWinforms
+    public class SerilogUserSettingsFactory : TemplateUserSettingsFactoryWinForms
     {
         public override string Title { get; set; } = "Serilog User Settings";
         public override UserControl DataProviderSettings { get; set; }
         public override Image SmallImage { get; set; } = Resources.AnalogySerilog16x16;
         public override Image LargeImage { get; set; } = Resources.AnalogySerilog32x32;
-        public override Guid FactoryId { get; set; } = PrimaryFactory.Id;
+        public override Guid FactoryId { get; set; } = SerilogPrimaryFactory.Id;
         public override Guid Id { get; set; } = new Guid("26FF0D4D-8FA8-46C6-A021-079E669E7EC6");
 
         public override void CreateUserControl(ILogger logger)
diff --git a/Analogy.LogViewer.Serilog/Parsers/CommonParser.cs b/Analogy.LogViewer.Serilog/Parsers/CommonParser.cs
@@ -1,4 +1,5 @@
 ﻿using Analogy.Interfaces;
+using Analogy.Interfaces.DataTypes;
 using Analogy.LogViewer.Serilog.Managers;
 using Analogy.LogViewer.Template.Managers;
 using Microsoft.Extensions.Logging;
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -33,7 +33,7 @@
 	</ItemGroup>
 	<!-- Analyzers (Roslyn, Meziantou, StyleCop, ...) -->
 	<ItemGroup>
-		<PackageReference Include="Meziantou.Analyzer" Version="2.0.252">
+		<PackageReference Include="Meziantou.Analyzer" Version="2.0.253">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using Analogy.Interfaces;`
	`2`	`+using Analogy.Interfaces.DataTypes;`
`2`	`3`	`using Analogy.LogServer.Clients;`
`3`	`4`	`using Serilog.Core;`
`4`	`5`	`using Serilog.Events;`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public async Task JsonFilePerFileTest()`
`62`	`62`	`public void CompactJsonFormatTestAutomaticDetection(string fileName, FileFormat format)`
`63`	`63`	`{`
`64`	`64`	`string file = Path.Combine(Folder, "log files", fileName);`
`65`		`- var type = OfflineDataProvider.TryDetectFormat(file);`
	`65`	`+ var type = SerilogOfflineDataProvider.TryDetectFormat(file);`
`66`	`66`	`Assert.IsTrue(type == format);`
`67`	`67`	`}`
`68`	`68`