From 9926c26cc350a35fe23984760165a55257504997 Mon Sep 17 00:00:00 2001 From: Andreas Billmann Date: Thu, 13 Mar 2025 03:21:23 +0100 Subject: [PATCH] fixed nuke build --- .nuke/build.schema.json | 113 +++++++++++++++++++----------------- K8sFileBrowser.sln | 1 + K8sFileBrowser/app.manifest | 2 +- build/Build.cs | 8 +-- build/_build.csproj | 4 +- 5 files changed, 69 insertions(+), 59 deletions(-) diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json index 13ac6c1..aa44f69 100644 --- a/.nuke/build.schema.json +++ b/.nuke/build.schema.json @@ -1,19 +1,48 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/build", - "title": "Build Schema", "definitions": { - "build": { - "type": "object", + "Host": { + "type": "string", + "enum": [ + "AppVeyor", + "AzurePipelines", + "Bamboo", + "Bitbucket", + "Bitrise", + "GitHubActions", + "GitLab", + "Jenkins", + "Rider", + "SpaceAutomation", + "TeamCity", + "Terminal", + "TravisCI", + "VisualStudio", + "VSCode" + ] + }, + "ExecutableTarget": { + "type": "string", + "enum": [ + "Clean", + "Publish", + "PublishLinux", + "PublishOsx", + "PublishWin" + ] + }, + "Verbosity": { + "type": "string", + "description": "", + "enum": [ + "Verbose", + "Normal", + "Minimal", + "Quiet" + ] + }, + "NukeBuild": { "properties": { - "Configuration": { - "type": "string", - "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)", - "enum": [ - "Debug", - "Release" - ] - }, "Continue": { "type": "boolean", "description": "Indicates to continue a previously failed build attempt" @@ -23,25 +52,8 @@ "description": "Shows the help text for this build assembly" }, "Host": { - "type": "string", "description": "Host for execution. Default is 'automatic'", - "enum": [ - "AppVeyor", - "AzurePipelines", - "Bamboo", - "Bitbucket", - "Bitrise", - "GitHubActions", - "GitLab", - "Jenkins", - "Rider", - "SpaceAutomation", - "TeamCity", - "Terminal", - "TravisCI", - "VisualStudio", - "VSCode" - ] + "$ref": "#/definitions/Host" }, "NoLogo": { "type": "boolean", @@ -70,44 +82,41 @@ "type": "array", "description": "List of targets to be skipped. Empty list skips all dependencies", "items": { - "type": "string", - "enum": [ - "Clean", - "Publish", - "PublishLinux", - "PublishOsx", - "PublishWin" - ] + "$ref": "#/definitions/ExecutableTarget" } }, "Target": { "type": "array", "description": "List of targets to be invoked. Default is '{default_target}'", "items": { - "type": "string", - "enum": [ - "Clean", - "Publish", - "PublishLinux", - "PublishOsx", - "PublishWin" - ] + "$ref": "#/definitions/ExecutableTarget" } }, "Verbosity": { - "type": "string", "description": "Logging verbosity during build execution. Default is 'Normal'", + "$ref": "#/definitions/Verbosity" + } + } + } + }, + "allOf": [ + { + "properties": { + "Configuration": { + "type": "string", + "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)", "enum": [ - "Minimal", - "Normal", - "Quiet", - "Verbose" + "Debug", + "Release" ] }, "Version": { "type": "string" } } + }, + { + "$ref": "#/definitions/NukeBuild" } - } + ] } diff --git a/K8sFileBrowser.sln b/K8sFileBrowser.sln index 001503f..6bc2a12 100644 --- a/K8sFileBrowser.sln +++ b/K8sFileBrowser.sln @@ -12,6 +12,7 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {C0C29CAE-A5C1-43B8-BFF8-BFE718FE04E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C0C29CAE-A5C1-43B8-BFF8-BFE718FE04E8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C0C29CAE-A5C1-43B8-BFF8-BFE718FE04E8}.Debug|Any CPU.Build.0 = Debug|Any CPU {637A753B-3168-4C9C-8098-7A16024E1957}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {637A753B-3168-4C9C-8098-7A16024E1957}.Debug|Any CPU.Build.0 = Debug|Any CPU {637A753B-3168-4C9C-8098-7A16024E1957}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/K8sFileBrowser/app.manifest b/K8sFileBrowser/app.manifest index c68ca8f..6f66f95 100644 --- a/K8sFileBrowser/app.manifest +++ b/K8sFileBrowser/app.manifest @@ -3,7 +3,7 @@ - + diff --git a/build/Build.cs b/build/Build.cs index 31eb029..fbb388a 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -12,7 +12,7 @@ class Build : NukeBuild [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")] readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release; - [Parameter] readonly string Version = "1.0.0"; + [Parameter] readonly string Version = "1.4.0"; AbsolutePath SourceDirectory => RootDirectory / "K8sFileBrowser"; AbsolutePath OutputDirectory => RootDirectory / "output"; @@ -47,7 +47,7 @@ class Build : NukeBuild .SetConfiguration(Configuration) .SetOutput(WinOutputDirectory) .EnableSelfContained() - .SetFramework("net7.0") + .SetFramework("net8.0") .SetRuntime("win-x64") .EnablePublishSingleFile() .EnablePublishReadyToRun() @@ -73,7 +73,7 @@ class Build : NukeBuild .SetConfiguration(Configuration) .SetOutput(LinuxOutputDirectory) .EnableSelfContained() - .SetFramework("net7.0") + .SetFramework("net8.0") .SetRuntime("linux-x64") .EnablePublishSingleFile() .EnablePublishReadyToRun() @@ -98,7 +98,7 @@ class Build : NukeBuild .SetConfiguration(Configuration) .SetOutput(OsxOutputDirectory) .EnableSelfContained() - .SetFramework("net7.0") + .SetFramework("net8.0") .SetRuntime("osx-arm64") .EnablePublishSingleFile() .EnablePublishReadyToRun() diff --git a/build/_build.csproj b/build/_build.csproj index 5f0ea28..7694661 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 CS0649;CS0169 .. @@ -11,7 +11,7 @@ - +