diff --git a/build/Build.cs b/build/Build.cs index 628fd270..7a577b3f 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -7,7 +7,6 @@ using Nuke.Common.Tooling; using Nuke.Common.Tools.DotNet; using Nuke.Common.Tools.GitVersion; -using Nuke.Common.Tools.MSBuild; using Nuke.Common.Tools.NuGet; using Nuke.Common.Utilities.Collections; using Nuke.GitHub; @@ -23,7 +22,6 @@ using static Nuke.Common.EnvironmentInfo; using static Nuke.Common.Tools.DotNet.DotNetTasks; -using static Nuke.Common.Tools.MSBuild.MSBuildTasks; using static Nuke.GitHub.GitHubTasks; [UnsetVisualStudioEnvironmentVariables] @@ -153,9 +151,8 @@ protected override void OnBuildInitialized () Target Restore => _ => _ .Executes(() => { - MSBuild(s => s - .SetTargetPath(Solution) - .SetTargets("Restore")); + DotNetRestore(s => s + .SetProjectFile(Solution)); }); Target Compile => _ => _ @@ -165,15 +162,13 @@ protected override void OnBuildInitialized () Log.Information($"Version: '{VersionString}'"); - MSBuild(s => s - .SetTargetPath(Solution) - .SetTargets("Rebuild") + DotNetBuild(s => s + .SetProjectFile(Solution) + .SetConfiguration(Configuration) .SetAssemblyVersion(VersionString) .SetFileVersion(VersionFileString) .SetInformationalVersion(VersionInformationString) - .SetTargetPlatform(MSBuildTargetPlatform.MSIL) - .SetConfiguration(Configuration) - .SetMaxCpuCount(Environment.ProcessorCount)); + .EnableNoRestore()); }); AbsolutePath PluginHashGeneratorProject => SourceDirectory / "PluginHashGenerator.Tool" / "PluginHashGenerator.Tool.csproj"; @@ -212,12 +207,11 @@ protected override void OnBuildInitialized () // Rebuild PluginRegistry project to include the generated file // IMPORTANT: Set OutputPath to match the main build output directory Log.Information("Rebuilding PluginRegistry to include generated hashes..."); - MSBuild(s => s - .SetTargetPath(SourceDirectory / "PluginRegistry" / "LogExpert.PluginRegistry.csproj") - .SetTargets("Build") + DotNetBuild(s => s + .SetProjectFile(SourceDirectory / "PluginRegistry" / "LogExpert.PluginRegistry.csproj") .SetConfiguration(Configuration) .SetProperty("OutputPath", OutputDirectory) - .SetMaxCpuCount(Environment.ProcessorCount)); + .EnableNoRestore()); Log.Information("PluginRegistry rebuilt successfully to {OutputDir}", OutputDirectory); } diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 2d04fe22..1f28b2b9 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,9 +1,9 @@ - 1.40.0.0 - 1.40.0.0 - 1.40.0.0 - 1.40.0.0 + 1.40.1.0 + 1.40.1.0 + 1.40.1.0 + 1.40.1.0 Hirogen, zarunbal, RandallFlagg, TheNicker LogExperts enable @@ -21,8 +21,8 @@ https://github.com/LogExperts/LogExpert LogExpert, Columnizer, Logging, Windows, Winforms git - https://github.com/LogExperts/LogExpert/releases/tag/v.1.40.0 - 1.40.0.0 + https://github.com/LogExperts/LogExpert/releases/tag/v.1.40.1 + 1.40.1.0 true LogExpert Copyright © LogExpert 2025 diff --git a/src/LogExpert.sln b/src/LogExpert.sln index 62df124f..4fe6edb1 100644 --- a/src/LogExpert.sln +++ b/src/LogExpert.sln @@ -26,7 +26,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .editorconfig = .editorconfig ..\.gitignore = ..\.gitignore Solution Items\AssemblyInfo.cs = Solution Items\AssemblyInfo.cs - ..\CHANGELOG.md = ..\CHANGELOG.md ..\.github\copilot-instructions.md = ..\.github\copilot-instructions.md Directory.Build.props = Directory.Build.props Directory.Packages.props = Directory.Packages.props @@ -95,6 +94,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GithubActions", "GithubActions", "{059D87DC-0895-449B-A81D-90336F7F6CD8}" ProjectSection(SolutionItems) = preProject ..\.github\workflows\build_dotnet.yml = ..\.github\workflows\build_dotnet.yml + ..\.github\workflows\release.yml = ..\.github\workflows\release.yml ..\.github\workflows\test_dotnet.yml = ..\.github\workflows\test_dotnet.yml EndProjectSection EndProject diff --git a/src/PluginRegistry/PluginHashGenerator.Generated.cs b/src/PluginRegistry/PluginHashGenerator.Generated.cs index fde5d6b7..f0b84d47 100644 --- a/src/PluginRegistry/PluginHashGenerator.Generated.cs +++ b/src/PluginRegistry/PluginHashGenerator.Generated.cs @@ -10,7 +10,7 @@ public static partial class PluginValidator { /// /// Gets pre-calculated SHA256 hashes for built-in plugins. - /// Generated: 2026-06-12 09:15:03 UTC + /// Generated: 2026-06-12 10:38:01 UTC /// Configuration: Release /// Plugin count: 21 /// @@ -18,27 +18,27 @@ public static Dictionary GetBuiltInPluginHashes() { return new Dictionary(StringComparer.OrdinalIgnoreCase) { - ["AutoColumnizer.dll"] = "FF0F70AC9616E6C8B3C0C899B6248E65F9218C44A1D49C1166AC11C639788675", + ["AutoColumnizer.dll"] = "4E710526BD2B2A13079B82C38A4AD1A709D82E234217E7B5308A3C107A23C906", ["BouncyCastle.Cryptography.dll"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6", ["BouncyCastle.Cryptography.dll (x86)"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6", - ["CsvColumnizer.dll"] = "696927EEC625E0BD23647807CA07AD7ED97BF644B3777FF182544A49AFBAC017", - ["CsvColumnizer.dll (x86)"] = "696927EEC625E0BD23647807CA07AD7ED97BF644B3777FF182544A49AFBAC017", - ["DefaultPlugins.dll"] = "127980A8745A3B8016A734351ACF3C3A48E8626B1DF996C2A51E68F777C80DD9", - ["FlashIconHighlighter.dll"] = "724DB02A467AC555F5C5C4824B6125E885CBA0E7A8341F9F6D77233D2B951BC7", - ["GlassfishColumnizer.dll"] = "EA3F490D49FFC700314488AF6FDDF9543924B4111797D858F490AB19D68E0CA3", - ["JsonColumnizer.dll"] = "02800517237A4E53B98A28B5FE8023ED156386CB6D6FCC74B0CEBE5C03F51395", - ["JsonCompactColumnizer.dll"] = "1A091F55B68755AA59BF74622B59D054B65819F74E7A768C4E686DC95E271F8D", - ["Log4jXmlColumnizer.dll"] = "FBD9A01DE8387FE0EEC7DBA70353524237D98E37FB6C6EDBC7320CB102E1678C", - ["LogExpert.Resources.dll"] = "B558E226387EA8AD8E6060532A18B952FCB48EA97F77A4BBFC259BB8CC054E6C", + ["CsvColumnizer.dll"] = "FC312E28E95EA5CC4EA081338B241238DDD2989AC967EA7BF8D770873E81AB6D", + ["CsvColumnizer.dll (x86)"] = "FC312E28E95EA5CC4EA081338B241238DDD2989AC967EA7BF8D770873E81AB6D", + ["DefaultPlugins.dll"] = "B6620DAF3B93DC5F4203116D53A5ACAB460DDAE8D2BC72708CFAB14CAD831AAF", + ["FlashIconHighlighter.dll"] = "537BB81E98D4F137CF85A2812020B67280A6588D5098024FEAA0112FB68AB60D", + ["GlassfishColumnizer.dll"] = "5CA763EAE72D02C9A33D702813151C75F6EC70850536487D946CAF7D8FA150A1", + ["JsonColumnizer.dll"] = "A1F320B4C0BAAF85EB8F8895B1911614EC8FF8FDDB1B5D44A965EE9084C6D8AE", + ["JsonCompactColumnizer.dll"] = "77E9A998F10205EBD80F2519DB23F1BCBA4BC89B44F7B13B5EAD6977186ECE36", + ["Log4jXmlColumnizer.dll"] = "0C8FC2643EAB52B1435F6799984F5254566F15D676668480E0443F84B8F08F41", + ["LogExpert.Resources.dll"] = "F831EF2BCC55F7502F10CCC4BEEAF7E3648EC45DE01CC1D21B39D71D370E330F", ["Microsoft.Extensions.DependencyInjection.Abstractions.dll"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93", ["Microsoft.Extensions.DependencyInjection.Abstractions.dll (x86)"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93", ["Microsoft.Extensions.Logging.Abstractions.dll"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D", ["Microsoft.Extensions.Logging.Abstractions.dll (x86)"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D", - ["RegexColumnizer.dll"] = "307E9950CFAEE1CAEAEDD04562DBFD5A290970B5386A496F521FF0284540272B", - ["SftpFileSystem.dll"] = "27D3B704DCACA235635E67A8F09A1A2210063C093876A4276E281DAA52BCA41F", - ["SftpFileSystem.dll (x86)"] = "560181F372EE3B20B122AB2CD42F08F394D0C46B5950853E7D683330C77C514E", - ["SftpFileSystem.Resources.dll"] = "17EE2F01F333F653DC193E55FBF7B9344CE073DF8A6C602A2729A327E8078FDB", - ["SftpFileSystem.Resources.dll (x86)"] = "17EE2F01F333F653DC193E55FBF7B9344CE073DF8A6C602A2729A327E8078FDB", + ["RegexColumnizer.dll"] = "AC2416F1B39E2F753179235C9EB6659DBAE1281194BD81F61F0BF6AF66E1AC3F", + ["SftpFileSystem.dll"] = "BCB0A0D5797C8E3C65376B3A01020540C5624A7F28851A9BFE9A31505FE94CF0", + ["SftpFileSystem.dll (x86)"] = "0AA3EBF08FE7067E636704463E3C39B7A52BD4851547B7BBFDC9933FB0DA7F4B", + ["SftpFileSystem.Resources.dll"] = "2CB1915833EFA80884B2C11767BFBBCAE58075CA375597065113AEAEC06FE11C", + ["SftpFileSystem.Resources.dll (x86)"] = "2CB1915833EFA80884B2C11767BFBBCAE58075CA375597065113AEAEC06FE11C", }; }