Skip to content

Commit 5f86810

Browse files
HirogenHirogen
committed
update and a few fixes
1 parent 2cd486e commit 5f86810

4 files changed

Lines changed: 117 additions & 35 deletions

File tree

‎README.md‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ Or Install via chocolatey
3434

3535
Requirements
3636

37-
* <https://dotnet.microsoft.com/en-us/download/dotnet/8.0>
38-
* .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>)
37+
* <https://dotnet.microsoft.com/en-us/download>
38+
* .NET 10 (<https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-10.0.0-windows-x64-installer>)
3939

4040
## CI
4141

@@ -54,7 +54,14 @@ This is a continous integration build. So always the latest and greates changes.
5454
Nuke.build Requirements
5555

5656
* Chocolatey must be installed
57-
* Optional for Setup Inno Script 5 or 6
57+
* Optional for Setup Inno Script 6.6.1
58+
59+
## Resources / Translations
60+
If you want to contribute translations or add new languages please use the ResXResourceManager Extension to add new or missing
61+
translations for either German / English. With this extension its easy to add a new language as well:
62+
[ResXResourceManager](https://github.com/dotnet/ResXResourceManager/tree/master)
63+
64+
After creating a new language resource please create a new pull request.
5865

5966
## Pull Request
6067

@@ -67,7 +74,6 @@ Please checkout the wiki for FAQ / HELP / Informations / Examples
6774
## High DPI
6875

6976
* dont use AutoScaleMode for single GUI controls like Buttons etc.
70-
7177
* dont use AutoScaleDimensions for single GUI controls like Buttons etc.
7278

7379
<https://github.com/LogExperts/LogExpert/wiki>

‎src/Directory.Build.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<PropertyGroup>
3-
<Version>1.20.0.0</Version>
4-
<AssemblyVersion>1.20.0.0</AssemblyVersion>
5-
<FileVersion>1.20.0.0</FileVersion>
3+
<Version>1.21.0.0</Version>
4+
<AssemblyVersion>1.21.0.0</AssemblyVersion>
5+
<FileVersion>1.21.0.0</FileVersion>
66
<InformationalVersion>1.20.0.0</InformationalVersion>
77
<Authors>Hirogen, zarunbal, RandallFlagg, TheNicker</Authors>
88
<Company>Log Expert</Company>
@@ -22,7 +22,7 @@
2222
<PackageTags>LogExpert, Columnizer, Logging, Windows, Winforms</PackageTags>
2323
<RepositoryType>git</RepositoryType>
2424
<PackageReleaseNotes>https://github.com/LogExperts/LogExpert/releases/tag/v.1.20.0</PackageReleaseNotes>
25-
<PackageVersion>1.20.0.0</PackageVersion>
25+
<PackageVersion>1.21.0.0</PackageVersion>
2626
<Optimize Condition="'$(Configuration)' == 'Release'">true</Optimize>
2727
<Product>LogExpert</Product>
2828
<Copyright>Copyright © LogExpert 2025</Copyright>

‎src/LogExpert/LogExpert.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
<OutputType>WinExe</OutputType>
1212
<TargetFramework>net10.0-windows</TargetFramework>
1313
<UseWindowsForms>False</UseWindowsForms>
14+
15+
<SelfContained>true</SelfContained>
16+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
17+
<PublishSingleFile>false</PublishSingleFile>
18+
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
1419
</PropertyGroup>
1520

1621
<ItemGroup>

‎src/setup/LogExpertInstaller.iss‎

Lines changed: 98 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
; Script generated by the Inno Script Studio Wizard.
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

4+
#include "CodeDependencies.iss"
5+
46
#define AppName "LogExpert"
5-
#define AppVersion "1.10.0"
6-
#define AppURL "https://github.com/zarunbal/LogExpert"
7+
#define AppVersion "1.21.0"
8+
#define AppURL "https://github.com/LogExperts/LogExpert"
79
#define AppExeName "LogExpert.exe"
810

911
; Path of the inno setup file
@@ -34,7 +36,7 @@ LicenseFile=..\..\LICENSE
3436
OutputDir=..\..\bin\
3537

3638
OutputBaseFilename={#SetupName}.{#SetupSetting("AppVersion")}
37-
SetupIconFile={#AppPath}..\LogExpert\Resources\logexpert.ico
39+
SetupIconFile={#AppPath}..\LogExpert.Resources\images\icons\logexpert.ico
3840
Compression=lzma2/normal
3941
SolidCompression=yes
4042

@@ -57,43 +59,123 @@ Name: "german"; MessagesFile: "compiler:Languages\German.isl"
5759
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
5860

5961
[Files]
60-
Source: "..\..\bin\Release\LogExpert.exe"; DestDir: "{app}"; Flags: ignoreversion
6162
Source: "..\..\bin\Release\Licenses\*"; DestDir: "{app}\Licenses\"; Flags: ignoreversion recursesubdirs createallsubdirs
62-
Source: "..\..\bin\Release\plugins\AutoColumnizer.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
63-
Source: "..\..\bin\Release\plugins\ColumnizerLib.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
63+
64+
;Plugins
6465

6566
;DLLS for CSV Suppport
66-
Source: "..\..\bin\Release\plugins\CsvColumnizer.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
6767
Source: "..\..\bin\Release\plugins\CsvHelper.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
68+
Source: "..\..\bin\Release\pluginsx86\CsvHelper.dll"; DestDir: "{app}\pluginsx86\"; Flags: ignoreversion recursesubdirs createallsubdirs
69+
Source: "..\..\bin\Release\plugins\CsvColumnizer.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
70+
Source: "..\..\bin\Release\pluginsx86\CsvColumnizer.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
71+
Source: "..\..\bin\Release\plugins\de\CsvColumnizer.resources.dll"; DestDir: "{app}\plugins\de\"; Flags: ignoreversion
72+
Source: "..\..\bin\Release\pluginsx86\de\CsvColumnizer.resources.dll"; DestDir: "{app}\plugins\de\"; Flags: ignoreversion
73+
Source: "..\..\bin\Release\plugins\CsvColumnizer.manifest.json"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
74+
Source: "..\..\bin\Release\pluginsx86\CsvColumnizer.manifest.json"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
75+
76+
Source: "..\..\bin\Release\plugins\AutoColumnizer.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
77+
Source: "..\..\bin\Release\plugins\AutoColumnizer.manifest.json"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
78+
79+
Source: "..\..\bin\Release\plugins\de\ColumnizerLib.resources.dll"; DestDir: "{app}\plugins\de\"; Flags: ignoreversion
80+
Source: "..\..\bin\Release\plugins\ColumnizerLib.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion
81+
Source: "..\..\bin\Release\plugins\ColumnizerLib.xml"; DestDir: "{app}\plugins\"; Flags: ignoreversion
82+
83+
Source: "..\..\bin\Release\pluginsx86\de\ColumnizerLib.resources.dll"; DestDir: "{app}\pluginsx86\de\"; Flags: ignoreversion
84+
Source: "..\..\bin\Release\pluginsx86\ColumnizerLib.dll"; DestDir: "{app}\pluginsx86\"; Flags: ignoreversion
85+
Source: "..\..\bin\Release\pluginsx86\ColumnizerLib.xml"; DestDir: "{app}\pluginsx86\"; Flags: ignoreversion
86+
87+
Source: "..\..\bin\Release\plugins\BouncyCastle.Cryptography.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
88+
Source: "..\..\bin\Release\plugins\Microsoft.Extensions.DependencyInjection.Abstractions"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
89+
Source: "..\..\bin\Release\pluginsx86\Microsoft.Extensions.DependencyInjection.Abstractions"; DestDir: "{app}\pluginsx86\"; Flags: ignoreversion recursesubdirs createallsubdirs
90+
Source: "..\..\bin\Release\plugins\Microsoft.Extensions.Logging.Abstractions.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
91+
Source: "..\..\bin\Release\pluginsx86\Microsoft.Extensions.Logging.Abstractions.dll"; DestDir: "{app}\pluginsx86\"; Flags: ignoreversion recursesubdirs createallsubdirs
92+
93+
Source: "..\..\bin\Release\plugins\Newtonsoft.Json.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
94+
Source: "..\..\bin\Release\pluginsx86\Newtonsoft.Json.dll"; DestDir: "{app}\pluginsx86\"; Flags: ignoreversion recursesubdirs createallsubdirs
6895

69-
;Created by CSV Helper
70-
Source: "..\..\bin\Release\plugins\Microsoft.Bcl.AsyncInterfaces.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
7196
Source: "..\..\bin\Release\plugins\Microsoft.Bcl.HashCode.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
72-
Source: "..\..\bin\Release\plugins\System.Buffers.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
97+
Source: "..\..\bin\Release\plugins\Renci.SshNet.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
7398
Source: "..\..\bin\Release\plugins\System.Memory.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
7499
Source: "..\..\bin\Release\plugins\System.Numerics.Vectors.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
75100
Source: "..\..\bin\Release\plugins\System.Runtime.CompilerServices.Unsafe.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
76101
Source: "..\..\bin\Release\plugins\System.Threading.Tasks.Extensions.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
77102

78103
Source: "..\..\bin\Release\plugins\DefaultPlugins.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
79104
Source: "..\..\bin\Release\plugins\FlashIconHighlighter.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
105+
Source: "..\..\bin\Release\plugins\FlashIconHighlighter.manifest.json"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
106+
80107
Source: "..\..\bin\Release\plugins\GlassfishColumnizer.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
108+
Source: "..\..\bin\Release\plugins\GlassfishColumnizer.manifest.json"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
109+
81110
Source: "..\..\bin\Release\plugins\JsonColumnizer.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
111+
Source: "..\..\bin\Release\plugins\JsonColumnizer.manifest.json"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
112+
82113
Source: "..\..\bin\Release\plugins\JsonCompactColumnizer.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
114+
Source: "..\..\bin\Release\plugins\de\JsonCompactColumnizer.resources.dll"; DestDir: "{app}\plugins\de\"; Flags: ignoreversion
115+
Source: "..\..\bin\Release\plugins\JsonCompactColumnizer.manifest.json"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
116+
83117
Source: "..\..\bin\Release\plugins\Log4jXmlColumnizer.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
84-
Source: "..\..\bin\Release\plugins\Newtonsoft.Json.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
118+
Source: "..\..\bin\Release\plugins\de\Log4jXmlColumnizer.resources.dll"; DestDir: "{app}\plugins\de\"; Flags: ignoreversion
119+
Source: "..\..\bin\Release\plugins\Log4jXmlColumnizer.manifest.json"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
120+
85121
Source: "..\..\bin\Release\plugins\RegexColumnizer.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
122+
Source: "..\..\bin\Release\plugins\de\RegexColumnizer.resources.dll"; DestDir: "{app}\plugins\de\"; Flags: ignoreversion
123+
Source: "..\..\bin\Release\plugins\RegexColumnizer.manifest.json"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
86124

87-
;DLLS for SFTP Support
125+
Source: "..\..\bin\Release\plugins\LogExpert.Core.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion
126+
127+
; DLLS for SFTP Support
88128
Source: "..\..\bin\Release\plugins\SftpFileSystem.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
129+
Source: "..\..\bin\Release\pluginsx86\SftpFileSystem.dll"; DestDir: "{app}\pluginsx86\"; Flags: ignoreversion recursesubdirs createallsubdirs
130+
Source: "..\..\bin\Release\plugins\SftpFileSystem.Resources.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
131+
Source: "..\..\bin\Release\pluginsx86\SftpFileSystem.Resources.dll"; DestDir: "{app}\pluginsx86\"; Flags: ignoreversion recursesubdirs createallsubdirs
132+
Source: "..\..\bin\Release\plugins\de\SftpFileSystem.Resources.resources.dll"; DestDir: "{app}\plugins\de\"; Flags: ignoreversion
133+
Source: "..\..\bin\Release\pluginsx86\de\SftpFileSystem.Resources.resources.dll"; DestDir: "{app}\pluginsx86\de\"; Flags: ignoreversion
134+
Source: "..\..\bin\Release\plugins\SftpFileSystem.manifest.json"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
135+
Source: "..\..\bin\Release\pluginsx86\SftpFileSystem.manifest.json"; DestDir: "{app}\pluginsx86\"; Flags: ignoreversion recursesubdirs createallsubdirs
89136
Source: "..\..\bin\Release\plugins\Renci.SshNet.dll"; DestDir: "{app}\plugins\"; Flags: ignoreversion recursesubdirs createallsubdirs
137+
Source: "..\..\bin\Release\pluginsx86\Renci.SshNet.dll"; DestDir: "{app}\pluginsx86\"; Flags: ignoreversion recursesubdirs createallsubdirs
90138

139+
Source: "..\..\bin\Release\de\ColumnizerLib.resources.dll"; DestDir: "{app}\de\"; Flags: ignoreversion
91140
Source: "..\..\bin\Release\ColumnizerLib.dll"; DestDir: "{app}"; Flags: ignoreversion
141+
Source: "..\..\bin\Release\ColumnizerLib.xml"; DestDir: "{app}"; Flags: ignoreversion
142+
143+
; LogExpert Files
144+
Source: "..\..\bin\Release\files\json\usedComponents.json"; DestDir: "{app}\files\json\"; Flags: ignoreversion
145+
Source: "..\..\bin\Release\LogExpert.exe"; DestDir: "{app}"; Flags: ignoreversion
146+
Source: "..\..\bin\Release\LogExpert.dll"; DestDir: "{app}"; Flags: ignoreversion
147+
Source: "..\..\bin\Release\de\LogExpert.Configuration.resources.dll"; DestDir: "{app}\de\"; Flags: ignoreversion
148+
Source: "..\..\bin\Release\LogExpert.Configuration.dll"; DestDir: "{app}"; Flags: ignoreversion
149+
Source: "..\..\bin\Release\LogExpert.Core.dll"; DestDir: "{app}"; Flags: ignoreversion
150+
Source: "..\..\bin\Release\LogExpert.UI.dll"; DestDir: "{app}"; Flags: ignoreversion
151+
Source: "..\..\bin\Release\LogExpert.Resources.dll"; DestDir: "{app}"; Flags: ignoreversion
152+
Source: "..\..\bin\Release\de\LogExpert.Resources.resources.dll"; DestDir: "{app}\de\"; Flags: ignoreversion
153+
Source: "..\..\bin\Release\LogExpert.PluginRegistry.dll"; DestDir: "{app}"; Flags: ignoreversion
154+
92155
Source: "..\..\bin\Release\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignoreversion
93-
Source: "..\..\bin\Release\LogExpert.exe.config"; DestDir: "{app}"; Flags: ignoreversion
156+
Source: "..\..\bin\Release\NuGet.Versioning.dll"; DestDir: "{app}"; Flags: ignoreversion
157+
Source: "..\..\bin\Release\LogExpert.xml"; DestDir: "{app}"; Flags: ignoreversion
94158
Source: "..\..\bin\Release\NLog.dll"; DestDir: "{app}"; Flags: ignoreversion
95159
Source: "..\..\bin\Release\Start.cmd"; DestDir: "{app}"; Flags: ignoreversion
160+
161+
; Vanara libs for Pinvoke => https://github.com/dahall/Vanara
162+
Source: "..\..\bin\Release\fr\Vanara.Core.resources.dll"; DestDir: "{app}\fr\"; Flags: ignoreversion
163+
Source: "..\..\bin\Release\Vanara.Core.dll"; DestDir: "{app}"; Flags: ignoreversion
164+
Source: "..\..\bin\Release\Vanara.PInvoke.ComCtl32.dll"; DestDir: "{app}"; Flags: ignoreversion
165+
Source: "..\..\bin\Release\Vanara.PInvoke.Cryptography.dll"; DestDir: "{app}"; Flags: ignoreversion
166+
Source: "..\..\bin\Release\Vanara.PInvoke.Gdi32.dll"; DestDir: "{app}"; Flags: ignoreversion
167+
Source: "..\..\bin\Release\Vanara.PInvoke.Kernel32.dll"; DestDir: "{app}"; Flags: ignoreversion
168+
Source: "..\..\bin\Release\Vanara.PInvoke.Ole.dll"; DestDir: "{app}"; Flags: ignoreversion
169+
Source: "..\..\bin\Release\Vanara.PInvoke.Rpc.dll"; DestDir: "{app}"; Flags: ignoreversion
170+
Source: "..\..\bin\Release\Vanara.PInvoke.RstrtMgr.dll"; DestDir: "{app}"; Flags: ignoreversion
171+
Source: "..\..\bin\Release\Vanara.PInvoke.Security.dll"; DestDir: "{app}"; Flags: ignoreversion
172+
Source: "..\..\bin\Release\Vanara.PInvoke.Shell32.dll"; DestDir: "{app}"; Flags: ignoreversion
173+
Source: "..\..\bin\Release\Vanara.PInvoke.ShlwApi.dll"; DestDir: "{app}"; Flags: ignoreversion
174+
Source: "..\..\bin\Release\Vanara.PInvoke.User32.dll"; DestDir: "{app}"; Flags: ignoreversion
175+
176+
; GUI Libs
96177
Source: "..\..\bin\Release\WeifenLuo.WinFormsUI.Docking.dll"; DestDir: "{app}"; Flags: ignoreversion
178+
Source: "..\..\bin\Release\WeifenLuo.WinFormsUI.Docking.ThemeVS2015.dll"; DestDir: "{app}"; Flags: ignoreversion
97179
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
98180

99181
[Icons]
@@ -105,19 +187,8 @@ Name: "{autodesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Tasks: deskto
105187
Filename: "{app}\{#AppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(AppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
106188

107189
[Code]
108-
#include "ExtraFunctions.iss"
109-
110190
function InitializeSetup(): Boolean;
111-
var
112-
dotNetInstalled: Boolean;
113191
begin
114-
//check for .net Version 4+ before the installation starts
115-
dotNetInstalled:=true;
116-
if not(IsDotNetDetected('v4.7.2',0)) then
117-
begin
118-
MsgBox('Microsoft .NET Framework 4.7.2 or higher is required.'#13#13
119-
'Please update your .net Framework installation!', mbInformation, MB_OK);
120-
dotNetInstalled := false;
121-
end;
122-
result:= dotNetInstalled;
123-
end;
192+
Dependency_AddDotNet100Desktop
193+
Result := True;
194+
end;

0 commit comments

Comments
 (0)