diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json index b189377e..9a68b28e 100644 --- a/.nuke/build.schema.json +++ b/.nuke/build.schema.json @@ -1,60 +1,92 @@ { "$schema": "http://json-schema.org/draft-04/schema#", - "$ref": "#/definitions/build", - "title": "Build Schema", + "properties": { + "Configuration": { + "type": "string", + "description": "Configuration to build - Default is 'Release'", + "enum": [ + "Debug", + "Release" + ] + }, + "GlobalVips": { + "type": "boolean", + "description": "Test with a globally installed libvips" + }, + "Package": { + "type": "boolean", + "description": "Build and create NuGet packages" + }, + "SkipTests": { + "type": "boolean", + "description": "Skip unit tests" + }, + "Solution": { + "type": "string", + "description": "Path to a solution file that is automatically loaded" + } + }, "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": [ + "All", + "Clean", + "CreateNativeNuGetPackages", + "CreateNetVipsExtensionsNugetPackage", + "CreateNetVipsNugetPackage", + "DownloadBinaries", + "RunTests" + ] + }, + "Verbosity": { + "type": "string", + "description": "", + "enum": [ + "Verbose", + "Normal", + "Minimal", + "Quiet" + ] + }, + "NukeBuild": { "properties": { - "Configuration": { - "type": "string", - "description": "Configuration to build - Default is 'Release'", - "enum": [ - "Debug", - "Release" - ] - }, "Continue": { "type": "boolean", "description": "Indicates to continue a previously failed build attempt" }, - "GlobalVips": { - "type": "boolean", - "description": "Test with a globally installed libvips" - }, "Help": { "type": "boolean", "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", "description": "Disables displaying the NUKE logo" }, - "Package": { - "type": "boolean", - "description": "Build and create NuGet packages" - }, "Partition": { "type": "string", "description": "Partition to use on CI" @@ -78,53 +110,22 @@ "type": "array", "description": "List of targets to be skipped. Empty list skips all dependencies", "items": { - "type": "string", - "enum": [ - "All", - "Clean", - "CreateNativeNuGetPackages", - "CreateNetVipsExtensionsNugetPackage", - "CreateNetVipsNugetPackage", - "DownloadBinaries", - "RunTests" - ] + "$ref": "#/definitions/ExecutableTarget" } }, - "SkipTests": { - "type": "boolean", - "description": "Skip unit tests" - }, - "Solution": { - "type": "string", - "description": "Path to a solution file that is automatically loaded" - }, "Target": { "type": "array", "description": "List of targets to be invoked. Default is '{default_target}'", "items": { - "type": "string", - "enum": [ - "All", - "Clean", - "CreateNativeNuGetPackages", - "CreateNetVipsExtensionsNugetPackage", - "CreateNetVipsNugetPackage", - "DownloadBinaries", - "RunTests" - ] + "$ref": "#/definitions/ExecutableTarget" } }, "Verbosity": { - "type": "string", "description": "Logging verbosity during build execution. Default is 'Normal'", - "enum": [ - "Minimal", - "Normal", - "Quiet", - "Verbose" - ] + "$ref": "#/definitions/Verbosity" } } } - } + }, + "$ref": "#/definitions/NukeBuild" } diff --git a/build/NetVips.Build.csproj b/build/NetVips.Build.csproj index 19baf89e..1336d116 100644 --- a/build/NetVips.Build.csproj +++ b/build/NetVips.Build.csproj @@ -17,7 +17,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/build/Shims.cs b/build/Shims.cs index 0b45004c..aafd258f 100644 --- a/build/Shims.cs +++ b/build/Shims.cs @@ -5,7 +5,6 @@ using System.Xml.Linq; using ICSharpCode.SharpZipLib.GZip; using ICSharpCode.SharpZipLib.Tar; -using Nuke.Common; using Nuke.Common.CI; using Nuke.Common.CI.AppVeyor; using Nuke.Common.CI.GitHubActions; diff --git a/tests/NetVips.Tests/NetVips.Tests.csproj b/tests/NetVips.Tests/NetVips.Tests.csproj index 38cd1e7c..13bfcdd3 100644 --- a/tests/NetVips.Tests/NetVips.Tests.csproj +++ b/tests/NetVips.Tests/NetVips.Tests.csproj @@ -22,7 +22,7 @@ - +