Skip to content

Commit

Permalink
Merge pull request #2 from hexagram-solutions/housekeeping
Browse files Browse the repository at this point in the history
Update all NuGet packages
  • Loading branch information
esond authored Jan 27, 2025
2 parents 606caa7 + 7a9da24 commit 56c44e0
Show file tree
Hide file tree
Showing 18 changed files with 132 additions and 145 deletions.
19 changes: 14 additions & 5 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,25 @@
"isRoot": true,
"tools": {
"nuke.globaltool": {
"version": "8.0.0",
"version": "9.0.4",
"commands": [
"nuke"
]
],
"rollForward": false
},
"docfx": {
"version": "2.66.0",
"version": "2.78.2",
"commands": [
"docfx"
]
],
"rollForward": false
},
"gitversion.tool": {
"version": "5.1.18",
"commands": [
"dotnet-gitversion"
],
"rollForward": false
}
}
}
}
42 changes: 6 additions & 36 deletions .github/workflows/continuous.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,77 +30,47 @@ jobs:
name: windows-latest
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('global.json', 'src/**/*.csproj') }}
- name: 'Run: Test'
run: ./build.cmd Test
- name: 'Publish: test-results'
uses: actions/upload-artifact@v3
with:
name: test-results
path: artifacts/test-results
- name: 'Publish: coverage-report.zip'
uses: actions/upload-artifact@v3
with:
name: coverage-report.zip
path: artifacts/reports/coverage-report.zip
ubuntu-latest:
name: ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('global.json', 'src/**/*.csproj') }}
- name: 'Run: Test'
run: ./build.cmd Test
- name: 'Publish: test-results'
uses: actions/upload-artifact@v3
with:
name: test-results
path: artifacts/test-results
- name: 'Publish: coverage-report.zip'
uses: actions/upload-artifact@v3
with:
name: coverage-report.zip
path: artifacts/reports/coverage-report.zip
macos-latest:
name: macos-latest
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
.nuke/temp
~/.nuget/packages
key: ${{ runner.os }}-${{ hashFiles('global.json', 'src/**/*.csproj') }}
- name: 'Run: Test'
run: ./build.cmd Test
- name: 'Publish: test-results'
uses: actions/upload-artifact@v3
with:
name: test-results
path: artifacts/test-results
- name: 'Publish: coverage-report.zip'
uses: actions/upload-artifact@v3
with:
name: coverage-report.zip
path: artifacts/reports/coverage-report.zip
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
name: ubuntu-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
.nuke/temp
Expand All @@ -41,17 +41,17 @@ jobs:
env:
NuGetApiKey: ${{ secrets.NUGET_API_KEY }}
- name: 'Publish: test-results'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: test-results
path: artifacts/test-results
- name: 'Publish: coverage-report.zip'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage-report.zip
path: artifacts/reports/coverage-report.zip
- name: 'Publish: packages'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: packages
path: artifacts/packages
153 changes: 79 additions & 74 deletions .nuke/build.schema.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,52 @@
{
"$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",
"Format",
"Pack",
"Push",
"ReportCoverage",
"Restore",
"Test",
"VerifyFormat"
]
},
"Verbosity": {
"type": "string",
"description": "",
"enum": [
"Verbose",
"Normal",
"Minimal",
"Quiet"
]
},
"NukeBuild": {
"properties": {
"Configuration": {
"type": "string",
"enum": [
"Debug",
"Release"
]
},
"Continue": {
"type": "boolean",
"description": "Indicates to continue a previously failed build attempt"
Expand All @@ -22,41 +56,13 @@
"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"
]
},
"IgnoreFailedSources": {
"type": "boolean",
"description": "Ignore unreachable sources during Restore"
"$ref": "#/definitions/Host"
},
"NoLogo": {
"type": "boolean",
"description": "Disables displaying the NUKE logo"
},
"NuGetApiKey": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"NuGetSource": {
"type": "string"
},
"Partition": {
"type": "string",
"description": "Partition to use on CI"
Expand All @@ -80,53 +86,52 @@
"type": "array",
"description": "List of targets to be skipped. Empty list skips all dependencies",
"items": {
"type": "string",
"enum": [
"Clean",
"Compile",
"Format",
"Pack",
"Push",
"ReportCoverage",
"Restore",
"Test",
"VerifyFormat"
]
"$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",
"Format",
"Pack",
"Push",
"ReportCoverage",
"Restore",
"Test",
"VerifyFormat"
]
"$ref": "#/definitions/ExecutableTarget"
}
},
"Verbosity": {
"type": "string",
"description": "Logging verbosity during build execution. Default is 'Normal'",
"$ref": "#/definitions/Verbosity"
}
}
}
},
"allOf": [
{
"properties": {
"Configuration": {
"type": "string",
"enum": [
"Minimal",
"Normal",
"Quiet",
"Verbose"
"Debug",
"Release"
]
},
"IgnoreFailedSources": {
"type": "boolean",
"description": "Ignore unreachable sources during Restore"
},
"NuGetApiKey": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"NuGetSource": {
"type": "string"
},
"Solution": {
"type": "string",
"description": "Path to a solution file that is automatically loaded"
}
}
},
{
"$ref": "#/definitions/NukeBuild"
}
}
]
}
2 changes: 1 addition & 1 deletion build/Build.CI.GitHubActions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
FetchDepth = 0,
OnPullRequestBranches = ["main"],
OnPushBranches = ["main", "release/v*"],
PublishArtifacts = true,
PublishArtifacts = false,
InvokedTargets = [nameof(ITest.Test)],
CacheKeyFiles = ["global.json", "src/**/*.csproj"])]
// TODO: Package signing
Expand Down
3 changes: 2 additions & 1 deletion build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Nuke.Common.ProjectModel;
using Nuke.Common.Tooling;
using Nuke.Common.Tools.DotNet;
using Nuke.Common.Utilities;

// ReSharper disable RedundantExtendsListEntry
// ReSharper disable InconsistentNaming
Expand Down Expand Up @@ -37,7 +38,7 @@ partial class Build : NukeBuild,
readonly Solution Solution;
Solution IHasSolution.Solution => Solution;

public IEnumerable<AbsolutePath> ExcludedFormatPaths => Enumerable.Empty<AbsolutePath>();
public IEnumerable<AbsolutePath> ExcludedFormatPaths => [];

public bool RunFormatAnalyzers => true;

Expand Down
2 changes: 1 addition & 1 deletion build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="8.0.0" />
<PackageReference Include="Nuke.Common" Version="9.0.4" />
<PackageDownload Include="GitVersion.Tool" version="[5.12.0]" />
<PackageDownload Include="ReportGenerator" Version="[5.1.18]" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/1-basic/build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="8.0.0" />
<PackageReference Include="Nuke.Common" Version="9.0.4" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/2-format/build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Build : NukeBuild, IFormat, ICompile
readonly Solution Solution;
Solution IHasSolution.Solution => Solution;

public IEnumerable<AbsolutePath> ExcludedFormatPaths => Enumerable.Empty<AbsolutePath>();
public IEnumerable<AbsolutePath> ExcludedFormatPaths => [];

Target ICompile.Compile => t => t
.Inherit<ICompile>()
Expand Down
Loading

0 comments on commit 56c44e0

Please sign in to comment.