From bbde1795f7eed9b58eb9db92183c4314dd3925a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dembski?= Date: Mon, 1 Dec 2025 18:00:10 +0100 Subject: [PATCH 1/3] update nuke to 10.0.1 --- .config/dotnet-tools.json | 2 +- Directory.Packages.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 56c7b90..cda7193 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "nuke.globaltool": { - "version": "10.0.0", + "version": "10.0.1", "commands": [ "nuke" ], diff --git a/Directory.Packages.props b/Directory.Packages.props index b038d70..458e5b2 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -38,7 +38,7 @@ - + From 17ddadf7b1dbbf44810150ef5433f9f985f5df74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dembski?= Date: Mon, 1 Dec 2025 18:00:43 +0100 Subject: [PATCH 2/3] Revert "Revert source generation till nuke-build/nuke#1570 is fixed" This reverts commit 60fabb8e4bbd9c1de2e22f9ebf64f5338cec1e1b. --- build/Build.cs | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/build/Build.cs b/build/Build.cs index 8925991..1318309 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -90,7 +90,7 @@ var nuke when nuke.TryGetValue("NUKE_RUN_ID", out var nukeid) => nukeid, _ => null }; - [Solution] public readonly Solution Solution = default!; + [Solution(GenerateProjects = true)] public readonly Solution Solution = default!; [GitRepository] private readonly GitRepository _gitRepository = default!; private GitVersion _gitVersion = default!; @@ -98,7 +98,7 @@ var nuke when nuke.TryGetValue("NUKE_RUN_ID", out var nukeid) => nukeid, private static AbsolutePath SourceDirectory => RootDirectory / "src"; private static AbsolutePath TestDirectory => RootDirectory / "test"; private static AbsolutePath ArtifactsDirectory => RootDirectory / "artifacts"; - private Project[] TestProjects => Solution.GetAllProjects("*.UTs").ToArray(); + private Project[] TestProjects => [.. Solution.test.Projects]; //private const string MASTER_BRANCH = "master"; private const string DEVELOP_BRANCH = "develop"; @@ -287,7 +287,7 @@ protected override void OnBuildInitialized() { //A runtime dependant version is also currently generated by default and exposed to CI artifacts PublishApp( - projectName: "Demo.Engine"); + Solution.src.Demo_Engine); //We generate a self contained, "one file", trimmed version for Windows x64 by default //Any other can be generated as well, but aren't currently supported so aren't exposed to CI artifacts @@ -300,7 +300,7 @@ protected override void OnBuildInitialized() foreach (var rid in rids) { PublishApp( - projectName: "Demo.Engine", + Solution.src.Demo_Engine, rid: rid); } }); @@ -346,30 +346,23 @@ protected override void OnBuildInitialized() ); }); - private void PublishApp(string projectName, string? rid = null, bool zipProject = true) + private void PublishApp(Project project, string? rid = null, bool zipProject = true) { AbsolutePath outputDir; if (string.IsNullOrEmpty(rid)) { - outputDir = ArtifactsDirectory / projectName; - Log.Information($"Publishing {projectName} into {outputDir}"); + outputDir = ArtifactsDirectory / project.Name; + Log.Information($"Publishing {project.Name} into {outputDir}"); } else { - outputDir = ArtifactsDirectory / $"{projectName}.{rid}"; - Log.Information($"Publishing {projectName} for {rid} into {outputDir}"); + outputDir = ArtifactsDirectory / $"{project.Name}.{rid}"; + Log.Information($"Publishing {project.Name} for {rid} into {outputDir}"); } _ = DotNetPublish(t => t .SetProject( - /* This doesn't work, because Demo.Engine is in a solution folder - * And Solution.GetProject only searches through projects that are directly in the Solution - * */ - //Solution.GetProject(projectName)) - v: Solution - .AllProjects - .Single(project - => project.Name.Equals(projectName, StringComparison.Ordinal))) + v: project) .SetConfiguration(Configuration) //.SetProperty("Platform", platform) .SetAssemblyVersion(_gitVersion.AssemblySemVer) From f3f0dc615ddb94d0d32e20d5d31ac8895eeb87e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dembski?= Date: Tue, 2 Dec 2025 12:24:00 +0100 Subject: [PATCH 3/3] update Nuke to 10.1.0 --- .config/dotnet-tools.json | 2 +- .github/workflows/CI.yml | 10 +++++----- Directory.Packages.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index cda7193..753fccc 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "nuke.globaltool": { - "version": "10.0.1", + "version": "10.1.0", "commands": [ "nuke" ], diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a85cdf9..f851a1f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -23,7 +23,7 @@ jobs: name: windows-latest runs-on: windows-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: lfs: true fetch-depth: 0 @@ -40,22 +40,22 @@ jobs: CoverallsToken: ${{ secrets.COVERALLS_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: 'Publish: coverage.zip' - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: coverage.zip path: artifacts/coverage.zip - name: 'Publish: Demo.Engine.zip' - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: Demo.Engine.zip path: artifacts/Demo.Engine.zip - name: 'Publish: Demo.Engine.win-x64.zip' - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: Demo.Engine.win-x64.zip path: artifacts/Demo.Engine.win-x64.zip - name: 'Publish: Demo.Engine.win-arm64.zip' - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: Demo.Engine.win-arm64.zip path: artifacts/Demo.Engine.win-arm64.zip diff --git a/Directory.Packages.props b/Directory.Packages.props index 458e5b2..55a8990 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -38,7 +38,7 @@ - +