Skip to content

Commit 4102a17

Browse files
committed
update for gitversion
1 parent 1bb370e commit 4102a17

4 files changed

Lines changed: 23 additions & 38 deletions

File tree

build/Build.cs

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -68,30 +68,14 @@ partial class Build : NukeBuild
6868

6969
string SetupCommandLineParameter => $"/dAppVersion=\"{VersionString}\" /O\"{BinDirectory}\" /F\"LogExpert-Setup-{VersionString}\"";
7070

71-
Version Version
72-
{
73-
get
74-
{
75-
int patch = 0;
76-
77-
if (AppVeyor.Instance != null)
78-
{
79-
patch = AppVeyor.Instance.BuildNumber;
80-
}
81-
82-
return new Version(1, 21, 0, patch);
83-
}
84-
}
85-
8671
[Parameter("Version string")]
87-
string VersionString => $"{Version.Major}.{Version.Minor}.{Version.Build}";
72+
string VersionString => $"{GitVersion.Major}.{GitVersion.Minor}.{GitVersion.Patch}";
8873

8974
[Parameter("Version Information string")]
90-
//.Branch.{GitVersion.BranchName}.{GitVersion.Sha} removed for testing purpose
9175
string VersionInformationString => $"{VersionString} {Configuration}";
9276

9377
[Parameter("Version file string")]
94-
string VersionFileString => $"{Version.Major}.{Version.Minor}.{Version.Build}";
78+
string VersionFileString => $"{GitVersion.Major}.{GitVersion.Minor}.{GitVersion.Patch}";
9579

9680
[Parameter("Exclude file globs")]
9781
string[] ExcludeFileGlob => ["**/*.xml", "**/*.XML", "**/*.pdb"];

