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

Release/3.0.0

.all-contributorsrc

@@ -24,6 +24,15 @@
         "bug",
         "code"
       ]
+    },
+    {
+      "login": "DiDoHH",
+      "name": "DiDoHH",
+      "avatar_url": "https://avatars.githubusercontent.com/u/45682415?v=4",
+      "profile": "https://github.com/DiDoHH",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/renovate.json

@@ -0,0 +1,10 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [ "github>nils-a/renovate-config" ],
+  "packageRules": [
+    {
+      "matchPackageNames": ["cake.tool", "Cake.Core"],
+      "enabled": false
+    }
+  ]
+}

.github/workflows/build.yml

@@ -21,16 +21,44 @@ jobs:
       matrix:
         os: [ windows-2019, ubuntu-18.04, macos-10.15 ]
 
+    env:
+      AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }}
+      AZURE_SOURCE: ${{ secrets.AZURE_SOURCE }}
+      AZURE_USER: ${{ secrets.AZURE_USER }}
+      COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+      GITHUB_PAT: ${{ secrets.GH_TOKEN }}
+      GITTER_ROOM_ID: ${{ secrets.GITTER_ROOM_ID }}
+      GITTER_TOKEN: ${{ secrets.GITTER_TOKEN }}
+      GPR_PASSWORD: ${{ secrets.GPR_PASSWORD }}
+      GPR_SOURCE: ${{ secrets.GPR_SOURCE }}
+      GPR_USER: ${{ secrets.GPR_USER }}
+      NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
+      NUGET_SOURCE: "https://api.nuget.org/v3/index.json"
+      TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
+      TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
+      TWITTER_CONSUMER_KEY: ${{ secrets.TWITTER_CONSUMER_KEY }}
+      TWITTER_CONSUMER_SECRET: ${{ secrets.TWITTER_CONSUMER_SECRET }}
+      WYAM_ACCESS_TOKEN: ${{ secrets.WYAM_ACCESS_TOKEN }}
+      WYAM_DEPLOY_BRANCH: "gh-pages"
+      WYAM_DEPLOY_REMOTE: ${{ github.event.repository.html_url }}
+
     steps:
       - name: Checkout the repository 
         uses: actions/checkout@v2
       - name: Fetch all tags and branches
         run: git fetch --prune --unshallow
+      - uses: actions/[email protected]
+        with:
+          dotnet-version: |
+            2.1.818
+            3.1.x
+            5.0.x
+            6.0.x
       - name: Cache Tools
         uses: actions/cache@v2
         with:
-          path: tools
-          key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
+          path: .cake
+          key: ${{ runner.os }}-cake-${{ hashFiles('recipe.cake') }}
       - name: Build project
         uses: cake-build/cake-action@v1
         with:

.github/workflows/codeql-analysis.yml

@@ -38,11 +38,19 @@ jobs:
       with:
         fetch-depth: 0
 
+    - uses: actions/[email protected]
+      with:
+        dotnet-version: |
+          2.1.818
+          3.1.x
+          5.0.x
+          6.0.x
+
     - name: Cache Tools
       uses: actions/cache@v2
       with:
-        path: tools
-        key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
+        path: .cake
+        key: ${{ runner.os }}-cake-${{ hashFiles('recipe.cake') }}
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.gitignore

@@ -17,8 +17,8 @@
 # GhostDoc plugin settings file
 *.GhostDoc.xml
 
