Skip to content

Commit 8d19227

Browse files
HirogenHirogen
authored
Merge pull request #616 from LogExperts/silentsetupfor_winget
Silentsetupfor winget
2 parents 2e3bb59 + 5e36f73 commit 8d19227

4 files changed

Lines changed: 32 additions & 38 deletions

File tree

‎build/Build.cs‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using Nuke.Common.Tooling;
88
using Nuke.Common.Tools.DotNet;
99
using Nuke.Common.Tools.GitVersion;
10-
using Nuke.Common.Tools.MSBuild;
1110
using Nuke.Common.Tools.NuGet;
1211
using Nuke.Common.Utilities.Collections;
1312
using Nuke.GitHub;
@@ -23,7 +22,6 @@
2322

2423
using static Nuke.Common.EnvironmentInfo;
2524
using static Nuke.Common.Tools.DotNet.DotNetTasks;
26-
using static Nuke.Common.Tools.MSBuild.MSBuildTasks;
2725
using static Nuke.GitHub.GitHubTasks;
2826

2927
[UnsetVisualStudioEnvironmentVariables]
@@ -153,9 +151,8 @@ protected override void OnBuildInitialized ()
153151
Target Restore => _ => _
154152
.Executes(() =>
155153
{
156-
MSBuild(s => s
157-
.SetTargetPath(Solution)
158-
.SetTargets("Restore"));
154+
DotNetRestore(s => s
155+
.SetProjectFile(Solution));
159156
});
160157

161158
Target Compile => _ => _
@@ -165,15 +162,13 @@ protected override void OnBuildInitialized ()
165162

166163
Log.Information($"Version: '{VersionString}'");
167164

168-
MSBuild(s => s
169-
.SetTargetPath(Solution)
170-
.SetTargets("Rebuild")
165+
DotNetBuild(s => s
166+
.SetProjectFile(Solution)
167+
.SetConfiguration(Configuration)
171168
.SetAssemblyVersion(VersionString)
172169
.SetFileVersion(VersionFileString)
173170
.SetInformationalVersion(VersionInformationString)
174-
.SetTargetPlatform(MSBuildTargetPlatform.MSIL)
175-
.SetConfiguration(Configuration)
176-
.SetMaxCpuCount(Environment.ProcessorCount));
171+
.EnableNoRestore());
177172
});
178173

179174
AbsolutePath PluginHashGeneratorProject => SourceDirectory / "PluginHashGenerator.Tool" / "PluginHashGenerator.Tool.csproj";
@@ -212,12 +207,11 @@ protected override void OnBuildInitialized ()
212207
// Rebuild PluginRegistry project to include the generated file
213208
// IMPORTANT: Set OutputPath to match the main build output directory
214209
Log.Information("Rebuilding PluginRegistry to include generated hashes...");
215-
MSBuild(s => s
216-
.SetTargetPath(SourceDirectory / "PluginRegistry" / "LogExpert.PluginRegistry.csproj")
217-
.SetTargets("Build")
210+
DotNetBuild(s => s
211+
.SetProjectFile(SourceDirectory / "PluginRegistry" / "LogExpert.PluginRegistry.csproj")
218212
.SetConfiguration(Configuration)
219213
.SetProperty("OutputPath", OutputDirectory)
220-
.SetMaxCpuCount(Environment.ProcessorCount));
214+
.EnableNoRestore());
221215

222216
Log.Information("PluginRegistry rebuilt successfully to {OutputDir}", OutputDirectory);
223217
}

