Merge branch 'release/0.5.1'

cake-contrib · Oct 12, 2021 · 974cd09 · 974cd09
2 parents f8b1668 + 2e83578
commit 974cd09
Show file tree

Hide file tree

Showing 15 changed files with 105 additions and 62 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,6 +47,19 @@ jobs:
         uses: actions/[email protected]
       - name: Fetch all tags and branches
         run: git fetch --prune --unshallow
+      - uses: actions/[email protected]
+        with:
+          # unittests needs 3.1
+          dotnet-version: '3.1.x'
+      - uses: actions/[email protected]
+        with:
+          # gitversion needs 5.0
+          dotnet-version: '5.0.x'
+      - uses: actions/[email protected]
+        with:
+          # need .NET 6 rc2 to build
+          dotnet-version: '6.0.x'
+          include-prerelease: true
       - name: Cache Tools
         uses: actions/[email protected]
         with:
@@ -61,15 +74,15 @@ jobs:
           cake-version: 0.38.5
           cake-bootstrap: true
       - name: Upload Issues
-        uses: actions/[email protected].3
+        uses: actions/[email protected].4
         with:
           if-no-files-found: warn
           name: ${{ matrix.os }} Issues
           path: |
             BuildArtifacts/report.html
             BuildArtifacts/**/coverlet/*.xml
       - name: Upload Packages
-        uses: actions/[email protected].3
+        uses: actions/[email protected].4
         if: runner.os == 'Windows'
         with:
           if-no-files-found: warn

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -33,6 +33,19 @@ jobs:
       uses: actions/[email protected]
     - name: Fetch all tags and branches
       run: git fetch --prune --unshallow
+    - uses: actions/[email protected]
+      with:
+        # unittests needs 3.1
+        dotnet-version: '3.1.x'
+    - uses: actions/[email protected]
+      with:
+        # gitversion needs 5.0
+        dotnet-version: '5.0.x'
+    - uses: actions/[email protected]
+      with:
+        # need .NET 6 rc2 to build
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     - name: Cache Tools
       uses: actions/[email protected]
       with:

diff --git a/demo/frosting/build/Build.csproj b/demo/frosting/build/Build.csproj
@@ -5,7 +5,7 @@
     <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.Frosting" Version="1.1.0" />
+    <PackageReference Include="Cake.Frosting" Version="1.3.0" />
     <PackageReference Include="Cake.Npm" Version="1.0.0" />
   </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": "7.28.0"
+    "eslint": "8.0.0"
   }
 }
diff --git a/demo/script/src2/package.json b/demo/script/src2/package.json
@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "eslint": "7.28.0"
+    "eslint": "8.0.0"
   }
 }
diff --git a/docs/input/_Bottom.cshtml b/docs/input/_Bottom.cshtml
@@ -0,0 +1,8 @@
+<a class="github-button" href="https://github.com/cake-contrib/Cake.ESLint" target="_blank">
+    <i class="fa fa-github"></i>
+    GitHub
+</a>
+<a class="discussion-button" href="https://github.com/cake-build/cake/discussions" target="_blank">
+    <i class="fa fa-github"></i>
+    Discussion
+</a>
diff --git a/docs/input/assets/css/override.less b/docs/input/assets/css/override.less
@@ -0,0 +1,37 @@
+/* For GitHub */
+.bottom-footer {
+	margin-bottom: 40px !important;  // Make room for GitHub buttons
+}
+
+.github-button,
+.discussion-button {
+	z-index: 100;
+	position: fixed;
+	bottom: 0px;
+	padding: 1em 3em;
+	background-color: #367fa9;
+	border: 0;
+	border-top-left-radius: 0.5em;
+	border-top-right-radius: 0.5em;
+	font-family: sans-serif;
+	font-size: 9pt;
+	text-transform: uppercase;
+	text-align: center;
+	text-decoration: none;
+	cursor: pointer;
+	cursor: hand;
+	-webkit-transition: all .3s ease;
+	transition: all .3s ease;
+	color: #fff;
+	a, a:active, a:hover, a:focus {
+		color: #fff;
+	}
+}
+
+.github-button {
+    right: 255px;
+}
+
+.discussion-button {
+	right: 80px;
+} 
diff --git a/global.json b/global.json
@@ -0,0 +1,7 @@
+{
+    "sdk": {
+        "allowPrerelease": true,
+        "version": "6.0.100-rc.2",
+        "rollForward": "latestFeature"
+    }
+}
diff --git a/recipe.cake b/recipe.cake
@@ -19,6 +19,11 @@ BuildParameters.SetParameters(
 
 BuildParameters.PrintParameters(Context);
 
+
+// workaround for https://github.com/cake-contrib/Cake.Recipe/issues/862
+ToolSettings.SetToolPreprocessorDirectives(
+    reSharperTools: "#tool nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2021.2.0");
+
 ToolSettings.SetToolSettings(context: Context);
 
 Build.RunDotNetCore();
diff --git a/src/Cake.ESLint.Tests/Cake.ESLint.Tests.csproj b/src/Cake.ESLint.Tests/Cake.ESLint.Tests.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp2.1;net5.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
         <TargetFrameworks Condition="'$(OS)'!='Unix'">net461;$(TargetFrameworks)</TargetFrameworks>
         <NoWarn>$(NoWarn);CS1591;SA1600</NoWarn>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Cake.Testing" Version="1.1.0" />
-        <PackageReference Include="coverlet.msbuild" Version="3.0.3">
+        <PackageReference Include="Cake.Testing" Version="1.3.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.10.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
         <PackageReference Include="Moq" Version="4.16.1" />
         <PackageReference Include="Shouldly" Version="4.0.3" />
-        <PackageReference Include="Verify.Xunit" Version="11.18.2" />
+        <PackageReference Include="Verify.Xunit" Version="13.1.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.Tests/ESLintAliasesTests.Runs_tool_with_given_action.verified.txt b/src/Cake.ESLint.Tests/ESLintAliasesTests.Runs_tool_with_given_action.verified.txt
@@ -1,24 +1,10 @@
 {
-  Path: {
-    FullPath: /Working/tools/eslint,
-    Separator: "/",
-    Segments: [
-      /Working,
-      tools,
-      eslint
-    ]
-  },
+  Path: /Working/tools/eslint,
   Process: {
     Arguments: [
       {}
     ],
-    WorkingDirectory: {
-      FullPath: /Working,
-      Separator: "/",
-      Segments: [
-        /Working
-      ]
-    }
+    WorkingDirectory: /Working
   },
   Args: "**/*"
 }
diff --git a/src/Cake.ESLint.Tests/ESLintAliasesTests.Runs_tool_with_given_settings.verified.txt b/src/Cake.ESLint.Tests/ESLintAliasesTests.Runs_tool_with_given_settings.verified.txt
@@ -1,21 +1,7 @@
-{
-  Path: {
-    FullPath: /Working/tools/eslint,
-    Separator: "/",
-    Segments: [
-      /Working,
-      tools,
-      eslint
-    ]
-  },
+{
+  Path: /Working/tools/eslint,
   Process: {
-    WorkingDirectory: {
-      FullPath: /Working,
-      Separator: "/",
-      Segments: [
-        /Working
-      ]
-    }
+    WorkingDirectory: /Working
   },
   Args: 
 }
diff --git a/src/Cake.ESLint.Tests/ESLintAliasesTests.Runs_tool_with_no_settings.verified.txt b/src/Cake.ESLint.Tests/ESLintAliasesTests.Runs_tool_with_no_settings.verified.txt
@@ -1,21 +1,7 @@
-{
-  Path: {
-    FullPath: /Working/tools/eslint,
-    Separator: "/",
-    Segments: [
-      /Working,
-      tools,
-      eslint
-    ]
-  },
+{
+  Path: /Working/tools/eslint,
   Process: {
-    WorkingDirectory: {
-      FullPath: /Working,
-      Separator: "/",
-      Segments: [
-        /Working
-      ]
-    }
+    WorkingDirectory: /Working
   },
   Args: 
 }
diff --git a/src/Cake.ESLint/Cake.ESLint.csproj b/src/Cake.ESLint/Cake.ESLint.csproj
@@ -9,6 +9,7 @@
     <ItemGroup>
         <AdditionalFiles Include="$(SolutionDir)/stylecop.json" Link="stylecop.json" />
         <None Include="$(SolutionDir)/.editorconfig" Link=".editorconfig" />
+        <None Include="$(ProjectDir)../../README.md" Link="README.md" PackagePath="" Pack="true" />
     </ItemGroup>
 
     <PropertyGroup>
@@ -27,11 +28,12 @@
         <PackageTags>cake;addin;eslint;build;cake-build;script;cake-addin</PackageTags>
         <RepositoryUrl>https://github.com/cake-contrib/Cake.ESLint.git</RepositoryUrl>
         <PackageReleaseNotes>https://github.com/cake-contrib/Cake.ESLint/releases/tag/$(Version)</PackageReleaseNotes>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All" />
-        <PackageReference Include="CakeContrib.Guidelines" Version="1.1.1">
+        <PackageReference Include="CakeContrib.Guidelines" Version="1.1.2">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/src/Cake.ESLint/ESLintSettings.cs b/src/Cake.ESLint/ESLintSettings.cs
@@ -196,7 +196,7 @@ public ESLintSettings()
 
         /// <summary>
         /// Gets or sets a value indicating whether
-        /// to check only hanged files.
+        /// to check only changed files.
         /// <para>Option: <c>--cache</c>.</para>
         /// </summary>
         public bool Cache { get; set; }