From 1bb370e4ce12b87782194a463bd9c9ce7decf5cc Mon Sep 17 00:00:00 2001 From: Hirogen Date: Tue, 3 Mar 2026 16:48:00 +0100 Subject: [PATCH 1/3] nuke parameters.json --- .gitignore | 3 ++- .nuke/parameters.json | 4 ++++ README.md | 2 +- src/Solution Items/AssemblyInfo.cs | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .nuke/parameters.json diff --git a/.gitignore b/.gitignore index 8fe30cb0..28329487 100644 --- a/.gitignore +++ b/.gitignore @@ -323,7 +323,8 @@ paket-files/ .fake/ # Nuke Build System -.nuke/ +.nuke/* +!.nuke/parameters.json # CodeRush personal settings .cr/personal diff --git a/.nuke/parameters.json b/.nuke/parameters.json new file mode 100644 index 00000000..969e7748 --- /dev/null +++ b/.nuke/parameters.json @@ -0,0 +1,4 @@ +{ + "$schema": "./build.schema.json", + "Solution": "src/LogExpert.sln" +} diff --git a/README.md b/README.md index 2d35ca0d..a2f6bf26 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ This is a continous integration build. So always the latest and greates changes. ## How to Build * Clone / Fork / Download the source code -* Open the Solution (src/LogExpert.sln) with Visual Studio 2017 (e.g. Community Edition) +* Open the Solution (src/LogExpert.sln) with Visual Studio 2026 (e.g. Community Edition) * Restore Nuget Packages on Solution * Build * The output is under bin/(Debug/Release)/ diff --git a/src/Solution Items/AssemblyInfo.cs b/src/Solution Items/AssemblyInfo.cs index b988922a..29fecd23 100644 --- a/src/Solution Items/AssemblyInfo.cs +++ b/src/Solution Items/AssemblyInfo.cs @@ -3,7 +3,7 @@ [assembly: AssemblyConfiguration("Release")] [assembly: AssemblyProduct("LogExpert")] -[assembly: AssemblyCopyright("Original work Copyright (c) 2008-2011 Hagen Raab\r\nModified work Copyright (c) 2025 Zarunbal|Hirogen and many others")] +[assembly: AssemblyCopyright("Original work Copyright (c) 2008-2011 Hagen Raab\r\nModified work Copyright (c) 2024-2026 Zarunbal|Hirogen and many others")] [assembly: AssemblyVersion("1.21.0")] [assembly: AssemblyFileVersion("1.21.0")] From 4102a171af4e9a739d881eb7b2c88bf2d7c57142 Mon Sep 17 00:00:00 2001 From: Hirogen Date: Tue, 3 Mar 2026 17:02:47 +0100 Subject: [PATCH 2/3] update for gitversion --- build/Build.cs | 20 ++--------- .../PluginHashGenerator.Generated.cs | 34 +++++++++---------- src/PluginRegistry/PluginRegistry.cs | 7 ++-- src/build/Build.cs | 0 4 files changed, 23 insertions(+), 38 deletions(-) create mode 100644 src/build/Build.cs diff --git a/build/Build.cs b/build/Build.cs index d8abec48..21d777fb 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -68,30 +68,14 @@ partial class Build : NukeBuild string SetupCommandLineParameter => $"/dAppVersion=\"{VersionString}\" /O\"{BinDirectory}\" /F\"LogExpert-Setup-{VersionString}\""; - Version Version - { - get - { - int patch = 0; - - if (AppVeyor.Instance != null) - { - patch = AppVeyor.Instance.BuildNumber; - } - - return new Version(1, 21, 0, patch); - } - } - [Parameter("Version string")] - string VersionString => $"{Version.Major}.{Version.Minor}.{Version.Build}"; + string VersionString => $"{GitVersion.Major}.{GitVersion.Minor}.{GitVersion.Patch}"; [Parameter("Version Information string")] - //.Branch.{GitVersion.BranchName}.{GitVersion.Sha} removed for testing purpose string VersionInformationString => $"{VersionString} {Configuration}"; [Parameter("Version file string")] - string VersionFileString => $"{Version.Major}.{Version.Minor}.{Version.Build}"; + string VersionFileString => $"{GitVersion.Major}.{GitVersion.Minor}.{GitVersion.Patch}"; [Parameter("Exclude file globs")] string[] ExcludeFileGlob => ["**/*.xml", "**/*.XML", "**/*.pdb"]; diff --git a/src/PluginRegistry/PluginHashGenerator.Generated.cs b/src/PluginRegistry/PluginHashGenerator.Generated.cs index 921ac921..3eef58a6 100644 --- a/src/PluginRegistry/PluginHashGenerator.Generated.cs +++ b/src/PluginRegistry/PluginHashGenerator.Generated.cs @@ -10,7 +10,7 @@ public static partial class PluginValidator { /// /// Gets pre-calculated SHA256 hashes for built-in plugins. - /// Generated: 2026-03-03 14:51:13 UTC + /// Generated: 2026-03-03 15:55:52 UTC /// Configuration: Release /// Plugin count: 22 /// @@ -18,28 +18,28 @@ public static Dictionary GetBuiltInPluginHashes() { return new Dictionary(StringComparer.OrdinalIgnoreCase) { - ["AutoColumnizer.dll"] = "94A2870DD326A4B873BC627AE4BB06963D3B1906C6ADBB94597FE442AFAAA9ED", + ["AutoColumnizer.dll"] = "5C6BB42AF77043CB962C6BBDA986AD8E30D07CFD141CA49CE9144BDCB7E3C79D", ["BouncyCastle.Cryptography.dll"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6", ["BouncyCastle.Cryptography.dll (x86)"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6", - ["CsvColumnizer.dll"] = "4723E306C5148A3D74FDA1892B1F0EBF8838E08C87E75D7210F566FFE2C76784", - ["CsvColumnizer.dll (x86)"] = "4723E306C5148A3D74FDA1892B1F0EBF8838E08C87E75D7210F566FFE2C76784", - ["DefaultPlugins.dll"] = "19CE5C9F946A3741FFC388BF6FF49346B950B22FD7A78D456ECAD8E87A40AF9F", - ["FlashIconHighlighter.dll"] = "FE12290FE581C9FEA1BA8DC6C8AB2FB5E73B6B3F9F4B2B663C06DEC6B157CDD1", - ["GlassfishColumnizer.dll"] = "4EF6C6D0B0C4A861E87CBC69735B56AA139C4BE474D54AF5B72703E200AA50CA", - ["JsonColumnizer.dll"] = "302C146435BA73D9D0C4DA408D88E5082D1528FF987CDBE54BC7B49EBA7B784D", - ["JsonCompactColumnizer.dll"] = "ED6FF92F711F51B82C0269FF6967E5165AA781CDBFFFE73252840AF6345AF7B5", - ["Log4jXmlColumnizer.dll"] = "FB3142052E4C952497D7340747CAC6CD0F631120C91850C3E27BC94FFD9BF0B4", - ["LogExpert.Core.dll"] = "AFF90A430B5EB9D61B9C88DC7E15597D9407956EA4F926C77F76660BA23E694F", - ["LogExpert.Resources.dll"] = "D629EE9BDDABFDD1C60D75F8EAA56D1CDDE62774BAB6DFB2DE316E53D6373ADC", + ["CsvColumnizer.dll"] = "C057EBE9CC5CD80929A9BD95DA49D53058BF34FBED0704CA4984F914D0C2143F", + ["CsvColumnizer.dll (x86)"] = "C057EBE9CC5CD80929A9BD95DA49D53058BF34FBED0704CA4984F914D0C2143F", + ["DefaultPlugins.dll"] = "BF56C02A1B4CABC26E8C16ABFA05631CEF029B95B20455630C619DABAC028E05", + ["FlashIconHighlighter.dll"] = "EB71A88ECC595BEDA0611018016A8E56258D01B79154E22E052121B020B9B3A9", + ["GlassfishColumnizer.dll"] = "FC3A8883D5E5886969C62241DF0DB7A3280ABEC2CF4116C59F941C656A4C3288", + ["JsonColumnizer.dll"] = "63669CA676E6010EAD0AF408178EE36D3315C4481E939E42B40D4FA01FD96E79", + ["JsonCompactColumnizer.dll"] = "FBB0121C6817E8CE3D21822843E54F42806A768E85ECC9FD7995D6FD700B1788", + ["Log4jXmlColumnizer.dll"] = "CF18068631B69E2F6008FA76055763034F680FD2DD434C3DC021AFF2C8EEE230", + ["LogExpert.Core.dll"] = "782E86B987078F283987FD264555BA5374A905728991C926271D8B225C81BF6B", + ["LogExpert.Resources.dll"] = "FA7CFEDA2901909AD92FF9483A0319DC0F04A35321D7FA4824DA823E1CE89484", ["Microsoft.Extensions.DependencyInjection.Abstractions.dll"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93", ["Microsoft.Extensions.DependencyInjection.Abstractions.dll (x86)"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93", ["Microsoft.Extensions.Logging.Abstractions.dll"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D", ["Microsoft.Extensions.Logging.Abstractions.dll (x86)"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D", - ["RegexColumnizer.dll"] = "1AF8EF852B060D69EFD9B57BDE155EE70D9682AC220899DE773652BE6E74C2E7", - ["SftpFileSystem.dll"] = "BE8143A21E46FAF8521B865FC4CBDE39D51B2BEB276901E78AE1C10FA6E24BE2", - ["SftpFileSystem.dll (x86)"] = "8EAB50EB4A72A23726063F8935A916E9E96F3BB793A24E5AEB3336B127F7E69F", - ["SftpFileSystem.Resources.dll"] = "54561A5E402D3C020CEB224E9E950208E1F9FC75AC06B421059FE8CC8784785E", - ["SftpFileSystem.Resources.dll (x86)"] = "54561A5E402D3C020CEB224E9E950208E1F9FC75AC06B421059FE8CC8784785E", + ["RegexColumnizer.dll"] = "2A5DBC467D9EB20CE24CAF43C49CE88E74B863586AF85A6F80465398A47CBF9A", + ["SftpFileSystem.dll"] = "712884F6B17554D46F9612BD69F5ED39175425CD5A5BB94A5CD3BCE6227B7B1A", + ["SftpFileSystem.dll (x86)"] = "13420B0728E0478FB29E15A33B5EE33A0199C94594E8278C47C0DE6B9A13436B", + ["SftpFileSystem.Resources.dll"] = "A03DDDAF2DC0B0989B944FE1387DBE5F31A134418F8BF77308A88B6CA0FEAE51", + ["SftpFileSystem.Resources.dll (x86)"] = "A03DDDAF2DC0B0989B944FE1387DBE5F31A134418F8BF77308A88B6CA0FEAE51", }; } diff --git a/src/PluginRegistry/PluginRegistry.cs b/src/PluginRegistry/PluginRegistry.cs index 515b23ce..38be6fae 100644 --- a/src/PluginRegistry/PluginRegistry.cs +++ b/src/PluginRegistry/PluginRegistry.cs @@ -5,6 +5,7 @@ using ColumnizerLib; using LogExpert.Core.Classes; +using LogExpert.Core.Classes.Columnizer; using LogExpert.Core.Entities; using LogExpert.Core.Interface; using LogExpert.PluginRegistry.Events; @@ -168,9 +169,9 @@ internal void LoadPlugins () [ //Default Columnizer if other Plugins can not be loaded new DefaultLogfileColumnizer(), - //new TimestampColumnizer() as ILogLineMemoryColumnizer, - //new SquareBracketColumnizer() as ILogLineMemoryColumnizer, - //new ClfColumnizer() as ILogLineMemoryColumnizer, + new TimestampColumnizer(), + new SquareBracketColumnizer(), + new ClfColumnizer(), ]; //Default FileSystem if other FileSystem Plugins cannot be loaded diff --git a/src/build/Build.cs b/src/build/Build.cs new file mode 100644 index 00000000..e69de29b From 85435006ea5f6d49cf027716feff5773ac75a8cf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 3 Mar 2026 16:09:07 +0000 Subject: [PATCH 3/3] chore: update plugin hashes [skip ci] --- .../PluginHashGenerator.Generated.cs | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/PluginRegistry/PluginHashGenerator.Generated.cs b/src/PluginRegistry/PluginHashGenerator.Generated.cs index 05476ac2..7e2fcd30 100644 --- a/src/PluginRegistry/PluginHashGenerator.Generated.cs +++ b/src/PluginRegistry/PluginHashGenerator.Generated.cs @@ -10,7 +10,7 @@ public static partial class PluginValidator { /// /// Gets pre-calculated SHA256 hashes for built-in plugins. - /// Generated: 2026-03-03 15:55:52 UTC + /// Generated: 2026-03-03 16:09:05 UTC /// Configuration: Release /// Plugin count: 22 /// @@ -18,28 +18,28 @@ public static Dictionary GetBuiltInPluginHashes() { return new Dictionary(StringComparer.OrdinalIgnoreCase) { - ["AutoColumnizer.dll"] = "22B0D8918CE8EC55B60E1C7F600CDE5346E84C850D0F101A708938C0A9D28B84", + ["AutoColumnizer.dll"] = "66A99B05B0158109FDD466BD86BF7146DB496E6FEF101E2432354482D4D7B54E", ["BouncyCastle.Cryptography.dll"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6", ["BouncyCastle.Cryptography.dll (x86)"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6", - ["CsvColumnizer.dll"] = "0F221FD603B46799D489B082715273EB9C3037127F0587EA3C2E64B4A55C79EF", - ["CsvColumnizer.dll (x86)"] = "0F221FD603B46799D489B082715273EB9C3037127F0587EA3C2E64B4A55C79EF", - ["DefaultPlugins.dll"] = "8DAB8BFB8A49F70721C056B528376BF5FA780984E867970D12D37F4ABEFA511D", - ["FlashIconHighlighter.dll"] = "67743542678B2FCC7E640D62D7A37982511C35331A019B5512E3CD130DE36005", - ["GlassfishColumnizer.dll"] = "FE72016523E48DED2AE02A0B8846237126A0EF737447BDE163DE6D7FA09D609A", - ["JsonColumnizer.dll"] = "467AEFF4EF4C7316AD62EDA83EC61CE9D997868C728DAD565036A6DA5924503B", - ["JsonCompactColumnizer.dll"] = "0941BC5EBC513895C4A3614ABF0BCA91C9F7178FEA9BFB456EBA73875E60F52F", - ["Log4jXmlColumnizer.dll"] = "223F858848286A6E813674493DF4C5436DA150A22B3C0F3BDFB9F0C0645C4C2B", - ["LogExpert.Core.dll"] = "1F9EE97286307D8DCAFE86B6CEE57B5E3A78D112CA6EFBD0A40BA9A0D66C7849", - ["LogExpert.Resources.dll"] = "20421EBFAF11D184D7BC838D87376400D7BD2F6F6F6AAB40AA66A28359D27C61", + ["CsvColumnizer.dll"] = "2C3C10055940DD621375D053E377103D11A93F335ED36D9E55040DB838E5C3A7", + ["CsvColumnizer.dll (x86)"] = "2C3C10055940DD621375D053E377103D11A93F335ED36D9E55040DB838E5C3A7", + ["DefaultPlugins.dll"] = "81B1B90671F3BE83FCA762FED5CB9374DB54222417FFC8CA788F6963C56987A0", + ["FlashIconHighlighter.dll"] = "E664D296451903BAFDEFF0893FFCBE3AEB311497A8AEC8E7738918050940EAB1", + ["GlassfishColumnizer.dll"] = "68B362D30EFEF28038CF94399D246E50B411C37CDCA98B75144B48005EAE0B21", + ["JsonColumnizer.dll"] = "73A5F86FE858F32D2CE431A96BE38349280CC906AD74CCDBFD44656AD33F9FC3", + ["JsonCompactColumnizer.dll"] = "A9F4F76E252E3097E2BD9BF23B97CF8EF8A0888589EEF5D2B8D06CEC4EF3A0EB", + ["Log4jXmlColumnizer.dll"] = "C2317699673D3C7C017DE4D454C21944734D23EFAE52ABFF6941C048C437906E", + ["LogExpert.Core.dll"] = "479001389D97EBF5E999862D8050D0716BFA041E64141941AF32AD7260D2D4FC", + ["LogExpert.Resources.dll"] = "4A74C2A933A4FC089792CCEC4793F3CCC962B4D2F2D9A26F4E96793B766BDF49", ["Microsoft.Extensions.DependencyInjection.Abstractions.dll"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93", ["Microsoft.Extensions.DependencyInjection.Abstractions.dll (x86)"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93", ["Microsoft.Extensions.Logging.Abstractions.dll"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D", ["Microsoft.Extensions.Logging.Abstractions.dll (x86)"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D", - ["RegexColumnizer.dll"] = "8B0B6CCD1527203874D9AB3CC8213AFAB002183088478780816DB6A9A7360D69", - ["SftpFileSystem.dll"] = "1D329D6B7CC40D91C3AE630E82A0EE8E3E07F2EC51C131C0B6C6B7D577E8AD93", - ["SftpFileSystem.dll (x86)"] = "979E99CE684AE144605C4BD7E00EFD7D48A61BA82428DEE6F657C9BB0C4AE0CE", - ["SftpFileSystem.Resources.dll"] = "21BB198D10368D23E18D103BC07092730C4231DEA66F2640FABD70E9C8FADFA9", - ["SftpFileSystem.Resources.dll (x86)"] = "21BB198D10368D23E18D103BC07092730C4231DEA66F2640FABD70E9C8FADFA9", + ["RegexColumnizer.dll"] = "2B6787EFC0AA8C1BE9888F65B771E022D0EF352D1307E2A0D936BCA0ED61719A", + ["SftpFileSystem.dll"] = "BA495D57BB5BAFAF0CADA9E420830EFF103B70F6A064A6AEC75EBA99992F3B43", + ["SftpFileSystem.dll (x86)"] = "9ED8AE8F8E75970C9127FF0B5ADF92FEA0D38A4AD21CCBCB724FA1134247098F", + ["SftpFileSystem.Resources.dll"] = "B1F0AF2F41A8CEE71F46C079B08AD11DD0E387042D26650D7A7A04BBC5966FA3", + ["SftpFileSystem.Resources.dll (x86)"] = "B1F0AF2F41A8CEE71F46C079B08AD11DD0E387042D26650D7A7A04BBC5966FA3", }; }