From 37de7e8f545ae111c2b68a7890f525797cc9a259 Mon Sep 17 00:00:00 2001
From: Hirogen <hirogenat@gmail.com>
Date: Sun, 27 Mar 2022 13:36:47 +0200
Subject: [PATCH 1/7] update nuget packages!

---
 build/Build.cs                                | 10 +-
 build/Configuration/Configuration.cs          | 15 +++
 build/_build.csproj                           | 93 ++++++++++---------
 .../ColumnizerLib.UnitTests.csproj            |  4 +-
 src/JsonColumnizer/JsonColumnizer.csproj      |  2 +-
 src/LogExpert.Tests/LogExpert.Tests.csproj    |  6 +-
 src/LogExpert/LogExpert.csproj                | 10 +-
 .../SftpFileSystemx86.csproj                  |  2 +-
 src/sftp-plugin/SftpFileSystemx64.csproj      |  2 +-
 9 files changed, 78 insertions(+), 66 deletions(-)
 create mode 100644 build/Configuration/Configuration.cs

diff --git a/build/Build.cs b/build/Build.cs
index 2f490e85..fb95c00c 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -5,9 +5,12 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
+using Nuke.Common.Tools.DotCover;
+using Nuke.Common.Tools.ReportGenerator;
 using Microsoft.Build.Execution;
 using Nuke.Common;
-using Nuke.Common.BuildServers;
+using Nuke.Common.CI.AppVeyor;
+using Nuke.Common.CI.AppVeyor.Configuration;
 using Nuke.Common.Execution;
 using Nuke.Common.Git;
 using Nuke.Common.IO;
@@ -18,12 +21,10 @@
 using Nuke.Common.Tools.GitVersion;
 using Nuke.Common.Tools.NuGet;
 using Nuke.Common.Tools.NUnit;
-using Nuke.Common.Utilities;
 using Nuke.Common.Utilities.Collections;
 using Nuke.GitHub;
 using static Nuke.Common.EnvironmentInfo;
 using static Nuke.Common.IO.FileSystemTasks;
-using static Nuke.Common.IO.PathConstruction;
 using static Nuke.Common.Tools.MSBuild.MSBuildTasks;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;
 using static Nuke.Common.IO.TextTasks;
@@ -42,7 +43,8 @@ class Build : NukeBuild
     ///   - Microsoft VSCode           https://nuke.build/vscode
     public static int Main() => Execute<Build>(x => x.Test);
 