-# Ignore cake tools directory, except packages.config
-tools/*
+# Ignore cake .cake directory, except packages.config
+.cake/*
 
 # Ignore build artifacts
 BuildArtifacts/

README.md

@@ -3,7 +3,7 @@
 [![standard-readme compliant][]][standard-readme]
 [![All Contributors][all-contributors-badge]](#contributors)
 [![Contributor Covenant][contrib-covenantimg]][contrib-covenant]
-[![Appveyor build][appveyorimage]][appveyor]
+[![Build][buildimage]][build]
 [![Codecov Report][codecovimage]][codecov]
 [![NuGet package][nugetimage]][nuget]
 
@@ -67,13 +67,15 @@ Thanks goes to these wonderful people ([emoji key][emoji-key]):
 <!-- markdownlint-disable -->
 <table>
   <tr>
-    <td align="center"><a href="http://www.nils-andresen.de/"><img src="https://avatars3.githubusercontent.com/u/349188?v=4" width="100px;" alt=""/><br /><sub><b>Nils Andresen</b></sub></a><br /><a href="https://github.com/cake-contrib/cake.asciidoctorj/commits?author=nils-a" title="Code">💻</a> <a href="https://github.com/cake-contrib/cake.asciidoctorj/commits?author=nils-a" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://twitter.com/hereispascal"><img src="https://avatars1.githubusercontent.com/u/2190718?v=4" width="100px;" alt=""/><br /><sub><b>Pascal Berger</b></sub></a><br /><a href="https://github.com/cake-contrib/cake.asciidoctorj/issues?q=author%3Apascalberger" title="Bug reports">🐛</a> <a href="https://github.com/cake-contrib/cake.asciidoctorj/commits?author=pascalberger" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.nils-andresen.de/"><img src="https://avatars3.githubusercontent.com/u/349188?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nils Andresen</b></sub></a><br /><a href="https://github.com/cake-contrib/cake.asciidoctorj/commits?author=nils-a" title="Code">💻</a> <a href="https://github.com/cake-contrib/cake.asciidoctorj/commits?author=nils-a" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://twitter.com/hereispascal"><img src="https://avatars1.githubusercontent.com/u/2190718?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pascal Berger</b></sub></a><br /><a href="https://github.com/cake-contrib/cake.asciidoctorj/issues?q=author%3Apascalberger" title="Bug reports">🐛</a> <a href="https://github.com/cake-contrib/cake.asciidoctorj/commits?author=pascalberger" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/DiDoHH"><img src="https://avatars.githubusercontent.com/u/45682415?v=4?s=100" width="100px;" alt=""/><br /><sub><b>DiDoHH</b></sub></a><br /><a href="https://github.com/cake-contrib/cake.asciidoctorj/commits?author=DiDoHH" title="Documentation">📖</a></td>
   </tr>
 </table>
 
-<!-- markdownlint-enable -->
+<!-- markdownlint-restore -->
 <!-- prettier-ignore-end -->
+
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 ## License
@@ -82,8 +84,8 @@ Thanks goes to these wonderful people ([emoji key][emoji-key]):
 
 [all-contributors]: https://github.com/all-contributors/all-contributors
 [all-contributors-badge]: https://img.shields.io/github/all-contributors/cake-contrib/cake.AsciiDoctorJ/develop?&style=flat-square
-[appveyor]: https://ci.appveyor.com/project/cakecontrib/cake-asciidoctorj
-[appveyorimage]: https://img.shields.io/appveyor/ci/cakecontrib/cake-asciidoctorj.svg?logo=appveyor&style=flat-square
+[build]: https://github.com/cake-contrib/cake.asciidoctorj/actions/workflows/build.yml
+[buildimage]: https://github.com/cake-contrib/cake.asciidoctorj/actions/workflows/build.yml/badge.svg
 [codecov]: https://codecov.io/gh/cake-contrib/Cake.AsciiDoctorJ
 [codecovimage]: https://img.shields.io/codecov/c/github/cake-contrib/Cake.AsciiDoctorJ.svg?logo=codecov&style=flat-square
 [contrib-covenant]: https://www.contributor-covenant.org/version/2/0/code_of_conduct/

cake.config

@@ -0,0 +1,3 @@
+; to align with https://github.com/cake-build/cake/issues/3263
+[Paths]
+Tools=./.cake

docs/input/_Bottom.cshtml

@@ -0,0 +1,8 @@
+<a class="github-button" href="https://github.com/cake-contrib/cake.asciidoctorj" 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>

docs/input/assets/css/override.less

@@ -0,0 +1,54 @@
+/* For GitHub */
+.bottom-footer {
+	margin-bottom: 40px !important;  // Make room for GitHub buttons
+}
+
+.github-button {
+	z-index: 100;
+	position: fixed;
+	bottom: 0px;
+	right: 255px;
+	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;
+	}
+}
+
+.discussion-button {
+	z-index: 100;
+	position: fixed;
+	bottom: 0px;
+	right: 80px;
+	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;
+	}
+}

recipe.cake

@@ -1,5 +1,8 @@
 #load nuget:?package=Cake.Recipe&version=2.2.1
 
+// Workaround for https://github.com/cake-contrib/Cake.Recipe/issues/854
+#tool nuget:?package=NuGet.CommandLine&version=5.8.1
+
 Environment.SetVariableNames();
 
 BuildParameters.SetParameters(
@@ -12,7 +15,9 @@ BuildParameters.SetParameters(
     repositoryName: "cake.asciidoctorj",
     appVeyorAccountName: "cakecontrib",
     shouldRunDotNetCorePack: true,
-    shouldUseDeterministicBuilds: true);
+    shouldUseDeterministicBuilds: true,
+    preferredBuildProviderType: BuildProviderType.GitHubActions,
+    preferredBuildAgentOperatingSystem: PlatformFamily.Linux);
 
 BuildParameters.PrintParameters(Context);
 

src/Cake.AsciiDoctorJ.Tests/AsciiDoctorJAliasesTests.cs

@@ -2,7 +2,7 @@
 
 using Cake.AsciiDoctorJ.Tests.Fixtures;
 
-using FluentAssertions;
+using Shouldly;
 
 using Xunit;
 
@@ -17,7 +17,7 @@ public void Should_throw_if_settings_are_null()
             fixture.GivenSettingsIsNull();
 
             Action action = () => fixture.Run();
-            action.Should().Throw<ArgumentNullException>().WithMessage("*settings*");
+            action.ShouldThrow<ArgumentNullException>().ParamName.ShouldBe("settings");
         }
 
         [Fact]
@@ -27,7 +27,7 @@ public void Should_not_throw_if_settings_are_set()
 
             var actual = fixture.Run();
 
-            actual.Args.Should().Be("");
+            actual.Args.ShouldBe("");
         }
 
         [Fact]
@@ -38,7 +38,7 @@ public void Should_not_throw_if_settings_are_null_but_called_fluently()
 
             var actual = fixture.RunFluent(x => { });
 
-            actual.Args.Should().Be("");
+            actual.Args.ShouldBe("");
         }
 
         [Fact]
@@ -48,7 +48,7 @@ public void Should_throw_if_context_is_null()
             fixture.GivenContextIsNull();
 
             Action action = () => fixture.Run();
-            action.Should().Throw<ArgumentNullException>().WithMessage("*context*");
+            action.ShouldThrow<ArgumentNullException>().ParamName.ShouldBe("context");
         }
 
         [Fact]
@@ -58,7 +58,7 @@ public void Should_throw_if_context_is_null_called_fluently()
             fixture.GivenContextIsNull();
 
             Action action = () => fixture.RunFluent(x => { });
-            action.Should().Throw<ArgumentNullException>().WithMessage("*context*");
+            action.ShouldThrow<ArgumentNullException>().ParamName.ShouldBe("context");
         }
     }
 }