Skip to content

Commit e60d119

Browse files
authored
Merge pull request #283 from nils-a/release/8.0.0
Release/8.0.0
2 parents e640764 + eaebe0c commit e60d119

File tree

13 files changed

+59
-55
lines changed

13 files changed

+59
-55
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 10 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-latest, macos-13, ubuntu-latest]
22+
os: [windows-2022, ubuntu-22.04]
2323

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

4545
steps:
4646
- name: Checkout the repository
47-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
47+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
4848

4949
- name: Fetch all tags and branches
5050
run: git fetch --prune --unshallow
5151

5252
# codecov and unittests need 2.1, gitversion needs 5.0
53-
- uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
53+
- uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
5454
with:
5555
dotnet-version: |
5656
2.1
5757
3.1
5858
5.0
5959
6.0
60-
7.0
61-
8.0
60+
9.0
6261
6362
- name: Cache Tools
64-
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
63+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
6564
with:
6665
path: tools
6766
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
6867

6968
- name: Build project
70-
uses: cake-build/cake-action@1223b6fa067ad192159f43b50cd4f953679b0934 # v2.0.0
69+
uses: cake-build/cake-action@5167c3f6a9e15c76f009de2acdfb9488552bc0b9 # v3
7170
with:
7271
script-path: recipe.cake
7372
target: CI
7473
verbosity: Diagnostic
75-
cake-version: 1.3.0
74+
cake-version: tool-manifest
7675

