Skip to content

Commit dd8a5e7

Browse files
author
BRUNER Patrick
committed
small fixes for the installation
1 parent 005b7c5 commit dd8a5e7

6 files changed

Lines changed: 126 additions & 121 deletions

File tree

build/Build.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ partial class Build : NukeBuild
3434
/// - JetBrains Rider https://nuke.build/rider
3535
/// - Microsoft VisualStudio https://nuke.build/visualstudio
3636
/// - Microsoft VSCode https://nuke.build/vscode
37-
public static int Main () => Execute<Build>(x => x.Test);
37+
public static int Main() => Execute<Build>(x => x.Test);
3838

3939
[Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
4040
readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
@@ -120,7 +120,7 @@ Version Version
120120
ChocolateyDirectory / $"logexpert.{VersionString}.nupkg"
121121
];
122122

123-
protected override void OnBuildInitialized ()
123+
protected override void OnBuildInitialized()
124124
{
125125
SetVariable("DOTNET_CLI_TELEMETRY_OPTOUT", "1");
126126

@@ -498,7 +498,7 @@ protected override void OnBuildInitialized ()
498498
}
499499
});
500500

501-
private void ExecuteInnoSetup (AbsolutePath innoPath)
501+
private void ExecuteInnoSetup(AbsolutePath innoPath)
502502
{
503503
Process proc = new();
504504

@@ -520,12 +520,12 @@ private void ExecuteInnoSetup (AbsolutePath innoPath)
520520
}
521521
}
522522

523-
private string ReplaceVersionMatch (Match match, string replacement)
523+
private string ReplaceVersionMatch(Match match, string replacement)
524524
{
525525
return $"{match.Groups[1]}{replacement}{match.Groups[3]}";
526526
}
527527

528-
private void TransformTemplateFile (AbsolutePath path, bool deleteTemplate)
528+
private void TransformTemplateFile(AbsolutePath path, bool deleteTemplate)
529529
{
530530
string text = path.ReadAllText();
531531
text = text.Replace("##version##", VersionString);
@@ -539,20 +539,20 @@ private void TransformTemplateFile (AbsolutePath path, bool deleteTemplate)
539539
}
540540

541541
[GeneratedRegex(@"(\[assembly: AssemblyInformationalVersion\("")([^""]*)(""\)\])")]
542-
private static partial Regex AssemblyInformationalVersion ();
542+
private static partial Regex AssemblyInformationalVersion();
543543

544544
[GeneratedRegex(@"(\[assembly: AssemblyVersion\("")([^""]*)(""\)\])")]
545-
private static partial Regex AssemblyVersion ();
545+
private static partial Regex AssemblyVersion();
546546

547547
[GeneratedRegex(@"(\[assembly: AssemblyConfiguration\()(""[^""]*"")(\)\])")]
548-
private static partial Regex AssemblyConfiguration ();
548+
private static partial Regex AssemblyConfiguration();
549549

550550
[GeneratedRegex(@"(\[assembly: AssemblyFileVersion\("")([^""]*)(""\)\])")]
551-
private static partial Regex AssemblyFileVersion ();
551+
private static partial Regex AssemblyFileVersion();
552552

553553
[GeneratedRegex(@"\w\w{2}[_]p?[tso]?[erzliasx]+[_rhe]{5}", RegexOptions.IgnoreCase, "en-GB")]
554-
private static partial Regex SFTPPlugin ();
554+
private static partial Regex SFTPPlugin();
555555

556556
[GeneratedRegex("\\.template$")]
557-
private static partial Regex TemplateRegex ();
557+
private static partial Regex TemplateRegex();
558558
}

build/_build.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="chocolatey" Version="2.5.1" />
14-
<PackageReference Include="GitVersion.Core" Version="6.5.0" />
14+
<PackageReference Include="GitVersion.Core" Version="6.5.1" />
1515
<PackageReference Include="Microsoft.Build" Version="18.0.2" />
1616
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="18.0.2" />
1717
<PackageReference Include="NuGet.CommandLine" Version="7.0.1">

src/Directory.Packages.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<PackageVersion Include="SSH.NET" Version="2025.1.0" />
2424
<PackageVersion Include="System.Drawing.Common" Version="10.0.0" />
2525
<PackageVersion Include="System.Resources.Extensions" Version="10.0.0" />
26+
<PackageVersion Include="Vanara.Library" Version="4.2.1" />
2627
<PackageVersion Include="Vanara.PInvoke.DwmApi" Version="4.2.1" />
2728
<PackageVersion Include="Vanara.PInvoke.RstrtMgr" Version="4.2.1" />
2829
<PackageVersion Include="Vanara.PInvoke.Shell32" Version="4.2.1" />

src/LogExpert.Core/Classes/Filter/FilterStarter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class FilterStarter
1212
{
1313
#region Fields
1414

15-
private static readonly ILogger _logger = LogManager.GetCurrentClassLogger();
15+
private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
1616

1717
private readonly ColumnizerCallback _callback;
1818
private readonly SortedDictionary<int, int> _filterHitDict;

src/LogExpert.Core/Classes/Log/LogfileReader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class LogfileReader : IAutoLogLineColumnizerCallback, IDisposable
2121
private readonly string _fileName;
2222
private readonly int _max_buffers;
2323
private readonly int _maxLinesPerBuffer;
24-
private readonly object _monitor = new();
24+
private readonly Lock _monitor = new();
2525
private readonly MultiFileOptions _multiFileOptions;
2626
private readonly IPluginRegistry _pluginRegistry;
2727
private readonly CancellationTokenSource _cts = new();

0 commit comments

Comments
 (0)