Skip to content

Commit f6d2c2a

Browse files
authored
Merge pull request #424 from nils-a/release/1.7.0
Release/1.7.0
2 parents 3a858f8 + e158c62 commit f6d2c2a

33 files changed

+586
-165
lines changed

.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": "1.3.0",
6+
"version": "2.3.0",
77
"commands": [
88
"dotnet-cake"
99
]
1010
}
1111
}
12-
}
12+
}

.github/renovate.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": [ "github>nils-a/renovate-config" ],
3+
"extends": [
4+
"github>cake-contrib/renovate-presets:cake-recipe",
5+
"github>cake-contrib/renovate-presets:github-actions"
6+
],
47
"packageRules": [
58
{
69
"matchPackageNames": [
7-
"cake.tool",
8-
"Cake.Core",
910
"Microsoft.Build",
1011
"Microsoft.Build.Framework",
1112
"Microsoft.Build.Utilities.Core"
1213
],
1314
"enabled": false
1415
}
15-
]
16-
}
16+
],
17+
"milestone": 17
18+
}

.github/workflows/build.yml

Lines changed: 23 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: [ ubuntu-22.04, windows-2022, macos-12 ]
22+
os: [ ubuntu-24.04, windows-2022, macos-13 ]
2323

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

4545
steps:
4646
- name: Checkout the repository
47-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
47+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
4848
- name: Fetch all tags and branches
4949
run: git fetch --prune --unshallow
50-
- uses: actions/setup-dotnet@v4.1.0
50+
- uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
5151
with:
5252
# codecov needs 2.1
53-
# unittests needs 3.1
5453
# gitversion needs 5.0
5554
# cake 1.3 needs 6.0
56-
# .NET 9 to build
55+
# unittests needs 6 & 7
56+
# .NET 10 to build
5757
dotnet-version: |
5858
2.1
5959
3.1
6060
5.0
6161
6.0
62+
7.0
6263
9.0
64+
10.0
65+
- name: Install mono
66+
if: runner.os == 'Linux'
67+
# check https://www.mono-project.com/download/stable/#download-lin
68+
run: |
69+
sudo apt install ca-certificates gnupg
70+
sudo gpg --homedir /tmp --no-default-keyring --keyring gnupg-ring:/usr/share/keyrings/mono-official-archive-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
71+
sudo chmod +r /usr/share/keyrings/mono-official-archive-keyring.gpg
72+
echo "deb [signed-by=/usr/share/keyrings/mono-official-archive-keyring.gpg] https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
73+
sudo apt update
74+
sudo apt install -y mono-complete
75+
mono --version
6376
- name: Cache Tools
64-
uses: actions/cache@v4
77+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
6578
with:
6679
path: tools
6780
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
6881
- name: Build project
69-
uses: cake-build/cake-action@v1
82+
uses: cake-build/cake-action@d218f1133bb74a1df0b08c89cfd8fc100c09e1a0 # v3
7083
with:
7184
script-path: recipe.cake
7285
target: CI
73-
cake-version: 1.3.0
86+
cake-version: tool-manifest
7487
# currently, Cake.Recipe does not upload artifacts when run on gh-actions
7588
- name: Upload Issues
76-
uses: actions/upload-artifact@v4
89+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
7790
with:
7891
if-no-files-found: warn
7992
name: ${{ matrix.os }} Issues
8093
path: |
8194
BuildArtifacts/report.html
8295
BuildArtifacts/**/coverlet/*.xml
8396
- name: Upload Packages
84-
uses: actions/upload-artifact@v4
97+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
8598
if: runner.os == 'Windows'
8699
with:
87100
if-no-files-found: warn

.github/workflows/codeql-analysis.yml

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
jobs:
1818
analyze:
1919
name: Analyze
20-
runs-on: ubuntu-22.04
20+
runs-on: ubuntu-24.04
2121

2222
strategy:
2323
fail-fast: false
@@ -30,42 +30,55 @@ jobs:
3030

3131
steps:
3232
- name: Checkout repository
33-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
33+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
3434
with:
3535
fetch-depth: 0
3636

37-
- uses: actions/setup-dotnet@v4.1.0
37+
- uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
3838
with:
3939
# gitversion needs 5.0
4040
# cake 1.3 needs 6.0
41-
# .NET 9 to build
41+
# .NET 10 to build
4242
dotnet-version: |
4343
5.0
4444
6.0
4545
9.0
46+
10.0
4647
4748
- name: Cache Tools
48-
uses: actions/cache@v4
49+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
4950
with:
5051
path: tools
5152
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
5253

5354
# Initializes the CodeQL tools for scanning.
5455
- name: Initialize CodeQL
55-
uses: github/codeql-action/init@v3
56+
uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4
5657
with:
5758
languages: ${{ matrix.language }}
5859
# If you wish to specify custom queries, you can do so here or in a config file.
5960
# By default, queries listed here will override any specified in a config file.
6061
# Prefix the list here with "+" to use these queries and those in the config file.
6162
# queries: ./path/to/local/query, your-org/your-repo/queries@main
6263

64+
- name: Install mono
65+
if: runner.os == 'Linux'
66+
# check https://www.mono-project.com/download/stable/#download-lin
67+
run: |
68+
sudo apt install ca-certificates gnupg
69+
sudo gpg --homedir /tmp --no-default-keyring --keyring gnupg-ring:/usr/share/keyrings/mono-official-archive-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
70+
sudo chmod +r /usr/share/keyrings/mono-official-archive-keyring.gpg
71+
echo "deb [signed-by=/usr/share/keyrings/mono-official-archive-keyring.gpg] https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
72+
sudo apt update
73+
sudo apt install -y mono-complete
74+
mono --version
75+
6376
- name: Build project
64-
uses: cake-build/cake-action@v1
77+
uses: cake-build/cake-action@d218f1133bb74a1df0b08c89cfd8fc100c09e1a0 # v3
6578
with:
6679
script-path: recipe.cake
6780
target: DotNetCore-Build
68-
cake-version: 1.3.0
81+
cake-version: tool-manifest
6982

7083
- name: Perform CodeQL Analysis
71-
uses: github/codeql-action/analyze@v3
84+
uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4

.github/workflows/publishDocs.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,32 @@ jobs:
1515

1616
steps:
1717
- name: checkout
18-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
18+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
1919

2020
- name: Fetch all tags and branches
2121
run: git fetch --prune --unshallow
2222

23+
- name: Install mono
24+
if: runner.os == 'Linux'
25+
# check https://www.mono-project.com/download/stable/#download-lin
26+
run: |
27+
sudo apt install ca-certificates gnupg
28+
sudo gpg --homedir /tmp --no-default-keyring --keyring gnupg-ring:/usr/share/keyrings/mono-official-archive-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
29+
sudo chmod +r /usr/share/keyrings/mono-official-archive-keyring.gpg
30+
echo "deb [signed-by=/usr/share/keyrings/mono-official-archive-keyring.gpg] https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
31+
sudo apt update
32+
sudo apt install -y mono-complete
33+
mono --version
34+
2335
- name: Cache Tools
24-
uses: actions/cache@v4
36+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
2537
with:
2638
path: tools
2739
key: ${{ runner.os }}-doc-tools-${{ hashFiles('recipe.cake') }}
2840

2941
- name: Publishing documentaiton
30-
uses: cake-build/cake-action@v1
42+
uses: cake-build/cake-action@d218f1133bb74a1df0b08c89cfd8fc100c09e1a0 # v3
3143
with:
3244
script-path: recipe.cake
3345
target: Force-Publish-Documentation
34-
cake-version: 1.3.0
46+
cake-version: tool-manifest

.github/workflows/updateToc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
name: Generate all TOCs
1515
runs-on: ubuntu-latest
1616
# "better" would be to check if GH_TOKEN is available
17-
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository
17+
if: github.event.pull_request.head.repo.full_name == github.repository
1818

1919
steps:
20-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
20+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
2121
with:
2222
fetch-depth: 0
2323
ref: ${{ github.event.ref }}
2424

25-
- uses: technote-space/toc-generator@v4
25+
- uses: technote-space/toc-generator@9e238e7974de5fcf7b17b7acc54c896160dda0a3 # v4
2626
with:
2727
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
2828
TARGET_PATHS: "."

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
!.vscode/extensions.json
77
!.vscode/settings.json
88
!.vscode/tasks.json
9+
!.vscode/launch.json
910

1011
# User-specific files in Visual Studio
1112
*.suo

.vscode/launch.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": "package-references (code)",
9+
"type": "coreclr",
10+
"request": "launch",
11+
"preLaunchTask": "build Generators",
12+
"program": "${workspaceFolder}/src/Generators/bin/Debug/net9.0/Generators.dll",
13+
"args": ["package-references", "${workspaceFolder}/../../cake-build/cake"],
14+
"cwd": "${workspaceFolder}",
15+
"stopAtEntry": false,
16+
"console": "internalConsole"
17+
},
18+
{
19+
"name": "package-references (markdown)",
20+
"type": "coreclr",
21+
"request": "launch",
22+
"preLaunchTask": "build Generators",
23+
"program": "${workspaceFolder}/src/Generators/bin/Debug/net9.0/Generators.dll",
24+
"args": ["package-references", "${workspaceFolder}/../../cake-build/cake", "--flatList"],
25+
"cwd": "${workspaceFolder}",
26+
"stopAtEntry": false,
27+
"console": "internalConsole"
28+
},
29+
]
30+
}

.vscode/tasks.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"type": "dotnet",
6+
"task": "build ${workspaceFolder}/src/Generators/Generators.csproj",
7+
"file": "${workspaceFolder}/src/Generators/Generators.csproj",
8+
"group": "build",
9+
"problemMatcher": [],
10+
"label": "build Generators"
11+
}
12+
]
13+
}

0 commit comments

Comments
 (0)