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' diff --git a/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj b/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj index 3c23f4b5..5320b34b 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 @@ -12,9 +12,9 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj b/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj index 05c57caf..a62816b1 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 @@ -12,7 +12,7 @@ auto-detection of ProjectType/Version will fail --> module - 2.0.0 + 3.0.0 @@ -55,7 +55,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj b/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj index 1e0d86c0..ad29442c 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 @@ -12,9 +12,9 @@ - - - + + + 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..0e5e9456 100644 --- a/src/Cake.Module.Shared/Cake.Module.Shared.csproj +++ b/src/Cake.Module.Shared/Cake.Module.Shared.csproj @@ -1,16 +1,16 @@ - + - netcoreapp3.1 + net6.0 true Cake.Module.Shared false - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all 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 { 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 . /// diff --git a/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj b/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj index 0bce6d84..bd614d34 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 @@ -12,9 +12,9 @@ - - - + + + 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..8ad4319d 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 @@ -12,9 +12,9 @@ - - - + + + 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..dbc79789 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 @@ -12,9 +12,9 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all