From 08aab6cce91032e090635b9076471bfe88d93d8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Nov 2022 20:25:22 +0000 Subject: [PATCH 1/7] Bump CakeContrib.Guidelines from 1.3.0 to 1.4.0 Bumps [CakeContrib.Guidelines](https://github.com/cake-contrib/CakeContrib.Guidelines) from 1.3.0 to 1.4.0. - [Release notes](https://github.com/cake-contrib/CakeContrib.Guidelines/releases) - [Changelog](https://github.com/cake-contrib/CakeContrib.Guidelines/blob/develop/GitReleaseManager.yaml) - [Commits](https://github.com/cake-contrib/CakeContrib.Guidelines/compare/1.3.0...1.4.0) --- updated-dependencies: - dependency-name: CakeContrib.Guidelines dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj b/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj index 05c57caf..b1a4dc72 100644 --- a/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj +++ b/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj @@ -55,7 +55,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 209bae22c908fcb338d9ff3ccb5e1ce9734fa936 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 05:26:30 +0000 Subject: [PATCH 2/7] Bump JetBrains.Annotations from 2022.3.1 to 2023.2.0 Bumps [JetBrains.Annotations](https://github.com/JetBrains/JetBrains.Annotations) from 2022.3.1 to 2023.2.0. - [Commits](https://github.com/JetBrains/JetBrains.Annotations/compare/v2022.3.1...v2023.2.0) --- updated-dependencies: - dependency-name: JetBrains.Annotations dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../Cake.AzurePipelines.Module.csproj | 2 +- .../Cake.GitHubActions.Module.csproj | 2 +- src/Cake.Module.Shared/Cake.Module.Shared.csproj | 4 ++-- src/Cake.MyGet.Module/Cake.MyGet.Module.csproj | 4 ++-- src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj | 4 ++-- src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj b/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj index 3c23f4b5..7cda09ea 100644 --- a/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj +++ b/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj @@ -14,7 +14,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj b/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj index 1e0d86c0..642cdb9f 100644 --- a/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj +++ b/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj @@ -14,7 +14,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Cake.Module.Shared/Cake.Module.Shared.csproj b/src/Cake.Module.Shared/Cake.Module.Shared.csproj index 5993a66d..3c8348fa 100644 --- a/src/Cake.Module.Shared/Cake.Module.Shared.csproj +++ b/src/Cake.Module.Shared/Cake.Module.Shared.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -10,7 +10,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj b/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj index 0bce6d84..c4fd0ade 100644 --- a/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj +++ b/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -14,7 +14,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj b/src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj index 2e50e638..543a2b2f 100644 --- a/src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj +++ b/src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -14,7 +14,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj b/src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj index 7bf03c13..5caa2917 100644 --- a/src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj +++ b/src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -14,7 +14,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From 8d30bae779b3dae7bf33b200dd7d639a4d4487ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Aug 2023 17:50:08 +0000 Subject: [PATCH 3/7] Bump actions/setup-dotnet from 3.0.3 to 3.2.0 Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 3.0.3 to 3.2.0. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v3.0.3...v3.2.0) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 8 ++++---- .github/workflows/codeql-analysis.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1bf37e4a..f2c0366e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,18 +49,18 @@ jobs: - name: Fetch all tags and branches run: git fetch --prune --unshallow - - uses: actions/setup-dotnet@v3.0.3 + - uses: actions/setup-dotnet@v3.2.0 with: # codecov and unittests need 2.1 dotnet-version: '2.1.818' - - uses: actions/setup-dotnet@v3.0.3 + - uses: actions/setup-dotnet@v3.2.0 with: dotnet-version: '3.1.414' - - uses: actions/setup-dotnet@v3.0.3 + - uses: actions/setup-dotnet@v3.2.0 with: # gitversion needs 5.0 dotnet-version: '5.0.402' - - uses: actions/setup-dotnet@v3.0.3 + - uses: actions/setup-dotnet@v3.2.0 with: # need at least .NET 6 to build dotnet-version: '6.0.400' diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index cb5fb2ef..76ddf56c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -24,18 +24,18 @@ jobs: with: fetch-depth: 0 - - uses: actions/setup-dotnet@v3.0.3 + - uses: actions/setup-dotnet@v3.2.0 with: # codecov and unittests need 2.1 dotnet-version: '2.1.818' - - uses: actions/setup-dotnet@v3.0.3 + - uses: actions/setup-dotnet@v3.2.0 with: dotnet-version: '3.1.414' - - uses: actions/setup-dotnet@v3.0.3 + - uses: actions/setup-dotnet@v3.2.0 with: # gitversion needs 5.0 dotnet-version: '5.0.402' - - uses: actions/setup-dotnet@v3.0.3 + - uses: actions/setup-dotnet@v3.2.0 with: # need at least .NET 6 to build dotnet-version: '6.0.400' From 727f4cf0b37b09492b55515e5f525f94e760ad19 Mon Sep 17 00:00:00 2001 From: Brian Dukes Date: Mon, 12 Jun 2023 17:06:05 -0500 Subject: [PATCH 4/7] Build against .NET 6 --- .../Cake.AzurePipelines.Module.csproj | 2 +- src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj | 2 +- src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj | 2 +- src/Cake.Module.Shared/Cake.Module.Shared.csproj | 2 +- src/Cake.MyGet.Module/Cake.MyGet.Module.csproj | 2 +- src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj | 2 +- src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj b/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj index 7cda09ea..1ccd3773 100644 --- a/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj +++ b/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 true Cake.AzurePipelines.Module false diff --git a/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj b/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj index b1a4dc72..8f3088ce 100644 --- a/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj +++ b/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 false true true diff --git a/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj b/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj index 642cdb9f..eab40284 100644 --- a/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj +++ b/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 true Cake.GitHubActions.Module false diff --git a/src/Cake.Module.Shared/Cake.Module.Shared.csproj b/src/Cake.Module.Shared/Cake.Module.Shared.csproj index 3c8348fa..eedb9601 100644 --- a/src/Cake.Module.Shared/Cake.Module.Shared.csproj +++ b/src/Cake.Module.Shared/Cake.Module.Shared.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 true Cake.Module.Shared false diff --git a/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj b/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj index c4fd0ade..86415845 100644 --- a/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj +++ b/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 true Cake.MyGet.Module false diff --git a/src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj b/src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj index 543a2b2f..d49898a1 100644 --- a/src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj +++ b/src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 true Cake.TeamCity.Module false diff --git a/src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj b/src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj index 5caa2917..84b0ad95 100644 --- a/src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj +++ b/src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 true Cake.TravisCI.Module false From e5cb7c9b8ea235236cc8475c59ca85dada1e4448 Mon Sep 17 00:00:00 2001 From: Brian Dukes Date: Mon, 12 Jun 2023 17:07:52 -0500 Subject: [PATCH 5/7] Build against Cake 3 --- .../Cake.AzurePipelines.Module.csproj | 4 ++-- src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj | 2 +- .../Cake.GitHubActions.Module.csproj | 4 ++-- src/Cake.Module.Shared/Cake.Module.Shared.csproj | 4 ++-- src/Cake.MyGet.Module/Cake.MyGet.Module.csproj | 4 ++-- src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj | 4 ++-- src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj b/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj index 1ccd3773..5320b34b 100644 --- a/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj +++ b/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj @@ -12,8 +12,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj b/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj index 8f3088ce..a62816b1 100644 --- a/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj +++ b/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj @@ -12,7 +12,7 @@ auto-detection of ProjectType/Version will fail --> module - 2.0.0 + 3.0.0 diff --git a/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj b/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj index eab40284..ad29442c 100644 --- a/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj +++ b/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj @@ -12,8 +12,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Cake.Module.Shared/Cake.Module.Shared.csproj b/src/Cake.Module.Shared/Cake.Module.Shared.csproj index eedb9601..0e5e9456 100644 --- a/src/Cake.Module.Shared/Cake.Module.Shared.csproj +++ b/src/Cake.Module.Shared/Cake.Module.Shared.csproj @@ -8,8 +8,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj b/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj index 86415845..bd614d34 100644 --- a/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj +++ b/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj @@ -12,8 +12,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj b/src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj index d49898a1..8ad4319d 100644 --- a/src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj +++ b/src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj @@ -12,8 +12,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj b/src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj index 84b0ad95..dbc79789 100644 --- a/src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj +++ b/src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj @@ -12,8 +12,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive From a8c4d8ce9c3af3d4c968b2ee992f9510cef93ffd Mon Sep 17 00:00:00 2001 From: Brian Dukes Date: Mon, 12 Jun 2023 17:13:39 -0500 Subject: [PATCH 6/7] Remove deprecated events --- src/Cake.Module.Shared/CakeEngineBase.cs | 42 +----------------------- 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/src/Cake.Module.Shared/CakeEngineBase.cs b/src/Cake.Module.Shared/CakeEngineBase.cs index 0a4a5156..51d70afe 100644 --- a/src/Cake.Module.Shared/CakeEngineBase.cs +++ b/src/Cake.Module.Shared/CakeEngineBase.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Threading.Tasks; using Cake.Core; @@ -27,16 +27,6 @@ protected CakeEngineBase(ICakeEngine implementation) _engine = implementation; } -#pragma warning disable CS0618 - /// - [Obsolete] - public event EventHandler Setup - { - add { _engine.Setup += value; } - remove { _engine.Setup -= value; } - } -#pragma warning restore CS0618 - /// public event EventHandler BeforeSetup { @@ -51,16 +41,6 @@ public event EventHandler AfterSetup remove { _engine.AfterSetup -= value; } } -#pragma warning disable CS0618 - /// - [Obsolete] - public event EventHandler Teardown - { - add { _engine.Teardown += value; } - remove { _engine.Teardown -= value; } - } -#pragma warning restore CS0618 - /// public event EventHandler BeforeTeardown { @@ -75,16 +55,6 @@ public event EventHandler AfterTeardown remove { _engine.AfterTeardown -= value; } } -#pragma warning disable CS0618 - /// - [Obsolete] - public event EventHandler TaskSetup - { - add { _engine.TaskSetup += value; } - remove { _engine.TaskSetup -= value; } - } -#pragma warning restore CS0618 - /// public event EventHandler BeforeTaskSetup { @@ -99,16 +69,6 @@ public event EventHandler AfterTaskSetup remove { _engine.AfterTaskSetup -= value; } } -#pragma warning disable CS0618 - /// - [Obsolete] - public event EventHandler TaskTeardown - { - add { _engine.TaskTeardown += value; } - remove { _engine.TaskTeardown -= value; } - } -#pragma warning restore CS0618 - /// public event EventHandler BeforeTaskTeardown { From 410cf26da95734b8cc5ddd6436ed1820a1120a63 Mon Sep 17 00:00:00 2001 From: Brian Dukes Date: Mon, 12 Jun 2023 17:14:11 -0500 Subject: [PATCH 7/7] Add new ICakeReportPrinter methods --- .../CakeReportPrinterBase.cs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/Cake.Module.Shared/CakeReportPrinterBase.cs b/src/Cake.Module.Shared/CakeReportPrinterBase.cs index b7239291..b2c952d6 100644 --- a/src/Cake.Module.Shared/CakeReportPrinterBase.cs +++ b/src/Cake.Module.Shared/CakeReportPrinterBase.cs @@ -39,6 +39,24 @@ public CakeReportPrinterBase(IConsole console, ICakeContext context) /// public abstract void Write(CakeReport report); + /// + public virtual void WriteLifeCycleStep(string name, Verbosity verbosity) + { + new CakeReportPrinter(_console, _context).WriteLifeCycleStep(name, verbosity); + } + + /// + public virtual void WriteStep(string name, Verbosity verbosity) + { + new CakeReportPrinter(_console, _context).WriteLifeCycleStep(name, verbosity); + } + + /// + public virtual void WriteSkippedStep(string name, Verbosity verbosity) + { + new CakeReportPrinter(_console, _context).WriteLifeCycleStep(name, verbosity); + } + /// /// Writes the report to the . ///