Merge pull request #127 from nils-a/release/1.0.0

Release/1.0.0
cake-contrib · Dec 4, 2021 · 8811787 · 8811787
2 parents 974cd09 + 7ae2cb6
commit 8811787
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 50 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,29 +44,24 @@ jobs:
 
     steps:
       - name: Checkout the repository 
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.4.0
       - name: Fetch all tags and branches
         run: git fetch --prune --unshallow
-      - uses: actions/setup-dotnet@v1.8.2
+      - uses: actions/setup-dotnet@v1.9.0
         with:
-          # unittests needs 3.1
-          dotnet-version: '3.1.x'
-      - uses: actions/setup-dotnet@v1.8.2
-        with:
-          # gitversion needs 5.0
-          dotnet-version: '5.0.x'
-      - uses: actions/setup-dotnet@v1.8.2
-        with:
-          # need .NET 6 rc2 to build
-          dotnet-version: '6.0.x'
-          include-prerelease: true
+          # 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
       - name: Cache Tools
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v2.1.7
         with:
           path: tools
           key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
       - name: Build project
-        uses: cake-build/cake-action@v1.3.0
+        uses: cake-build/cake-action@v1.4.0
         with:
           script-path: recipe.cake
           target: CI

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -30,24 +30,19 @@ jobs:
 
     steps:
     - name: Checkout the repository 
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v2.4.0
     - name: Fetch all tags and branches
       run: git fetch --prune --unshallow
-    - uses: actions/setup-dotnet@v1.8.2
-      with:
-        # unittests needs 3.1
-        dotnet-version: '3.1.x'
-    - uses: actions/setup-dotnet@v1.8.2
-      with:
-        # gitversion needs 5.0
-        dotnet-version: '5.0.x'
-    - uses: actions/setup-dotnet@v1.8.2
-      with:
-        # need .NET 6 rc2 to build
-        dotnet-version: '6.0.x'
-        include-prerelease: true
+      - uses: actions/setup-dotnet@v1.9.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
     - name: Cache Tools
-      uses: actions/cache@v2.1.6
+      uses: actions/cache@v2.1.7
       with:
         path: tools
         key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
@@ -63,7 +58,7 @@ jobs:
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
     - name: Build project
-      uses: cake-build/cake-action@v1.3.0
+      uses: cake-build/cake-action@v1.4.0
       with:
         script-path: recipe.cake
         target: DotNetCore-Build

diff --git a/.github/workflows/publishDocs.yml b/.github/workflows/publishDocs.yml
@@ -15,16 +15,16 @@ jobs:
 
     steps:
     - name: Checkout the repository 
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v2.4.0
     - name: Fetch all tags and branches
       run: git fetch --prune --unshallow
     - name: Cache Tools
-      uses: actions/cache@v2.1.6
+      uses: actions/cache@v2.1.7
       with:
         path: tools
         key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
     - name: Publishing documentaiton
-      uses: cake-build/cake-action@v1.3.0
+      uses: cake-build/cake-action@v1.4.0
       with:
         script-path: recipe.cake
         target: Force-Publish-Documentation

diff --git a/demo/frosting/build/Build.csproj b/demo/frosting/build/Build.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.Frosting" Version="1.3.0" />
+    <PackageReference Include="Cake.Frosting" Version="2.0.0" />
     <PackageReference Include="Cake.Npm" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup>
@@ -22,4 +22,4 @@
   <ItemGroup>
     <None Remove="tools\**" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/demo/frosting/src2/package.json b/demo/frosting/src2/package.json
@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "eslint": "8.0.0"
+    "eslint": "8.4.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": "1.1.0",
+      "version": "2.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=1.0.0
-#r "..\..\src\Cake.ESLint\bin\Debug\netstandard2.0\Cake.ESLint.dll"
+#r "..\..\src\Cake.ESLint\bin\Debug\net6.0\Cake.ESLint.dll"
 
 ///////////////////////////////////////////////////////////////////////////////
 // ARGUMENTS
@@ -32,6 +32,7 @@ Task("manual-installation")
       x.ContinueOnErrors = true;
       x.AddDirectory("src1");
    });
+   Information("> If you saw an error above, everything is fine!");
 });
 
 Task("local-project")
@@ -47,6 +48,7 @@ Task("local-project")
       x.ContinueOnErrors = true;
       x.AddDirectory("."); // relative to WorkingDirectory
    });
+   Information("> If you saw an error above, everything is fine!");
 });
 
 Task("Default")

diff --git a/demo/script/src2/package.json b/demo/script/src2/package.json
@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "eslint": "8.0.0"
+    "eslint": "8.4.0"
   }
 }
diff --git a/src/Cake.ESLint.Tests/Cake.ESLint.Tests.csproj b/src/Cake.ESLint.Tests/Cake.ESLint.Tests.csproj
@@ -1,23 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
-        <TargetFrameworks Condition="'$(OS)'!='Unix'">net461;$(TargetFrameworks)</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <NoWarn>$(NoWarn);CS1591;SA1600</NoWarn>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Cake.Testing" Version="1.3.0" />
+        <PackageReference Include="Cake.Testing" Version="2.0.0" />
         <PackageReference Include="coverlet.msbuild" Version="3.1.0">
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
           <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
         <PackageReference Include="Moq" Version="4.16.1" />
         <PackageReference Include="Shouldly" Version="4.0.3" />
-        <PackageReference Include="Verify.Xunit" Version="13.1.0" />
+        <PackageReference Include="Verify.Xunit" Version="14.7.0" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
           <PrivateAssets>all</PrivateAssets>

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>netstandard2.0;net461;net5.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <IncludeSymbols>true</IncludeSymbols>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -32,12 +32,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All" />
-        <PackageReference Include="CakeContrib.Guidelines" Version="1.1.2">
+        <PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
+        <PackageReference Include="CakeContrib.Guidelines" Version="1.3.0">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
           <PrivateAssets>all</PrivateAssets>
         </PackageReference>