‎src/Directory.Build.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22
<PropertyGroup>
3-
<Version>1.40.0.0</Version>
4-
<AssemblyVersion>1.40.0.0</AssemblyVersion>
5-
<FileVersion>1.40.0.0</FileVersion>
6-
<InformationalVersion>1.40.0.0</InformationalVersion>
3+
<Version>1.40.1.0</Version>
4+
<AssemblyVersion>1.40.1.0</AssemblyVersion>
5+
<FileVersion>1.40.1.0</FileVersion>
6+
<InformationalVersion>1.40.1.0</InformationalVersion>
77
<Authors>Hirogen, zarunbal, RandallFlagg, TheNicker</Authors>
88
<Company>LogExperts</Company>
99
<ImplicitUsings>enable</ImplicitUsings>
@@ -21,8 +21,8 @@
2121
<RepositoryUrl>https://github.com/LogExperts/LogExpert</RepositoryUrl>
2222
<PackageTags>LogExpert, Columnizer, Logging, Windows, Winforms</PackageTags>
2323
<RepositoryType>git</RepositoryType>
24-
<PackageReleaseNotes>https://github.com/LogExperts/LogExpert/releases/tag/v.1.40.0</PackageReleaseNotes>
25-
<PackageVersion>1.40.0.0</PackageVersion>
24+
<PackageReleaseNotes>https://github.com/LogExperts/LogExpert/releases/tag/v.1.40.1</PackageReleaseNotes>
25+
<PackageVersion>1.40.1.0</PackageVersion>
2626
<Optimize Condition="'$(Configuration)' == 'Release'">true</Optimize>
2727
<Product>LogExpert</Product>
2828
<Copyright>Copyright © LogExpert 2025</Copyright>

‎src/LogExpert.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2626
.editorconfig = .editorconfig
2727
..\.gitignore = ..\.gitignore
2828
Solution Items\AssemblyInfo.cs = Solution Items\AssemblyInfo.cs
29-
..\CHANGELOG.md = ..\CHANGELOG.md
3029
..\.github\copilot-instructions.md = ..\.github\copilot-instructions.md
3130
Directory.Build.props = Directory.Build.props
3231
Directory.Packages.props = Directory.Packages.props
@@ -95,6 +94,7 @@ EndProject
9594
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GithubActions", "GithubActions", "{059D87DC-0895-449B-A81D-90336F7F6CD8}"
9695
ProjectSection(SolutionItems) = preProject
9796
..\.github\workflows\build_dotnet.yml = ..\.github\workflows\build_dotnet.yml
97+
..\.github\workflows\release.yml = ..\.github\workflows\release.yml
9898
..\.github\workflows\test_dotnet.yml = ..\.github\workflows\test_dotnet.yml
9999
EndProjectSection
100100
EndProject

