Skip to content

Commit 5f9d987

Browse files
authored
Merge pull request #295 from nils-a/release/6.0.0
Release/6.0.0
2 parents 0da3226 + 07ab8e5 commit 5f9d987

File tree

10 files changed

+44
-37
lines changed

10 files changed

+44
-37
lines changed

.github/workflows/build.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ${{ matrix.os }}
2020
strategy:
2121
matrix:
22-
os: [ windows-2022, ubuntu-22.04, macos-12 ]
22+
os: [ windows-2022, ubuntu-22.04, macos-13 ]
2323

2424
env:
2525
AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }}
@@ -44,41 +44,45 @@ jobs:
4444

4545
steps:
4646
- name: checkout
47-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
47+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
4848
- name: Fetch all tags and branches
4949
run: git fetch --prune --unshallow
5050
- name: Cache Tools
51-
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3
51+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
5252
with:
5353
path: tools
5454
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
55-
- uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
55+
- uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0
5656
with:
57+
# codecov needs 2.1
58+
# unittests needs 3.1
59+
# gitversion needs 5.0
60+
# cake 1.3 needs 6.0
61+
# .NET 9 to build
5762
dotnet-version: |
5863
2.1
5964
3.1
6065
5.0
6166
6.0
62-
7.0
63-
8.0
67+
9.0
6468
- name: Build project
65-
uses: cake-build/cake-action@a6eb054329257c9e70a6c6bf01747ad6e1d9d52b # v1.4.1
69+
uses: cake-build/cake-action@1223b6fa067ad192159f43b50cd4f953679b0934 # v2.0.0
6670
with:
6771
script-path: recipe.cake
6872
target: CI
6973
cake-version: tool-manifest
7074

