Skip to content

Commit 2e3bb59

Browse files
HirogenHirogen
authored
Merge pull request #613 from LogExperts/silentsetupfor_winget
fix(setup): skip self-bootstrapping .NET runtime on silent installs
2 parents 322af94 + fb882e4 commit 2e3bb59

5 files changed

Lines changed: 72 additions & 19 deletions

File tree

‎src/PluginRegistry/PluginHashGenerator.Generated.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,35 @@ public static partial class PluginValidator
1010
{
1111
/// <summary>
1212
/// Gets pre-calculated SHA256 hashes for built-in plugins.
13-
/// Generated: 2026-06-10 15:04:17 UTC
13+
/// Generated: 2026-06-12 09:15:03 UTC
1414
/// Configuration: Release
1515
/// Plugin count: 21
1616
/// </summary>
1717
public static Dictionary<string, string> GetBuiltInPluginHashes()
1818
{
1919
return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
2020
{
21-
["AutoColumnizer.dll"] = "E4B38EF06D529544235164D80293F136C5A86926C182BA4C71BDFE3735D779FF",
21+
["AutoColumnizer.dll"] = "FF0F70AC9616E6C8B3C0C899B6248E65F9218C44A1D49C1166AC11C639788675",
2222
["BouncyCastle.Cryptography.dll"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
2323
["BouncyCastle.Cryptography.dll (x86)"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
24-
["CsvColumnizer.dll"] = "52FF4C445364D904AE5241A02159648931D665FF60C7FA9CCA7AFABE24E37D78",
25-
["CsvColumnizer.dll (x86)"] = "52FF4C445364D904AE5241A02159648931D665FF60C7FA9CCA7AFABE24E37D78",
26-
["DefaultPlugins.dll"] = "3AF02565D2295FAA391C7366396B3C1144B5EA09F369DE5566D9D34F2A68E5BC",
27-
["FlashIconHighlighter.dll"] = "06686AC574387944C8F9F88D230533CE46B1673CCE259ABEDA7C06C6CD27A220",
28-
["GlassfishColumnizer.dll"] = "C2A15B5A6604730BA1FA97720BE81006F9AB1B108FC921C5FE9ABD61ED967430",
29-
["JsonColumnizer.dll"] = "CDBA1977A604A40AA9C271F03C118498882A96593FC265E3351B4238653FEC2A",
30-
["JsonCompactColumnizer.dll"] = "EAE15E1AF60562D7B125BE71AC34D9F45AAEF543624F1CD2FAF11E005CFFEDEE",
31-
["Log4jXmlColumnizer.dll"] = "18179D85706FB87E62AB0170C9677B96587E90E3E7B0F73BC1ED947FA4B8A4E0",
32-
["LogExpert.Resources.dll"] = "47E64D27822A50093BB7D5508E6EECAD7AA852B92F8E4D27FD891706D6FA45C7",
24+
["CsvColumnizer.dll"] = "696927EEC625E0BD23647807CA07AD7ED97BF644B3777FF182544A49AFBAC017",
25+
["CsvColumnizer.dll (x86)"] = "696927EEC625E0BD23647807CA07AD7ED97BF644B3777FF182544A49AFBAC017",
26+
["DefaultPlugins.dll"] = "127980A8745A3B8016A734351ACF3C3A48E8626B1DF996C2A51E68F777C80DD9",
27+
["FlashIconHighlighter.dll"] = "724DB02A467AC555F5C5C4824B6125E885CBA0E7A8341F9F6D77233D2B951BC7",
28+
["GlassfishColumnizer.dll"] = "EA3F490D49FFC700314488AF6FDDF9543924B4111797D858F490AB19D68E0CA3",
29+
["JsonColumnizer.dll"] = "02800517237A4E53B98A28B5FE8023ED156386CB6D6FCC74B0CEBE5C03F51395",
30+
["JsonCompactColumnizer.dll"] = "1A091F55B68755AA59BF74622B59D054B65819F74E7A768C4E686DC95E271F8D",
31+
["Log4jXmlColumnizer.dll"] = "FBD9A01DE8387FE0EEC7DBA70353524237D98E37FB6C6EDBC7320CB102E1678C",
32+
["LogExpert.Resources.dll"] = "B558E226387EA8AD8E6060532A18B952FCB48EA97F77A4BBFC259BB8CC054E6C",
3333
["Microsoft.Extensions.DependencyInjection.Abstractions.dll"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93",
3434
["Microsoft.Extensions.DependencyInjection.Abstractions.dll (x86)"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93",
3535
["Microsoft.Extensions.Logging.Abstractions.dll"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D",
3636
["Microsoft.Extensions.Logging.Abstractions.dll (x86)"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D",
37-
["RegexColumnizer.dll"] = "7897A2F4A62B6C19DACB3D6FFF69A4AB32C1647B46235403C6420AE0974D2AC0",
38-
["SftpFileSystem.dll"] = "A8E38CBFC4D58FEA36B90292180305FA7D026D28878770AB5A07646E16A66251",
39-
["SftpFileSystem.dll (x86)"] = "67C691E2416CD73EE81FE716719CCC70763266699C12A5D5296434665B632054",
40-
["SftpFileSystem.Resources.dll"] = "2E2CDDD89ADBBDAAEC8C5231280A27B44807823BB4A617626005F12572459EF1",
41-
["SftpFileSystem.Resources.dll (x86)"] = "2E2CDDD89ADBBDAAEC8C5231280A27B44807823BB4A617626005F12572459EF1",
37+
["RegexColumnizer.dll"] = "307E9950CFAEE1CAEAEDD04562DBFD5A290970B5386A496F521FF0284540272B",
38+
["SftpFileSystem.dll"] = "27D3B704DCACA235635E67A8F09A1A2210063C093876A4276E281DAA52BCA41F",
39+
["SftpFileSystem.dll (x86)"] = "560181F372EE3B20B122AB2CD42F08F394D0C46B5950853E7D683330C77C514E",
40+
["SftpFileSystem.Resources.dll"] = "17EE2F01F333F653DC193E55FBF7B9344CE073DF8A6C602A2729A327E8078FDB",
41+
["SftpFileSystem.Resources.dll (x86)"] = "17EE2F01F333F653DC193E55FBF7B9344CE073DF8A6C602A2729A327E8078FDB",
4242

4343
};
4444
}

‎src/setup/LogExpertInstaller.iss‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,12 @@ Filename: "{app}\{#AppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(
197197
198198
function InitializeSetup(): Boolean;
199199
begin
200-
Dependency_ForceX64 := True;
201-
Dependency_AddDotNet100Desktop;
202-
Dependency_ForceX64 := False;
200+
// silent setup means probably winget and it already resolves the .NET dependency from the manifest,
201+
// only self-bootstrap for standalone installs, should check the .net dependency
202+
if not WizardSilent then begin
203+
Dependency_ForceX64 := True;
204+
Dependency_AddDotNet100Desktop;
205+
Dependency_ForceX64 := False;
206+
end;
203207
Result := True;
204208
end;

‎winget/LogExperts.LogExpert.installer.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Created using wingetcreate 1.10.3.0
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.10.0.schema.json
3+
4+
PackageIdentifier: LogExperts.LogExpert
5+
PackageVersion: 1.40.1
6+
InstallerType: inno
7+
Dependencies:
8+
PackageDependencies:
9+
- PackageIdentifier: Microsoft.DotNet.DesktopRuntime.10
10+
Installers:
11+
- Architecture: x64
12+
InstallerUrl: https://github.com/LogExperts/LogExpert/releases/download/v1.40.0/LogExpert-Setup-1.40.0.exe
13+
InstallerSha256: bd30ab5bedeaabfd55417e232e7e500cd1ead1395ac6bbf234a9b141af773e58
14+
ManifestType: installer
15+
ManifestVersion: 1.10.0
16+
ReleaseDate: 2026-06-12

‎winget/LogExperts.LogExpert.locale.en-US.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Created using wingetcreate 1.10.3.0
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.10.0.schema.json
3+
4+
PackageIdentifier: LogExperts.LogExpert
5+
PackageVersion: 1.40.1
6+
PackageLocale: en-US
7+
Publisher: LogExperts
8+
PublisherUrl: https://github.com/LogExperts
9+
PublisherSupportUrl: https://github.com/LogExperts/LogExpert/issues
10+
PackageName: LogExpert
11+
PackageUrl: https://github.com/LogExperts/LogExpert
12+
License: MIT License
13+
ShortDescription: A Windows GUI tail utility and log file analyzer
14+
Tags:
15+
- columnizer
16+
- logger
17+
- logger-interface
18+
- logging
19+
- winforms
20+
ReleaseNotesUrl: https://github.com/LogExperts/LogExpert/releases/tag/v1.40.1
21+
Documentations:
22+
- DocumentLabel: Wiki
23+
DocumentUrl: https://github.com/LogExperts/LogExpert/wiki
24+
ManifestType: defaultLocale
25+
ManifestVersion: 1.10.0

‎winget/LogExperts.LogExpert.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Created using wingetcreate 1.10.3.0
2+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.10.0.schema.json
3+
4+
PackageIdentifier: LogExperts.LogExpert
5+
PackageVersion: 1.40.1
6+
DefaultLocale: en-US
7+
ManifestType: version
8+
ManifestVersion: 1.10.0

0 commit comments

Comments
 (0)