Merge pull request #139 from bdukes/cake-3

Update dependency to Cake 3
cake-contrib · Aug 30, 2023 · 869c43e · 869c43e
2 parents ef6bb98 + 410cf26
commit 869c43e
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 61 deletions.
diff --git a/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj b/src/Cake.AzurePipelines.Module/Cake.AzurePipelines.Module.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Cake.AzurePipelines.Module</AssemblyName>
     <IsPackable>false</IsPackable>
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
-    <PackageReference Include="Cake.Common" Version="2.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Common" Version="3.0.0" PrivateAssets="All" />
     <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj b/src/Cake.BuildSystems.Module/Cake.BuildSystems.Module.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <IncludeBuildOutput>false</IncludeBuildOutput>
         <IsPackable>true</IsPackable>
         <IncludeSymbols>true</IncludeSymbols>
@@ -12,7 +12,7 @@
           auto-detection of ProjectType/Version will fail
         -->
         <CakeContribGuidelinesProjectType>module</CakeContribGuidelinesProjectType>
-        <CakeContribGuidelinesOverrideTargetFrameworkCakeVersion>2.0.0</CakeContribGuidelinesOverrideTargetFrameworkCakeVersion>
+        <CakeContribGuidelinesOverrideTargetFrameworkCakeVersion>3.0.0</CakeContribGuidelinesOverrideTargetFrameworkCakeVersion>
     </PropertyGroup>
 
     <PropertyGroup>

diff --git a/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj b/src/Cake.GitHubActions.Module/Cake.GitHubActions.Module.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Cake.GitHubActions.Module</AssemblyName>
     <IsPackable>false</IsPackable>
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
-    <PackageReference Include="Cake.Common" Version="2.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Common" Version="3.0.0" PrivateAssets="All" />
     <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Cake.Module.Shared/Cake.Module.Shared.csproj b/src/Cake.Module.Shared/Cake.Module.Shared.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Cake.Module.Shared</AssemblyName>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
-    <PackageReference Include="Cake.Common" Version="2.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Common" Version="3.0.0" PrivateAssets="All" />
     <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git 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
-        /// <inheritdoc cref="ICakeEngine.Setup"/>
-        [Obsolete]
-        public event EventHandler<SetupEventArgs> Setup
-        {
-            add { _engine.Setup += value; }
-            remove { _engine.Setup -= value; }
-        }
-#pragma warning restore CS0618
-
         /// <inheritdoc cref="ICakeEngine.BeforeSetup"/>
         public event EventHandler<BeforeSetupEventArgs> BeforeSetup
         {
@@ -51,16 +41,6 @@ public event EventHandler<AfterSetupEventArgs> AfterSetup
             remove { _engine.AfterSetup -= value; }
         }
 
-#pragma warning disable CS0618
-        /// <inheritdoc cref="ICakeEngine.Teardown"/>
-        [Obsolete]
-        public event EventHandler<TeardownEventArgs> Teardown
-        {
-            add { _engine.Teardown += value; }
-            remove { _engine.Teardown -= value; }
-        }
-#pragma warning restore CS0618
-
         /// <inheritdoc cref="ICakeEngine.BeforeTeardown"/>
         public event EventHandler<BeforeTeardownEventArgs> BeforeTeardown
         {
@@ -75,16 +55,6 @@ public event EventHandler<AfterTeardownEventArgs> AfterTeardown
             remove { _engine.AfterTeardown -= value; }
         }
 
-#pragma warning disable CS0618
-        /// <inheritdoc cref="ICakeEngine.TaskSetup"/>
-        [Obsolete]
-        public event EventHandler<TaskSetupEventArgs> TaskSetup
-        {
-            add { _engine.TaskSetup += value; }
-            remove { _engine.TaskSetup -= value; }
-        }
-#pragma warning restore CS0618
-
         /// <inheritdoc cref="ICakeEngine.BeforeTaskSetup"/>
         public event EventHandler<BeforeTaskSetupEventArgs> BeforeTaskSetup
         {
@@ -99,16 +69,6 @@ public event EventHandler<AfterTaskSetupEventArgs> AfterTaskSetup
             remove { _engine.AfterTaskSetup -= value; }
         }
 
-#pragma warning disable CS0618
-        /// <inheritdoc cref="ICakeEngine.TaskTeardown"/>
-        [Obsolete]
-        public event EventHandler<TaskTeardownEventArgs> TaskTeardown
-        {
-            add { _engine.TaskTeardown += value; }
-            remove { _engine.TaskTeardown -= value; }
-        }
-#pragma warning restore CS0618
-
         /// <inheritdoc cref="ICakeEngine.BeforeTaskTeardown"/>
         public event EventHandler<BeforeTaskTeardownEventArgs> BeforeTaskTeardown
         {

diff --git a/src/Cake.Module.Shared/CakeReportPrinterBase.cs b/src/Cake.Module.Shared/CakeReportPrinterBase.cs
@@ -39,6 +39,24 @@ public CakeReportPrinterBase(IConsole console, ICakeContext context)
         /// <inheritdoc />
         public abstract void Write(CakeReport report);
 
+        /// <inheritdoc/>
+        public virtual void WriteLifeCycleStep(string name, Verbosity verbosity)
+        {
+            new CakeReportPrinter(_console, _context).WriteLifeCycleStep(name, verbosity);
+        }
+
+        /// <inheritdoc/>
+        public virtual void WriteStep(string name, Verbosity verbosity)
+        {
+            new CakeReportPrinter(_console, _context).WriteLifeCycleStep(name, verbosity);
+        }
+
+        /// <inheritdoc/>
+        public virtual void WriteSkippedStep(string name, Verbosity verbosity)
+        {
+            new CakeReportPrinter(_console, _context).WriteLifeCycleStep(name, verbosity);
+        }
+
         /// <summary>
         /// Writes the report to the <see cref="IConsole"/>.
         /// </summary>

diff --git a/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj b/src/Cake.MyGet.Module/Cake.MyGet.Module.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Cake.MyGet.Module</AssemblyName>
     <IsPackable>false</IsPackable>
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
-    <PackageReference Include="Cake.Common" Version="2.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Common" Version="3.0.0" PrivateAssets="All" />
     <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj b/src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Cake.TeamCity.Module</AssemblyName>
     <IsPackable>false</IsPackable>
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
-    <PackageReference Include="Cake.Common" Version="2.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Common" Version="3.0.0" PrivateAssets="All" />
     <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj b/src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Cake.TravisCI.Module</AssemblyName>
     <IsPackable>false</IsPackable>
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
-    <PackageReference Include="Cake.Common" Version="2.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Common" Version="3.0.0" PrivateAssets="All" />
     <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>