diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index ee6e86a..1c6c252 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 @@ -43,21 +44,34 @@ 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@v2 + uses: actions/cache@v4 with: path: | .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: 'dotnet-version' + + - name: Show installed .NET runtimes (debug) + run: dotnet --list-runtimes + - name: Run './build.cmd Pack' run: ./build.cmd Pack - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 with: name: httrack-${{matrix.BaseImage}}-${{matrix.Configuration}}-${{matrix.Arch}} path: final + + 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 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 } 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 1adf2c2..bdb20b1 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -163,9 +163,11 @@ private IReadOnlyCollection OurMSBuild(Func 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 b132645..07e908b 100644 --- a/build/NukePlusPlus/OurGitHubActionsAttribute.cs +++ b/build/NukePlusPlus/OurGitHubActionsAttribute.cs @@ -15,18 +15,18 @@ namespace NukePlusPlus { [PublicAPI] [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)] public class OurGitHubActionsAttribute : GitHubActionsAttribute { - public override ConfigurationEntity GetConfiguration(NukeBuild build, IReadOnlyCollection relevantTargets) { - this.build = build; - var orig = base.GetConfiguration(build, relevantTargets) as GitHubActionsConfiguration; + public override ConfigurationEntity GetConfiguration(IReadOnlyCollection relevantTargets) { + //this.build = build; + var orig = base.GetConfiguration(relevantTargets) as GitHubActionsConfiguration; configuration.DetailedTriggers = orig.DetailedTriggers; configuration.Jobs = orig.Jobs; configuration.Name = orig.Name; 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) { + public OurGitHubActionsAttribute(string name, params object[] vals) : base(name, GitHubActionsImage.MacOs1015) { job = new(this, configuration, vals.Cast().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); } } diff --git a/build/_build.csproj b/build/_build.csproj index ddd6d67..dc81ecf 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -2,24 +2,31 @@ Exe - net6.0 - + net8.0 + + CS0649;CS0169 .. .. 0 + + + enable + enable + + + true - + - - - + - + +