From cabd0175ba9c2690ef57ccfbcac08e2aa7277596 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 13 Apr 2021 20:57:07 +0000 Subject: [PATCH 01/30] Add renovate.json --- renovate.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 00000000..f45d8f11 --- /dev/null +++ b/renovate.json @@ -0,0 +1,5 @@ +{ + "extends": [ + "config:base" + ] +} From 143aa6508d45fcb1537d86adb2995890cd68e275 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Tue, 13 Apr 2021 23:05:11 +0200 Subject: [PATCH 02/30] (maint) selected preset for renovate and disabled dependabot --- .github/dependabot.yml | 18 ------------------ .github/renovate.json | 14 ++++++++++++++ .github/workflows/dependabot-cake.yml | 13 ------------- renovate.json | 5 ----- 4 files changed, 14 insertions(+), 36 deletions(-) delete mode 100644 .github/dependabot.yml create mode 100644 .github/renovate.json delete mode 100644 .github/workflows/dependabot-cake.yml delete mode 100644 renovate.json diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index a0dd5887..00000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,18 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "nuget" - directory: "/" - schedule: - interval: "daily" - commit-message: - prefix: "(maint)" - target-branch: "develop" - ignore: - - dependency-name: "Cake.Core" - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" - commit-message: - prefix: "(maint)" - target-branch: "develop" diff --git a/.github/renovate.json b/.github/renovate.json new file mode 100644 index 00000000..1b3a7d85 --- /dev/null +++ b/.github/renovate.json @@ -0,0 +1,14 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ "github>nils-a/renovate-config" ], + "packageRules": [ + { + "matchPackageNames": ["cake.tool"], + "enabled": false + }, + { + "matchPackageNames": ["cake.core"], + "enabled": false + } + ] +} \ No newline at end of file diff --git a/.github/workflows/dependabot-cake.yml b/.github/workflows/dependabot-cake.yml deleted file mode 100644 index f34a9670..00000000 --- a/.github/workflows/dependabot-cake.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Run dependabot for cake -on: - workflow_dispatch: - schedule: - # run everyday at 6 - - cron: '0 6 * * *' - -jobs: - dependabot-cake: - runs-on: ubuntu-latest # linux, because this is a docker-action - steps: - - name: check/update cake dependencies - uses: nils-org/dependabot-cake-action@v1 \ No newline at end of file diff --git a/renovate.json b/renovate.json deleted file mode 100644 index f45d8f11..00000000 --- a/renovate.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": [ - "config:base" - ] -} From 4f343a88f7542d3404f9059c135cf3743769a890 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Wed, 14 Apr 2021 00:06:43 +0200 Subject: [PATCH 03/30] (maint) fixed renovate.json --- .github/renovate.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 1b3a7d85..392c3ce5 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -3,11 +3,7 @@ "extends": [ "github>nils-a/renovate-config" ], "packageRules": [ { - "matchPackageNames": ["cake.tool"], - "enabled": false - }, - { - "matchPackageNames": ["cake.core"], + "matchPackageNames": ["cake.tool", "Cake.Core"], "enabled": false } ] From ddc8f08368d72a178627d9f697562d38f194cbf5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 25 May 2021 21:01:08 +0000 Subject: [PATCH 04/30] (maint) Update dependency Microsoft.NET.Test.Sdk to v16.10.0 --- src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj index e58abbbc..f961ef84 100644 --- a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj +++ b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj @@ -26,7 +26,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From b7a715b4b063086119a245dafb5bd9ff3d2d4af1 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 19 Jul 2021 18:12:35 +0000 Subject: [PATCH 05/30] (maint) Update dependency coverlet.msbuild to v3.1.0 --- src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj index f961ef84..23ebd05b 100644 --- a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj +++ b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj @@ -20,7 +20,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From 10723430d5f0651a926dbfd2dd87740980bed4f9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 13 Aug 2021 14:23:48 +0000 Subject: [PATCH 06/30] (maint) Update dependency Microsoft.NET.Test.Sdk to v16.11.0 --- src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj index 23ebd05b..d1a74a5b 100644 --- a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj +++ b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj @@ -26,7 +26,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From 0e468c27dac49b5b745f14b789f6465faa34f04f Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Fri, 13 Aug 2021 22:42:43 +0200 Subject: [PATCH 07/30] (maint) Switched from FluentAssertions to Shouldly --- .../AsciiDoctorJAliasesTests.cs | 12 ++++++------ .../AsciiDoctorJRunnerTests.cs | 12 ++++++------ .../Cake.AsciiDoctorJ.Tests.csproj | 3 +-- .../SettingsExtensionsTests.cs | 12 ++++++------ src/Cake.AsciiDoctorJ.Tests/SettingsTests.cs | 4 ++-- src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj | 6 +++--- 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/Cake.AsciiDoctorJ.Tests/AsciiDoctorJAliasesTests.cs b/src/Cake.AsciiDoctorJ.Tests/AsciiDoctorJAliasesTests.cs index 4c5d8175..becbb0d4 100644 --- a/src/Cake.AsciiDoctorJ.Tests/AsciiDoctorJAliasesTests.cs +++ b/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().WithMessage("*settings*"); + action.ShouldThrow().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().WithMessage("*context*"); + action.ShouldThrow().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().WithMessage("*context*"); + action.ShouldThrow().ParamName.ShouldBe("context"); } } } diff --git a/src/Cake.AsciiDoctorJ.Tests/AsciiDoctorJRunnerTests.cs b/src/Cake.AsciiDoctorJ.Tests/AsciiDoctorJRunnerTests.cs index 385a7d34..1f78340a 100644 --- a/src/Cake.AsciiDoctorJ.Tests/AsciiDoctorJRunnerTests.cs +++ b/src/Cake.AsciiDoctorJ.Tests/AsciiDoctorJRunnerTests.cs @@ -4,7 +4,7 @@ using Cake.Core; using Cake.Testing; -using FluentAssertions; +using Shouldly; using Xunit; @@ -23,7 +23,7 @@ public void Should_Throw_If_Settings_Are_Null() fixture.Run(); }; - result.Should().Throw(); + result.ShouldThrow(); } [Fact] @@ -34,7 +34,7 @@ public void Should_throw_if_asciidoctorj_executable_was_not_found() const string expectedMessage = "Could not locate executable"; Action result = () => fixture.Run(); - result.Should().Throw().Where(ex => ex.Message.Contains(expectedMessage)); + result.ShouldThrow().Message.ShouldContain(expectedMessage); } [Fact] @@ -44,7 +44,7 @@ public void Should_not_throw_if_asciidoctorj_executable_was_found() var actual = fixture.RunFluent(x => { }); - actual.Args.Should().Be(""); + actual.Args.ShouldBe(""); } [Fact] @@ -55,7 +55,7 @@ public void Should_not_throw_if_settings_are_null_on_fluent_invocation() var actual = fixture.RunFluent(x => { }); - actual.Args.Should().Be(""); + actual.Args.ShouldBe(""); } [Fact] @@ -68,7 +68,7 @@ public void Should_not_throw_if_settings_and_action_are_null_on_fluent_invocatio var actual = fixture.RunFluent(null); - actual.Args.Should().Be(""); + actual.Args.ShouldBe(""); } } } diff --git a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj index d1a74a5b..69726b68 100644 --- a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj +++ b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj @@ -24,14 +24,13 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - runtime; build; native; contentfiles; analyzers; buildtransitive all + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Cake.AsciiDoctorJ.Tests/SettingsExtensionsTests.cs b/src/Cake.AsciiDoctorJ.Tests/SettingsExtensionsTests.cs index a82fb5e0..9727a096 100644 --- a/src/Cake.AsciiDoctorJ.Tests/SettingsExtensionsTests.cs +++ b/src/Cake.AsciiDoctorJ.Tests/SettingsExtensionsTests.cs @@ -6,7 +6,7 @@ using Cake.AsciiDoctorJ.Tests.Fixtures; using Cake.Core.IO; -using FluentAssertions; +using Shouldly; using Xunit; @@ -24,7 +24,7 @@ public void Should_convert_all_extensions_to_arguments(Action @@ -181,7 +181,7 @@ private class ArgSetterTestData : IEnumerable public IEnumerator GetEnumerator() { - return GetTestData().Select(x => new[] { (object)x.Item1, x.Item2, x.Item3 }).GetEnumerator(); + return GetTestData().Select(x => new[] { x.Item1, x.Item2, x.Item3 }).GetEnumerator(); } IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); diff --git a/src/Cake.AsciiDoctorJ.Tests/SettingsTests.cs b/src/Cake.AsciiDoctorJ.Tests/SettingsTests.cs index 93bbf212..1e044e77 100644 --- a/src/Cake.AsciiDoctorJ.Tests/SettingsTests.cs +++ b/src/Cake.AsciiDoctorJ.Tests/SettingsTests.cs @@ -1,4 +1,4 @@ -using FluentAssertions; +using Shouldly; using Xunit; using System.Collections; using System.Collections.Generic; @@ -21,7 +21,7 @@ public void Should_convert_all_setters_to_arguments(Action diff --git a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj index e1c6e71a..05c16a91 100644 --- a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj +++ b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj @@ -41,9 +41,9 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - all - runtime; build; native; contentfiles; analyzers; buildtransitive + + all + runtime; build; native; contentfiles; analyzers; buildtransitive runtime; build; native; contentfiles; analyzers From e5b0bde5a39b2b590a3c22caf829d5e10181a159 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 16 Aug 2021 16:47:06 +0000 Subject: [PATCH 08/30] (maint) Update dependency IDisposableAnalyzers to v3.4.14 --- src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj index 05c16a91..87eb0bab 100644 --- a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj +++ b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj @@ -37,7 +37,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 893a37ff4be3f153d53d8be592d9c6d116877ef9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 17 Aug 2021 13:15:17 +0000 Subject: [PATCH 09/30] (maint) Update dependency IDisposableAnalyzers to v3.4.15 --- src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj index 87eb0bab..6b98b7fc 100644 --- a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj +++ b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj @@ -37,7 +37,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 4d7bf91daed7881a5e0337c5f430b59df2613c9d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 29 Aug 2021 13:04:52 +0000 Subject: [PATCH 10/30] (maint) Update dependency Cake.Testing to v1.2.0 --- src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj index 69726b68..2b2bd273 100644 --- a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj +++ b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj @@ -19,7 +19,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From ba8a0c0be14275e2e671f47af65a404e5190c7b0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 22 Sep 2021 18:59:40 +0000 Subject: [PATCH 11/30] (maint) Update dependency CakeContrib.Guidelines to v1.1.2 --- src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj index 6b98b7fc..f000ee79 100644 --- a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj +++ b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj @@ -36,7 +36,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive From c315fe4b1819eaa4007ba307dc40b177a229d412 Mon Sep 17 00:00:00 2001 From: Diana Dohr-Andresen Date: Sun, 3 Oct 2021 23:01:52 +0200 Subject: [PATCH 12/30] Issue #112: GitHub and discussion-buttons --- docs/input/_Bottom.cshtml | 8 +++++ docs/input/assets/css/override.less | 54 +++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 docs/input/_Bottom.cshtml create mode 100644 docs/input/assets/css/override.less diff --git a/docs/input/_Bottom.cshtml b/docs/input/_Bottom.cshtml new file mode 100644 index 00000000..4ec1d7c2 --- /dev/null +++ b/docs/input/_Bottom.cshtml @@ -0,0 +1,8 @@ + + + GitHub + + + + Discussion + diff --git a/docs/input/assets/css/override.less b/docs/input/assets/css/override.less new file mode 100644 index 00000000..1812aa81 --- /dev/null +++ b/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; + } +} \ No newline at end of file From f25bc675768a8d2b7d43362038910c0af8b2f7f8 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sun, 3 Oct 2021 21:22:34 +0000 Subject: [PATCH 13/30] docs: update README.md [skip ci] --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d648db02..d68c1dd9 100644 --- a/README.md +++ b/README.md @@ -67,13 +67,15 @@ Thanks goes to these wonderful people ([emoji key][emoji-key]): - - + + +

Nils Andresen

💻 📖

Pascal Berger

🐛 💻

Nils Andresen

💻 📖

Pascal Berger

🐛 💻

DiDoHH

📖
- + + ## License From 01540a50c1adb59127c1ccf7cac6bb2195c91b47 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sun, 3 Oct 2021 21:22:35 +0000 Subject: [PATCH 14/30] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 13f12377..6f76a32d 100644 --- a/.all-contributorsrc +++ b/.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, From da49e15793ed105713470f15ff47a6cecbd7cc30 Mon Sep 17 00:00:00 2001 From: Diana Dohr-Andresen Date: Sun, 3 Oct 2021 23:47:23 +0200 Subject: [PATCH 15/30] Issue #114 : changes csproj-file, added readme setttings --- src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj index f000ee79..dd6a5259 100644 --- a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj +++ b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj @@ -11,6 +11,7 @@ + @@ -28,6 +29,7 @@ cake;build;cake-build;addin;script;cake-addin;asciidoctorj https://github.com/cake-contrib/Cake.AsciiDoctorJ.git https://github.com/cake-contrib/Cake.AsciiDoctorJ/releases/tag/$(Version) + README.md From 844ff325d15173f23ca260cb24668e78cde60b45 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 7 Oct 2021 22:03:23 +0000 Subject: [PATCH 16/30] (maint) Update dependency Cake.Testing to v1.3.0 --- src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj index 2b2bd273..ea80b25c 100644 --- a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj +++ b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj @@ -19,7 +19,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From bbb3fa685821438ce8f9861811e8d2b462d26b0e Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Sun, 10 Oct 2021 23:02:12 +0200 Subject: [PATCH 17/30] changed the tools path to .cake --- .appveyor.yml | 2 +- .github/workflows/build.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 4 ++-- .gitignore | 4 ++-- cake.config | 3 +++ 5 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 cake.config diff --git a/.appveyor.yml b/.appveyor.yml index ffa86c44..989fa0b2 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -20,4 +20,4 @@ build_script: - ps: .\build.ps1 --target=CI --verbosity=Diagnostic cache: - - "tools -> recipe.cake" + - ".cake -> recipe.cake" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d26ab04..52a9ca3c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,8 +29,8 @@ jobs: - 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: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 4927563c..363fde41 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -41,8 +41,8 @@ jobs: - 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 diff --git a/.gitignore b/.gitignore index f5e12477..8355ba2a 100644 --- a/.gitignore +++ b/.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/ diff --git a/cake.config b/cake.config new file mode 100644 index 00000000..09c33423 --- /dev/null +++ b/cake.config @@ -0,0 +1,3 @@ +; to align with https://github.com/cake-build/cake/issues/3263 +[Paths] +Tools=./.cake From 0914f21acdbfb194752953dd2b7e755b378eb444 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 19 Oct 2021 03:12:00 +0000 Subject: [PATCH 18/30] (maint) Update dependency Text.Analyzers to v3 --- src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj | 2 +- src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj index ea80b25c..b191c2f3 100644 --- a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj +++ b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj @@ -31,7 +31,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj index dd6a5259..7f90f642 100644 --- a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj +++ b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj @@ -52,7 +52,7 @@ all - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 03d8ce59e0fd14ce69bd83ef6cf5d1122d8fd6ef Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 22 Oct 2021 00:30:43 +0000 Subject: [PATCH 19/30] (maint) Update dependency Text.Analyzers to v3.3.3 --- src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj | 2 +- src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj index b191c2f3..c0c0c31d 100644 --- a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj +++ b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj @@ -31,7 +31,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj index 7f90f642..a8767c57 100644 --- a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj +++ b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj @@ -52,7 +52,7 @@ all - + all runtime; build; native; contentfiles; analyzers; buildtransitive From f276d6c0497b37935191733b9e62a892d2045a2b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 26 Oct 2021 21:37:44 +0000 Subject: [PATCH 20/30] (maint) Update dependency Microsoft.NET.Test.Sdk to v17 --- src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj index c0c0c31d..e9784610 100644 --- a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj +++ b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj @@ -24,7 +24,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all From 086df2c0fa992ecaf132772d8fb12759777148f9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 10 Nov 2021 21:54:46 +0000 Subject: [PATCH 21/30] (maint) Update dependency Microsoft.SourceLink.GitHub to v1.1.1 --- src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj | 2 +- src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj index e9784610..fa3e19d7 100644 --- a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj +++ b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj @@ -25,7 +25,7 @@ all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj index a8767c57..86de0dbf 100644 --- a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj +++ b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj @@ -51,7 +51,7 @@ runtime; build; native; contentfiles; analyzers all - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 3e83193dbde2989cbeb6dfd181d0eae3a3c37202 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 11 Nov 2021 13:46:22 +0000 Subject: [PATCH 22/30] (maint) Update dependency Microsoft.CodeAnalysis.NetAnalyzers to v6 --- src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj index 86de0dbf..2b12c884 100644 --- a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj +++ b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj @@ -43,7 +43,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 9282d07adb73de15d5be1396227166c0be3115ae Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 15 Nov 2021 18:10:41 +0000 Subject: [PATCH 23/30] (maint) Update dependency CakeContrib.Guidelines to v1.2.0 --- src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj index 2b12c884..28526d2f 100644 --- a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj +++ b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj @@ -38,7 +38,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive From af54959145509f84454fce078167b17a49d13417 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 21 Nov 2021 20:54:49 +0000 Subject: [PATCH 24/30] (maint) Update dependency IDisposableAnalyzers to v4 --- src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj index 28526d2f..b39394b2 100644 --- a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj +++ b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj @@ -39,7 +39,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 2716c50f20f99937a7278b15ccd329be104f219b Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Wed, 1 Dec 2021 22:56:21 +0100 Subject: [PATCH 25/30] (#128) bumped Cake to version 2.0.0 and CakeContrib.Guidelines to 1.3.0 --- src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj | 7 +++---- src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj index fa3e19d7..cc1ecf67 100644 --- a/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj +++ b/src/Cake.AsciiDoctorJ.Tests/Cake.AsciiDoctorJ.Tests.csproj @@ -1,8 +1,7 @@ - netcoreapp2.1;netcoreapp3.1 - $(TargetFrameworks);net461 + netcoreapp3.1;net5.0;net6.0 ..\Cake.AsciiDoctorJ.ruleset false @@ -19,7 +18,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -45,4 +44,4 @@ - \ No newline at end of file + diff --git a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj index b39394b2..ca2a8904 100644 --- a/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj +++ b/src/Cake.AsciiDoctorJ/Cake.AsciiDoctorJ.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net461;net5.0 + netcoreapp3.1;net5.0;net6.0 true true $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb @@ -37,8 +37,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive From 67246cf80040144c5c814fe82ec9991a27401388 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Wed, 1 Dec 2021 23:09:08 +0100 Subject: [PATCH 26/30] (maint) switch build to GH-Actions --- .appveyor.yml | 23 ----------------------- recipe.cake | 4 +++- 2 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 989fa0b2..00000000 --- a/.appveyor.yml +++ /dev/null @@ -1,23 +0,0 @@ -image: - - Visual Studio 2019 - -pull_requests: - do_not_increment_build_number: true - -skip_branch_with_pr: true - -branches: - only: - - main - - develop - - /release\/.*/ - - /hotfix\/.*/ - -test: off -build: off - -build_script: - - ps: .\build.ps1 --target=CI --verbosity=Diagnostic - -cache: - - ".cake -> recipe.cake" diff --git a/recipe.cake b/recipe.cake index 0e1977b4..fdc26bb6 100644 --- a/recipe.cake +++ b/recipe.cake @@ -12,7 +12,9 @@ BuildParameters.SetParameters( repositoryName: "cake.asciidoctorj", appVeyorAccountName: "cakecontrib", shouldRunDotNetCorePack: true, - shouldUseDeterministicBuilds: true); + shouldUseDeterministicBuilds: true, + preferredBuildProviderType: BuildProviderType.GitHubActions, + preferredBuildAgentOperatingSystem: PlatformFamily.Linux); BuildParameters.PrintParameters(Context); From 7a090e046687ec7fdc53b10cfabfa8dd23534c91 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Wed, 1 Dec 2021 23:09:40 +0100 Subject: [PATCH 27/30] (maint) add net6.0 to GH-Actions --- .github/workflows/build.yml | 7 +++++++ .github/workflows/codeql-analysis.yml | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 52a9ca3c..16fb6e81 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,6 +26,13 @@ jobs: uses: actions/checkout@v2 - name: Fetch all tags and branches run: git fetch --prune --unshallow + - uses: actions/setup-dotnet@v1.9.0 + with: + dotnet-version: | + 2.1.818 + 3.1.x + 5.0.x + 6.0.x - name: Cache Tools uses: actions/cache@v2 with: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 363fde41..e7473f43 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,6 +38,14 @@ jobs: with: fetch-depth: 0 + - uses: actions/setup-dotnet@v1.9.0 + with: + dotnet-version: | + 2.1.818 + 3.1.x + 5.0.x + 6.0.x + - name: Cache Tools uses: actions/cache@v2 with: From 03b49ffe5a8eb420ea41716e5de1077555a718db Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Wed, 1 Dec 2021 23:27:37 +0100 Subject: [PATCH 28/30] (#130) replaced appVeyor badge with GH-Actions --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d68c1dd9..f92dbdeb 100644 --- a/README.md +++ b/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] @@ -84,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/ From d1ad4d3d19ecac0d6ae503d6e1df8cb44cca0b4d Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Wed, 1 Dec 2021 23:31:27 +0100 Subject: [PATCH 29/30] (maint) added missing env-variables --- .github/workflows/build.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 16fb6e81..ca6414f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,27 @@ 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 From b587846fdbfd4b4765d1a13b5507706b287c2ad6 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Wed, 1 Dec 2021 23:36:49 +0100 Subject: [PATCH 30/30] (maint) addes a workaround for missing nuget --- recipe.cake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe.cake b/recipe.cake index fdc26bb6..58cd28c8 100644 --- a/recipe.cake +++ b/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(