Merge pull request #399 from nils-a/release/3.0.0

Release/3.0.0
cake-contrib · Nov 23, 2023 · e3c4b2e · e3c4b2e
2 parents a0fb780 + 60b1822
commit e3c4b2e
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 51 deletions.
diff --git a/.github/workflows/build.yml b/.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,20 +44,21 @@ jobs:
 
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - 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:
           # codecov needs 2.1, unittests needs 3.1, gitversion needs 5.0
           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.2.4
+        uses: actions/cache@v3.3.2
         with:
           path: tools
           key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
@@ -69,15 +70,15 @@ jobs:
           verbosity: Diagnostic
           cake-version: 1.3.0
       - name: Upload Issues
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v3.1.3
         with:
           if-no-files-found: warn
           name: ${{ matrix.os }} Issues
           path: |
             BuildArtifacts/report.html
             BuildArtifacts/**/coverlet/*.xml
       - name: Upload Packages
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v3.1.3
         if: runner.os == 'Windows'
         with:
           if-no-files-found: warn

diff --git a/.github/workflows/codeql-analysis.yml b/.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,20 +30,21 @@ jobs:
 
     steps:
     - name: Checkout the repository
-      uses: actions/checkout@v3.3.0
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - 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:
         # codecov needs 2.1, unittests needs 3.1, gitversion needs 5.0
         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.2.4
+      uses: actions/cache@v3.3.2
       with:
         path: tools
         key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}

diff --git a/.github/workflows/publishDocs.yml b/.github/workflows/publishDocs.yml
@@ -11,15 +11,15 @@ env:
 
 jobs:
   cake:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
-    - name: Checkout the repository 
-      uses: actions/checkout@v3.3.0
+    - name: Checkout the repository
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Fetch all tags and branches
       run: git fetch --prune --unshallow
     - name: Cache Tools
-      uses: actions/cache@v3.2.4
+      uses: actions/cache@v3.3.2
       with:
         path: tools
         key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}

diff --git a/demo/frosting/build/Build.csproj b/demo/frosting/build/Build.csproj
@@ -1,16 +1,16 @@
 <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.Npm" Version="2.0.0" />
+    <PackageReference Include="Cake.Frosting" Version="4.0.0" />
+    <PackageReference Include="Cake.Npm" Version="3.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Cake.ESLint, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\..\..\src\Cake.ESLint\bin\Debug\netstandard2.0\Cake.ESLint.dll</HintPath>
+    <Reference Include="Cake.ESLint">
+      <HintPath>$(ProjectDir)../../../src/Cake.ESLint/bin/Debug/net8.0/Cake.ESLint.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/demo/frosting/src2/package.json b/demo/frosting/src2/package.json
@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "eslint": "8.33.0"
+    "eslint": "8.54.0"
   }
 }
diff --git 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
@@ -1,5 +1,5 @@
-#addin nuget:?package=Cake.Npm&version=2.0.0
-#r "..\..\src\Cake.ESLint\bin\Debug\net6.0\Cake.ESLint.dll"
+#addin nuget:?package=Cake.Npm&version=3.0.0
+#r "..\..\src\Cake.ESLint\bin\Debug\net8.0\Cake.ESLint.dll"
 
 ///////////////////////////////////////////////////////////////////////////////
 // ARGUMENTS
@@ -12,11 +12,11 @@ var target = Argument("target", "Default");
 ///////////////////////////////////////////////////////////////////////////////
 
 Task("ensure-eslint-tool")
-.Does(() => 
+.Does(() =>
 {
    var tools = Context.Configuration.GetToolPath(Context.Environment.WorkingDirectory, Context.Environment);
    CreateDirectory(tools);
-   var settings = new NpmInstallSettings 
+   var settings = new NpmInstallSettings
    {
       WorkingDirectory = tools
    };

diff --git a/demo/script/src2/package.json b/demo/script/src2/package.json
@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "eslint": "8.33.0"
+    "eslint": "8.54.0"
   }
 }
diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
     "sdk": {
         "allowPrerelease": true,
-        "version": "7.0.102",
+        "version": "8.0.100",
         "rollForward": "latestFeature"
     }
 }
diff --git a/recipe.cake b/recipe.cake
@@ -1,4 +1,4 @@
-#load nuget:?package=Cake.Recipe&version=3.0.1
+#load nuget:?package=Cake.Recipe&version=3.1.1
 
 Environment.SetVariableNames();
 

diff --git a/src/Cake.ESLint.Tests/Cake.ESLint.Tests.csproj b/src/Cake.ESLint.Tests/Cake.ESLint.Tests.csproj
@@ -8,24 +8,24 @@
             Remove this hack if Cake.Recipe bumps the usage of Cake.Incubator to version 7.0.0
         -->
         <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="Cake.Testing" Version="3.0.0" />
-        <PackageReference Include="coverlet.msbuild" Version="3.2.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.1" />
-        <PackageReference Include="Moq" Version="4.18.4" />
-        <PackageReference Include="Shouldly" Version="4.1.0" />
-        <PackageReference Include="Verify.Xunit" Version="19.8.1" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Moq" Version="4.20.69" />
+        <PackageReference Include="Shouldly" Version="4.2.1" />
+        <PackageReference Include="Verify.Xunit" Version="22.5.0" />
+        <PackageReference Include="xunit" Version="2.6.2" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/src/Cake.ESLint/Cake.ESLint.csproj b/src/Cake.ESLint/Cake.ESLint.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>
         <IncludeSymbols>true</IncludeSymbols>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -32,12 +32,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
-        <PackageReference Include="CakeContrib.Guidelines" Version="1.4.0">
+        <PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
+        <PackageReference Include="CakeContrib.Guidelines" Version="1.5.1">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
           <PrivateAssets>all</PrivateAssets>
         </PackageReference>