Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/5.0.0 #398

Merged
merged 125 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
fb8a282
(maint) Update actions/cache action to v4
renovate[bot] Jan 17, 2024
134c5bb
update README.md [skip ci]
allcontributors[bot] Jan 17, 2024
74e8fa1
update .all-contributorsrc [skip ci]
allcontributors[bot] Jan 17, 2024
08ea1ae
(maint) Update dependency Microsoft.NET.Test.Sdk to v17.9.0
renovate[bot] Feb 6, 2024
9d92174
(maint) Update dependency dotnet-sdk to v8.0.200
renovate[bot] Feb 14, 2024
868dea8
(maint) Update dependency dotnet-sdk to v8.0.201
renovate[bot] Feb 16, 2024
5eef060
(maint) Update xunit-dotnet monorepo
renovate[bot] Feb 16, 2024
369a5e5
(maint) Update dependency coverlet.msbuild to v6.0.1
renovate[bot] Feb 21, 2024
c6e06b7
update renovate settings
nils-a Feb 23, 2024
08732e5
remove milestone setting
nils-a Feb 23, 2024
4c68eaa
Pin dependencies
renovate[bot] Feb 23, 2024
354a43e
Merge pull request #309 from cake-contrib/renovate/pin-dependencies
nils-a Feb 23, 2024
8cc5bea
Update actions/cache digest to ab5e6d0
renovate[bot] Feb 29, 2024
048129c
Update github/codeql-action digest to 8a470fd
renovate[bot] Mar 3, 2024
43363a8
Update dependency dotnet-sdk to v8.0.202
renovate[bot] Mar 13, 2024
852a064
Update dependency coverlet.msbuild to v6.0.2
renovate[bot] Mar 15, 2024
f401966
Update github/codeql-action digest to 3ab4101
renovate[bot] Mar 15, 2024
da1db57
Update dependency dotnet-sdk to v8.0.203
renovate[bot] Mar 15, 2024
dff3565
Update actions/cache digest to 0c45773
renovate[bot] Mar 19, 2024
92353f1
Update github/codeql-action digest to 05963f4
renovate[bot] Mar 22, 2024
4d1e007
Update github/codeql-action digest to 1b1aada
renovate[bot] Mar 22, 2024
93093a8
(#324) disable codecov
nils-a May 7, 2024
e8b6a05
Update xunit-dotnet monorepo
renovate[bot] May 7, 2024
6cc5191
Update actions/checkout digest to 0ad4b8f
renovate[bot] May 7, 2024
e110528
Update actions/upload-artifact digest to 6546280
renovate[bot] May 7, 2024
09047b2
Update github/codeql-action digest to d39d31e
renovate[bot] May 7, 2024
545a840
Update dependency dotnet-sdk to v8.0.204
renovate[bot] May 7, 2024
bcb2ff0
Merge pull request #320 from cake-contrib/renovate/dotnet-monorepo
nils-a May 7, 2024
d52698b
Update github/codeql-action digest to ccf74c9
renovate[bot] May 8, 2024
8873731
Update actions/checkout digest to 44c2b7a
renovate[bot] May 8, 2024
1b5d515
Update actions/checkout digest to 0ad4b8f
renovate[bot] May 9, 2024
62e0dc5
Update github/codeql-action digest to b7cec75
renovate[bot] May 13, 2024
ce4cc03
Update dependency dotnet-sdk to v8.0.300
renovate[bot] May 16, 2024
5248933
Update actions/checkout digest to a5ac7e5
renovate[bot] May 20, 2024
98ce7fd
Update github/codeql-action digest to 9fdb3e4
renovate[bot] May 20, 2024
043783d
Update dependency Microsoft.NET.Test.Sdk to v17.10.0
renovate[bot] May 22, 2024
bd6e7bd
Merge pull request #333 from cake-contrib/renovate/vstest-monorepo
nils-a May 22, 2024
9f22f7d
Update xunit-dotnet monorepo
renovate[bot] May 25, 2024
e46ba06
Update dependency dotnet-sdk to v8.0.301
renovate[bot] May 29, 2024
c6e2616
Update github/codeql-action digest to f079b84
renovate[bot] May 31, 2024
46d72bc
Update github/codeql-action digest to 2e230e8
renovate[bot] Jun 4, 2024
121d520
Update actions/checkout digest to 692973e
renovate[bot] Jun 13, 2024
13d2dc5
Update dependency dotnet-sdk to v8.0.302
renovate[bot] Jun 15, 2024
6d3428d
Update github/codeql-action digest to 23acc5c
renovate[bot] Jun 15, 2024
7c83098
Update dependency IDisposableAnalyzers to v4.0.8
renovate[bot] Jun 19, 2024
22d1887
Update github/codeql-action digest to b611370
renovate[bot] Jun 28, 2024
5a6a66f
Update actions/upload-artifact digest to 0b2256b
renovate[bot] Jul 5, 2024
d14a4bc
Update xunit-dotnet monorepo
renovate[bot] Jul 8, 2024
1461d46
Merge pull request #344 from cake-contrib/renovate/xunit-dotnet-monorepo
nils-a Jul 9, 2024
8c6b128
Update actions/setup-dotnet action to v4.0.1
renovate[bot] Jul 9, 2024
f462da9
Update github/codeql-action digest to 4fa2a79
renovate[bot] Jul 12, 2024
698bab1
Merge pull request #347 from cake-contrib/renovate/github-codeql-acti…
nils-a Jul 12, 2024
573a7e2
Update dependency dotnet-sdk to v8.0.303
renovate[bot] Jul 12, 2024
35c587b
Merge pull request #346 from cake-contrib/renovate/dotnet-monorepo
nils-a Jul 12, 2024
72587e9
Update github/codeql-action digest to 2d79040
renovate[bot] Jul 19, 2024
e4d83bc
Update github/codeql-action digest to 5cf07d8
renovate[bot] Jul 25, 2024
b5be481
Update github/codeql-action digest to afb54ba
renovate[bot] Jul 26, 2024
bf96a2a
Merge pull request #350 from cake-contrib/renovate/github-codeql-acti…
nils-a Jul 26, 2024
8dd03c5
Update actions/upload-artifact digest to 89ef406
renovate[bot] Aug 2, 2024
4742d7c
Update github/codeql-action digest to eb055d7
renovate[bot] Aug 6, 2024
b5a2941
Update actions/upload-artifact digest to 834a144
renovate[bot] Aug 6, 2024
697ba68
Update github/codeql-action digest to 429e197
renovate[bot] Aug 14, 2024
7998fcb
Merge pull request #354 from cake-contrib/renovate/github-codeql-acti…
nils-a Aug 14, 2024
b3e2b19
Update dependency dotnet-sdk to v8.0.400
renovate[bot] Aug 14, 2024
866cc19
Merge pull request #355 from cake-contrib/renovate/dotnet-monorepo
nils-a Aug 14, 2024
8ac9ee4
Update github/codeql-action digest to 429e197
renovate[bot] Aug 14, 2024
623a51c
Update github/codeql-action digest to 8214744
renovate[bot] Sep 13, 2024
c4c3747
Merge pull request #358 from cake-contrib/renovate/github-codeql-acti…
nils-a Sep 13, 2024
5bb4e13
Update dependency Moq to 4.20.72
renovate[bot] Sep 13, 2024
ad1193b
Merge pull request #362 from cake-contrib/renovate/moq-4.x
nils-a Sep 13, 2024
f6fb25d
Update dependency xunit.analyzers to 1.16.0
renovate[bot] Sep 13, 2024
9494e6c
Merge pull request #360 from cake-contrib/renovate/xunit-dotnet-monorepo
nils-a Sep 13, 2024
614c9d1
Update dependency Microsoft.NET.Test.Sdk to 17.11.1
renovate[bot] Sep 13, 2024
9ce7e42
Merge pull request #359 from cake-contrib/renovate/vstest-monorepo
nils-a Sep 14, 2024
4a446d8
Update dependency dotnet-sdk to v8.0.401
renovate[bot] Sep 14, 2024
5255b5e
Merge pull request #357 from cake-contrib/renovate/dotnet-monorepo
nils-a Sep 14, 2024
8504b38
Update actions/upload-artifact digest to 5076954
renovate[bot] Sep 14, 2024
6eb5ba3
Update github/codeql-action digest to 294a9d9
renovate[bot] Sep 19, 2024
e09939b
Merge pull request #363 from cake-contrib/renovate/github-codeql-acti…
nils-a Sep 19, 2024
8a14114
Update dependency xunit to 2.9.1
renovate[bot] Sep 22, 2024
88debe7
Merge pull request #364 from cake-contrib/renovate/xunit-dotnet-monorepo
nils-a Sep 23, 2024
df17815
Update github/codeql-action digest to 461ef6c
renovate[bot] Sep 24, 2024
2f934f8
Merge pull request #365 from cake-contrib/renovate/github-codeql-acti…
nils-a Sep 24, 2024
b087421
Update dependency xunit to 2.9.2
renovate[bot] Sep 27, 2024
4b278c2
Merge pull request #368 from cake-contrib/renovate/xunit-dotnet-monorepo
nils-a Sep 29, 2024
30539f0
Update github/codeql-action digest to e2b3eaf
renovate[bot] Sep 30, 2024
71c7a33
Merge pull request #369 from cake-contrib/renovate/github-codeql-acti…
nils-a Sep 30, 2024
5a2058d
Update dependency dotnet-sdk to v8.0.402
renovate[bot] Sep 30, 2024
eac8e04
Merge pull request #366 from cake-contrib/renovate/dotnet-monorepo
nils-a Sep 30, 2024
c94e52e
Update actions/upload-artifact digest to b4b15b8
renovate[bot] Oct 10, 2024
40b3988
Update github/codeql-action digest to c36620d
renovate[bot] Oct 11, 2024
91ada42
Merge pull request #370 from cake-contrib/renovate/github-codeql-acti…
nils-a Oct 11, 2024
1166f81
Update actions/checkout digest to eef6144
renovate[bot] Oct 11, 2024
18da905
Update actions/cache digest to 3624ceb
renovate[bot] Oct 13, 2024
e3b3904
Update github/codeql-action digest to f779452
renovate[bot] Oct 14, 2024
f700f40
Merge pull request #375 from cake-contrib/renovate/github-codeql-acti…
nils-a Oct 15, 2024
8fb8e84
Update dependency dotnet-sdk to v8.0.403
renovate[bot] Oct 15, 2024
5818023
Merge pull request #374 from cake-contrib/renovate/dotnet-monorepo
nils-a Oct 15, 2024
56ff47e
Update actions/setup-dotnet action to v4.1.0
renovate[bot] Oct 24, 2024
264ec69
Update github/codeql-action digest to ea9e4e3
renovate[bot] Nov 14, 2024
9febdc8
Merge pull request #377 from cake-contrib/renovate/github-codeql-acti…
nils-a Nov 17, 2024
0dc9bfe
Update dependency xunit.analyzers to 1.17.0
renovate[bot] Nov 17, 2024
8fb3f7e
Merge pull request #381 from cake-contrib/renovate/xunit-dotnet-monorepo
nils-a Nov 17, 2024
9dbb592
Update actions/cache digest to 6849a64
renovate[bot] Nov 17, 2024
94692a5
Update actions/checkout digest to 11bd719
renovate[bot] Nov 17, 2024
271ed12
Update dependency Microsoft.NET.Test.Sdk to 17.12.0
renovate[bot] Nov 19, 2024
c1e9ea2
Merge pull request #386 from cake-contrib/renovate/vstest-monorepo
nils-a Nov 19, 2024
93bda03
Update dependency dotnet-sdk to v9
renovate[bot] Nov 19, 2024
d07fa33
added net9 to CI
nils-a Nov 19, 2024
431cfc9
Merge pull request #384 from cake-contrib/renovate/major-dotnet-monorepo
nils-a Nov 19, 2024
52668b1
(#388) Update Cake reference to Cake 5
nils-a Nov 23, 2024
d544138
Merge pull request #390 from nils-a/feature/GH-388
nils-a Nov 24, 2024
65327d9
(#378) switched runner from macos-12 to macos-13
nils-a Dec 16, 2024
4f278da
Merge pull request #393 from nils-a/feature/GH-387
nils-a Dec 16, 2024
6babab7
Update actions/cache digest to 1bd1e32 (#392)
renovate[bot] Dec 16, 2024
36ccb79
Update dependency dotnet-sdk to v9.0.101
renovate[bot] Dec 16, 2024
c97ac9a
Merge pull request #391 from cake-contrib/renovate/dotnet-monorepo
nils-a Dec 16, 2024
3c7487d
Update github/codeql-action digest to df409f7
renovate[bot] Dec 16, 2024
f99e065
Merge pull request #389 from cake-contrib/renovate/github-codeql-acti…
nils-a Dec 16, 2024
47c6fd4
(#394) Update GRM to 0.18.0
nils-a Dec 16, 2024
e01d2cb
Merge pull request #395 from nils-a/feature/GH-394
nils-a Dec 16, 2024
293ad6d
Update dependency xunit.analyzers to 1.18.0
renovate[bot] Dec 16, 2024
bf866d2
Merge pull request #396 from cake-contrib/renovate/xunit-dotnet-monorepo
nils-a Dec 16, 2024
e9beec7
Update dependency xunit.runner.visualstudio to v3
renovate[bot] Dec 16, 2024
f61ea05
Merge pull request #397 from cake-contrib/renovate/major-xunit-dotnet…
nils-a Dec 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@
"contributions": [
"doc"
]
},
{
"login": "stehlih",
"name": "Heiko Stehli",
"avatar_url": "https://avatars.githubusercontent.com/u/43820014?v=4",
"profile": "https://github.com/stehlih",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
Expand All @@ -31,5 +40,6 @@
"repoType": "github",
"repoHost": "https://github.com",
"commitConvention": "none",
"skipCi": true
"skipCi": true,
"commitType": "docs"
}
16 changes: 13 additions & 3 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [ "github>nils-a/renovate-config" ],
"extends": [
"github>cake-contrib/renovate-presets:cake-recipe",
"github>cake-contrib/renovate-presets:github-actions" ],
"packageRules": [
{
"matchPackageNames": ["cake.tool", "Cake.Core"],
"description": "Update Cake references only for major updates.",
"matchPackageNames": ["Cake.Core", "Cake.Common"],
"matchUpdateTypes": ["minor", "patch"],
"enabled": false
},
{
"description": "Updates to Cake.Core references are breaking.",
"matchPackageNames": ["Cake.Core"],
"matchUpdateTypes": ["major"],
"labels": ["Breaking Change"]
}
]
}
}
30 changes: 17 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ windows-2022, ubuntu-22.04, macos-12 ]
os: [ windows-2022, ubuntu-22.04, macos-13 ]

env:
AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }}
Expand All @@ -44,40 +44,44 @@ jobs:

