Skip to content

Commit 3d46e96

Browse files
HirogenHirogen
authored
Merge pull request #442 from LogExperts/Development
Dev to Master version 1.20
2 parents b7c088b + ffd9e3e commit 3d46e96

693 files changed

Lines changed: 52087 additions & 68039 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/test_dotnet.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup .NET
2020
uses: actions/setup-dotnet@v4
2121
with:
22-
dotnet-version: 8.0.x
22+
dotnet-version: 9.0.x
2323
- name: Restore dependencies
2424
run: dotnet restore
2525
working-directory: src

src/LogExpert/Licenses/Nlog.license.txt renamed to Licenses/Nlog.license.txt

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
Copyright (c) 2004-2017 Jaroslaw Kowalski <jaak@jkowalski.net>, Kim Christensen, Julian Verdurmen
2-
3-
All rights reserved.
4-
5-
Redistribution and use in source and binary forms, with or without
6-
modification, are permitted provided that the following conditions
7-
are met:
8-
9-
* Redistributions of source code must retain the above copyright notice,
10-
this list of conditions and the following disclaimer.
11-
12-
* Redistributions in binary form must reproduce the above copyright notice,
13-
this list of conditions and the following disclaimer in the documentation
14-
and/or other materials provided with the distribution.
15-
16-
* Neither the name of Jaroslaw Kowalski nor the names of its
17-
contributors may be used to endorse or promote products derived from this
18-
software without specific prior written permission.
19-
20-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
24-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30-
THE POSSIBILITY OF SUCH DAMAGE.
1+
Copyright (c) 2004-2017 Jaroslaw Kowalski <jaak@jkowalski.net>, Kim Christensen, Julian Verdurmen
2+
3+
All rights reserved.
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions
7+
are met:
8+
9+
* Redistributions of source code must retain the above copyright notice,
10+
this list of conditions and the following disclaimer.
11+
12+
* Redistributions in binary form must reproduce the above copyright notice,
13+
this list of conditions and the following disclaimer in the documentation
14+
and/or other materials provided with the distribution.
15+
16+
* Neither the name of Jaroslaw Kowalski nor the names of its
17+
contributors may be used to endorse or promote products derived from this
18+
software without specific prior written permission.
19+
20+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
24+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30+
THE POSSIBILITY OF SUCH DAMAGE.

src/LogExpert/Licenses/WinformsUI.Docking.license.txt renamed to Licenses/WinformsUI.Docking.license.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
The MIT License
2-
3-
Copyright (c) 2007 Weifen Luo (email: weifenluo@yahoo.com)
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
6-
7-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
8-
9-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1+
The MIT License
2+
3+
Copyright (c) 2007 Weifen Luo (email: weifenluo@yahoo.com)
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
6+
7+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
8+
9+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Summary of (most) features:
2424
* Portable (all options / settings saved in application startup directory)
2525

