From 9f0520a98aa8c5e9320ddb44f990cbec2688ad2e Mon Sep 17 00:00:00 2001 From: Hirogen Date: Tue, 3 Mar 2026 20:27:21 +0100 Subject: [PATCH 1/5] update gitversion --- GitVersion.yml | 7 ++++++- src/Solution Items/AssemblyInfo.cs | 6 +++--- src/TestResult.xml | 12 ------------ 3 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 src/TestResult.xml diff --git a/GitVersion.yml b/GitVersion.yml index 85cfd271..da44070b 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,6 +1,11 @@ assembly-versioning-scheme: MajorMinorPatchTag mode: ContinuousDelivery -branches: {} +tag-prefix: 'v\.?' +branches: + develop: + increment: None + main: + increment: None ignore: sha: [] merge-message-formats: {} diff --git a/src/Solution Items/AssemblyInfo.cs b/src/Solution Items/AssemblyInfo.cs index 29fecd23..f525df70 100644 --- a/src/Solution Items/AssemblyInfo.cs +++ b/src/Solution Items/AssemblyInfo.cs @@ -5,9 +5,9 @@ [assembly: AssemblyProduct("LogExpert")] [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")] -[assembly: AssemblyInformationalVersion("1.21.0 Release")] +[assembly: AssemblyVersion("1.30.0")] +[assembly: AssemblyFileVersion("1.30.0")] +[assembly: AssemblyInformationalVersion("1.30.0 Release")] [assembly: ComVisible(false)] //warning CA1824: Mark assemblies with NeutralResourcesLanguageAttribute diff --git a/src/TestResult.xml b/src/TestResult.xml deleted file mode 100644 index b2a4e5b9..00000000 --- a/src/TestResult.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - File type is not supported - - - \ No newline at end of file From c93be3ae3525f909376ceb26b1a928f77ef29627 Mon Sep 17 00:00:00 2001 From: Hirogen Date: Fri, 6 Mar 2026 18:38:12 +0100 Subject: [PATCH 2/5] inno setup missing file --- src/setup/LogExpertInstaller.iss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/setup/LogExpertInstaller.iss b/src/setup/LogExpertInstaller.iss index 257e3a5e..bf75241d 100644 --- a/src/setup/LogExpertInstaller.iss +++ b/src/setup/LogExpertInstaller.iss @@ -146,6 +146,7 @@ Source: "{#ReleaseFolder}\files\json\usedComponents.json"; DestDir: "{app}\files Source: "{#ReleaseFolder}\LogExpert.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "{#ReleaseFolder}\LogExpert.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "{#ReleaseFolder}\LogExpert.runtimeconfig.json"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#ReleaseFolder}\LogExpert.deps.json"; DestDir: "{app}"; Flags: ignoreversion Source: "{#ReleaseFolder}\de\LogExpert.Configuration.resources.dll"; DestDir: "{app}\de\"; Flags: ignoreversion Source: "{#ReleaseFolder}\LogExpert.Configuration.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "{#ReleaseFolder}\LogExpert.Core.dll"; DestDir: "{app}"; Flags: ignoreversion From 60d363a2575690ffb4261c8d5619ad1631d0201d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 6 Mar 2026 17:41:36 +0000 Subject: [PATCH 3/5] 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 e01c45ae..108056e4 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-04 15:54:58 UTC + /// Generated: 2026-03-06 17:41:35 UTC /// Configuration: Release /// Plugin count: 22 /// @@ -18,28 +18,28 @@ public static Dictionary GetBuiltInPluginHashes() { return new Dictionary(StringComparer.OrdinalIgnoreCase) { - ["AutoColumnizer.dll"] = "B0B1B60EC33F9C14F554A093805753CD1FC7C9689ABA78A18911301CE3D5407E", + ["AutoColumnizer.dll"] = "B847F5147D97269C267A13C7B77D773EB0F0D739DBF615505E103852B04E923C", ["BouncyCastle.Cryptography.dll"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6", ["BouncyCastle.Cryptography.dll (x86)"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6", - ["CsvColumnizer.dll"] = "1EC38C3AF3AF71D64F3223F08D0638BBF5565E468CC3FB6D3F3E244BDDA76E6E", - ["CsvColumnizer.dll (x86)"] = "1EC38C3AF3AF71D64F3223F08D0638BBF5565E468CC3FB6D3F3E244BDDA76E6E", - ["DefaultPlugins.dll"] = "7906B85F36FD3808332CD3E2B0D00AF464AC7E011703AAE3AD438E4D9E64482C", - ["FlashIconHighlighter.dll"] = "DBB83532F73E071A099E0357F61BB4BA54B0A7FD322BEC7533F1FCA77373915C", - ["GlassfishColumnizer.dll"] = "C5B3705FE463287FCEF238268CA42B4C1AB2E444AF3E8A0DE2145A68554E8F25", - ["JsonColumnizer.dll"] = "DDE69E8F5003D476918315BD3F1A7F2F919772DB93122F6033ED18CC0DBB022B", - ["JsonCompactColumnizer.dll"] = "D1A7C67B80CEDB21B5B8E4D0234A25BCC899C6216588BA81C3DFE8057F9EFBC8", - ["Log4jXmlColumnizer.dll"] = "04BF19BBC7BCFB6BD21DE44C332463D35207D1C54968B0A44F67A071E533574B", - ["LogExpert.Core.dll"] = "6AEC50B847303F59B22870ADEBE1CF74EB2705BAA5873F410EE61ACBD5463E33", - ["LogExpert.Resources.dll"] = "957BF2E2804899A3775592D0317FBA394ACF7D8D6AAFB63AFAF63251F903A587", + ["CsvColumnizer.dll"] = "86B2E192EA714694D9981B0009CF7FC7AC83EC25B87B09AB998ECBDF2640F441", + ["CsvColumnizer.dll (x86)"] = "86B2E192EA714694D9981B0009CF7FC7AC83EC25B87B09AB998ECBDF2640F441", + ["DefaultPlugins.dll"] = "AB3C602BEDFE62A2C1D0E1E8B8CFAA5709FE5634F5E0943F44481FC9997466B6", + ["FlashIconHighlighter.dll"] = "33F083438933807FFD8B65AFAE1B014ACDD426FA5A93C939708911DF57607E8F", + ["GlassfishColumnizer.dll"] = "AEBA72105FFBDD23CC53C831D8D85C8632E9071B5BAD0CD8E6D068E00196763F", + ["JsonColumnizer.dll"] = "A34A2CE1C4449FB40C543DA6C950D316D541F1EDDDCC575D79B5C964901B86B8", + ["JsonCompactColumnizer.dll"] = "4092100E896008C5B84886B16D5E23C1E43A5F46E8A5CFC827F463A3697F036A", + ["Log4jXmlColumnizer.dll"] = "5E65E13EF2BFD91D5D80E76EED2880D68749FC42B26AD72AD82FF3373D26BD47", + ["LogExpert.Core.dll"] = "8ED453D904134B52D7834E98AF3F03E7ED84099919AD97156BE2E843AB7A7BD5", + ["LogExpert.Resources.dll"] = "C0B96DF4172923AF14040310B0A33CD749CFE09E4362CE00ECC5691585BE1E2D", ["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"] = "651ABE3BEA0919D0A3227285F7A2EBB3A15DC553E6086D99E67215E8CA961C38", - ["SftpFileSystem.dll"] = "66AAF4A5346BEB75CEA250A70B82B9242441132BFC706E22D248190960F3C9EB", - ["SftpFileSystem.dll (x86)"] = "D5FCC5BAD62CDA43A56E24464792C48AC9FCF68937CD5FCBAF41E5ED436F4394", - ["SftpFileSystem.Resources.dll"] = "DEABFE508023F01697DF2723F22E512DD53204856B89EF824E441A207B545933", - ["SftpFileSystem.Resources.dll (x86)"] = "DEABFE508023F01697DF2723F22E512DD53204856B89EF824E441A207B545933", + ["RegexColumnizer.dll"] = "9672C208D2FAE39786480636D524D74193D433EBCEFB31DFE6D146D68CA2F786", + ["SftpFileSystem.dll"] = "77A1197A099784DE50D36E89370DD55D8F352798419089A5D2B40E5C406C49DA", + ["SftpFileSystem.dll (x86)"] = "19E3D786478402BF7876959DFE3C614E0C26158CDB35B80DEBC475739D5EC64D", + ["SftpFileSystem.Resources.dll"] = "8BCB036E6367E63AA261F068C9B71A438BE5D83852C001CC36BC28CA1D8151FA", + ["SftpFileSystem.Resources.dll (x86)"] = "8BCB036E6367E63AA261F068C9B71A438BE5D83852C001CC36BC28CA1D8151FA", }; } From c7fee7dea69327886a911eeb1f515e0666ed9535 Mon Sep 17 00:00:00 2001 From: Hirogen Date: Fri, 6 Mar 2026 18:52:44 +0100 Subject: [PATCH 4/5] added dependency check for .net 10 and download for .net 10.0.3 --- src/setup/CodeDependencies.iss | 6 +++--- src/setup/LogExpertInstaller.iss | 8 +------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/setup/CodeDependencies.iss b/src/setup/CodeDependencies.iss index d550bfd3..1efd26bf 100644 --- a/src/setup/CodeDependencies.iss +++ b/src/setup/CodeDependencies.iss @@ -576,11 +576,11 @@ end; procedure Dependency_AddDotNet100Desktop; begin // https://dotnet.microsoft.com/download/dotnet/10.0 - if not Dependency_IsNetCoreInstalled('Microsoft.WindowsDesktop.App', 10, 0, 0) then begin + if not Dependency_IsNetCoreInstalled('Microsoft.WindowsDesktop.App', 10, 0, 3) then begin Dependency_Add('dotnet100desktop' + Dependency_ArchSuffix + '.exe', '/lcid ' + IntToStr(GetUILanguage) + ' /passive /norestart', - '.NET Desktop Runtime 10.0.0' + Dependency_ArchTitle, - Dependency_String('https://builds.dotnet.microsoft.com/dotnet/WindowsDesktop/10.0.0/windowsdesktop-runtime-10.0.0-win-x86.exe', 'https://builds.dotnet.microsoft.com/dotnet/WindowsDesktop/10.0.0/windowsdesktop-runtime-10.0.0-win-x64.exe'), + '.NET Desktop Runtime 10.0.3' + Dependency_ArchTitle, + Dependency_String('https://builds.dotnet.microsoft.com/dotnet/WindowsDesktop/10.0.0/windowsdesktop-runtime-10.0.3-win-x86.exe', 'https://builds.dotnet.microsoft.com/dotnet/WindowsDesktop/10.0.3/windowsdesktop-runtime-10.0.3-win-x64.exe'), '', False, False); end; end; diff --git a/src/setup/LogExpertInstaller.iss b/src/setup/LogExpertInstaller.iss index bf75241d..328693a7 100644 --- a/src/setup/LogExpertInstaller.iss +++ b/src/setup/LogExpertInstaller.iss @@ -192,13 +192,7 @@ Filename: "{app}\{#AppExeName}"; Description: "{cm:LaunchProgram,{#StringChange( [Code] function InitializeSetup(): Boolean; -var ErrCode: integer; begin - if not Dependency_IsNetCoreInstalled('Microsoft.AspNetCore.App', 10, 0, 0) then begin - if MsgBox('.net 10 64Bit is missing do you want to download it from https://dotnet.microsoft.com/download/dotnet/10.0 ?', mbConfirmation, MB_YESNO) = IDYES then - begin - ShellExecAsOriginalUser('open', 'https://dotnet.microsoft.com/download/dotnet/10.0', '', '', SW_SHOW, ewNoWait, ErrCode); - end; - end; + Dependency_AddDotNet100Desktop; Result := True; end; \ No newline at end of file From 38b5d3c5a91cef1546cf8ad7a72f79b6da5c2527 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 6 Mar 2026 17:55:28 +0000 Subject: [PATCH 5/5] 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 108056e4..a7430110 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-06 17:41:35 UTC + /// Generated: 2026-03-06 17:55:27 UTC /// Configuration: Release /// Plugin count: 22 /// @@ -18,28 +18,28 @@ public static Dictionary GetBuiltInPluginHashes() { return new Dictionary(StringComparer.OrdinalIgnoreCase) { - ["AutoColumnizer.dll"] = "B847F5147D97269C267A13C7B77D773EB0F0D739DBF615505E103852B04E923C", + ["AutoColumnizer.dll"] = "9056D83B18F290806F5510679FF7DF7F6E2426FCD41E9A272E551BD9CE254A71", ["BouncyCastle.Cryptography.dll"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6", ["BouncyCastle.Cryptography.dll (x86)"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6", - ["CsvColumnizer.dll"] = "86B2E192EA714694D9981B0009CF7FC7AC83EC25B87B09AB998ECBDF2640F441", - ["CsvColumnizer.dll (x86)"] = "86B2E192EA714694D9981B0009CF7FC7AC83EC25B87B09AB998ECBDF2640F441", - ["DefaultPlugins.dll"] = "AB3C602BEDFE62A2C1D0E1E8B8CFAA5709FE5634F5E0943F44481FC9997466B6", - ["FlashIconHighlighter.dll"] = "33F083438933807FFD8B65AFAE1B014ACDD426FA5A93C939708911DF57607E8F", - ["GlassfishColumnizer.dll"] = "AEBA72105FFBDD23CC53C831D8D85C8632E9071B5BAD0CD8E6D068E00196763F", - ["JsonColumnizer.dll"] = "A34A2CE1C4449FB40C543DA6C950D316D541F1EDDDCC575D79B5C964901B86B8", - ["JsonCompactColumnizer.dll"] = "4092100E896008C5B84886B16D5E23C1E43A5F46E8A5CFC827F463A3697F036A", - ["Log4jXmlColumnizer.dll"] = "5E65E13EF2BFD91D5D80E76EED2880D68749FC42B26AD72AD82FF3373D26BD47", - ["LogExpert.Core.dll"] = "8ED453D904134B52D7834E98AF3F03E7ED84099919AD97156BE2E843AB7A7BD5", - ["LogExpert.Resources.dll"] = "C0B96DF4172923AF14040310B0A33CD749CFE09E4362CE00ECC5691585BE1E2D", + ["CsvColumnizer.dll"] = "5C0930E15B27472ACF3C7D9096CC55C95C94001B1E9367B8D5E3D1D5D44CC60F", + ["CsvColumnizer.dll (x86)"] = "5C0930E15B27472ACF3C7D9096CC55C95C94001B1E9367B8D5E3D1D5D44CC60F", + ["DefaultPlugins.dll"] = "128FB997DD422F5ECB141064E6159CE186D0B93A98677CC8F6A5704804B5262F", + ["FlashIconHighlighter.dll"] = "1149B270FDCAD66E1BEC6806DA9662CA703975397712403DE0CB31AAC048A1C0", + ["GlassfishColumnizer.dll"] = "600E2CED7A8B748204A7F0816289907E0896E1D4CCC5DAC96FDEAAD904BD9224", + ["JsonColumnizer.dll"] = "0B7BD98D696888C7AB06D4165AA9D44468AEA6A4F169453AAF09F550B5F661ED", + ["JsonCompactColumnizer.dll"] = "AEEBCC16171996546924A71EC8C9BBB85E3702AD6338AE5C11D3DECC91CB2A47", + ["Log4jXmlColumnizer.dll"] = "5774021A4EB107E61A124B3BD73E8FE311C5944101BD48D800FA18D92BFE734E", + ["LogExpert.Core.dll"] = "B23C469A4221CDE1DD52B6AE632A9BA0BF0D0BF224E050D715D25FCDE8585340", + ["LogExpert.Resources.dll"] = "510ECEAEB987490CF605095915D71A29E50B0E5DE4826F10E131F0F272669BF9", ["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"] = "9672C208D2FAE39786480636D524D74193D433EBCEFB31DFE6D146D68CA2F786", - ["SftpFileSystem.dll"] = "77A1197A099784DE50D36E89370DD55D8F352798419089A5D2B40E5C406C49DA", - ["SftpFileSystem.dll (x86)"] = "19E3D786478402BF7876959DFE3C614E0C26158CDB35B80DEBC475739D5EC64D", - ["SftpFileSystem.Resources.dll"] = "8BCB036E6367E63AA261F068C9B71A438BE5D83852C001CC36BC28CA1D8151FA", - ["SftpFileSystem.Resources.dll (x86)"] = "8BCB036E6367E63AA261F068C9B71A438BE5D83852C001CC36BC28CA1D8151FA", + ["RegexColumnizer.dll"] = "B981BA0AF176D7ADF2E72AC57BA7F1A2D340B634AF6D96EBE3BB944CBCB02923", + ["SftpFileSystem.dll"] = "821E9655FE7855376664855177E1F6FB73D856BC9B3C73E261596280A85F53DB", + ["SftpFileSystem.dll (x86)"] = "CDA740FB7098D1CD502BA6A23090431645CCE29084513D560B277F44166C5710", + ["SftpFileSystem.Resources.dll"] = "F1E8B9949092CCD2C0011BF1605EB9AD72C85499D213AB0A44EF064F688549F6", + ["SftpFileSystem.Resources.dll (x86)"] = "F1E8B9949092CCD2C0011BF1605EB9AD72C85499D213AB0A44EF064F688549F6", }; }