steps:
- name: Checkout the repository
uses: actions/checkout@v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- name: Fetch all tags and branches
run: git fetch --prune --unshallow
- uses: actions/setup-dotnet@v4.0.0
- uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0
with:
# codecov needs 2.1
# unittests needs 3.1
# gitversion needs 5.0
# cake 1.3 needs 6.0
# .NET 9 to build
dotnet-version: |
2.1.818
3.1.x
5.0.x
6.0.x
7.0.x
8.0.x
2.1
3.1
5.0
6.0
9.0
- name: Cache Tools
uses: actions/cache@v3
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
with:
path: tools
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
- name: Build project
uses: cake-build/cake-action@v1
uses: cake-build/cake-action@a6eb054329257c9e70a6c6bf01747ad6e1d9d52b # v1
with:
script-path: recipe.cake
target: CI
verbosity: Diagnostic
cake-version: tool-manifest
- name: Upload Issues
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
with:
if-no-files-found: warn
name: ${{ matrix.os }} Issues
path: |
BuildArtifacts/report.html
BuildArtifacts/**/coverlet/*.xml
- name: Upload Packages
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
if: runner.os == 'Windows'
with:
if-no-files-found: warn
Expand Down
22 changes: 13 additions & 9 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,28 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
with:
fetch-depth: 0
- uses: actions/setup-dotnet@v4.0.0
- uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0
with:
# gitversion needs 5.0
# cake 1.3 needs 6.0
# .NET 9 to build
dotnet-version: |
5.0.x
8.0.x
5.0
6.0
9.0

- name: Cache Tools
uses: actions/cache@v3
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
with:
path: tools
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -57,7 +61,7 @@ jobs:
# queries: ./path/to/local/query, your-org/your-repo/queries@main

- name: Build project
uses: cake-build/cake-action@v1
uses: cake-build/cake-action@a6eb054329257c9e70a6c6bf01747ad6e1d9d52b # v1
with:
script-path: recipe.cake
target: DotNetCore-Build
Expand All @@ -68,10 +72,10 @@ jobs:
COMPlus_DbgMiniDumpName: BuildArtifacts/coredump.dmp

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3

- name: Upload CoreDump
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
if: failure()
with:
if-no-files-found: warn
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publishDocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ jobs:

steps:
- name: checkout
uses: actions/checkout@v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

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

- name: Cache Tools
uses: actions/cache@v3
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
with:
path: tools
key: ${{ runner.os }}-doc-tools-${{ hashFiles('recipe.cake') }}

- name: Publishing documentaiton
uses: cake-build/cake-action@v1
uses: cake-build/cake-action@a6eb054329257c9e70a6c6bf01747ad6e1d9d52b # v1
with:
script-path: recipe.cake
target: Force-Publish-Documentation
Expand Down
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,13 @@ Thanks goes to these wonderful people ([emoji key][emoji-key]):
<!-- prettier-ignore-start -->
<!-- markdownlint-disable -->
<table>
<tr>
<td align="center"><a href="http://www.nils-andresen.de/"><img src="https://avatars3.githubusercontent.com/u/349188?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nils Andresen</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.7zip/commits?author=nils-a" title="Code">💻</a> <a href="https://github.com/cake-contrib/Cake.7zip/commits?author=nils-a" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/DiDoHH"><img src="https://avatars.githubusercontent.com/u/45682415?v=4?s=100" width="100px;" alt=""/><br /><sub><b>DiDoHH</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.7zip/commits?author=DiDoHH" title="Documentation">📖</a></td>
</tr>
<tbody>
<tr>
<td align="center" valign="top" width="14.28%"><a href="http://www.nils-andresen.de/"><img src="https://avatars3.githubusercontent.com/u/349188?v=4?s=100" width="100px;" alt="Nils Andresen"/><br /><sub><b>Nils Andresen</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.7zip/commits?author=nils-a" title="Code">💻</a> <a href="https://github.com/cake-contrib/Cake.7zip/commits?author=nils-a" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/DiDoHH"><img src="https://avatars.githubusercontent.com/u/45682415?v=4?s=100" width="100px;" alt="DiDoHH"/><br /><sub><b>DiDoHH</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.7zip/commits?author=DiDoHH" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/stehlih"><img src="https://avatars.githubusercontent.com/u/43820014?v=4?s=100" width="100px;" alt="Heiko Stehli"/><br /><sub><b>Heiko Stehli</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.7zip/commits?author=stehlih" title="Code">💻</a></td>
</tr>
</tbody>
</table>

<!-- markdownlint-restore -->
Expand Down
4 changes: 2 additions & 2 deletions demo/cake/.config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"isRoot": true,
"tools": {
"cake.tool": {
"version": "4.0.0",
"version": "5.0.0",
"commands": [
"dotnet-cake"
]
}
}
}
}
4 changes: 2 additions & 2 deletions demo/cake/build.cake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#tool "nuget:?package=7-Zip.CommandLine&version=18.1.0"
#r "..\..\src\Cake.7zip\bin\Release\net6.0\Cake.7zip.dll"
#r "..\..\src\Cake.7zip\bin\Release\net8.0\Cake.7zip.dll"

///////////////////////////////////////////////////////////////////////////////
// ARGUMENTS
Expand Down Expand Up @@ -195,4 +195,4 @@ Task("Default")
.IsDependentOn("RenameFile")
.IsDependentOn("GH78");

RunTarget(target);
RunTarget(target);
12 changes: 6 additions & 6 deletions demo/frosting/build/Build.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<RunWorkingDirectory>$(MSBuildProjectDirectory)..</RunWorkingDirectory>
<TargetFramework>net8.0</TargetFramework>
<RunWorkingDirectory>$(MSBuildProjectDirectory)\</RunWorkingDirectory>
</PropertyGroup>
<ItemGroup>
<Reference Include="Cake.7zip, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\..\src\Cake.7zip\bin\Release\net6.0\Cake.7zip.dll</HintPath>
<Reference Include="Cake.7zip">
<HintPath>$(MSBuildProjectDirectory)\..\..\..\src\Cake.7zip\bin\Release\net8.0\Cake.7zip.dll</HintPath>
</Reference>
<PackageReference Include="Cake.Frosting" Version="4.0.0" />
<PackageReference Include="Cake.Frosting" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<Compile Remove="output\**" />
<EmbeddedResource Remove="output\**" />
<None Remove="output\**" />
</ItemGroup>
</Project>
</Project>
18 changes: 17 additions & 1 deletion demo/frosting/build/Program.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.Runtime.InteropServices;
using Cake.Frosting;

namespace Build
Expand All @@ -8,10 +9,25 @@ public static class Program
public static int Main(string[] args)
{
return new CakeHost()
.InstallTool(new Uri("nuget:?package=7-Zip.CommandLine&version=18.1.0"))
.InstallSevenZip()
.UseContext<BuildContext>()
.UseSetup<BuildSetup>()
.Run(args);
}

private static CakeHost InstallSevenZip(this CakeHost host)
{
// 7-Zip.CommandLine is a windows-only package
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
host.InstallTool(new Uri("nuget:?package=7-Zip.CommandLine&version=18.1.0"));
}
else
{
Console.WriteLine("7-Zip.CommandLine tool not installed. Make sure you hava a version of 7zip installed!");
}

return host;
}
}
}
2 changes: 1 addition & 1 deletion demo/frosting/build/Tasks/ZipItTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public override void Run(BuildContext context)
context.SevenZip(m => m
.InAddMode()
.WithArchive(context.Output.CombineWithFilePath("archive.zip"))
.WithFiles(context.Root.CombineWithFilePath("README.MD"))
.WithFiles(context.Root.CombineWithFilePath("README.md"))
.WithFiles(context.Root.CombineWithFilePath("CODE_OF_CONDUCT.md")));
}
}
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.101",
"version": "9.0.101",
"rollForward": "latestFeature"
}
}
3 changes: 3 additions & 0 deletions recipe.cake
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@ BuildParameters.SetParameters(
repositoryOwner: "cake-contrib",
shouldRunDotNetCorePack: true,
shouldUseDeterministicBuilds: true,
shouldRunCodecov: false,
preferredBuildProviderType: BuildProviderType.GitHubActions,
preferredBuildAgentOperatingSystem: PlatformFamily.Linux);

BuildParameters.PrintParameters(Context);

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

Build.RunDotNetCore();
16 changes: 8 additions & 8 deletions src/Cake.7zip.Tests/Cake.7zip.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
This is done to make Cake.Recipe avoid using OpenCover. Remove this hack if Cake.Recipe bumps the usage of Cake.Incubator to version 7.0.0
-->
<TargetFrameworks Condition="false">netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<CodeAnalysisRuleSet>..\cake.7zip.ruleset</CodeAnalysisRuleSet>

<IsPackable>false</IsPackable>
Expand All @@ -15,21 +15,21 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Testing" Version="4.0.0" />
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
<PackageReference Include="Cake.Testing" Version="5.0.0" />
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.analyzers" Version="1.10.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.analyzers" Version="1.18.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions src/Cake.7zip.Tests/SevenZipRunnerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public void Should_Access_registry()

var sevenZipKey = new Mock<IRegistryKey>();
sevenZipKey.Setup(k => k.GetValue("Path")).Returns(installLocation.Path.FullPath);
sevenZipKey.Setup(k => k.GetValue("Path64")).Returns(null);
sevenZipKey.Setup(k => k.GetValue("Path64")).Returns(null!);
var softwareKey = new Mock<IRegistryKey>();
softwareKey.Setup(k => k.OpenKey("7-Zip")).Returns(sevenZipKey.Object);
var hklm = new Mock<IRegistryKey>();
Expand Down Expand Up @@ -124,7 +124,7 @@ public void Should_Access_64bit_tool_from_registry()
var file = fixture.FileSystem.CreateFile(installLocation.Path.CombineWithFilePath("7z.exe"));

var sevenZipKey = new Mock<IRegistryKey>();
sevenZipKey.Setup(k => k.GetValue("Path")).Returns(null);
sevenZipKey.Setup(k => k.GetValue("Path")).Returns(null!);
sevenZipKey.Setup(k => k.GetValue("Path64")).Returns(installLocation.Path.FullPath);
var softwareKey = new Mock<IRegistryKey>();
softwareKey.Setup(k => k.OpenKey("7-Zip")).Returns(sevenZipKey.Object);
Expand Down Expand Up @@ -313,4 +313,4 @@ public void BuildArguments(ref ProcessArgumentBuilder builder)
{
// no-op
}
}
}
Loading
Loading