diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json index 466bf0f..ee329a6 100644 --- a/.nuke/build.schema.json +++ b/.nuke/build.schema.json @@ -1,23 +1,54 @@ { "$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", + "Compile", + "Default", + "Package", + "PrePublish", + "Publish", + "PublishPackages", + "PublishPreRelease", + "PublishRelease", + "Restore", + "RunUnitTests" + ] + }, + "Verbosity": { + "type": "string", + "description": "", + "enum": [ + "Verbose", + "Normal", + "Minimal", + "Quiet" + ] + }, + "NukeBuild": { "properties": { - "CommonPropsFilePath": { - "type": "string", - "description": "common.props file path - to determine the configured version" - }, - "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" @@ -27,25 +58,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", @@ -66,10 +80,6 @@ "type": "string" } }, - "ReleaseNotesFilePath": { - "type": "string", - "description": "ReleaseNotesFilePath - To determine the lates changelog version" - }, "Root": { "type": "string", "description": "Root directory during build execution" @@ -78,59 +88,50 @@ "type": "array", "description": "List of targets to be skipped. Empty list skips all dependencies", "items": { - "type": "string", - "enum": [ - "Clean", - "Compile", - "CreatePackages", - "Default", - "Package", - "PrePublish", - "Publish", - "PublishPackages", - "PublishPreRelease", - "PublishRelease", - "Restore", - "RunUnitTests" - ] + "$ref": "#/definitions/ExecutableTarget" } }, - "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": [ - "Clean", - "Compile", - "CreatePackages", - "Default", - "Package", - "PrePublish", - "Publish", - "PublishPackages", - "PublishPreRelease", - "PublishRelease", - "Restore", - "RunUnitTests" - ] + "$ref": "#/definitions/ExecutableTarget" } }, "Verbosity": { - "type": "string", "description": "Logging verbosity during build execution. Default is 'Normal'", - "enum": [ - "Minimal", - "Normal", - "Quiet", - "Verbose" - ] + "$ref": "#/definitions/Verbosity" } } } - } + }, + "allOf": [ + { + "properties": { + "CommonPropsFilePath": { + "type": "string", + "description": "common.props file path - to determine the configured version" + }, + "Configuration": { + "type": "string", + "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)", + "enum": [ + "Debug", + "Release" + ] + }, + "ReleaseNotesFilePath": { + "type": "string", + "description": "ReleaseNotesFilePath - To determine the lates changelog version" + }, + "Solution": { + "type": "string", + "description": "Path to a solution file that is automatically loaded" + } + } + }, + { + "$ref": "#/definitions/NukeBuild" + } + ] } diff --git a/Changelog.md b/Changelog.md index 2062e42..ae37cc9 100644 --- a/Changelog.md +++ b/Changelog.md @@ -12,6 +12,7 @@ - Added option to provide floating point value as aspect ratios with `SetAspectRatio` (#793) - Added `TitleBarOverlay` property to `BrowserWindowOptions` (#909) - Added `RoundedCorners` property to `BrowserWindowOptions` +- Added .NET 10 as an explicit target # 0.0.18 diff --git a/LICENSE b/LICENSE index 5d83f95..9e71947 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017-2024 Gregor Biswanger, Robert Mühsig +Copyright (c) 2017-2025 Gregor Biswanger, Robert Mühsig, Florian Rappl Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/global.json b/global.json index ceda25e..ef313ab 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.305", + "version": "10.0.100", "rollForward": "feature", "allowPrerelease": false } diff --git a/nuke/Build.cs b/nuke/Build.cs index 8fe3b44..e4fe84e 100644 --- a/nuke/Build.cs +++ b/nuke/Build.cs @@ -3,6 +3,7 @@ using Nuke.Common; using Nuke.Common.CI.GitHubActions; using Nuke.Common.IO; using Nuke.Common.ProjectModel; +using Nuke.Common.Tooling; using Nuke.Common.Tools.DotNet; using Nuke.Common.Tools.GitHub; using Nuke.Common.Tools.NuGet; @@ -15,7 +16,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using static Nuke.Common.IO.FileSystemTasks; using static Nuke.Common.IO.PathConstruction; using static Nuke.Common.Tools.DotNet.DotNetTasks; // ReSharper disable ArrangeThisQualifier @@ -116,7 +116,7 @@ class Build : NukeBuild Target Restore => _ => _ .Executes(() => { - DotNetRestore(s => s.SetProjectFile(Solution.Path)); + DotNetRestore(s => s.SetProjectFile(Solution)); }); Target Compile => _ => _ @@ -124,7 +124,7 @@ class Build : NukeBuild .Executes(() => { DotNetBuild(s => s - .SetProjectFile(Solution.Path) + .SetProjectFile(Solution) .SetConfiguration(Configuration) .SetProperty("GeneratePackageOnBuild", "True") .SetProperty("VersionPostFix", VersionPostFix ?? string.Empty)); @@ -134,18 +134,17 @@ class Build : NukeBuild .DependsOn(Compile) .Executes(() => { - // There aren't any yet - }); + var TestProject = SourceDirectory / "ElectronNET.IntegrationTests" / "ElectronNET.IntegrationTests.csproj"; - Target CreatePackages => _ => _ - .DependsOn(Compile) - .Executes(() => - { - // Packages are created on build + DotNetTest(s => s + .SetProjectFile(TestProject) + .SetConfiguration(Configuration) + .When(_ => GitHubActions.Instance is not null, x => x.SetLoggers("GitHubActions")) + ); }); Target PublishPackages => _ => _ - .DependsOn(CreatePackages) + .DependsOn(Compile) .DependsOn(RunUnitTests) .Executes(() => { @@ -240,7 +239,7 @@ class Build : NukeBuild Target Package => _ => _ .DependsOn(RunUnitTests) - .DependsOn(CreatePackages); + .DependsOn(Compile); Target Default => _ => _ .DependsOn(Package); diff --git a/nuke/_build.csproj b/nuke/_build.csproj index a71fa1b..3258f31 100644 --- a/nuke/_build.csproj +++ b/nuke/_build.csproj @@ -11,11 +11,11 @@ - + - + diff --git a/src/ElectronNET/build/ElectronNET.Build.dll b/src/ElectronNET/build/ElectronNET.Build.dll index 2f3e380..c850ff3 100644 Binary files a/src/ElectronNET/build/ElectronNET.Build.dll and b/src/ElectronNET/build/ElectronNET.Build.dll differ diff --git a/src/common.props b/src/common.props index 3f0619b..4773795 100644 --- a/src/common.props +++ b/src/common.props @@ -1,6 +1,6 @@ - 0.1.0.0 + 0.1.0 ElectronNET.Core Gregor Biswanger, Florian Rappl, softworkz Electron.NET