Merge pull request #357 from nils-a/release/4.0.0

Release/4.0.0

.github/workflows/build.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ windows-2019, ubuntu-18.04, macos-10.15 ]
+        os: [ windows-2022, ubuntu-22.04, macos-12 ]
 
     env:
       AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }}
@@ -44,17 +44,18 @@ jobs:
 
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - 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:
           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:

.github/workflows/codeql-analysis.yml

@@ -17,7 +17,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false
@@ -30,12 +30,16 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - uses: actions/setup-dotnet@v3.0.3
+    - uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: |
+          5.0
+          6.0
+          7.0
+          8.0
     - name: Cache Tools
       uses: actions/cache@v3
       with:

.github/workflows/publishDocs.yml

@@ -11,15 +11,15 @@ env:
 
 jobs:
   cake:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
     - name: checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Fetch all tags and branches
       run: git fetch --prune --unshallow
-    
+
     - name: Cache Tools
       uses: actions/cache@v3
       with:

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.0.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>

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"
       ]

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();
     });

global.json

@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "8.0.100",
+    "rollForward": "latestFeature"
+  }
+}

recipe.cake

@@ -1,4 +1,4 @@
-#l nuget:?package=Cake.Recipe&version=3.0.1
+#l nuget:?package=Cake.Recipe&version=3.1.1
 
 Environment.SetVariableNames();
 

src/Cake.Gradle.Tests/Cake.Gradle.Tests.csproj

@@ -1,35 +1,40 @@
 <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>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="AutoFixture.AutoMoq" Version="4.17.0" />
-        <PackageReference Include="Cake.Common" Version="3.0.0" />
-        <PackageReference Include="Cake.Testing" Version="3.0.0" />
-        <PackageReference Include="coverlet.msbuild" Version="3.2.0">
+        <PackageReference Include="AutoFixture.AutoMoq" Version="4.18.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>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
           <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Moq" Version="4.18.3" />
-        <PackageReference Include="Verify.Xunit" Version="19.3.0" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="xunit.analyzers" Version="1.1.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="Moq" Version="4.20.69" />
+        <PackageReference Include="Verify.Xunit" Version="22.5.0" />
+        <PackageReference Include="xunit" Version="2.6.2" />
+        <PackageReference Include="xunit.analyzers" Version="1.6.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Shouldly" Version="4.1.0" />
+        <PackageReference Include="Shouldly" Version="4.2.1" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="../Cake.Gradle/Cake.Gradle.csproj" />

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,25 +32,26 @@
     </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>
-        <PackageReference Include="IDisposableAnalyzers" Version="4.0.2">
+        <PackageReference Include="IDisposableAnalyzers" Version="4.0.7">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
+        <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
+        <PackageReference Include="LitJson.Source" Version="0.19.0" />
         <PackageReference Include="stylecop.analyzers" Version="1.1.118">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     </ItemGroup>
 </Project>