‎src/PluginRegistry/PluginHashGenerator.Generated.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,35 @@ public static partial class PluginValidator
1010
{
1111
/// <summary>
1212
/// Gets pre-calculated SHA256 hashes for built-in plugins.
13-
/// Generated: 2026-06-12 09:15:03 UTC
13+
/// Generated: 2026-06-12 10:38:01 UTC
1414
/// Configuration: Release
1515
/// Plugin count: 21
1616
/// </summary>
1717
public static Dictionary<string, string> GetBuiltInPluginHashes()
1818
{
1919
return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
2020
{
21-
["AutoColumnizer.dll"] = "FF0F70AC9616E6C8B3C0C899B6248E65F9218C44A1D49C1166AC11C639788675",
21+
["AutoColumnizer.dll"] = "4E710526BD2B2A13079B82C38A4AD1A709D82E234217E7B5308A3C107A23C906",
2222
["BouncyCastle.Cryptography.dll"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
2323
["BouncyCastle.Cryptography.dll (x86)"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
24-
["CsvColumnizer.dll"] = "696927EEC625E0BD23647807CA07AD7ED97BF644B3777FF182544A49AFBAC017",
25-
["CsvColumnizer.dll (x86)"] = "696927EEC625E0BD23647807CA07AD7ED97BF644B3777FF182544A49AFBAC017",
26-
["DefaultPlugins.dll"] = "127980A8745A3B8016A734351ACF3C3A48E8626B1DF996C2A51E68F777C80DD9",
27-
["FlashIconHighlighter.dll"] = "724DB02A467AC555F5C5C4824B6125E885CBA0E7A8341F9F6D77233D2B951BC7",
28-
["GlassfishColumnizer.dll"] = "EA3F490D49FFC700314488AF6FDDF9543924B4111797D858F490AB19D68E0CA3",
29-
["JsonColumnizer.dll"] = "02800517237A4E53B98A28B5FE8023ED156386CB6D6FCC74B0CEBE5C03F51395",
30-
["JsonCompactColumnizer.dll"] = "1A091F55B68755AA59BF74622B59D054B65819F74E7A768C4E686DC95E271F8D",
31-
["Log4jXmlColumnizer.dll"] = "FBD9A01DE8387FE0EEC7DBA70353524237D98E37FB6C6EDBC7320CB102E1678C",
32-
["LogExpert.Resources.dll"] = "B558E226387EA8AD8E6060532A18B952FCB48EA97F77A4BBFC259BB8CC054E6C",
24+
["CsvColumnizer.dll"] = "FC312E28E95EA5CC4EA081338B241238DDD2989AC967EA7BF8D770873E81AB6D",
25+
["CsvColumnizer.dll (x86)"] = "FC312E28E95EA5CC4EA081338B241238DDD2989AC967EA7BF8D770873E81AB6D",
26+
["DefaultPlugins.dll"] = "B6620DAF3B93DC5F4203116D53A5ACAB460DDAE8D2BC72708CFAB14CAD831AAF",
27+
["FlashIconHighlighter.dll"] = "537BB81E98D4F137CF85A2812020B67280A6588D5098024FEAA0112FB68AB60D",
28+
["GlassfishColumnizer.dll"] = "5CA763EAE72D02C9A33D702813151C75F6EC70850536487D946CAF7D8FA150A1",
29+
["JsonColumnizer.dll"] = "A1F320B4C0BAAF85EB8F8895B1911614EC8FF8FDDB1B5D44A965EE9084C6D8AE",
30+
["JsonCompactColumnizer.dll"] = "77E9A998F10205EBD80F2519DB23F1BCBA4BC89B44F7B13B5EAD6977186ECE36",
31+
["Log4jXmlColumnizer.dll"] = "0C8FC2643EAB52B1435F6799984F5254566F15D676668480E0443F84B8F08F41",
32+
["LogExpert.Resources.dll"] = "F831EF2BCC55F7502F10CCC4BEEAF7E3648EC45DE01CC1D21B39D71D370E330F",
3333
["Microsoft.Extensions.DependencyInjection.Abstractions.dll"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93",
3434
["Microsoft.Extensions.DependencyInjection.Abstractions.dll (x86)"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93",
3535
["Microsoft.Extensions.Logging.Abstractions.dll"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D",
3636
["Microsoft.Extensions.Logging.Abstractions.dll (x86)"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D",
37-
["RegexColumnizer.dll"] = "307E9950CFAEE1CAEAEDD04562DBFD5A290970B5386A496F521FF0284540272B",
38-
["SftpFileSystem.dll"] = "27D3B704DCACA235635E67A8F09A1A2210063C093876A4276E281DAA52BCA41F",
39-
["SftpFileSystem.dll (x86)"] = "560181F372EE3B20B122AB2CD42F08F394D0C46B5950853E7D683330C77C514E",
40-
["SftpFileSystem.Resources.dll"] = "17EE2F01F333F653DC193E55FBF7B9344CE073DF8A6C602A2729A327E8078FDB",
41-
["SftpFileSystem.Resources.dll (x86)"] = "17EE2F01F333F653DC193E55FBF7B9344CE073DF8A6C602A2729A327E8078FDB",
37+
["RegexColumnizer.dll"] = "AC2416F1B39E2F753179235C9EB6659DBAE1281194BD81F61F0BF6AF66E1AC3F",
38+
["SftpFileSystem.dll"] = "BCB0A0D5797C8E3C65376B3A01020540C5624A7F28851A9BFE9A31505FE94CF0",
39+
["SftpFileSystem.dll (x86)"] = "0AA3EBF08FE7067E636704463E3C39B7A52BD4851547B7BBFDC9933FB0DA7F4B",
40+
["SftpFileSystem.Resources.dll"] = "2CB1915833EFA80884B2C11767BFBBCAE58075CA375597065113AEAEC06FE11C",
41+
["SftpFileSystem.Resources.dll (x86)"] = "2CB1915833EFA80884B2C11767BFBBCAE58075CA375597065113AEAEC06FE11C",
4242

4343
};
4444
}

0 commit comments

Comments
 (0)