-    [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")] private readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
+    [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")] 
+    readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
 
     [Solution] readonly Solution Solution;
     [GitRepository] readonly GitRepository GitRepository;
diff --git a/build/Configuration/Configuration.cs b/build/Configuration/Configuration.cs
new file mode 100644
index 00000000..fd740356
--- /dev/null
+++ b/build/Configuration/Configuration.cs
@@ -0,0 +1,15 @@
+using System.ComponentModel;
+
+using Nuke.Common.Tooling;
+
+[TypeConverter(typeof(TypeConverter<Configuration>))]
+public class Configuration : Enumeration
+{
+    public static Configuration Debug = new Configuration { Value = nameof(Debug) };
+    public static Configuration Release = new Configuration { Value = nameof(Release) };
+
+    public static implicit operator string(Configuration configuration)
+    {
+        return configuration.Value;
+    }
+}
\ No newline at end of file
diff --git a/build/_build.csproj b/build/_build.csproj
index ccb775d3..2adbd6fd 100644
--- a/build/_build.csproj
+++ b/build/_build.csproj
@@ -1,48 +1,49 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <RootNamespace></RootNamespace>
-    <IsPackable>False</IsPackable>
-    <NoWarn>CS0649;CS0169</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="chocolatey" Version="0.10.14" />
-    <PackageReference Include="GitVersion.CommandLine.DotNetCore" Version="5.0.1">
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <RootNamespace></RootNamespace>
+    <IsPackable>False</IsPackable>
+    <NoWarn>CS0649;CS0169</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="chocolatey" Version="1.0.1" />
+    <PackageReference Include="GitVersion.CommandLine" Version="5.9.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="NuGet.CommandLine" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="NuGet.CommandLine" Version="5.2.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Nuke.Common" Version="0.21.2" />
-    <PackageReference Include="Nuke.GitHub" Version="1.5.0" />
-    <PackageReference Include="NUnit.ConsoleRunner" Version="3.10.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <NukeMetadata Include="**\*.json" Exclude="bin\**;obj\**" />
-    <NukeExternalFiles Include="**\*.*.ext" Exclude="bin\**;obj\**" />
-    <None Remove="*.csproj.DotSettings;*.ref.*.txt" />
-    <None Include="..\appveyor-release.yml" Link="appveyor-release.yml" />
-    <None Include="..\Build-DebugPack.ps1" Link="Build-DebugPack.ps1" />
-    <None Include="..\Build-ReleasePack.ps1" Link="Build-ReleasePack.ps1" />
-
-    <!-- Common build related files -->
-    <None Include="..\build.ps1" />
-    <None Include="..\build.sh" />
-    <None Include="..\.nuke" />
-    <None Include="..\global.json" Condition="Exists('..\global.json')" />
-    <None Include="..\nuget.config" Condition="Exists('..\nuget.config')" />
-    <None Include="..\azure-pipelines.yml" Condition="Exists('..\azure-pipelines.yml')" />
-    <None Include="..\Jenkinsfile" Condition="Exists('..\Jenkinsfile')" />
-    <None Include="..\appveyor.yml" Condition="Exists('..\appveyor.yml')" />
-    <None Include="..\.travis.yml" Condition="Exists('..\.travis.yml')" />
-    <None Include="..\GitVersion.yml" Condition="Exists('..\GitVersion.yml')" />
-  </ItemGroup>
-
-</Project>
+    </PackageReference>
+    <PackageReference Include="Nuke.Common" Version="5.0.0" />
+    <PackageReference Include="Nuke.GitHub" Version="1.5.0" />
+    <PackageReference Include="NUnit.ConsoleRunner" Version="3.15.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <NukeMetadata Include="**\*.json" Exclude="bin\**;obj\**" />
+    <NukeExternalFiles Include="**\*.*.ext" Exclude="bin\**;obj\**" />
+    <None Remove="*.csproj.DotSettings;*.ref.*.txt" />
+    <None Include="..\appveyor-release.yml" Link="appveyor-release.yml" />
+    <None Include="..\Build-DebugPack.ps1" Link="Build-DebugPack.ps1" />
+    <None Include="..\Build-ReleasePack.ps1" Link="Build-ReleasePack.ps1" />
+
+    <!-- Common build related files -->
+    <None Include="..\build.ps1" />
+    <None Include="..\build.sh" />
+    <None Include="..\.nuke" />
+    <None Include="..\global.json" Condition="Exists('..\global.json')" />
+    <None Include="..\nuget.config" Condition="Exists('..\nuget.config')" />
+    <None Include="..\azure-pipelines.yml" Condition="Exists('..\azure-pipelines.yml')" />
+    <None Include="..\Jenkinsfile" Condition="Exists('..\Jenkinsfile')" />
+    <None Include="..\appveyor.yml" Condition="Exists('..\appveyor.yml')" />
+    <None Include="..\.travis.yml" Condition="Exists('..\.travis.yml')" />
+    <None Include="..\GitVersion.yml" Condition="Exists('..\GitVersion.yml')" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/ColumnizerLib.UnitTests/ColumnizerLib.UnitTests.csproj b/src/ColumnizerLib.UnitTests/ColumnizerLib.UnitTests.csproj
index b086efdc..120fd833 100644
--- a/src/ColumnizerLib.UnitTests/ColumnizerLib.UnitTests.csproj
+++ b/src/ColumnizerLib.UnitTests/ColumnizerLib.UnitTests.csproj
@@ -59,10 +59,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="NUnit">
-      <Version>3.12.0</Version>
+      <Version>3.13.3</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>4.2.1</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/JsonColumnizer/JsonColumnizer.csproj b/src/JsonColumnizer/JsonColumnizer.csproj
index e2dc7401..b4b16a89 100644
--- a/src/JsonColumnizer/JsonColumnizer.csproj
+++ b/src/JsonColumnizer/JsonColumnizer.csproj
@@ -72,7 +72,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>12.0.2</Version>
+      <Version>13.0.1</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/LogExpert.Tests/LogExpert.Tests.csproj b/src/LogExpert.Tests/LogExpert.Tests.csproj
index 5d92c994..4477ab1d 100644
--- a/src/LogExpert.Tests/LogExpert.Tests.csproj
+++ b/src/LogExpert.Tests/LogExpert.Tests.csproj
@@ -63,13 +63,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Moq">
-      <Version>4.13.0</Version>
+      <Version>4.17.2</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
-      <Version>3.12.0</Version>
+      <Version>3.13.3</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>3.15.1</Version>
+      <Version>4.2.1</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/LogExpert/LogExpert.csproj b/src/LogExpert/LogExpert.csproj
index d2e2dd5e..cff3c064 100644
--- a/src/LogExpert/LogExpert.csproj
+++ b/src/LogExpert/LogExpert.csproj
@@ -44,14 +44,8 @@
     <AssemblyOriginatorKeyFile>..\Solution Items\Key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Accessibility" />
-    <Reference Include="CookComputing.XmlRpcV2, Version=2.4.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\CookComputing.XmlRpcV2.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Windows.Forms" />
@@ -586,12 +580,12 @@
       <Name>WinFormsUI</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup />
+    <ItemGroup>
     <PackageReference Include="NLog.Config">
       <Version>4.6.7</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/SftpFileSystemx86/SftpFileSystemx86.csproj b/src/SftpFileSystemx86/SftpFileSystemx86.csproj
index 82a17927..1d7064e6 100644
--- a/src/SftpFileSystemx86/SftpFileSystemx86.csproj
+++ b/src/SftpFileSystemx86/SftpFileSystemx86.csproj
@@ -111,7 +111,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="chilkat-win32">
-      <Version>9.5.0.77</Version>
+      <Version>9.5.0.90</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/sftp-plugin/SftpFileSystemx64.csproj b/src/sftp-plugin/SftpFileSystemx64.csproj
index 74697d2b..1a792609 100644
--- a/src/sftp-plugin/SftpFileSystemx64.csproj
+++ b/src/sftp-plugin/SftpFileSystemx64.csproj
@@ -116,7 +116,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="chilkat-x64">
-      <Version>9.5.0.72</Version>
+      <Version>9.5.0.90</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

From 62e5d83a903162f05ba53cc3181cfcbdf1ee0f95 Mon Sep 17 00:00:00 2001
From: Hirogen <hirogenat@gmail.com>
Date: Sun, 27 Mar 2022 13:37:11 +0200
Subject: [PATCH 2/7] update nuget package, cleanup classes

---
 .../JsonCompactColumnizer.csproj              |  2 +-
 .../Classes/Bookmark/BookmarkDataProvider.cs  | 70 ++++++++-----------
 .../Classes/Log/LogStreamReaderBase.cs        |  3 -
 src/LogExpert/Classes/Log/LogfileReader.cs    |  4 +-
 .../Log/PositionAwareStreamReaderBase.cs      | 50 +++++++------
 .../Log/PositionAwareStreamReaderLegacy.cs    | 53 +++++++-------
 .../Log/PositionAwareStreamReaderSystem.cs    | 11 ++-
 src/LogExpert/Controls/LogWindow/LogWindow.cs |  1 +
 8 files changed, 91 insertions(+), 103 deletions(-)

diff --git a/src/JsonCompactColumnizer/JsonCompactColumnizer.csproj b/src/JsonCompactColumnizer/JsonCompactColumnizer.csproj
index 14e629ae..d4c70ce3 100644
--- a/src/JsonCompactColumnizer/JsonCompactColumnizer.csproj
+++ b/src/JsonCompactColumnizer/JsonCompactColumnizer.csproj
@@ -76,7 +76,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>12.0.2</Version>
+      <Version>13.0.1</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/LogExpert/Classes/Bookmark/BookmarkDataProvider.cs b/src/LogExpert/Classes/Bookmark/BookmarkDataProvider.cs
index 6bdae183..80296305 100644
--- a/src/LogExpert/Classes/Bookmark/BookmarkDataProvider.cs
+++ b/src/LogExpert/Classes/Bookmark/BookmarkDataProvider.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
-using System.Text;
 using NLog;
 
-namespace LogExpert
+namespace LogExpert.Classes.Bookmark
 {
     internal class BookmarkDataProvider : IBookmarkData
     {
@@ -18,12 +16,12 @@ internal class BookmarkDataProvider : IBookmarkData
 
         internal BookmarkDataProvider()
         {
-            BookmarkList = new SortedList<int, Bookmark>();
+            BookmarkList = new SortedList<int, LogExpert.Bookmark>();
         }
 
-        internal BookmarkDataProvider(SortedList<int, Bookmark> bookmarkList)
+        internal BookmarkDataProvider(SortedList<int, LogExpert.Bookmark> bookmarkList)
         {
-            this.BookmarkList = bookmarkList;
+            BookmarkList = bookmarkList;
         }
 
         #endregion
@@ -47,13 +45,10 @@ internal BookmarkDataProvider(SortedList<int, Bookmark> bookmarkList)
         #endregion
 
         #region Properties
+        
+        public BookmarkCollection Bookmarks => new BookmarkCollection(BookmarkList);
 
-        public BookmarkCollection Bookmarks
-        {
-            get { return new BookmarkCollection(this.BookmarkList); }
-        }
-
-        internal SortedList<int, Bookmark> BookmarkList { get; set; }
+        internal SortedList<int, LogExpert.Bookmark> BookmarkList { get; set; }
 
         #endregion
 
@@ -67,23 +62,23 @@ public void ToggleBookmark(int lineNum)
             }
             else
             {
-                AddBookmark(new Bookmark(lineNum));
+                AddBookmark(new LogExpert.Bookmark(lineNum));
             }
         }
 
         public bool IsBookmarkAtLine(int lineNum)
         {
-            return this.BookmarkList.ContainsKey(lineNum);
+            return BookmarkList.ContainsKey(lineNum);
         }
 
         public int GetBookmarkIndexForLine(int lineNum)
         {
-            return this.BookmarkList.IndexOfKey(lineNum);
+            return BookmarkList.IndexOfKey(lineNum);
         }
 
-        public Bookmark GetBookmarkForLine(int lineNum)
+        public LogExpert.Bookmark GetBookmarkForLine(int lineNum)
         {
-            return this.BookmarkList[lineNum];
+            return BookmarkList[lineNum];
         }
 
         #endregion
@@ -92,8 +87,8 @@ public Bookmark GetBookmarkForLine(int lineNum)
 
         internal void ShiftBookmarks(int offset)
         {
-            SortedList<int, Bookmark> newBookmarkList = new SortedList<int, Bookmark>();
-            foreach (Bookmark bookmark in this.BookmarkList.Values)
+            SortedList<int, LogExpert.Bookmark> newBookmarkList = new SortedList<int, LogExpert.Bookmark>();
+            foreach (LogExpert.Bookmark bookmark in BookmarkList.Values)
             {
                 int line = bookmark.LineNum - offset;
                 if (line >= 0)
@@ -102,26 +97,26 @@ internal void ShiftBookmarks(int offset)
                     newBookmarkList.Add(line, bookmark);
                 }
             }
-            this.BookmarkList = newBookmarkList;
+            BookmarkList = newBookmarkList;
         }
 
         internal int FindPrevBookmarkIndex(int lineNum)
         {
-            IList<Bookmark> values = this.BookmarkList.Values;
-            for (int i = this.BookmarkList.Count - 1; i >= 0; --i)
+            IList<LogExpert.Bookmark> values = BookmarkList.Values;
+            for (int i = BookmarkList.Count - 1; i >= 0; --i)
             {
                 if (values[i].LineNum <= lineNum)
                 {
                     return i;
                 }
             }
-            return this.BookmarkList.Count - 1;
+            return BookmarkList.Count - 1;
         }
 
         internal int FindNextBookmarkIndex(int lineNum)
         {
-            IList<Bookmark> values = this.BookmarkList.Values;
-            for (int i = 0; i < this.BookmarkList.Count; ++i)
+            IList<LogExpert.Bookmark> values = BookmarkList.Values;
+            for (int i = 0; i < BookmarkList.Count; ++i)
             {
                 if (values[i].LineNum >= lineNum)
                 {
@@ -133,7 +128,7 @@ internal int FindNextBookmarkIndex(int lineNum)
 
         internal void RemoveBookmarkForLine(int lineNum)
         {
-            this.BookmarkList.Remove(lineNum);
+            BookmarkList.Remove(lineNum);
             OnBookmarkRemoved();
         }
 
@@ -141,22 +136,22 @@ internal void RemoveBookmarksForLines(List<int> lineNumList)
         {
             foreach (int lineNum in lineNumList)
             {
-                this.BookmarkList.Remove(lineNum);
+                BookmarkList.Remove(lineNum);
             }
             OnBookmarkRemoved();
         }
 
 
-        internal void AddBookmark(Bookmark bookmark)
+        internal void AddBookmark(LogExpert.Bookmark bookmark)
         {
-            this.BookmarkList.Add(bookmark.LineNum, bookmark);
+            BookmarkList.Add(bookmark.LineNum, bookmark);
             OnBookmarkAdded();
         }
 
         internal void ClearAllBookmarks()
         {
             _logger.Debug("Removing all bookmarks");
-            this.BookmarkList.Clear();
+            BookmarkList.Clear();
             OnAllBookmarksRemoved();
         }
 
@@ -164,26 +159,17 @@ internal void ClearAllBookmarks()
 
         protected void OnBookmarkAdded()
         {
-            if (BookmarkAdded != null)
-            {
-                BookmarkAdded(this, new EventArgs());
-            }
+            BookmarkAdded?.Invoke(this, EventArgs.Empty);
         }
 
         protected void OnBookmarkRemoved()
         {
-            if (BookmarkRemoved != null)
-            {
-                BookmarkRemoved(this, new EventArgs());
-            }
+            BookmarkRemoved?.Invoke(this, EventArgs.Empty);
         }
 
         protected void OnAllBookmarksRemoved()
         {
-            if (AllBookmarksRemoved != null)
-            {
-                AllBookmarksRemoved(this, new EventArgs());
-            }
+            AllBookmarksRemoved?.Invoke(this, EventArgs.Empty);
         }
     }
 }
\ No newline at end of file
diff --git a/src/LogExpert/Classes/Log/LogStreamReaderBase.cs b/src/LogExpert/Classes/Log/LogStreamReaderBase.cs
index e845e545..59b5ffcd 100644
--- a/src/LogExpert/Classes/Log/LogStreamReaderBase.cs
+++ b/src/LogExpert/Classes/Log/LogStreamReaderBase.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace LogExpert.Classes.Log
 {
diff --git a/src/LogExpert/Classes/Log/LogfileReader.cs b/src/LogExpert/Classes/Log/LogfileReader.cs
index 624795d3..02231715 100644
--- a/src/LogExpert/Classes/Log/LogfileReader.cs
+++ b/src/LogExpert/Classes/Log/LogfileReader.cs
@@ -990,8 +990,7 @@ private void ReadToBufferList(ILogFileInfo logFileInfo, long filePos, int startL
                             int droppedLines = logBuffer.PrevBuffersDroppedLinesSum;
                             filePos = reader.Position;
 
-                            while (ReadLine(reader, logBuffer.StartLine + logBuffer.LineCount,
-                                logBuffer.StartLine + logBuffer.LineCount + droppedLines, out var line))
+                            while (ReadLine(reader, logBuffer.StartLine + logBuffer.LineCount, logBuffer.StartLine + logBuffer.LineCount + droppedLines, out var line))
                             {
                                 LogLine logLine = new LogLine();
                                 if (_shouldStop)
@@ -1645,6 +1644,7 @@ private ILogStreamReader GetLogStreamReader(Stream stream, EncodingOptions encod
 
             return IsXmlMode ? new XmlBlockSplitter(new XmlLogReader(reader), XmlLogConfig) : reader;
         }
+
         private ILogStreamReader CreateLogStreamReader(Stream stream, EncodingOptions encodingOptions, bool useSystemReader)
         {
             if (useSystemReader)
diff --git a/src/LogExpert/Classes/Log/PositionAwareStreamReaderBase.cs b/src/LogExpert/Classes/Log/PositionAwareStreamReaderBase.cs
index 99e648bb..246197ba 100644
--- a/src/LogExpert/Classes/Log/PositionAwareStreamReaderBase.cs
+++ b/src/LogExpert/Classes/Log/PositionAwareStreamReaderBase.cs
@@ -8,9 +8,9 @@ public abstract class PositionAwareStreamReaderBase : LogStreamReaderBase
     {
         #region Fields
 
-        protected const int MAX_LINE_LEN = 20000;
+        private const int MAX_LINE_LEN = 20000;
 
-        private static readonly Encoding[] _preambleEncodings = new Encoding[] { Encoding.UTF8, Encoding.Unicode, Encoding.BigEndianUnicode, Encoding.UTF32 };
+        private static readonly Encoding[] _preambleEncodings = { Encoding.UTF8, Encoding.Unicode, Encoding.BigEndianUnicode, Encoding.UTF32 };
 
         private readonly BufferedStream _stream;
         private readonly StreamReader _reader;
@@ -30,8 +30,8 @@ protected PositionAwareStreamReaderBase(Stream stream, EncodingOptions encodingO
 
             _preambleLength = DetectPreambleLengthAndEncoding(out Encoding detectedEncoding);
 
-            Encoding usedEncoding = getUsedEncoding(encodingOptions, detectedEncoding);
-            _posIncPrecomputed = getPosIncPrecomputed(usedEncoding);
+            Encoding usedEncoding = GetUsedEncoding(encodingOptions, detectedEncoding);
+            _posIncPrecomputed = GetPosIncPrecomputed(usedEncoding);
 
             _reader = new StreamReader(_stream, usedEncoding, true);
             
@@ -71,6 +71,8 @@ public sealed override long Position
 
         public sealed override bool IsBufferComplete => true;
 
+        protected static int MaxLineLen => MAX_LINE_LEN;
+
         #endregion
 
         #region Public methods
@@ -90,7 +92,10 @@ protected override void Dispose(bool disposing)
 
         public override unsafe int ReadChar()
         {
-            if (IsDisposed) throw new ObjectDisposedException(ToString());
+            if (IsDisposed)
+            {
+                throw new ObjectDisposedException(ToString());
+            }
 
             try
             {
@@ -154,7 +159,7 @@ private int DetectPreambleLengthAndEncoding(out Encoding detectedEncoding)
             int readLen = _stream.Read(readPreamble, 0, 4);
             if (readLen >= 2)
             {
-                foreach (Encoding encoding in PositionAwareStreamReaderBase._preambleEncodings)
+                foreach (Encoding encoding in _preambleEncodings)
                 {
                     byte[] preamble = encoding.GetPreamble();
                     bool fail = false;
@@ -180,7 +185,7 @@ private int DetectPreambleLengthAndEncoding(out Encoding detectedEncoding)
             return 0;
         }
 
-        private Encoding getUsedEncoding(EncodingOptions encodingOptions, Encoding detectedEncoding)
+        private Encoding GetUsedEncoding(EncodingOptions encodingOptions, Encoding detectedEncoding)
         {
             if (encodingOptions.Encoding != null)
             {
@@ -192,26 +197,25 @@ private Encoding getUsedEncoding(EncodingOptions encodingOptions, Encoding detec
                 return detectedEncoding;
             }
 
-            if (encodingOptions.DefaultEncoding != null)
-            {
-                return encodingOptions.DefaultEncoding;
-            }
-
-            return Encoding.Default;
+            return encodingOptions.DefaultEncoding ?? Encoding.Default;
         }
-        private int getPosIncPrecomputed(Encoding usedEncoding)
+        private int GetPosIncPrecomputed(Encoding usedEncoding)
         {
-            if (usedEncoding is UTF8Encoding)
+            switch (usedEncoding)
             {
-                return 0;
-            }
-
-            if (usedEncoding is UnicodeEncoding)
-            {
-                return 2;
+                case UTF8Encoding _:
+                {
+                    return 0;
+                }
+                case UnicodeEncoding _:
+                {
+                    return 2;
+                }
+                default:
+                {
+                    return 1;
+                }
             }
-
-            return 1;
         }
 
         #endregion
diff --git a/src/LogExpert/Classes/Log/PositionAwareStreamReaderLegacy.cs b/src/LogExpert/Classes/Log/PositionAwareStreamReaderLegacy.cs
index 23053154..a3af3488 100644
--- a/src/LogExpert/Classes/Log/PositionAwareStreamReaderLegacy.cs
+++ b/src/LogExpert/Classes/Log/PositionAwareStreamReaderLegacy.cs
@@ -6,17 +6,16 @@ public class PositionAwareStreamReaderLegacy : PositionAwareStreamReaderBase
     {
         #region Fields
 
-        private readonly char[] charBuffer = new char[MAX_LINE_LEN];
+        private readonly char[] _charBuffer = new char[MaxLineLen];
 
-        private int _charBufferPos = 0;
-        private bool _crDetect = false;
+        private int _charBufferPos;
+        private bool _crDetect;
 
         #endregion
 
         #region cTor
 
-        public PositionAwareStreamReaderLegacy(Stream stream, EncodingOptions encodingOptions) 
-            : base(stream, encodingOptions)
+        public PositionAwareStreamReaderLegacy(Stream stream, EncodingOptions encodingOptions) : base(stream, encodingOptions)
         {
 
         }
@@ -36,35 +35,37 @@ public override string ReadLine()
                 switch (readChar)
                 {
                     case '\n':
+                    {
                         _crDetect = false;
-                        return getLineAndResetCharBufferPos();
+                        return GetLineAndResetCharBufferPos();
+                    }
                     case '\r':
+                    {
                         if (_crDetect)
                         {
-                            return getLineAndResetCharBufferPos();
-                        }
-                        else
-                        {
-                            _crDetect = true;
+                            return GetLineAndResetCharBufferPos();
                         }
+
+                        _crDetect = true;
                         break;
+                    }
                     default:
+                    {
                         if (_crDetect)
                         {
                             _crDetect = false;
-                            string line = getLineAndResetCharBufferPos();
-                            appendToCharBuffer(readChar);
+                            string line = GetLineAndResetCharBufferPos();
+                            AppendToCharBuffer(readChar);
                             return line;
                         }
-                        else
-                        {
-                            appendToCharBuffer(readChar);
-                        }
+
+                        AppendToCharBuffer(readChar);
                         break;
+                    }
                 }
             }
 
-            string result = getLineAndResetCharBufferPos();
+            string result = GetLineAndResetCharBufferPos();
             if (readInt == -1 && result.Length == 0 && !_crDetect)
             {
                 return null; // EOF
@@ -75,7 +76,7 @@ public override string ReadLine()
 
         protected override void ResetReader()
         {
-            resetCharBufferPos();
+            ResetCharBufferPos();
 
             base.ResetReader();
         }
@@ -84,22 +85,22 @@ protected override void ResetReader()
 
         #region Private Methods
 
-        private string getLineAndResetCharBufferPos()
+        private string GetLineAndResetCharBufferPos()
         {
-            string result = new string(charBuffer, 0, _charBufferPos);
-            resetCharBufferPos();
+            string result = new string(_charBuffer, 0, _charBufferPos);
+            ResetCharBufferPos();
             return result;
         }
 
-        private void appendToCharBuffer(char readChar)
+        private void AppendToCharBuffer(char readChar)
         {
-            if (_charBufferPos < MAX_LINE_LEN)
+            if (_charBufferPos < MaxLineLen)
             {
-                charBuffer[_charBufferPos++] = readChar;
+                _charBuffer[_charBufferPos++] = readChar;
             }
         }
 
-        private void resetCharBufferPos()
+        private void ResetCharBufferPos()
         {
             _charBufferPos = 0;
         }
diff --git a/src/LogExpert/Classes/Log/PositionAwareStreamReaderSystem.cs b/src/LogExpert/Classes/Log/PositionAwareStreamReaderSystem.cs
index edd385c6..589ea48a 100644
--- a/src/LogExpert/Classes/Log/PositionAwareStreamReaderSystem.cs
+++ b/src/LogExpert/Classes/Log/PositionAwareStreamReaderSystem.cs
@@ -21,8 +21,7 @@ public class PositionAwareStreamReaderSystem : PositionAwareStreamReaderBase
 
         #region cTor
 
-        public PositionAwareStreamReaderSystem(Stream stream, EncodingOptions encodingOptions)
-            : base(stream, encodingOptions)
+        public PositionAwareStreamReaderSystem(Stream stream, EncodingOptions encodingOptions) : base(stream, encodingOptions)
         {
             
         }
@@ -37,7 +36,7 @@ public override string ReadLine()
 
             if (_newLineSequenceLength == 0)
             {
-                _newLineSequenceLength = guessNewLineSequenceLength(reader);
+                _newLineSequenceLength = GuessNewLineSequenceLength(reader);
             }
 
             string line = reader.ReadLine();
@@ -46,9 +45,9 @@ public override string ReadLine()
             {
                 MovePosition(Encoding.GetByteCount(line) + _newLineSequenceLength);
 
-                if (line.Length > MAX_LINE_LEN)
+                if (line.Length > MaxLineLen)
                 {
-                    line = line.Remove(MAX_LINE_LEN);
+                    line = line.Remove(MaxLineLen);
                 }
             }
 
@@ -59,7 +58,7 @@ public override string ReadLine()
 
         #region Private Methods
 
-        private int guessNewLineSequenceLength(StreamReader reader)
+        private int GuessNewLineSequenceLength(StreamReader reader)
         {
             long currentPos = Position;
 
diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.cs b/src/LogExpert/Controls/LogWindow/LogWindow.cs
index 8c1d6700..1a1c3820 100644
--- a/src/LogExpert/Controls/LogWindow/LogWindow.cs
+++ b/src/LogExpert/Controls/LogWindow/LogWindow.cs
@@ -4,6 +4,7 @@
 using System.Windows.Forms;
 using LogExpert.Dialogs;
 using System.Threading;
+using LogExpert.Classes.Bookmark;
 using LogExpert.Classes.ILogLineColumnizerCallback;
 using NLog;
 using WeifenLuo.WinFormsUI.Docking;

From d6b677a188d6a758b2ed74f9c78c80c3d1a163db Mon Sep 17 00:00:00 2001
From: Hirogen <hirogenat@gmail.com>
Date: Sun, 27 Mar 2022 13:50:15 +0200
Subject: [PATCH 3/7] add gitversion.yml

---
 GitVersion.yml          | 5 +++++
 appveyor.gitversion.yml | 9 +++++++++
 build/Build.cs          | 2 +-
 build/_build.csproj     | 1 +
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 GitVersion.yml
 create mode 100644 appveyor.gitversion.yml

diff --git a/GitVersion.yml b/GitVersion.yml
new file mode 100644
index 00000000..ed16160b
--- /dev/null
+++ b/GitVersion.yml
@@ -0,0 +1,5 @@
+mode: ContinuousDelivery
+branches: {}
+ignore:
+  sha: []
+merge-message-formats: {}
diff --git a/appveyor.gitversion.yml b/appveyor.gitversion.yml
new file mode 100644
index 00000000..c5762524
--- /dev/null
+++ b/appveyor.gitversion.yml
@@ -0,0 +1,9 @@
+install:
+  - choco install gitversion.portable -pre -y
+
+before_build:
+  - nuget restore
+  - ps: gitversion /l console /output buildserver /updateAssemblyInfo
+
+build:
+  project: scr\LogExpert.sln
\ No newline at end of file
diff --git a/build/Build.cs b/build/Build.cs
index fb95c00c..4546ceca 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -82,7 +82,7 @@ Version Version
                 patch = AppVeyor.Instance.BuildNumber;
             }
 
-            return new Version(1, 8, patch);
+            return new Version(1, 8, 8, patch);
         }
     }
 
diff --git a/build/_build.csproj b/build/_build.csproj
index 2adbd6fd..99a88bc0 100644
--- a/build/_build.csproj
+++ b/build/_build.csproj
@@ -30,6 +30,7 @@
     <NukeExternalFiles Include="**\*.*.ext" Exclude="bin\**;obj\**" />
     <None Remove="*.csproj.DotSettings;*.ref.*.txt" />
     <None Include="..\appveyor-release.yml" Link="appveyor-release.yml" />
+    <None Include="..\appveyor.gitversion.yml" Link="appveyor.gitversion.yml" />
     <None Include="..\Build-DebugPack.ps1" Link="Build-DebugPack.ps1" />
     <None Include="..\Build-ReleasePack.ps1" Link="Build-ReleasePack.ps1" />
 

From 390108253b546e9164c8fb5bd603bb0c6597cfa6 Mon Sep 17 00:00:00 2001
From: Hirogen <hirogenat@gmail.com>
Date: Sun, 27 Mar 2022 14:02:59 +0200
Subject: [PATCH 4/7] update to .net core 3.1 and use gitversion.core, maybe
 works now?

---
 build/Build.cs      | 2 +-
 build/_build.csproj | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/Build.cs b/build/Build.cs
index 4546ceca..b2b9d05a 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -48,7 +48,7 @@ class Build : NukeBuild
 
     [Solution] readonly Solution Solution;
     [GitRepository] readonly GitRepository GitRepository;
-    [GitVersion] readonly GitVersion GitVersion;
+    [GitVersion] readonly Nuke.Common.Tools.GitVersion.GitVersion GitVersion;
 
     AbsolutePath SourceDirectory => RootDirectory / "src";
 
diff --git a/build/_build.csproj b/build/_build.csproj
index 99a88bc0..3f08fed0 100644
--- a/build/_build.csproj
+++ b/build/_build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <RootNamespace></RootNamespace>
@@ -16,6 +16,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="GitVersion.Core" Version="5.9.0" />
     <PackageReference Include="NuGet.CommandLine" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

From 4abde8608e301b7a7e47bfc516c4bcad78ea37c3 Mon Sep 17 00:00:00 2001
From: Hirogen <hirogenat@gmail.com>
Date: Sun, 27 Mar 2022 14:32:08 +0200
Subject: [PATCH 5/7] changing config

---
 GitVersion.yml                 | 1 +
 src/LogExpert/LogExpert.csproj | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/GitVersion.yml b/GitVersion.yml
index ed16160b..85cfd271 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,3 +1,4 @@
+assembly-versioning-scheme: MajorMinorPatchTag
 mode: ContinuousDelivery
 branches: {}
 ignore:
diff --git a/src/LogExpert/LogExpert.csproj b/src/LogExpert/LogExpert.csproj
index cff3c064..7a381d6f 100644
--- a/src/LogExpert/LogExpert.csproj
+++ b/src/LogExpert/LogExpert.csproj
@@ -581,9 +581,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup />
-    <ItemGroup>
+  <ItemGroup>
     <PackageReference Include="NLog.Config">
-      <Version>4.6.7</Version>
+      <Version>4.7.15</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

From 578eda2289cca1ad4d08ebc48a33372e09cf2bd3 Mon Sep 17 00:00:00 2001
From: Hirogen <hirogenat@gmail.com>
Date: Sun, 27 Mar 2022 14:42:39 +0200
Subject: [PATCH 6/7] update buildnumber

---
 build/Build.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/Build.cs b/build/Build.cs
index b2b9d05a..2c5d4df8 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -48,7 +48,8 @@ class Build : NukeBuild
 
     [Solution] readonly Solution Solution;
     [GitRepository] readonly GitRepository GitRepository;
-    [GitVersion] readonly Nuke.Common.Tools.GitVersion.GitVersion GitVersion;
+    [GitVersion(UpdateBuildNumber = true)] 
+    readonly Nuke.Common.Tools.GitVersion.GitVersion GitVersion;
 
     AbsolutePath SourceDirectory => RootDirectory / "src";
 

From de6209b65b3de4503ec078066dc5cf2cad45685c Mon Sep 17 00:00:00 2001
From: Hirogen <hirogenat@gmail.com>
Date: Sun, 27 Mar 2022 14:45:29 +0200
Subject: [PATCH 7/7] GitVersion.Branchname and SHA removed for testing purpose

---
 build/Build.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/Build.cs b/build/Build.cs
index 2c5d4df8..8aa70116 100644
--- a/build/Build.cs
+++ b/build/Build.cs
@@ -91,7 +91,8 @@ Version Version
     string VersionString => $"{Version.Major}.{Version.Minor}.{Version.Build}";
 
     [Parameter("Version Information string")]
-    string VersionInformationString => $"{VersionString}.Branch.{GitVersion.BranchName}.{GitVersion.Sha} {Configuration}";
+    //.Branch.{GitVersion.BranchName}.{GitVersion.Sha} removed for testing purpose
+    string VersionInformationString => $"{VersionString} {Configuration}";
 
     [Parameter("Version file string")]
     string VersionFileString => $"{Version.Major}.{Version.Minor}.0";