2626
# Download
27-
Follow the [Link](https://github.com/zarunbal/LogExpert/releases/latest) and download the latest package. Just extract it where you want and execute the application or download the Setup and install it
27+
Follow the [Link](https://github.com/LogExperts/LogExpert/releases/latest) and download the latest package. Just extract it where you want and execute the application or download the Setup and install it
2828

2929
Or Install via chocolatey
3030

@@ -62,7 +62,7 @@ Please checkout the wiki for FAQ / HELP / Informations / Examples
6262
- dont use AutoScaleMode for single GUI controls like Buttons etc.
6363
- dont use AutoScaleDimensions for single GUI controls like Buttons etc.
6464

65-
https://github.com/zarunbal/LogExpert/wiki
65+
https://github.com/LogExperts/LogExpert/wiki
6666

6767
# Discord Server
6868
https://discord.gg/SjxkuckRe9
@@ -71,8 +71,8 @@ https://discord.gg/SjxkuckRe9
7171
### Contributors
7272

7373
This project exists thanks to all the people who contribute.
74-
<a href="https://github.com/zarunbal/LogExpert/graphs/contributors">
75-
<img src="https://contrib.rocks/image?repo=zarunbal/LogExpert" />
74+
<a href="https://github.com/LogExperts/LogExpert/graphs/contributors">
75+
<img src="https://contrib.rocks/image?repo=LogExperts/LogExpert" />
7676
</a>
7777

7878
Made with [contrib.rocks](https://contrib.rocks).

‎build/Build.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,9 @@ protected override void OnBuildInitialized()
245245
{
246246
Log.Information($"AssemblyVersion {VersionString}\r\nAssemblyFileVersion {VersionFileString}\r\nAssemblyInformationalVersion {VersionInformationString}");
247247

248-
AbsolutePath assemblyVersion = SourceDirectory / "Solution Items" / "AssemblyVersion.cs";
248+
AbsolutePath assemblyInfo = SourceDirectory / "Solution Items" / "AssemblyInfo.cs";
249249

250-
string text = assemblyVersion.ReadAllText();
250+
string text = assemblyInfo.ReadAllText();
251251
Regex configurationRegex = AssemblyConfiguration();
252252
Regex assemblyVersionRegex = AssemblyVersion();
253253
Regex assemblyFileVersionRegex = AssemblyFileVersion();
@@ -258,11 +258,11 @@ protected override void OnBuildInitialized()
258258
text = assemblyFileVersionRegex.Replace(text, (match) => ReplaceVersionMatch(match, VersionFileString));
259259
text = assemblyInformationalVersionRegex.Replace(text, (match) => ReplaceVersionMatch(match, VersionInformationString));
260260

261-
Log.Verbose("Content of AssemblyVersion file");
261+
Log.Verbose("Content of AssemblyInfo.cs file");
262262
Log.Verbose(text);
263263
Log.Verbose("End of Content");
264264

265-
assemblyVersion.WriteAllText(text);
265+
assemblyInfo.WriteAllText(text);
266266

267267
SourceDirectory.GlobFiles("**sftp-plugin/*.cs").ForEach(file =>
268268
{
@@ -443,7 +443,7 @@ protected override void OnBuildInitialized()
443443

444444
AppveyorArtifacts.ForEach((artifact) =>
445445
{
446-
Process proc = new Process();
446+
var proc = new Process();
447447
proc.StartInfo = new ProcessStartInfo("appveyor", $"PushArtifact \"{artifact}\"");
448448
if (!proc.Start())
449449
{
@@ -464,7 +464,7 @@ protected override void OnBuildInitialized()
464464
{
465465
AbsolutePath logExpertApplicationData = SpecialFolder(SpecialFolders.ApplicationData) / "LogExpert";
466466

467-
DirectoryInfo info = new DirectoryInfo(logExpertApplicationData);
467+
var info = new DirectoryInfo(logExpertApplicationData);
468468
info.GetDirectories().ForEach(a => a.Delete(true));
469469
logExpertApplicationData.DeleteDirectory();
470470
});
@@ -474,7 +474,7 @@ protected override void OnBuildInitialized()
474474
{
475475
AbsolutePath logExpertDocuments = SpecialFolder(SpecialFolders.UserProfile) / "Documents" / "LogExpert";
476476

477-
DirectoryInfo info = new DirectoryInfo(logExpertDocuments);
477+
var info = new DirectoryInfo(logExpertDocuments);
478478
info.GetDirectories().ForEach(a => a.Delete(true));
479479
logExpertDocuments.DeleteDirectory();
480480
});

‎build/_build.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net8.0</TargetFramework>
6-
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
76
<RootNamespace></RootNamespace>
87
<IsPackable>False</IsPackable>
98
<NoWarn>CS0649;CS0169</NoWarn>
@@ -12,14 +11,14 @@
1211

1312
<ItemGroup>
1413
<PackageReference Include="chocolatey" Version="2.4.3" />
15-
<PackageReference Include="GitVersion.Core" Version="6.1.0" />
16-
<PackageReference Include="NuGet.CommandLine" Version="6.13.2">
14+
<PackageReference Include="GitVersion.Core" Version="6.3.0" />
15+
<PackageReference Include="NuGet.CommandLine" Version="6.14.0">
1716
<PrivateAssets>all</PrivateAssets>
1817
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1918
</PackageReference>
2019
<PackageReference Include="Nuke.Common" Version="9.0.4" />
2120
<PackageReference Include="Nuke.GitHub" Version="7.0.0" />
22-
<PackageReference Include="NUnit.ConsoleRunner" Version="3.19.2" />
21+
<PackageReference Include="NUnit.ConsoleRunner" Version="3.20.1" />
2322
</ItemGroup>
2423

2524
<ItemGroup>

‎chocolatey/logexpert.portable.nuspec.template‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@
44
<id>logexpert</id>
55
<version>##version##</version>
66
<title>LogExpert</title>
7-
<authors>Zarunbal Previous:Hagen Raab</authors>
8-
<owners>Zarunbal</owners>
9-
<licenseUrl>https://cdn.rawgit.com/zarunbal/LogExpert/v##version##/LICENSE</licenseUrl>
10-
<packageSourceUrl>https://github.com/zarunbal/LogExpert/tree/master/chocolatey</packageSourceUrl>
11-
<projectUrl>https://github.com/zarunbal/LogExpert</projectUrl>
12-
<bugTrackerUrl>https://github.com/zarunbal/LogExpert/issues</bugTrackerUrl>
13-
<releaseNotes>https://github.com/zarunbal/LogExpert/releases/tag/v##version##</releaseNotes>
7+
<authors>Zarunbal, Hagen Raab, Hirogen, RandallFlagg and others</authors>
8+
<owners>Zarunbal, Hirogen</owners>
9+
<licenseUrl>https://raw.githubusercontent.com/LogExperts/LogExpert/v##version##/LICENSE</licenseUrl>
10+
<packageSourceUrl>https://github.com/LogExperts/LogExpert/tree/master/chocolatey</packageSourceUrl>
11+
<projectUrl>https://github.com/LogExperts/LogExpert</projectUrl>
12+
<bugTrackerUrl>https://github.com/LogExperts/LogExpert/issues</bugTrackerUrl>
13+
<releaseNotes>https://github.com/LogExperts/LogExpert/releases/tag/v##version##</releaseNotes>
1414
<requireLicenseAcceptance>false</requireLicenseAcceptance>
15-
<dependencies>
16-
<dependency id="chocolatey" version="0.10.8" />
17-
</dependencies>
1815
<description>LogExpert is a Windows tail program (a GUI replacement for the Unix tail command).
1916

2017
Summary of (most) features:
@@ -40,6 +37,9 @@ Summary of (most) features:
4037
<summary>LogExpert is log file viewing for the Pros.</summary>
4138
<copyright>Original work Copyright (c) 2011 Hagen Raab, Modified work Copyright (c) 2017 Zarunbal</copyright>
4239
<tags>LogExpert windows tail logging viewer troubleshooting</tags>
40+
<dependencies>
41+
<dependency id="dotnet-desktopruntime" version="[8.0,)" />
42+
</dependencies>
4343
</metadata>
4444
<files>
4545
<file src="tools\**" target="tools" />

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "9.0.101"
3+
"version": "9.0.301"
44
}
5-
}
5+
}

‎lib/3rdparty.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Released under "MIT X11 license"
88

99
DockPanel Suite:
1010
----------------
11-
http://sourceforge.net/projects/dockpanelsuite/
11+
https://github.com/dockpanelsuite/dockpanelsuite
1212
Copyright (c) 2007 Weifen Luo (email: weifenluo@yahoo.com)
1313
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
1414
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

0 commit comments

Comments
 (0)