Merge branch 'Development' into 470-settings-deserialization-fails-if-filterparamscurrentcolumnizer-cant-be-deserialized

Author: Hirogen

.github/workflows/build_dotnet.yml

@@ -10,36 +10,60 @@ on:
 
 env:
   Solution: src/LogExpert.sln
-  Test_Project: src/LogExpert.Tests/LogExpert.Tests.csproj
+  Test_Project_LogExpert: src/LogExpert.Tests/LogExpert.Tests.csproj
+  Test_Project_ColumnizerLib: src/ColumnizerLib.UnitTests/ColumnizerLib.UnitTests.csproj
+  Test_Project_PluginRegistry: src/PluginRegistry.Tests/PluginRegistry.Tests.csproj
+  Test_Project_RegexColumnizer: src/RegexColumnizer.UnitTests/RegexColumnizer.UnitTests.csproj
 
 jobs:
   build:
-    permissions: 
-      contents: read
-    
+    permissions:
+      contents: write  # Changed to 'write' for committing
+      pull-requests: write  # Added for PR operations
+
     strategy:
       fail-fast: false
       matrix:
         configuration: [Debug, Release]
-        
+
     runs-on: windows-latest
     name: Build Application - ${{ matrix.configuration }}
-    
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+          ref: ${{ github.head_ref }}  # Checkout the PR branch
 
       - name: Install .NET Core
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
 
       - name: Build application
         run: |
           dotnet build ${{ env.Solution }} --nologo -v quiet -c ${{ matrix.configuration }}
 
+      - name: Generate Plugin Hashes
+        if: matrix.configuration == 'Release'
+        run: dotnet run --project src/PluginHashGenerator.Tool/PluginHashGenerator.Tool.csproj -- "bin/Release/" "src/PluginRegistry/PluginHashGenerator.Generated.cs" Release
+
+      - name: Commit Updated Hashes
+        if: matrix.configuration == 'Release'
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add src/PluginRegistry/PluginHashGenerator.Generated.cs
+          git diff --staged --quiet
+          if ($LASTEXITCODE -ne 0) {
+            git commit -m "chore: update plugin hashes [skip ci]"
+            git push
+          } else {
+            Write-Host "No changes to commit"
+          }
+
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:

.github/workflows/test_dotnet.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: Restore dependencies
       run: dotnet restore
       working-directory: src

README.md

@@ -1,9 +1,10 @@
 # LogExpert [![.NET](https://github.com/LogExperts/LogExpert/actions/workflows/build_dotnet.yml/badge.svg)](https://github.com/LogExperts/LogExpert/actions/workflows/build_dotnet.yml)
 
-This is a clone from (no longer exists) https://logexpert.codeplex.com/
+This is a clone from (no longer exists) <https://logexpert.codeplex.com/>
 
-# Overview
-LogExpert is a Windows tail program (a GUI replacement for the Unix tail command).
+## Overview
+
+LogExpert is a Windows feature rich tail program (a GUI replacement for the Unix tail command) with support for plugins, highlighting, filtering, bookmarking, columnizing and more.
 
 Summary of (most) features:
 
@@ -23,51 +24,61 @@ Summary of (most) features:
 * Serilog.Formatting.Compact format support (Experimental)
 * Portable (all options / settings saved in application startup directory)
 
-# Download
+## Download
+
 Follow the [Link](https://github.com/LogExperts/LogExpert/releases/latest) and download the latest package. Just extract it where you want and execute the application or download the Setup and install it
 
 Or Install via chocolatey
 
 ```choco install logexpert```
 
 Requirements
-- https://dotnet.microsoft.com/en-us/download/dotnet/8.0
-- .NET 8 (https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-8.0.13-windows-x64-installer or https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-8.0.13-windows-x86-installer) 
+
+* <https://dotnet.microsoft.com/en-us/download/dotnet/8.0>
+* .NET 8 (<https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-8.0.13-windows-x64-installer> or <https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-8.0.13-windows-x86-installer>)
 
 ## CI
+
 This is a continous integration build. So always the latest and greates changes. It should be stable but no promises. Can be viewed as Beta.
 
 [CI Download](https://ci.appveyor.com/project/Zarunbal/logexpert)
 
-# How to Build
+## How to Build
 
-- Clone / Fork / Download the source code
-- Open the Solution (src/LogExpert.sln) with Visual Studio 2017 (e.g. Community Edition)
-- Restore Nuget Packages on Solution
-- Build
-- The output is under bin/(Debug/Release)/
+* Clone / Fork / Download the source code
+* Open the Solution (src/LogExpert.sln) with Visual Studio 2017 (e.g. Community Edition)
+* Restore Nuget Packages on Solution
+* Build
+* The output is under bin/(Debug/Release)/
 
 Nuke.build Requirements
-- Chocolatey must be installed
-- Optional for Setup Inno Script 5 or 6
 
-# Pull Request
-- Use Development branch as target
+* Chocolatey must be installed
+* Optional for Setup Inno Script 5 or 6
+
+## Pull Request
+
+* Use Development branch as target
+
+## FAQ / HELP / Informations / Examples
 
-# FAQ / HELP / Informations / Examples
 Please checkout the wiki for FAQ / HELP / Informations / Examples
 
-# High DPI
-- dont use AutoScaleMode for single GUI controls like Buttons etc.
-- dont use AutoScaleDimensions for single GUI controls like Buttons etc.
+## High DPI
+
+* dont use AutoScaleMode for single GUI controls like Buttons etc.
+
+* dont use AutoScaleDimensions for single GUI controls like Buttons etc.
+
+<https://github.com/LogExperts/LogExpert/wiki>
+
+## Discord Server
 
-https://github.com/LogExperts/LogExpert/wiki
+<https://discord.gg/SjxkuckRe9>
 
-# Discord Server
-https://discord.gg/SjxkuckRe9
+### Credits
 
-## Credits
-### Contributors
+#### Contributors
 
 This project exists thanks to all the people who contribute.
 <a href="https://github.com/LogExperts/LogExpert/graphs/contributors">

TODOs.txt

@@ -34,7 +34,7 @@ partial class Build : NukeBuild
     ///   - JetBrains Rider            https://nuke.build/rider
     ///   - Microsoft VisualStudio     https://nuke.build/visualstudio
     ///   - Microsoft VSCode           https://nuke.build/vscode
-    public static int Main() => Execute<Build>(x => x.Test);
+    public static int Main () => Execute<Build>(x => x.Test);
 
     [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
     readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
@@ -78,7 +78,7 @@ Version Version
                 patch = AppVeyor.Instance.BuildNumber;
             }
 
-            return new Version(1, 12, 0, patch);
+            return new Version(1, 20, 0, patch);
         }
     }
 
