From cb892f9c0b5c50fd39a745e3c7bf2511bad89363 Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Wed, 2 Apr 2025 21:58:52 +0200 Subject: [PATCH 01/25] Update continuous.yml --- .github/workflows/continuous.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index ee6e86a..c192527 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -23,7 +23,8 @@ on: push: branches-ignore: - trash - + workflow_dispatch: # This allows manual triggering of the workflow + jobs: continuous: name: Run From e50a3b4990f6b21140dc36ffd5499f9e72e20974 Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Wed, 2 Apr 2025 22:02:06 +0200 Subject: [PATCH 02/25] Update continuous.yml --- .github/workflows/continuous.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index c192527..e447362 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -31,7 +31,7 @@ jobs: runs-on: ${{matrix.BaseImage}} strategy: matrix: - BaseImage: [windows-latest, ubuntu-latest, ubuntu-18.04] + BaseImage: [windows-latest] Configuration: [Debug, Release] Arch: [x86, x64] exclude: @@ -50,7 +50,7 @@ jobs: fetch-depth: 0 repository: mitchcapper/httrack-windows - name: Cache .nuke/temp, ~/.nuget/packages - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | .nuke/temp From ed5c4bcce483181feafaee1ddb5ac0af77d1d875 Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Wed, 2 Apr 2025 22:04:25 +0200 Subject: [PATCH 03/25] Update continuous.yml --- .github/workflows/continuous.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index e447362..0907132 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -58,7 +58,7 @@ jobs: key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }} - name: Run './build.cmd Pack' run: ./build.cmd Pack - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v3 with: name: httrack-${{matrix.BaseImage}}-${{matrix.Configuration}}-${{matrix.Arch}} path: final From 6ca19f8829c4b9a1de9186cf49ba999de6a44361 Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Wed, 2 Apr 2025 22:06:41 +0200 Subject: [PATCH 04/25] Update continuous.yml --- .github/workflows/continuous.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index 0907132..06843e1 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -58,7 +58,7 @@ jobs: key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }} - name: Run './build.cmd Pack' run: ./build.cmd Pack - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: httrack-${{matrix.BaseImage}}-${{matrix.Configuration}}-${{matrix.Arch}} path: final From 4d7bb517bf5558c61cd921aa23ffb87fc44be8f2 Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Wed, 2 Apr 2025 22:13:22 +0200 Subject: [PATCH 05/25] Update continuous.yml --- .github/workflows/continuous.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index 06843e1..6989a22 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -32,8 +32,10 @@ jobs: strategy: matrix: BaseImage: [windows-latest] - Configuration: [Debug, Release] - Arch: [x86, x64] + #Configuration: [Debug, Release] + Configuration: [Release] + #Arch: [x86, x64] + Arch: [x64] exclude: - Arch: x86 BaseImage: ubuntu-latest @@ -50,7 +52,7 @@ jobs: fetch-depth: 0 repository: mitchcapper/httrack-windows - name: Cache .nuke/temp, ~/.nuget/packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | .nuke/temp From bff3f78038ec156b7820ae77fa9789302259569d Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Thu, 30 Oct 2025 22:08:16 +0200 Subject: [PATCH 06/25] Update httrack submodule URL --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index aae41ca..26023f7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "httrack"] path = httrack - url = https://github.com/mitchcapper/httrack.git + url = https://github.com/xroche/httrack.git From ef13f2c983ba6dc2ce9c4efc6030ad16b248bfd7 Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Thu, 30 Oct 2025 22:14:12 +0200 Subject: [PATCH 07/25] Upgrade target framework from net6.0 to net8.0 --- build/_build.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/_build.csproj b/build/_build.csproj index ddd6d67..7a8ce3d 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 CS0649;CS0169 .. From 3da2bb6a6e424cadeb27a6b7110388880e20ac4e Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Thu, 30 Oct 2025 22:41:50 +0200 Subject: [PATCH 08/25] Add caching and .NET 8 setup to CI workflow --- .github/workflows/continuous.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index 6989a22..c88f7ca 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -51,6 +51,7 @@ jobs: submodules: recursive fetch-depth: 0 repository: mitchcapper/httrack-windows + - name: Cache .nuke/temp, ~/.nuget/packages uses: actions/cache@v4 with: @@ -58,9 +59,21 @@ jobs: .nuke/temp ~/.nuget/packages key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }} + + - name: Ensure .NET 8 runtime is available + uses: actions/setup-dotnet@v3 + with: + dotnet-version: '8.0.x' + package-type: 'runtime' + + - name: Show installed .NET runtimes (debug) + run: dotnet --list-runtimes + - name: Run './build.cmd Pack' run: ./build.cmd Pack - uses: actions/upload-artifact@v4 with: name: httrack-${{matrix.BaseImage}}-${{matrix.Configuration}}-${{matrix.Arch}} path: final + + From 664b42196300fa4dddefd7146ffd331b5952ea93 Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Thu, 30 Oct 2025 22:54:51 +0200 Subject: [PATCH 09/25] Enhance _build.csproj with modern settings Updated project file with recommended settings and comments. --- build/_build.csproj | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/build/_build.csproj b/build/_build.csproj index 7a8ce3d..a975628 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -3,11 +3,16 @@ Exe net8.0 - + + CS0649;CS0169 .. .. 0 + + + enable + enable @@ -19,7 +24,8 @@ - + + From 4645f73a7cc3b947529c1ddeae7abb86862bb50a Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Fri, 31 Oct 2025 10:37:18 +0200 Subject: [PATCH 10/25] Update continuous.yml --- .github/workflows/continuous.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index c88f7ca..4f0dc98 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -64,7 +64,7 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: '8.0.x' - package-type: 'runtime' + package-type: 'dotnet-version' - name: Show installed .NET runtimes (debug) run: dotnet --list-runtimes From 89e74cf80a441a29bfd100061b5776a7c910e1a1 Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Wed, 5 Nov 2025 21:04:48 +0200 Subject: [PATCH 11/25] Upgrade checkout action from v2 to v4 --- .github/workflows/continuous.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index 4f0dc98..304d1c4 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -46,11 +46,11 @@ jobs: NUKE_Configuration: ${{matrix.Configuration}} NUKE_Arch: ${{matrix.Arch}} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: recursive fetch-depth: 0 - repository: mitchcapper/httrack-windows +# repository: mitchcapper/httrack-windows - name: Cache .nuke/temp, ~/.nuget/packages uses: actions/cache@v4 From ecdafcf510b528b0de134a0aa3fa5f22d8e4317b Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Wed, 5 Nov 2025 21:09:48 +0200 Subject: [PATCH 12/25] Comment out .NET 8 runtime setup step Comment out the step to ensure .NET 8 runtime is available in the CI workflow. --- .github/workflows/continuous.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index 304d1c4..6be88ae 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -60,11 +60,11 @@ jobs: ~/.nuget/packages key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }} - - name: Ensure .NET 8 runtime is available - uses: actions/setup-dotnet@v3 - with: - dotnet-version: '8.0.x' - package-type: 'dotnet-version' +# - name: Ensure .NET 8 runtime is available +# uses: actions/setup-dotnet@v3 +# with: +# dotnet-version: '8.0.x' +# package-type: 'dotnet-version' - name: Show installed .NET runtimes (debug) run: dotnet --list-runtimes From b35de3ad47ceda56e14b5f8511d71c54d88c853c Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Wed, 5 Nov 2025 21:11:10 +0200 Subject: [PATCH 13/25] Update Nuke.Common package version to 7.0.6 --- build/_build.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/_build.csproj b/build/_build.csproj index a975628..8a7206e 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -16,7 +16,7 @@ - + From 7f4b202fcbc00aabea2aa4d01f6166a810da9e91 Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Wed, 5 Nov 2025 21:22:48 +0200 Subject: [PATCH 14/25] Update relevantTargets type in OurGitHubActionsAttribute --- build/NukePlusPlus/OurGitHubActionsAttribute.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/NukePlusPlus/OurGitHubActionsAttribute.cs b/build/NukePlusPlus/OurGitHubActionsAttribute.cs index b132645..85ec095 100644 --- a/build/NukePlusPlus/OurGitHubActionsAttribute.cs +++ b/build/NukePlusPlus/OurGitHubActionsAttribute.cs @@ -15,7 +15,7 @@ namespace NukePlusPlus { [PublicAPI] [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] public class OurGitHubActionsAttribute : GitHubActionsAttribute { - public override ConfigurationEntity GetConfiguration(NukeBuild build, IReadOnlyCollection relevantTargets) { + public override ConfigurationEntity GetConfiguration(NukeBuild build, IReadOnlyCollection relevantTargets) { this.build = build; var orig = base.GetConfiguration(build, relevantTargets) as GitHubActionsConfiguration; configuration.DetailedTriggers = orig.DetailedTriggers; @@ -36,7 +36,7 @@ public OurGitHubActionsAttribute(string name, params object[] vals) : base(name, public OurGithubActionsJobWithMatrix job; - protected override GitHubActionsJob GetJobs(GitHubActionsImage image, IReadOnlyCollection relevantTargets) { + protected override GitHubActionsJob GetJobs(GitHubActionsImage image, IReadOnlyCollection relevantTargets) { var baseRes = base.GetJobs(image, relevantTargets);//just need to get its steps var ourRet = job; ourRet.Name = image.GetValue().Replace(".", "_"); From 82a1241701b7966c39485f489c78ab5dedbf5bc2 Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Wed, 5 Nov 2025 21:32:45 +0200 Subject: [PATCH 15/25] Refactor GetConfiguration and GetJobs method signatures --- build/NukePlusPlus/OurGitHubActionsAttribute.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/NukePlusPlus/OurGitHubActionsAttribute.cs b/build/NukePlusPlus/OurGitHubActionsAttribute.cs index 85ec095..2184e95 100644 --- a/build/NukePlusPlus/OurGitHubActionsAttribute.cs +++ b/build/NukePlusPlus/OurGitHubActionsAttribute.cs @@ -15,7 +15,7 @@ namespace NukePlusPlus { [PublicAPI] [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] public class OurGitHubActionsAttribute : GitHubActionsAttribute { - public override ConfigurationEntity GetConfiguration(NukeBuild build, IReadOnlyCollection relevantTargets) { + public override ConfigurationEntity GetConfiguration(Type build, IReadOnlyCollection relevantTargets) { this.build = build; var orig = base.GetConfiguration(build, relevantTargets) as GitHubActionsConfiguration; configuration.DetailedTriggers = orig.DetailedTriggers; @@ -36,7 +36,7 @@ public OurGitHubActionsAttribute(string name, params object[] vals) : base(name, public OurGithubActionsJobWithMatrix job; - protected override GitHubActionsJob GetJobs(GitHubActionsImage image, IReadOnlyCollection relevantTargets) { + protected override IReadOnlyDictionary GetJobs(Type buildType, IReadOnlyDictionary relevantTargets) { var baseRes = base.GetJobs(image, relevantTargets);//just need to get its steps var ourRet = job; ourRet.Name = image.GetValue().Replace(".", "_"); From 9cf76b48d1f51dd665edd6540665d485b51bf068 Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Wed, 5 Nov 2025 21:36:16 +0200 Subject: [PATCH 16/25] Refactor GetConfiguration method in OurGitHubActionsAttribute --- build/NukePlusPlus/OurGitHubActionsAttribute.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/NukePlusPlus/OurGitHubActionsAttribute.cs b/build/NukePlusPlus/OurGitHubActionsAttribute.cs index 2184e95..e181028 100644 --- a/build/NukePlusPlus/OurGitHubActionsAttribute.cs +++ b/build/NukePlusPlus/OurGitHubActionsAttribute.cs @@ -15,7 +15,7 @@ namespace NukePlusPlus { [PublicAPI] [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] public class OurGitHubActionsAttribute : GitHubActionsAttribute { - public override ConfigurationEntity GetConfiguration(Type build, IReadOnlyCollection relevantTargets) { + public override GitHubActionsConfiguration GetConfiguration(Type build) { this.build = build; var orig = base.GetConfiguration(build, relevantTargets) as GitHubActionsConfiguration; configuration.DetailedTriggers = orig.DetailedTriggers; @@ -24,7 +24,7 @@ public override ConfigurationEntity GetConfiguration(Type build, IReadOnlyCollec configuration.ShortTriggers = orig.ShortTriggers; return configuration; } - internal NukeBuild build; + internal Type build; protected OurGitHubActionsConfiguration configuration=new(); public OurGitHubActionsAttribute(string name, params object[] vals) : base(name, GitHubActionsImage.MacOs1014) { job = new(this, configuration, vals.Cast().ToArray()); From 97b7a1e4ef6fd4c0ee668762c38d82c2a3262716 Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Wed, 5 Nov 2025 21:57:20 +0200 Subject: [PATCH 17/25] Refactor OurGitHubActionsAttribute methods --- build/NukePlusPlus/OurGitHubActionsAttribute.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/NukePlusPlus/OurGitHubActionsAttribute.cs b/build/NukePlusPlus/OurGitHubActionsAttribute.cs index e181028..7ff95e8 100644 --- a/build/NukePlusPlus/OurGitHubActionsAttribute.cs +++ b/build/NukePlusPlus/OurGitHubActionsAttribute.cs @@ -15,8 +15,8 @@ namespace NukePlusPlus { [PublicAPI] [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] public class OurGitHubActionsAttribute : GitHubActionsAttribute { - public override GitHubActionsConfiguration GetConfiguration(Type build) { - this.build = build; + public override ConfigurationEntity GetConfiguration(IReadOnlyCollection relevantTargets) { + //this.build = build; var orig = base.GetConfiguration(build, relevantTargets) as GitHubActionsConfiguration; configuration.DetailedTriggers = orig.DetailedTriggers; configuration.Jobs = orig.Jobs; @@ -36,7 +36,7 @@ public OurGitHubActionsAttribute(string name, params object[] vals) : base(name, public OurGithubActionsJobWithMatrix job; - protected override IReadOnlyDictionary GetJobs(Type buildType, IReadOnlyDictionary relevantTargets) { + protected override IReadOnlyDictionary GetJobs(GitHubActionsImage image, IReadOnlyCollection relevantTargets) { var baseRes = base.GetJobs(image, relevantTargets);//just need to get its steps var ourRet = job; ourRet.Name = image.GetValue().Replace(".", "_"); From 8e98a3205f489648c678fa11355935208d28536e Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Wed, 5 Nov 2025 22:01:38 +0200 Subject: [PATCH 18/25] Change return type of GetJobs method --- build/NukePlusPlus/OurGitHubActionsAttribute.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/NukePlusPlus/OurGitHubActionsAttribute.cs b/build/NukePlusPlus/OurGitHubActionsAttribute.cs index 7ff95e8..d001a0c 100644 --- a/build/NukePlusPlus/OurGitHubActionsAttribute.cs +++ b/build/NukePlusPlus/OurGitHubActionsAttribute.cs @@ -36,7 +36,7 @@ public OurGitHubActionsAttribute(string name, params object[] vals) : base(name, public OurGithubActionsJobWithMatrix job; - protected override IReadOnlyDictionary GetJobs(GitHubActionsImage image, IReadOnlyCollection relevantTargets) { + protected override GitHubActionsJob GetJobs(GitHubActionsImage image, IReadOnlyCollection relevantTargets) { var baseRes = base.GetJobs(image, relevantTargets);//just need to get its steps var ourRet = job; ourRet.Name = image.GetValue().Replace(".", "_"); From 2702cb9094aa0ef8147ea8d64184846b91a77ee6 Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Wed, 5 Nov 2025 22:09:18 +0200 Subject: [PATCH 19/25] Refactor LinMake calls for httrack installation --- build/Build.cs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/build/Build.cs b/build/Build.cs index 1adf2c2..934dc3a 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -163,9 +163,19 @@ private IReadOnlyCollection OurMSBuild(Func s + .SetArguments("httrack") + .SetLogOutput(true) + .SetLogInvocation(true) + .SetProcessLogger((outputType, line) => GCCLogHandler(outputType, line))); + +// replaces: LinMake("install", "httrack", logOutput: true, logInvocation: true, customLogger: GCCLogHandler); +LinMake(s => s + .SetArguments("install httrack") + .SetLogOutput(true) + .SetLogInvocation(true) + .SetProcessLogger((outputType, line) => GCCLogHandler(outputType, line))); From 7c0d70a1408642206e77ab5df8d248b06bf1a55b Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Thu, 6 Nov 2025 20:30:10 +0200 Subject: [PATCH 20/25] refactor(build): Simplify LinMake calls and update GitHub Actions configuration - Refactor LinMake method calls in Build.cs to remove custom logger and simplify invocation - Update OurConfigurationEntity to use System.Type for build property - Modify OurGitHubActionsAttribute to use updated base method signatures - Change default MacOS image from 10.14 to 10.15 in GitHub Actions configuration - Add debug logging in OurGithubActionsJobWithMatrix for configuration writing process - Update build.ps1 to use lowercase "current" for DotNetChannel - Improve matrix job preparation and global write handling --- build.ps1 | 2 +- build/Build.cs | 17 ++++------------- build/NukePlusPlus/OurConfigurationEntity.cs | 2 +- build/NukePlusPlus/OurGitHubActionsAttribute.cs | 4 ++-- .../OurGithubActionsJobWithMatrix.cs | 7 ++++++- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/build.ps1 b/build.ps1 index 8c52d63..67cc4f0 100755 --- a/build.ps1 +++ b/build.ps1 @@ -18,7 +18,7 @@ $TempDirectory = "$PSScriptRoot\\.nuke\temp" $DotNetGlobalFile = "$PSScriptRoot\\global.json" $DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1" -$DotNetChannel = "Current" +$DotNetChannel = "current" $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1 $env:DOTNET_CLI_TELEMETRY_OPTOUT = 1 diff --git a/build/Build.cs b/build/Build.cs index 934dc3a..bdb20b1 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -163,19 +163,11 @@ private IReadOnlyCollection OurMSBuild(Func s - .SetArguments("httrack") - .SetLogOutput(true) - .SetLogInvocation(true) - .SetProcessLogger((outputType, line) => GCCLogHandler(outputType, line))); +// replaces: LinMake("", "httrack", logOutput: true, logInvocation: true); +LinMake("", "httrack", logOutput: true, logInvocation: true); -// replaces: LinMake("install", "httrack", logOutput: true, logInvocation: true, customLogger: GCCLogHandler); -LinMake(s => s - .SetArguments("install httrack") - .SetLogOutput(true) - .SetLogInvocation(true) - .SetProcessLogger((outputType, line) => GCCLogHandler(outputType, line))); +// replaces: LinMake("install", "httrack", logOutput: true, logInvocation: true); +LinMake("install", "httrack", logOutput: true, logInvocation: true); @@ -204,4 +196,3 @@ protected override void OnTargetFailed(string target) { }); } - diff --git a/build/NukePlusPlus/OurConfigurationEntity.cs b/build/NukePlusPlus/OurConfigurationEntity.cs index 4f2c8e5..e483003 100644 --- a/build/NukePlusPlus/OurConfigurationEntity.cs +++ b/build/NukePlusPlus/OurConfigurationEntity.cs @@ -27,7 +27,7 @@ public enum PRIORITY { Normal, First} public ConfigurationEntity after { get; set; } protected OurGithubActionsJobWithMatrix job { get; private set; } - protected NukeBuild build => attribute.build; + protected System.Type build => attribute.build; protected OurGitHubActionsAttribute attribute { get; private set; } WRITE_LEVEL IConfigurationEntityHasLevel.level => _level; diff --git a/build/NukePlusPlus/OurGitHubActionsAttribute.cs b/build/NukePlusPlus/OurGitHubActionsAttribute.cs index d001a0c..07e908b 100644 --- a/build/NukePlusPlus/OurGitHubActionsAttribute.cs +++ b/build/NukePlusPlus/OurGitHubActionsAttribute.cs @@ -17,7 +17,7 @@ namespace NukePlusPlus { public class OurGitHubActionsAttribute : GitHubActionsAttribute { public override ConfigurationEntity GetConfiguration(IReadOnlyCollection relevantTargets) { //this.build = build; - var orig = base.GetConfiguration(build, relevantTargets) as GitHubActionsConfiguration; + var orig = base.GetConfiguration(relevantTargets) as GitHubActionsConfiguration; configuration.DetailedTriggers = orig.DetailedTriggers; configuration.Jobs = orig.Jobs; configuration.Name = orig.Name; @@ -26,7 +26,7 @@ public override ConfigurationEntity GetConfiguration(IReadOnlyCollection().ToArray()); ActionName = name; } diff --git a/build/NukePlusPlus/OurGithubActionsJobWithMatrix.cs b/build/NukePlusPlus/OurGithubActionsJobWithMatrix.cs index c84c2a6..2c158a6 100644 --- a/build/NukePlusPlus/OurGithubActionsJobWithMatrix.cs +++ b/build/NukePlusPlus/OurGithubActionsJobWithMatrix.cs @@ -51,7 +51,7 @@ public void PrepareForWrite() { }; AllWriteItems.Insert(pos, newStep); } - var oBuild = attribute.build as OurNukeBuild; + var oBuild = Activator.CreateInstance(attribute.build) as OurNukeBuild; if (oBuild != null) oBuild.DoWritingAdds(this); @@ -117,15 +117,20 @@ void AddItemSorted(ConfigurationEntity entity) { } private void Configuration_OnGlobalWriteBegin(object sender, CustomFileWriter writer) { + Console.WriteLine("OurGithubActionsJobWithMatrix.Configuration_OnGlobalWriteBegin: entering"); AddNewItem(matrixWriter => { matrixWriter.InitialRange = MatrixOptions; this.matrixWriter = matrixWriter; } ); + Console.WriteLine("OurGithubActionsJobWithMatrix.Configuration_OnGlobalWriteBegin: about to PrepareForWrite"); PrepareForWrite(); + Console.WriteLine("OurGithubActionsJobWithMatrix.Configuration_OnGlobalWriteBegin: returned from PrepareForWrite"); var global = AllWriteItems.Where(a => (a as IConfigurationEntityHasLevel)?.level == BaseOurConfigurationEntity.WRITE_LEVEL.Global).ToArray(); + Console.WriteLine($"OurGithubActionsJobWithMatrix.Configuration_OnGlobalWriteBegin: global items count = {global.Length}"); foreach(var itm in global) { AllWriteItems.Remove(itm); + Console.WriteLine($"OurGithubActionsJobWithMatrix: writing global item of type {itm.GetType().FullName}"); itm.Write(writer); } } From fdaf034e18c888c2777c44057f02dcba6ece9c27 Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Thu, 6 Nov 2025 20:44:34 +0200 Subject: [PATCH 21/25] refactor(build): Remove Serializable attribute from OurMSBuildSettings - Remove [Serializable] attribute from OurMSBuildSettings class - Simplify class definition by removing unnecessary serialization marker - Maintain compatibility with existing MSBuildSettings implementation --- build/NukePlusPlus/OurMSBuildSettings.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/build/NukePlusPlus/OurMSBuildSettings.cs b/build/NukePlusPlus/OurMSBuildSettings.cs index 3dfb799..db87744 100644 --- a/build/NukePlusPlus/OurMSBuildSettings.cs +++ b/build/NukePlusPlus/OurMSBuildSettings.cs @@ -8,7 +8,6 @@ namespace NukePlusPlus { [PublicAPI] [ExcludeFromCodeCoverage] - [Serializable] public class OurMSBuildSettings : MSBuildSettings { protected override Arguments ConfigureProcessArguments(Arguments arguments) { var args = base.ConfigureProcessArguments(arguments); From 79d18a41738596c4752a3c0f57d0935e68fb87ce Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Thu, 6 Nov 2025 20:48:38 +0200 Subject: [PATCH 22/25] chore(build): Enable BinaryFormatter for Nuke/GitVersion compatibility - Add EnableUnsafeBinaryFormatterSerialization property to temporarily support binary serialization - Remove explicit GitVersion.Tool package download - Maintain recommended modern project settings (ImplicitUsings, Nullable) - Ensure build project compatibility with Nuke and GitVersion dependencies --- build/_build.csproj | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build/_build.csproj b/build/_build.csproj index 8a7206e..dc81ecf 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -13,15 +13,16 @@ enable enable + + + true - - - + From 9766d59817a8d34c9f009038a8b336e7967b4d63 Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Thu, 6 Nov 2025 21:28:25 +0200 Subject: [PATCH 23/25] feat(build): Re-add Serializable attribute to OurMSBuildSettings - Add [Serializable] attribute back to OurMSBuildSettings class - Ensures compatibility with serialization requirements - Reverts previous removal of Serializable attribute - Supports potential serialization needs in build process --- build/NukePlusPlus/OurMSBuildSettings.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/build/NukePlusPlus/OurMSBuildSettings.cs b/build/NukePlusPlus/OurMSBuildSettings.cs index db87744..3dfb799 100644 --- a/build/NukePlusPlus/OurMSBuildSettings.cs +++ b/build/NukePlusPlus/OurMSBuildSettings.cs @@ -8,6 +8,7 @@ namespace NukePlusPlus { [PublicAPI] [ExcludeFromCodeCoverage] + [Serializable] public class OurMSBuildSettings : MSBuildSettings { protected override Arguments ConfigureProcessArguments(Arguments arguments) { var args = base.ConfigureProcessArguments(arguments); From 441cc9605e84f867d78e5efad28e4a6ef244f9fb Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Fri, 7 Nov 2025 10:47:16 +0200 Subject: [PATCH 24/25] Update continuous.yml restore x86 build enabled --- .github/workflows/continuous.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index 6be88ae..1c6c252 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -31,11 +31,9 @@ jobs: runs-on: ${{matrix.BaseImage}} strategy: matrix: - BaseImage: [windows-latest] - #Configuration: [Debug, Release] - Configuration: [Release] - #Arch: [x86, x64] - Arch: [x64] + BaseImage: [windows-latest, ubuntu-latest, ubuntu-18.04] + Configuration: [Debug, Release] + Arch: [x86, x64] exclude: - Arch: x86 BaseImage: ubuntu-latest From 117b32fc38c67ebf1453bf0d3206bffd47fb3290 Mon Sep 17 00:00:00 2001 From: David de Caires e Freitas Date: Fri, 7 Nov 2025 17:00:16 +0200 Subject: [PATCH 25/25] This option is the worst to be on by default, nothing works when it's on. No proxy by default. fix(ui): Update default SSL proxy setting in OptionTab10 - Change default m_sslproxy value from TRUE to FALSE - Modify initial SSL proxy configuration in constructor - Ensure more conservative default proxy behavior for SSL connections --- WinHTTrack/OptionTab10.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WinHTTrack/OptionTab10.cpp b/WinHTTrack/OptionTab10.cpp index 6605289..31b2a4a 100755 --- a/WinHTTrack/OptionTab10.cpp +++ b/WinHTTrack/OptionTab10.cpp @@ -43,7 +43,7 @@ COptionTab10::COptionTab10() : CPropertyPage(COptionTab10::IDD) m_proxy = _T(""); m_port = _T(""); m_ftpprox = FALSE; - m_sslproxy = TRUE; + m_sslproxy = FALSE; //}}AFX_DATA_INIT }