Skip to content

Commit 997ca65

Browse files
nils-anils-a
authored
Merge pull request #569 from nils-a/feature/GH-545
(#545) Bump Cake to 5.0.0
2 parents 6a11568 + 14cc801 commit 997ca65

File tree

11 files changed

+35
-21
lines changed

11 files changed

+35
-21
lines changed

‎.github/workflows/build.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,21 @@ jobs:
4949
run: git fetch --prune --unshallow
5050
- uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
5151
with:
52-
# codecov needs 2.1, unittests needs 3.1, gitversion needs 5.0
52+
# codecov needs 2.1
53+
# unittests needs 3.1
54+
# gitversion needs 5.0
55+
# cake 1.3 needs 6.0
56+
# gitrelasemanager (v0.18.0) needs 7.0
57+
# .NET 9 to build
58+
# test are running on 8 and 9
5359
dotnet-version: |
5460
2.1
5561
3.1
5662
5.0
5763
6.0
5864
7.0
5965
8.0
66+
9.0
6067
- name: Cache Tools
6168
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
6269
with:

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,13 @@ jobs:
3535
run: git fetch --prune --unshallow
3636
- uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
3737
with:
38-
# codecov needs 2.1, unittests needs 3.1, gitversion needs 5.0
38+
# gitversion needs 5.0
39+
# cake 1.3 needs 6.0
40+
# .NET 9 to build
3941
dotnet-version: |
40-
2.1
41-
3.1
42-
5.0
43-
6.0
44-
7.0
45-
8.0
42+
5.0
43+
6.0
44+
9.0
4645
- name: Cache Tools
4746
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
4847
with:

‎demo/frosting/build.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1+
# ensure a most-recent debug-build, so we can reference that.
2+
dotnet build ../../src/Cake.ESLint/Cake.ESLint.csproj
3+
14
dotnet run --project ./build/Build.csproj -- "$@"

‎demo/frosting/build/Build.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Cake.Frosting" Version="4.0.0" />
9-
<PackageReference Include="Cake.Npm" Version="4.0.0" />
8+
<PackageReference Include="Cake.Frosting" Version="5.0.0" />
9+
<PackageReference Include="Cake.Npm" Version="5.0.0" />
1010
</ItemGroup>
1111
<ItemGroup>
1212
<Reference Include="Cake.ESLint">
13-
<HintPath>$(ProjectDir)../../../src/Cake.ESLint/bin/Debug/net8.0/Cake.ESLint.dll</HintPath>
13+
<HintPath>$(ProjectDir)../../../src/Cake.ESLint/bin/Debug/net9.0/Cake.ESLint.dll</HintPath>
1414
</Reference>
1515
</ItemGroup>
1616
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"isRoot": true,
44
"tools": {
55
"cake.tool": {
6-
"version": "4.0.0",
6+
"version": "5.0.0",
77
"commands": [
88
"dotnet-cake"
99
]
1010
}
1111
}
12-
}
12+
}

‎demo/script/build.cake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#addin nuget:?package=Cake.Npm&version=4.0.0
2-
#r "..\..\src\Cake.ESLint\bin\Debug\net8.0\Cake.ESLint.dll"
1+
#addin nuget:?package=Cake.Npm&version=5.0.0
2+
#r "..\..\src\Cake.ESLint\bin\Debug\net9.0\Cake.ESLint.dll"
33

44
///////////////////////////////////////////////////////////////////////////////
55
// ARGUMENTS

‎demo/script/build.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
77
export DOTNET_CLI_TELEMETRY_OPTOUT=1
88
export DOTNET_NOLOGO=1
99

10+
# ensure a most-recent debug-build, so we can reference that.
11+
dotnet build ../../src/Cake.ESLint/Cake.ESLint.csproj
12+
1013
dotnet tool restore
1114

1215
dotnet cake "$@"

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
33
"allowPrerelease": true,
4-
"version": "8.0.410",
4+
"version": "9.0.300",
55
"rollForward": "latestFeature"
66
}
77
}

‎recipe.cake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@ BuildParameters.SetParameters(
1818
BuildParameters.PrintParameters(Context);
1919

2020
ToolSettings.SetToolSettings(context: Context);
21+
ToolSettings.SetToolPreprocessorDirectives(
22+
gitReleaseManagerGlobalTool: "#tool dotnet:?package=GitReleaseManager.Tool&version=0.18.0");
2123

2224
Build.RunDotNetCore();

‎src/Cake.ESLint.Tests/Cake.ESLint.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
Remove this hack if Cake.Recipe bumps the usage of Cake.Incubator to version 7.0.0
99
-->
1010
<TargetFrameworks Condition="false">netcoreapp3.1</TargetFrameworks>
11-
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
11+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
1212
<NoWarn>$(NoWarn);CS1591;SA1600</NoWarn>
1313

1414
<IsPackable>false</IsPackable>
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Cake.Testing" Version="4.0.0" />
18+
<PackageReference Include="Cake.Testing" Version="5.0.0" />
1919
<PackageReference Include="coverlet.msbuild" Version="6.0.4">
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)