@@ -119,7 +119,7 @@ Version Version
         ChocolateyDirectory / $"logexpert.{VersionString}.nupkg"
     ];
 
-    protected override void OnBuildInitialized()
+    protected override void OnBuildInitialized ()
     {
         SetVariable("DOTNET_CLI_TELEMETRY_OPTOUT", "1");
 
@@ -479,7 +479,7 @@ protected override void OnBuildInitialized()
             logExpertDocuments.DeleteDirectory();
         });
 
-    private void ExecuteInnoSetup(AbsolutePath innoPath)
+    private void ExecuteInnoSetup (AbsolutePath innoPath)
     {
         Process proc = new();
 
@@ -501,12 +501,12 @@ private void ExecuteInnoSetup(AbsolutePath innoPath)
         }
     }
 
-    private string ReplaceVersionMatch(Match match, string replacement)
+    private string ReplaceVersionMatch (Match match, string replacement)
     {
         return $"{match.Groups[1]}{replacement}{match.Groups[3]}";
     }
 
-    private void TransformTemplateFile(AbsolutePath path, bool deleteTemplate)
+    private void TransformTemplateFile (AbsolutePath path, bool deleteTemplate)
     {
         string text = path.ReadAllText();
         text = text.Replace("##version##", VersionString);
@@ -520,17 +520,17 @@ private void TransformTemplateFile(AbsolutePath path, bool deleteTemplate)
     }
 
     [GeneratedRegex(@"(\[assembly: AssemblyInformationalVersion\("")([^""]*)(""\)\])")]
-    private static partial Regex AssemblyInformationalVersion();
+    private static partial Regex AssemblyInformationalVersion ();
 
     [GeneratedRegex(@"(\[assembly: AssemblyVersion\("")([^""]*)(""\)\])")]
-    private static partial Regex AssemblyVersion();
+    private static partial Regex AssemblyVersion ();
 
     [GeneratedRegex(@"(\[assembly: AssemblyConfiguration\()(""[^""]*"")(\)\])")]
-    private static partial Regex AssemblyConfiguration();
+    private static partial Regex AssemblyConfiguration ();
 
     [GeneratedRegex(@"(\[assembly: AssemblyFileVersion\("")([^""]*)(""\)\])")]
-    private static partial Regex AssemblyFileVersion();
+    private static partial Regex AssemblyFileVersion ();
 
     [GeneratedRegex(@"\w\w{2}[_]p?[tso]?[erzliasx]+[_rhe]{5}", RegexOptions.IgnoreCase, "en-GB")]
-    private static partial Regex SFTPPlugin();
+    private static partial Regex SFTPPlugin ();
 }

build/Build.cs

@@ -2,23 +2,26 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace></RootNamespace>
     <IsPackable>False</IsPackable>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeTelemetryVersion>1</NukeTelemetryVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="chocolatey" Version="2.4.3" />
-    <PackageReference Include="GitVersion.Core" Version="6.3.0" />
-    <PackageReference Include="NuGet.CommandLine" Version="6.14.0">
+    <PackageReference Include="chocolatey" Version="2.5.1" />
+    <PackageReference Include="GitVersion.Core" Version="6.5.0" />
+    <PackageReference Include="Microsoft.Build" Version="18.0.2" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="18.0.2" />
+    <PackageReference Include="NuGet.CommandLine" Version="7.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="NuGet.Versioning" Version="7.0.0" />
     <PackageReference Include="Nuke.Common" Version="9.0.4" />
     <PackageReference Include="Nuke.GitHub" Version="7.0.0" />
-    <PackageReference Include="NUnit.ConsoleRunner" Version="3.20.1" />
+    <PackageReference Include="NUnit.ConsoleRunner" Version="3.20.2" />
   </ItemGroup>
 
   <ItemGroup>

build/_build.csproj

@@ -1,5 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.301"
+    "version": "10.0.100",
+    "rollForward": "latestPatch"
   }
 }