Skip to content

Commit 9926c26

Browse files
committed
fixed nuke build
1 parent f12b12a commit 9926c26

File tree

5 files changed

+69
-59
lines changed

5 files changed

+69
-59
lines changed

.nuke/build.schema.json

Lines changed: 61 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,48 @@
11
{
22
"$schema": "http://json-schema.org/draft-04/schema#",
3-
"$ref": "#/definitions/build",
4-
"title": "Build Schema",
53
"definitions": {
6-
"build": {
7-
"type": "object",
4+
"Host": {
5+
"type": "string",
6+
"enum": [
7+
"AppVeyor",
8+
"AzurePipelines",
9+
"Bamboo",
10+
"Bitbucket",
11+
"Bitrise",
12+
"GitHubActions",
13+
"GitLab",
14+
"Jenkins",
15+
"Rider",
16+
"SpaceAutomation",
17+
"TeamCity",
18+
"Terminal",
19+
"TravisCI",
20+
"VisualStudio",
21+
"VSCode"
22+
]
23+
},
24+
"ExecutableTarget": {
25+
"type": "string",
26+
"enum": [
27+
"Clean",
28+
"Publish",
29+
"PublishLinux",
30+
"PublishOsx",
31+
"PublishWin"
32+
]
33+
},
34+
"Verbosity": {
35+
"type": "string",
36+
"description": "",
37+
"enum": [
38+
"Verbose",
39+
"Normal",
40+
"Minimal",
41+
"Quiet"
42+
]
43+
},
44+
"NukeBuild": {
845
"properties": {
9-
"Configuration": {
10-
"type": "string",
11-
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
12-
"enum": [
13-
"Debug",
14-
"Release"
15-
]
16-
},
1746
"Continue": {
1847
"type": "boolean",
1948
"description": "Indicates to continue a previously failed build attempt"
@@ -23,25 +52,8 @@
2352
"description": "Shows the help text for this build assembly"
2453
},
2554
"Host": {
26-
"type": "string",
2755
"description": "Host for execution. Default is 'automatic'",
28-
"enum": [
29-
"AppVeyor",
30-
"AzurePipelines",
31-
"Bamboo",
32-
"Bitbucket",
33-
"Bitrise",
34-
"GitHubActions",
35-
"GitLab",
36-
"Jenkins",
37-
"Rider",
38-
"SpaceAutomation",
39-
"TeamCity",
40-
"Terminal",
41-
"TravisCI",
42-
"VisualStudio",
43-
"VSCode"
44-
]
56+
"$ref": "#/definitions/Host"
4557
},
4658
"NoLogo": {
4759
"type": "boolean",
@@ -70,44 +82,41 @@
7082
"type": "array",
7183
"description": "List of targets to be skipped. Empty list skips all dependencies",
7284
"items": {
73-
"type": "string",
74-
"enum": [
75-
"Clean",
76-
"Publish",
77-
"PublishLinux",
78-
"PublishOsx",
79-
"PublishWin"
80-
]
85+
"$ref": "#/definitions/ExecutableTarget"
8186
}
8287
},
8388
"Target": {
8489
"type": "array",
8590
"description": "List of targets to be invoked. Default is '{default_target}'",
8691
"items": {
87-
"type": "string",
88-
"enum": [
89-
"Clean",
90-
"Publish",
91-
"PublishLinux",
92-
"PublishOsx",
93-
"PublishWin"
94-
]
92+
"$ref": "#/definitions/ExecutableTarget"
9593
}
9694
},
9795
"Verbosity": {
98-
"type": "string",
9996
"description": "Logging verbosity during build execution. Default is 'Normal'",
97+
"$ref": "#/definitions/Verbosity"
98+
}
99+
}
100+
}
101+
},
102+
"allOf": [
103+
{
104+
"properties": {
105+
"Configuration": {
106+
"type": "string",
107+
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
100108
"enum": [
101-
"Minimal",
102-
"Normal",
103-
"Quiet",
104-
"Verbose"
109+
"Debug",
110+
"Release"
105111
]
106112
},
107113
"Version": {
108114
"type": "string"
109115
}
110116
}
117+
},
118+
{
119+
"$ref": "#/definitions/NukeBuild"
111120
}
112-
}
121+
]
113122
}

K8sFileBrowser.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Global
1212
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1313
{C0C29CAE-A5C1-43B8-BFF8-BFE718FE04E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1414
{C0C29CAE-A5C1-43B8-BFF8-BFE718FE04E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
15+
{C0C29CAE-A5C1-43B8-BFF8-BFE718FE04E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
1516
{637A753B-3168-4C9C-8098-7A16024E1957}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1617
{637A753B-3168-4C9C-8098-7A16024E1957}.Debug|Any CPU.Build.0 = Debug|Any CPU
1718
{637A753B-3168-4C9C-8098-7A16024E1957}.Release|Any CPU.ActiveCfg = Release|Any CPU

K8sFileBrowser/app.manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- This manifest is used on Windows only.
44
Don't remove it as it might cause problems with window transparency and embeded controls.
55
For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
6-
<assemblyIdentity version="1.0.0.0" name="K8sFileBrowser.Desktop"/>
6+
<assemblyIdentity version="1.4.0.0" name="K8sFileBrowser.Desktop"/>
77

88
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
99
<application>

build/Build.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Build : NukeBuild
1212
[Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
1313
readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
1414

15-
[Parameter] readonly string Version = "1.0.0";
15+
[Parameter] readonly string Version = "1.4.0";
1616

1717
AbsolutePath SourceDirectory => RootDirectory / "K8sFileBrowser";
1818
AbsolutePath OutputDirectory => RootDirectory / "output";
@@ -47,7 +47,7 @@ class Build : NukeBuild
4747
.SetConfiguration(Configuration)
4848
.SetOutput(WinOutputDirectory)
4949
.EnableSelfContained()
50-
.SetFramework("net7.0")
50+
.SetFramework("net8.0")
5151
.SetRuntime("win-x64")
5252
.EnablePublishSingleFile()
5353
.EnablePublishReadyToRun()
@@ -73,7 +73,7 @@ class Build : NukeBuild
7373
.SetConfiguration(Configuration)
7474
.SetOutput(LinuxOutputDirectory)
7575
.EnableSelfContained()
76-
.SetFramework("net7.0")
76+
.SetFramework("net8.0")
7777
.SetRuntime("linux-x64")
7878
.EnablePublishSingleFile()
7979
.EnablePublishReadyToRun()
@@ -98,7 +98,7 @@ class Build : NukeBuild
9898
.SetConfiguration(Configuration)
9999
.SetOutput(OsxOutputDirectory)
100100
.EnableSelfContained()
101-
.SetFramework("net7.0")
101+
.SetFramework("net8.0")
102102
.SetRuntime("osx-arm64")
103103
.EnablePublishSingleFile()
104104
.EnablePublishReadyToRun()

build/_build.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<RootNamespace></RootNamespace>
77
<NoWarn>CS0649;CS0169</NoWarn>
88
<NukeRootDirectory>..</NukeRootDirectory>
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Nuke.Common" Version="9.0.4" />
14+
<PackageReference Include="Nuke.Common" Version="8.1.4" />
1515
</ItemGroup>
1616

1717
</Project>

0 commit comments

Comments
 (0)