7175
# currently, Cake.Recipe does not upload artifacts when run on gh-actions
7276
- name: Upload Issues
73-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
77+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
7478
with:
7579
if-no-files-found: warn
7680
name: ${{ matrix.os }} Issues
7781
path: |
7882
BuildArtifacts/report.html
7983
BuildArtifacts/**/coverlet/*.xml
8084
- name: Upload Packages
81-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
85+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
8286
if: runner.os == 'Windows'
8387
with:
8488
if-no-files-found: warn

.github/workflows/codeql-analysis.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,44 +30,44 @@ jobs:
3030

3131
steps:
3232
- name: Checkout repository
33-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
33+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
3434
with:
3535
fetch-depth: 0
36-
- uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
36+
- uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0
3737
with:
38+
# gitversion needs 5.0
39+
# cake 1.3 needs 6.0
40+
# .NET 9 to build
3841
dotnet-version: |
39-
2.1
40-
3.1
4142
5.0
4243
6.0
43-
7.0
44-
8.0
44+
9.0
4545
- name: Cache Tools
46-
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3
46+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
4747
with:
4848
path: tools
4949
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
5050

5151
# Initializes the CodeQL tools for scanning.
5252
- name: Initialize CodeQL
53-
uses: github/codeql-action/init@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2
53+
uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3
5454
with:
5555
languages: ${{ matrix.language }}
5656
# If you wish to specify custom queries, you can do so here or in a config file.
5757
# By default, queries listed here will override any specified in a config file.
5858
# Prefix the list here with "+" to use these queries and those in the config file.
5959
# queries: ./path/to/local/query, your-org/your-repo/queries@main
6060

61-
- uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
61+
- uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0
6262
with:
6363
dotnet-version: 7.0.x
6464

6565
- name: Build project
66-
uses: cake-build/cake-action@a6eb054329257c9e70a6c6bf01747ad6e1d9d52b # v1.4.1
66+
uses: cake-build/cake-action@1223b6fa067ad192159f43b50cd4f953679b0934 # v2.0.0
6767
with:
6868
script-path: recipe.cake
6969
target: DotNetCore-Build
7070
cake-version: tool-manifest
7171

7272
- name: Perform CodeQL Analysis
73-
uses: github/codeql-action/analyze@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2
73+
uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3

build.sh

100644100755
File mode changed.

demo/frosting/build/Build.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Cake.Frosting" Version="4.0.0" />
8+
<PackageReference Include="Cake.Frosting" Version="4.2.0" />
99
<ProjectReference Include="$(ProjectDir)../../../src/Cake.Npm.Module/Cake.Npm.Module.csproj" />
1010
</ItemGroup>
1111
<ItemGroup>

demo/script/.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"cake.tool": {
6-
"version": "4.0.0",
6+
"version": "4.2.0",
77
"commands": [
88
"dotnet-cake"
99
]

docs/input/doc/parameters.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ This corresponds to the `--global` option, and tells npm to install this package
7070
# CakeTool
7171

7272
This parameter controls the installation location of the npm package: While the default is the current working directory (unless [global](#global) is set),
73-
setting `caketool` will set the installation location to inside the `tools` folder and thus ensure that the installed tools are automatically found as
73+
setting `caketools` will set the installation location to inside the `tools` folder and thus ensure that the installed tools are automatically found as
7474
tools in Cake.
7575

7676
### Example
7777

7878
```
79-
#tool npm:?package=yo&caketool
79+
#tool npm:?package=yo&caketools
8080
```
8181

8282
# Save

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.100",
3+
"version": "9.0.101",
44
"rollForward": "latestFeature"
55
}
6-
}
6+
}

recipe.cake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,14 @@ BuildParameters.SetParameters(
1414
shouldUseDeterministicBuilds: true,
1515
gitterMessage: "@/all " + standardNotificationMessage,
1616
twitterMessage: standardNotificationMessage,
17+
shouldRunCodecov: false,
1718
preferredBuildProviderType: BuildProviderType.GitHubActions,
1819
preferredBuildAgentOperatingSystem: PlatformFamily.Linux);
1920

2021
BuildParameters.PrintParameters(Context);
2122

2223
ToolSettings.SetToolSettings(context: Context);
24+
ToolSettings.SetToolPreprocessorDirectives(
25+
gitReleaseManagerGlobalTool: "#tool dotnet:?package=GitReleaseManager.Tool&version=0.18.0");
2326

2427
Build.RunDotNetCore();

src/Cake.Npm.Module.Tests/Cake.Npm.Module.Tests.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
Remove this hack, if Cake.Recipe bumps the usage of Cake.Incubator to version 7.0.0.
88
-->
99
<TargetFramework Condition="false">netcoreapp3.1</TargetFramework>
10-
<TargetFramework>net6.0</TargetFramework>
10+
<TargetFramework>net8.0</TargetFramework>
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
16-
<PackageReference Include="xunit" Version="2.6.2" />
17-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
14+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
16+
<PackageReference Include="xunit" Version="2.9.2" />
17+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>
21-
<PackageReference Include="Cake.Testing" Version="4.0.0" />
22-
<PackageReference Include="NSubstitute" Version="5.1.0" />
21+
<PackageReference Include="Cake.Testing" Version="5.0.0" />
22+
<PackageReference Include="NSubstitute" Version="5.3.0" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

src/Cake.Npm.Module/Cake.Npm.Module.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<PublishRepositoryUrl>true</PublishRepositoryUrl>
77
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
88
<EmbedUntrackedSources>true</EmbedUntrackedSources>
99
<AssemblyName>Cake.Npm.Module</AssemblyName>
10-
<CakeVersion>4.0.0</CakeVersion>
10+
<CakeVersion>5.0.0</CakeVersion>
1111
</PropertyGroup>
1212

1313
<PropertyGroup>
@@ -39,11 +39,11 @@
3939

4040
<ItemGroup>
4141
<PackageReference Include="Cake.Core" Version="$(CakeVersion)" PrivateAssets="all" />
42-
<PackageReference Include="CakeContrib.Guidelines" Version="1.5.1">
42+
<PackageReference Include="CakeContrib.Guidelines" Version="1.6.1">
4343
<PrivateAssets>all</PrivateAssets>
4444
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4545
</PackageReference>
46-
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
46+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
4747
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
4848
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
4949
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)