src/PluginRegistry/PluginHashGenerator.Generated.cs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,36 @@ public static partial class PluginValidator
1010
{
1111
/// <summary>
1212
/// Gets pre-calculated SHA256 hashes for built-in plugins.
13-
/// Generated: 2026-03-03 14:51:13 UTC
13+
/// Generated: 2026-03-03 15:55:52 UTC
1414
/// Configuration: Release
1515
/// Plugin count: 22
1616
/// </summary>
1717
public static Dictionary<string, string> GetBuiltInPluginHashes()
1818
{
1919
return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
2020
{
21-
["AutoColumnizer.dll"] = "94A2870DD326A4B873BC627AE4BB06963D3B1906C6ADBB94597FE442AFAAA9ED",
21+
["AutoColumnizer.dll"] = "5C6BB42AF77043CB962C6BBDA986AD8E30D07CFD141CA49CE9144BDCB7E3C79D",
2222
["BouncyCastle.Cryptography.dll"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
2323
["BouncyCastle.Cryptography.dll (x86)"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
24-
["CsvColumnizer.dll"] = "4723E306C5148A3D74FDA1892B1F0EBF8838E08C87E75D7210F566FFE2C76784",
25-
["CsvColumnizer.dll (x86)"] = "4723E306C5148A3D74FDA1892B1F0EBF8838E08C87E75D7210F566FFE2C76784",
26-
["DefaultPlugins.dll"] = "19CE5C9F946A3741FFC388BF6FF49346B950B22FD7A78D456ECAD8E87A40AF9F",
27-
["FlashIconHighlighter.dll"] = "FE12290FE581C9FEA1BA8DC6C8AB2FB5E73B6B3F9F4B2B663C06DEC6B157CDD1",
28-
["GlassfishColumnizer.dll"] = "4EF6C6D0B0C4A861E87CBC69735B56AA139C4BE474D54AF5B72703E200AA50CA",
29-
["JsonColumnizer.dll"] = "302C146435BA73D9D0C4DA408D88E5082D1528FF987CDBE54BC7B49EBA7B784D",
30-
["JsonCompactColumnizer.dll"] = "ED6FF92F711F51B82C0269FF6967E5165AA781CDBFFFE73252840AF6345AF7B5",
31-
["Log4jXmlColumnizer.dll"] = "FB3142052E4C952497D7340747CAC6CD0F631120C91850C3E27BC94FFD9BF0B4",
32-
["LogExpert.Core.dll"] = "AFF90A430B5EB9D61B9C88DC7E15597D9407956EA4F926C77F76660BA23E694F",
33-
["LogExpert.Resources.dll"] = "D629EE9BDDABFDD1C60D75F8EAA56D1CDDE62774BAB6DFB2DE316E53D6373ADC",
24+
["CsvColumnizer.dll"] = "C057EBE9CC5CD80929A9BD95DA49D53058BF34FBED0704CA4984F914D0C2143F",
25+
["CsvColumnizer.dll (x86)"] = "C057EBE9CC5CD80929A9BD95DA49D53058BF34FBED0704CA4984F914D0C2143F",
26+
["DefaultPlugins.dll"] = "BF56C02A1B4CABC26E8C16ABFA05631CEF029B95B20455630C619DABAC028E05",
27+
["FlashIconHighlighter.dll"] = "EB71A88ECC595BEDA0611018016A8E56258D01B79154E22E052121B020B9B3A9",
28+
["GlassfishColumnizer.dll"] = "FC3A8883D5E5886969C62241DF0DB7A3280ABEC2CF4116C59F941C656A4C3288",
29+
["JsonColumnizer.dll"] = "63669CA676E6010EAD0AF408178EE36D3315C4481E939E42B40D4FA01FD96E79",
30+
["JsonCompactColumnizer.dll"] = "FBB0121C6817E8CE3D21822843E54F42806A768E85ECC9FD7995D6FD700B1788",
31+
["Log4jXmlColumnizer.dll"] = "CF18068631B69E2F6008FA76055763034F680FD2DD434C3DC021AFF2C8EEE230",
32+
["LogExpert.Core.dll"] = "782E86B987078F283987FD264555BA5374A905728991C926271D8B225C81BF6B",
33+
["LogExpert.Resources.dll"] = "FA7CFEDA2901909AD92FF9483A0319DC0F04A35321D7FA4824DA823E1CE89484",
3434
["Microsoft.Extensions.DependencyInjection.Abstractions.dll"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93",
3535
["Microsoft.Extensions.DependencyInjection.Abstractions.dll (x86)"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93",
3636
["Microsoft.Extensions.Logging.Abstractions.dll"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D",
3737
["Microsoft.Extensions.Logging.Abstractions.dll (x86)"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D",
38-
["RegexColumnizer.dll"] = "1AF8EF852B060D69EFD9B57BDE155EE70D9682AC220899DE773652BE6E74C2E7",
39-
["SftpFileSystem.dll"] = "BE8143A21E46FAF8521B865FC4CBDE39D51B2BEB276901E78AE1C10FA6E24BE2",
40-
["SftpFileSystem.dll (x86)"] = "8EAB50EB4A72A23726063F8935A916E9E96F3BB793A24E5AEB3336B127F7E69F",
41-
["SftpFileSystem.Resources.dll"] = "54561A5E402D3C020CEB224E9E950208E1F9FC75AC06B421059FE8CC8784785E",
42-
["SftpFileSystem.Resources.dll (x86)"] = "54561A5E402D3C020CEB224E9E950208E1F9FC75AC06B421059FE8CC8784785E",
38+
["RegexColumnizer.dll"] = "2A5DBC467D9EB20CE24CAF43C49CE88E74B863586AF85A6F80465398A47CBF9A",
39+
["SftpFileSystem.dll"] = "712884F6B17554D46F9612BD69F5ED39175425CD5A5BB94A5CD3BCE6227B7B1A",
40+
["SftpFileSystem.dll (x86)"] = "13420B0728E0478FB29E15A33B5EE33A0199C94594E8278C47C0DE6B9A13436B",
41+
["SftpFileSystem.Resources.dll"] = "A03DDDAF2DC0B0989B944FE1387DBE5F31A134418F8BF77308A88B6CA0FEAE51",
42+
["SftpFileSystem.Resources.dll (x86)"] = "A03DDDAF2DC0B0989B944FE1387DBE5F31A134418F8BF77308A88B6CA0FEAE51",
4343

4444
};
4545
}

src/PluginRegistry/PluginRegistry.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using ColumnizerLib;
66

77
using LogExpert.Core.Classes;
8+
using LogExpert.Core.Classes.Columnizer;
89
using LogExpert.Core.Entities;
910
using LogExpert.Core.Interface;
1011
using LogExpert.PluginRegistry.Events;
@@ -168,9 +169,9 @@ internal void LoadPlugins ()
168169
[
169170
//Default Columnizer if other Plugins can not be loaded
170171
new DefaultLogfileColumnizer(),
171-
//new TimestampColumnizer() as ILogLineMemoryColumnizer,
172-
//new SquareBracketColumnizer() as ILogLineMemoryColumnizer,
173-
//new ClfColumnizer() as ILogLineMemoryColumnizer,
172+
new TimestampColumnizer(),
173+
new SquareBracketColumnizer(),
174+
new ClfColumnizer(),
174175
];
175176

176177
//Default FileSystem if other FileSystem Plugins cannot be loaded

src/build/Build.cs

Whitespace-only changes.

0 commit comments

Comments
 (0)