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/PluginRegistry/PluginHashGenerator.Generated.cs b/src/PluginRegistry/PluginHashGenerator.Generated.cs index e01c45ae..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-04 15:54:58 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"] = "B0B1B60EC33F9C14F554A093805753CD1FC7C9689ABA78A18911301CE3D5407E", + ["AutoColumnizer.dll"] = "9056D83B18F290806F5510679FF7DF7F6E2426FCD41E9A272E551BD9CE254A71", ["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"] = "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"] = "651ABE3BEA0919D0A3227285F7A2EBB3A15DC553E6086D99E67215E8CA961C38", - ["SftpFileSystem.dll"] = "66AAF4A5346BEB75CEA250A70B82B9242441132BFC706E22D248190960F3C9EB", - ["SftpFileSystem.dll (x86)"] = "D5FCC5BAD62CDA43A56E24464792C48AC9FCF68937CD5FCBAF41E5ED436F4394", - ["SftpFileSystem.Resources.dll"] = "DEABFE508023F01697DF2723F22E512DD53204856B89EF824E441A207B545933", - ["SftpFileSystem.Resources.dll (x86)"] = "DEABFE508023F01697DF2723F22E512DD53204856B89EF824E441A207B545933", + ["RegexColumnizer.dll"] = "B981BA0AF176D7ADF2E72AC57BA7F1A2D340B634AF6D96EBE3BB944CBCB02923", + ["SftpFileSystem.dll"] = "821E9655FE7855376664855177E1F6FB73D856BC9B3C73E261596280A85F53DB", + ["SftpFileSystem.dll (x86)"] = "CDA740FB7098D1CD502BA6A23090431645CCE29084513D560B277F44166C5710", + ["SftpFileSystem.Resources.dll"] = "F1E8B9949092CCD2C0011BF1605EB9AD72C85499D213AB0A44EF064F688549F6", + ["SftpFileSystem.Resources.dll (x86)"] = "F1E8B9949092CCD2C0011BF1605EB9AD72C85499D213AB0A44EF064F688549F6", }; } 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 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 85f7f13a..0804fb94 100644 --- a/src/setup/LogExpertInstaller.iss +++ b/src/setup/LogExpertInstaller.iss @@ -152,6 +152,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 @@ -203,13 +204,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