Skip to content

Commit 8f1e9ac

Browse files
nils-anils-a
authored
Merge pull request #478 from nils-a/feature/GH-458
(#458) Bump Cake to 5.0.0
2 parents ee84ac5 + 27e3922 commit 8f1e9ac

File tree

16 files changed

+68
-20
lines changed

16 files changed

+68
-20
lines changed

‎.github/workflows/build.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +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
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
5259
dotnet-version: |
5360
2.1
5461
3.1
5562
5.0
5663
6.0
5764
7.0
5865
8.0
66+
9.0
5967
- name: Cache Tools
6068
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
6169
with:

‎.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,13 @@ jobs:
3535
fetch-depth: 0
3636
- uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
3737
with:
38+
# gitversion needs 5.0
39+
# cake 1.3 needs 6.0
40+
# .NET 9 to build
3841
dotnet-version: |
3942
5.0
4043
6.0
41-
7.0
42-
8.0
44+
9.0
4345
- name: Cache Tools
4446
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
4547
with:

‎demo/frosting/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.gradle/
22
tools/
3+
example/build/

‎demo/frosting/build.ps1

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,14 @@
1+
$ErrorActionPreference = 'Stop'
2+
3+
Set-Location -LiteralPath $PSScriptRoot
4+
5+
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = '1'
6+
$env:DOTNET_CLI_TELEMETRY_OPTOUT = '1'
7+
$env:DOTNET_NOLOGO = '1'
8+
9+
# ensure a most-recent debug-build, so we can reference that.
10+
dotnet build ../../src/Cake.Gradle/Cake.Gradle.csproj
11+
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
12+
113
dotnet run --project build/Build.csproj -- $args
2-
exit $LASTEXITCODE;
14+
exit $LASTEXITCODE;

‎demo/frosting/build.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
cd "$(dirname "${BASH_SOURCE[0]}")"
5+
6+
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
7+
export DOTNET_CLI_TELEMETRY_OPTOUT=1
8+
export DOTNET_NOLOGO=1
9+
10+
# ensure a most-recent debug-build, so we can reference that.
11+
dotnet build ../../src/Cake.Gradle/Cake.Gradle.csproj
12+
113
dotnet run --project ./build/Build.csproj -- "$@"

‎demo/frosting/build/Build.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
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" />
8+
<PackageReference Include="Cake.Frosting" Version="5.0.0" />
99
</ItemGroup>
1010
<ItemGroup>
1111
<Reference Include="Cake.Gradle">
12-
<HintPath>$(ProjectDir)../../../src/Cake.Gradle/bin/Release/net8.0/Cake.Gradle.dll</HintPath>
12+
<HintPath>$(ProjectDir)../../../src/Cake.Gradle/bin/Debug/net9.0/Cake.Gradle.dll</HintPath>
1313
</Reference>
1414
</ItemGroup>
1515
</Project>

‎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/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.gradle/
22
tools/
3+
example/build/

‎demo/script/build.cake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// build artifacts first by executing ./build.ps1 in root
2-
#r "../../src/Cake.Gradle/bin/Release/net8.0/Cake.Gradle.dll"
2+
#r "../../src/Cake.Gradle/bin/Debug/net9.0/Cake.Gradle.dll"
33

44
// requires Java Runtime Environment
55

@@ -25,4 +25,4 @@ Task("Gradle-Example")
2525
Gradle.FromPath("./example").WithTask("hello").WithArguments("--offline --build-file build.gradle").Run();
2626
});
2727

28-
RunTarget("Gradle-Example");
28+
RunTarget("Gradle-Example");

‎demo/script/build.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = '1'
66
$env:DOTNET_CLI_TELEMETRY_OPTOUT = '1'
77
$env:DOTNET_NOLOGO = '1'
88

9+
# ensure a most-recent debug-build, so we can reference that.
10+
dotnet build ../../src/Cake.Gradle/Cake.Gradle.csproj
11+
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
12+
913
dotnet tool restore
1014
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
1115

0 commit comments

Comments
 (0)