7776
# currently, Cake.Recipe does not upload artifacts when run on gh-actions
7877
- name: Upload Issues
79-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
78+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
8079
with:
8180
if-no-files-found: warn
8281
name: ${{ matrix.os }} Issues
@@ -85,7 +84,7 @@ jobs:
8584
BuildArtifacts/**/coverlet/*.xml
8685
8786
- name: Upload Packages
88-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
87+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
8988
if: runner.os == 'Windows'
9089
with:
9190
if-no-files-found: warn

.github/workflows/codeql-analysis.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
jobs:
1212
analyze:
1313
name: Analyze
14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-22.04
1515

1616
strategy:
1717
fail-fast: false
@@ -20,11 +20,11 @@ jobs:
2020

2121
steps:
2222
- name: Checkout repository
23-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
23+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2424
with:
2525
fetch-depth: 0
2626

27-
- uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
27+
- uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
2828
with:
2929
dotnet-version: |
3030
2.1
@@ -33,24 +33,25 @@ jobs:
3333
6.0
3434
7.0
3535
8.0
36+
9.0
3637
3738
- name: Cache Tools
38-
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
39+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
3940
with:
4041
path: tools
4142
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
4243

4344
- name: Initialize CodeQL
44-
uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3
45+
uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3
4546
with:
4647
languages: ${{ matrix.language }}
4748

4849
- name: Build project
49-
uses: cake-build/cake-action@1223b6fa067ad192159f43b50cd4f953679b0934 # v2.0.0
50+
uses: cake-build/cake-action@5167c3f6a9e15c76f009de2acdfb9488552bc0b9 # v3
5051
with:
5152
script-path: recipe.cake
5253
target: DotNetCore-Build
53-
cake-version: 1.3.0
54+
cake-version: tool-manifest
5455

5556
- name: Perform CodeQL Analysis
56-
uses: github/codeql-action/analyze@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3
57+
uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3

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="JetBrains.Annotations" Version="2024.2.0" />
8+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
99
<PackageReference Include="Cake.Frosting" Version="4.0.0" />
1010
<ProjectReference Include="$(ProjectDir)../../../src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj" />
1111
<ProjectReference Include="$(ProjectDir)../../../src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj" />

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.402",
3+
"version": "9.0.301",
44
"rollForward": "latestFeature"
55
}
6-
}
6+
}

recipe.cake

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,16 @@ BuildParameters.SetParameters(
1616
twitterMessage: standardNotificationMessage,
1717
shouldRunCodecov: false,
1818
preferredBuildProviderType: BuildProviderType.GitHubActions,
19-
preferredBuildAgentOperatingSystem: PlatformFamily.Linux);
19+
preferredBuildAgentOperatingSystem: PlatformFamily.Linux,
20+
shouldUseTargetFrameworkPath: false);
2021

2122
BuildParameters.PrintParameters(Context);
2223

2324
ToolSettings.SetToolPreprocessorDirectives(
24-
gitReleaseManagerGlobalTool: "#tool dotnet:?package=GitReleaseManager.Tool&version=0.18.0");
25+
gitReleaseManagerGlobalTool: "#tool dotnet:?package=GitReleaseManager.Tool&version=0.18.0",
26+
gitVersionGlobalTool: "#tool dotnet:?package=GitVersion.Tool&version=5.12.0",
27+
reportGeneratorGlobalTool: "#tool dotnet:?package=dotnet-reportgenerator-globaltool&version=5.4.7",
28+
coverallsGlobalTool: "#tool dotnet:?package=coveralls.net&version=4.0.1");
2529

2630
ToolSettings.SetToolSettings(context: Context);
2731

src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<AssemblyName>Cake.AzurePipelines.Module</AssemblyName>
77
<IsPackable>false</IsPackable>
@@ -12,9 +12,9 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
16-
<PackageReference Include="Cake.Common" Version="4.0.0" PrivateAssets="All" />
17-
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="All" />
15+
<PackageReference Include="Cake.Core" Version="5.0.0" PrivateAssets="All" />
16+
<PackageReference Include="Cake.Common" Version="5.0.0" PrivateAssets="All" />
17+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="All" />
1818
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>

src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<IncludeBuildOutput>false</IncludeBuildOutput>
66
<IsPackable>true</IsPackable>
77
<IncludeSymbols>true</IncludeSymbols>
@@ -12,7 +12,7 @@
1212
auto-detection of ProjectType/Version will fail
1313
-->
1414
<CakeContribGuidelinesProjectType>module</CakeContribGuidelinesProjectType>
15-
<CakeContribGuidelinesOverrideTargetFrameworkCakeVersion>3.0.0</CakeContribGuidelinesOverrideTargetFrameworkCakeVersion>
15+
<CakeContribGuidelinesOverrideTargetFrameworkCakeVersion>5.0.0</CakeContribGuidelinesOverrideTargetFrameworkCakeVersion>
1616
</PropertyGroup>
1717

1818
<PropertyGroup>
@@ -48,7 +48,7 @@
4848
</ProjectReference>
4949
<ProjectReference Include="..\Cake.GitLabCI.Module\Cake.GitLabCI.Module.csproj">
5050
<PrivateAssets>all</PrivateAssets>
51-
</ProjectReference>
51+
</ProjectReference>
5252
</ItemGroup>
5353

5454
<ItemGroup>
@@ -58,7 +58,7 @@
5858
</ItemGroup>
5959

6060
<ItemGroup>
61-
<PackageReference Include="CakeContrib.Guidelines" Version="1.5.1">
61+
<PackageReference Include="CakeContrib.Guidelines" Version="1.6.1">
6262
<PrivateAssets>all</PrivateAssets>
6363
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6464
</PackageReference>

src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<AssemblyName>Cake.GitHubActions.Module</AssemblyName>
77
<IsPackable>false</IsPackable>
@@ -12,9 +12,9 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
16-
<PackageReference Include="Cake.Common" Version="4.0.0" PrivateAssets="All" />
17-
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="All" />
15+
<PackageReference Include="Cake.Core" Version="5.0.0" PrivateAssets="All" />
16+
<PackageReference Include="Cake.Common" Version="5.0.0" PrivateAssets="All" />
17+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="All" />
1818
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>

src/Cake.GitLabCI.Module/Cake.GitLabCI.Module.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<AssemblyName>Cake.GitLabCI.Module</AssemblyName>
77
<IsPackable>false</IsPackable>
@@ -12,9 +12,9 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
16-
<PackageReference Include="Cake.Common" Version="4.0.0" PrivateAssets="All" />
17-
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="All" />
15+
<PackageReference Include="Cake.Core" Version="5.0.0" PrivateAssets="All" />
16+
<PackageReference Include="Cake.Common" Version="5.0.0" PrivateAssets="All" />
17+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="All" />
1818
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>

src/Cake.Module.Shared/Cake.Module.Shared.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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<AssemblyName>Cake.Module.Shared</AssemblyName>
77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
12-
<PackageReference Include="Cake.Common" Version="4.0.0" PrivateAssets="All" />
13-
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="All" />
11+
<PackageReference Include="Cake.Core" Version="5.0.0" PrivateAssets="All" />
12+
<PackageReference Include="Cake.Common" Version="5.0.0" PrivateAssets="All" />
13+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="All" />
1414
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
<PrivateAssets>all</PrivateAssets>

src/Cake.MyGet.Module/Cake.MyGet.Module.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<AssemblyName>Cake.MyGet.Module</AssemblyName>
77
<IsPackable>false</IsPackable>
@@ -12,9 +12,9 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
16-
<PackageReference Include="Cake.Common" Version="4.0.0" PrivateAssets="All" />
17-
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="All" />
15+
<PackageReference Include="Cake.Core" Version="5.0.0" PrivateAssets="All" />
16+
<PackageReference Include="Cake.Common" Version="5.0.0" PrivateAssets="All" />
17+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="All" />
1818
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>

src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<AssemblyName>Cake.TeamCity.Module</AssemblyName>
77
<IsPackable>false</IsPackable>
@@ -12,9 +12,9 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
16-
<PackageReference Include="Cake.Common" Version="4.0.0" PrivateAssets="All" />
17-
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="All" />
15+
<PackageReference Include="Cake.Core" Version="5.0.0" PrivateAssets="All" />
16+
<PackageReference Include="Cake.Common" Version="5.0.0" PrivateAssets="All" />
17+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="All" />
1818
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>

src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<AssemblyName>Cake.TravisCI.Module</AssemblyName>
77
<IsPackable>false</IsPackable>
@@ -12,9 +12,9 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
16-
<PackageReference Include="Cake.Common" Version="4.0.0" PrivateAssets="All" />
17-
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="All" />
15+
<PackageReference Include="Cake.Core" Version="5.0.0" PrivateAssets="All" />
16+
<PackageReference Include="Cake.Common" Version="5.0.0" PrivateAssets="All" />
17+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="All" />
1818
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)