From b635fab8939c9da54d7bffc4c7a8e94ca7fdce8b Mon Sep 17 00:00:00 2001
From: Nils Andresen <nils@nils-andresen.de>
Date: Thu, 23 Nov 2023 21:06:10 +0100
Subject: [PATCH 1/2] (#354) Update Cake.Core to 4.0.0

and CakeContrib.Guidelines to 1.5.1
---
 demo/frosting/build/Build.csproj               |  8 ++++----
 demo/script/.config/dotnet-tools.json          |  2 +-
 demo/script/build.cake                         | 12 ++++++------
 src/Cake.Gradle.Tests/Cake.Gradle.Tests.csproj | 11 ++++++++---
 src/Cake.Gradle/Cake.Gradle.csproj             |  8 ++++----
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/demo/frosting/build/Build.csproj b/demo/frosting/build/Build.csproj
index f050ea73..95c10edc 100644
--- a/demo/frosting/build/Build.csproj
+++ b/demo/frosting/build/Build.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.Frosting" Version="3.2.0" />
+    <PackageReference Include="Cake.Frosting" Version="4.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Cake.Gradle, Version=1.2.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\..\..\src\Cake.Gradle\bin\Release\net6.0\Cake.Gradle.dll</HintPath>
+    <Reference Include="Cake.Gradle">
+      <HintPath>$(ProjectDir)../../../src/Cake.Gradle/bin/Release/net8.0/Cake.Gradle.dll</HintPath>
     </Reference>
   </ItemGroup>
 </Project>
diff --git a/demo/script/.config/dotnet-tools.json b/demo/script/.config/dotnet-tools.json
index 31e896e9..da200cda 100644
--- a/demo/script/.config/dotnet-tools.json
+++ b/demo/script/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "2.0.0",
+      "version": "4.0.0",
       "commands": [
         "dotnet-cake"
       ]
diff --git a/demo/script/build.cake b/demo/script/build.cake
index 0021f284..0ced1c17 100644
--- a/demo/script/build.cake
+++ b/demo/script/build.cake
@@ -1,7 +1,7 @@
  // build artifacts first by executing ./build.ps1 in root
- #r "../../src/Cake.Gradle/bin/Release/net6.0/Cake.Gradle.dll"
+ #r "../../src/Cake.Gradle/bin/Release/net8.0/Cake.Gradle.dll"
 
-// requires Java Runtime Environment 
+// requires Java Runtime Environment
 
 Task("Gradle-Example")
     .Does(() =>
@@ -12,15 +12,15 @@ Task("Gradle-Example")
         // Run 'gradle --version'
         // run this, in example folder too. So the "test" does not break when gradle is not installed globally.
         Gradle.FromPath("./example").WithArguments("--version").Run();
-        
+
         // Run 'gradle hello' in a specific folder
         // Note: if you have a gradle wrapper setup in the specified path, this one will be used
         Gradle.FromPath("./example").WithTask("hello").Run();
-        
+
         // Run 'gradle hello' in a specific folder with default log level
         // Note: if no log level is set, it is derived from the Cake verbosity (which is set to 'verbose' in build.ps1)
-        Gradle.FromPath("./example").WithTask("hello").WithLogLevel(GradleLogLevel.Default).Run(); 
-        
+        Gradle.FromPath("./example").WithTask("hello").WithLogLevel(GradleLogLevel.Default).Run();
+
         // Run 'gradle --offline --build-file build.gradle hello' in a specific folder
         Gradle.FromPath("./example").WithTask("hello").WithArguments("--offline --build-file build.gradle").Run();
     });
diff --git a/src/Cake.Gradle.Tests/Cake.Gradle.Tests.csproj b/src/Cake.Gradle.Tests/Cake.Gradle.Tests.csproj
index a3429d7d..7c145523 100644
--- a/src/Cake.Gradle.Tests/Cake.Gradle.Tests.csproj
+++ b/src/Cake.Gradle.Tests/Cake.Gradle.Tests.csproj
@@ -1,8 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
+        <!--
+        Fool Cake.Incubator into thinking we're building against netcoreapp3.1.
+        This is done to make Cake.Recipe avoid using OpenCover.
+        https://github.com/cake-contrib/Cake.Recipe/issues/570 will resolve this workaround.
+        -->
         <TargetFrameworks Condition="false">netcoreapp3.1</TargetFrameworks>
-        <TargetFrameworks>net6.0;net7.0;</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <NoWarn>$(NoWarn);CS1591;SA1600</NoWarn>
 
         <IsPackable>false</IsPackable>
@@ -10,8 +15,8 @@
 
     <ItemGroup>
         <PackageReference Include="AutoFixture.AutoMoq" Version="4.18.0" />
-        <PackageReference Include="Cake.Common" Version="3.0.0" />
-        <PackageReference Include="Cake.Testing" Version="3.2.0" />
+        <PackageReference Include="Cake.Common" Version="4.0.0" />
+        <PackageReference Include="Cake.Testing" Version="4.0.0" />
         <PackageReference Include="coverlet.msbuild" Version="6.0.0">
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
           <PrivateAssets>all</PrivateAssets>
diff --git a/src/Cake.Gradle/Cake.Gradle.csproj b/src/Cake.Gradle/Cake.Gradle.csproj
index 2fcedd2d..f87b82af 100644
--- a/src/Cake.Gradle/Cake.Gradle.csproj
+++ b/src/Cake.Gradle/Cake.Gradle.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <CodeAnalysisRuleSet>$(SolutionDir)/Cake.Gradle.ruleset</CodeAnalysisRuleSet>
     </PropertyGroup>
@@ -32,13 +32,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Cake.Common" Version="3.0.0" PrivateAssets="All" />
-        <PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
+        <PackageReference Include="Cake.Common" Version="4.0.0" PrivateAssets="All" />
+        <PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
         <PackageReference Include="Cake.Addin.Analyzer" Version="0.1.3">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="CakeContrib.Guidelines" Version="1.4.0">
+        <PackageReference Include="CakeContrib.Guidelines" Version="1.5.1">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

From 2d093e9c9f5ec0ef017194b588283cab0a12008a Mon Sep 17 00:00:00 2001
From: Nils Andresen <nils@nils-andresen.de>
Date: Thu, 23 Nov 2023 21:18:01 +0100
Subject: [PATCH 2/2] add install of net8.0 to GH-Actions

---
 .github/workflows/build.yml           | 11 ++++++-----
 .github/workflows/codeql-analysis.yml |  7 ++++---
 global.json                           |  6 ++++++
 3 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 global.json

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d00e8c2b..a598501f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,11 +50,12 @@ jobs:
       - uses: actions/setup-dotnet@v3.2.0
         with:
           dotnet-version: |
-            2.1.818
-            3.1.x
-            5.0.x
-            6.0.x
-            7.0.x
+            2.1
+            3.1
+            5.0
+            6.0
+            7.0
+            8.0
       - name: Cache Tools
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 4f42ff09..597e0ee8 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -36,9 +36,10 @@ jobs:
     - uses: actions/setup-dotnet@v3.2.0
       with:
         dotnet-version: |
-          5.0.x
-          6.0.x
-          7.0.x
+          5.0
+          6.0
+          7.0
+          8.0
     - name: Cache Tools
       uses: actions/cache@v3
       with:
diff --git a/global.json b/global.json
new file mode 100644
index 00000000..501e79a8
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "8.0.100",
+    "rollForward": "latestFeature"
+  }
+}
\ No newline at end of file