Merge pull request #23 from gep13/feature/issue-22-cake-2-catch-up

(#22) Cake 2 catch-up

Author: gep13

Source/Cake.StrongNameSigner.Tests/Cake.StrongNameSigner.Tests.csproj

@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Cake.Testing" Version="1.0.0" />
+        <PackageReference Include="Cake.Testing" Version="2.0.0" />
         <PackageReference Include="coverlet.msbuild" Version="3.0.2">
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
           <PrivateAssets>all</PrivateAssets>

Source/Cake.StrongNameSigner/Cake.StrongNameSigner.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <IncludeSymbols>true</IncludeSymbols>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -30,12 +30,24 @@
     <ItemGroup>
         <AdditionalFiles Include="stylecop.json" />
     </ItemGroup>
+    <!--
+      CCG0007 asks for netcoreapp3.1 + net5.0 when depending on Cake.Core 2.x
+      (those are Cake.Core 2.0.0's TFMs alongside net6.0). Both are past EOL,
+      so we ship net6.0 only — the sole runtime installable from
+      `actions/setup-dotnet` in our `[ windows-2025, ubuntu-24.04 ]` matrix.
+      CCG0009 ("recommended Cake 6.0.0") stays as a warning — we're on
+      Cake.Core 2.0.0 for this release, it resolves at the eventual 6.0.0.
+    -->
+    <ItemGroup>
+        <CakeContribGuidelinesOmitTargetFramework Include="netcoreapp3.1" />
+        <CakeContribGuidelinesOmitTargetFramework Include="net5.0" />
+    </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Cake.Addin.Analyzer" Version="0.1.3">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All" />
+        <PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
         <PackageReference Include="CakeContrib.Guidelines" Version="1.7.0" PrivateAssets="All" />
         <PackageReference Include="IDisposableAnalyzers" Version="4.0.8">
           <PrivateAssets>all</PrivateAssets>

demo/frosting/build/Build.csproj

@@ -7,8 +7,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Cake.StrongNameSigner">
-      <HintPath>$(MSBuildProjectDirectory)\..\..\..\BuildArtifacts\temp\_PublishedLibraries\Cake.StrongNameSigner\netstandard2.0\Cake.StrongNameSigner.dll</HintPath>
+      <HintPath>$(MSBuildProjectDirectory)\..\..\..\BuildArtifacts\temp\_PublishedLibraries\Cake.StrongNameSigner\net6.0\Cake.StrongNameSigner.dll</HintPath>
     </Reference>
-    <PackageReference Include="Cake.Frosting" Version="1.3.0" />
+    <PackageReference Include="Cake.Frosting" Version="2.3.0" />
   </ItemGroup>
 </Project>

demo/script/.config/dotnet-tools.json

@@ -3,7 +3,7 @@
     "isRoot": true,
     "tools": {
         "cake.tool": {
-            "version": "1.3.0",
+            "version": "2.3.0",
             "commands": [
                 "dotnet-cake"
             ]

demo/script/strongnamesigner.cake

@@ -1,4 +1,4 @@
-#reference "../../BuildArtifacts/temp/_PublishedLibraries/Cake.StrongNameSigner/netstandard2.0/Cake.StrongNameSigner.dll"
+#reference "../../BuildArtifacts/temp/_PublishedLibraries/Cake.StrongNameSigner/net6.0/Cake.StrongNameSigner.dll"
 
 using Cake.StrongNameSigner;