Merge pull request #29 from pascalberger/feature/cake-3

Update Cake.Wyam to Cake 3.0

Author: daveaglick

ReleaseNotes.md

@@ -1,3 +1,7 @@
+# 2.2.14
+
+- Target Cake.Wyam to `net6.0` and `net7.0` and reference Cake 3.0 (#29).
+
 # 2.2.13
 
 - Updated Cake.Wyam to `netcoreapp3.1` and Cake 2.0 (#28).

SolutionInfo.cs

@@ -6,7 +6,7 @@
 using System.Reflection;
 
 [assembly: AssemblyProduct("Wyam")]
-[assembly: AssemblyVersion("2.2.13")]
-[assembly: AssemblyFileVersion("2.2.13")]
-[assembly: AssemblyInformationalVersion("2.2.13")]
+[assembly: AssemblyVersion("2.2.14")]
+[assembly: AssemblyFileVersion("2.2.14")]
+[assembly: AssemblyInformationalVersion("2.2.14")]
 [assembly: AssemblyCopyright("Copyright © Wyam Contributors")]

build.cake

@@ -24,7 +24,7 @@
 // - Add a blog post to Wyam.Web about the release
 // - Run a build on Wyam.Web from CI to verify final release (first make sure NuGet Gallery has updated packages by searching for "wyam")
 
-#addin "Cake.FileHelpers"
+#addin "Cake.FileHelpers&version=3.1.0"
 #addin "Octokit"
 #tool "nuget:?package=NUnit.ConsoleRunner&version=3.7.0"
 #tool "nuget:?package=NuGet.CommandLine&version=4.9.2"

src/clients/Cake.Wyam/Cake.Wyam.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <Description>Wyam is a simple to use, highly modular, and extremely configurable static content generator. This library contains an addin for Cake for interacting with Wyam.</Description>
     <PackageTags>Cake Wyam Static StaticContent StaticSite Blog BlogEngine cake-addin</PackageTags>
     <RepositoryUrl>https://github.com/Wyamio/Wyam.git</RepositoryUrl>
@@ -9,10 +9,10 @@
     <NoWarn>$(NoWarn);NU5048</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="2.0.0">
+    <PackageReference Include="Cake.Core" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Cake.Common" Version="2.0.0">
+    <PackageReference Include="Cake.Common" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>

src/clients/Cake.Wyam/WyamRunner.cs

@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
-using Cake.Common.Tools.DotNetCore;
 using Cake.Core;
 using Cake.Core.IO;
 using Cake.Core.Tooling;

src/clients/Cake.Wyam/WyamSettings.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Cake.Common.Tools.DotNetCore;
+using Cake.Common.Tools.DotNet;
 using Cake.Core.IO;
 using Cake.Core.Tooling;
 
@@ -9,7 +9,7 @@ namespace Cake.Wyam
     /// <summary>
     /// Contains settings used by <see cref="WyamRunner"/>.
     /// </summary>
-    public sealed class WyamSettings : DotNetCoreSettings
+    public sealed class WyamSettings : DotNetSettings
     {
         /// <summary>
         /// Gets or sets a value indicating whether to enable watching of input folder for changes to files.

tests/clients/Cake.Wyam.Tests/Cake.Wyam.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\clients\Cake.Wyam\Cake.Wyam.csproj" />