Merge branch 'hotfix/1.0.1'

cake-contrib · Mar 26, 2021 · 3117ded · 3117ded
2 parents 6db90e0 + 0f5fcc9
commit 3117ded
Show file tree

Hide file tree

Showing 23 changed files with 166 additions and 136 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,7 +1,7 @@
 version: 2
 updates:
     - package-ecosystem: "nuget"
-      directory: "/"
+      directory: "/Source"
       schedule:
         interval: "daily"
       ignore:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,23 +15,23 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-latest]
+        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 }}
-        GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-        GITTER_ROOM_ID: ${{ secrets.GITTER_ROOM_ID }}
-        GITTER_TOKEN: ${{ secrets.GITTER_TOKEN }}
-        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 }}
+      AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }}
+      AZURE_SOURCE: ${{ secrets.AZURE_SOURCE }}
+      AZURE_USER: ${{ secrets.AZURE_USER }}
+      GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+      GITTER_ROOM_ID: ${{ secrets.GITTER_ROOM_ID }}
+      GITTER_TOKEN: ${{ secrets.GITTER_TOKEN }}
+      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:
       - uses: actions/checkout@v2.3.4
@@ -53,8 +53,8 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
         with:
-            name: ${{ matrix.os }}-artifacts
-            path: |
-                BuildArtifacts/report.html
-                BuildArtifacts/packages/**/*.nupkg
-                BuildArtifacts/**/coverlet/*.xml
+          name: ${{ matrix.os }}-artifacts
+          path: |
+            BuildArtifacts/report.html
+            BuildArtifacts/packages/**/*.nupkg
+            BuildArtifacts/**/coverlet/*.xml
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -8,13 +8,15 @@ on:
 jobs:
   super_linter:
     name: List with Super Linter
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
       - uses: actions/checkout@v2.3.4
+        with:
+          fetch-depth: 0
 
       - name: Lint Code Base
-        uses: github/super-linter@v3.14.5
+        uses: github/super-linter@v3.15.5
         env:
           VALIDATE_ALL_CODEBASE: false
           DEFAULT_BRANCH: develop

diff --git a/.github/workflows/pre-release-notes.yml b/.github/workflows/pre-release-notes.yml
@@ -7,7 +7,7 @@ jobs:
   draft-pre-release:
     env:
       GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
       - name: Checkout the requested branch

diff --git a/.github/workflows/publishdocs.yml b/.github/workflows/publishdocs.yml
@@ -10,7 +10,7 @@ jobs:
       WYAM_ACCESS_TOKEN: ${{ secrets.WYAM_ACCESS_TOKEN }}
       WYAM_DEPLOY_REMOTE: "${{ github.event.repository.html_url }}"
       WYAM_DEPLOY_BRANCH: "gh-pages"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
       - name: Checkout the requested branch

diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
@@ -7,7 +7,7 @@ jobs:
   draft-stable:
     env:
       GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
       - name: Checkout the requested branch

diff --git a/Source/Cake.Codecov.Tests/Cake.Codecov.Tests.csproj b/Source/Cake.Codecov.Tests/Cake.Codecov.Tests.csproj
@@ -1,33 +1,33 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks Condition="'$(OS)' != 'Unix'">net50;netcoreapp2.1;net461</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' == 'Unix'">net50;netcoreapp2.1</TargetFrameworks>
-    <LangVersion>8.0</LangVersion>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="AppVeyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Cake.Testing" Version="1.0.0" />
-    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
-    <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
-    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Moq" Version="4.14.5" />
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
-    <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="XunitXml.TestLogger" Version="2.1.26" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Cake.Codecov\Cake.Codecov.csproj" />
-  </ItemGroup>
+    <PropertyGroup>
+        <TargetFrameworks Condition="'$(OS)' != 'Unix'">net5.0;netcoreapp2.1;net461</TargetFrameworks>
+        <TargetFrameworks Condition="'$(OS)' == 'Unix'">net5.0;netcoreapp2.1</TargetFrameworks>
+        <LangVersion>8.0</LangVersion>
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="AppVeyor.TestLogger" Version="2.0.0" />
+        <PackageReference Include="Cake.Testing" Version="1.1.0" />
+        <PackageReference Include="coverlet.msbuild" Version="3.0.3">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="FluentAssertions" Version="5.10.3" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="Moq" Version="4.16.1" />
+        <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
+        <PackageReference Include="xunit" Version="2.4.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="XunitXml.TestLogger" Version="3.0.66" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Cake.Codecov\Cake.Codecov.csproj" />
+    </ItemGroup>
 </Project>
diff --git a/Source/Cake.Codecov.Tests/CodecovAliasesFixture.cs b/Source/Cake.Codecov.Tests/CodecovAliasesFixture.cs
@@ -48,7 +48,7 @@ protected override void RunTool()
                     _context.Codecov(File);
                 }
             }
-            else if (Files != null && Files.Any())
+            else if (Files?.Any() == true)
             {
                 if (!string.IsNullOrEmpty(Token))
                 {

diff --git a/Source/Cake.Codecov.Tests/CodecovAliasesTests.cs b/Source/Cake.Codecov.Tests/CodecovAliasesTests.cs
@@ -70,7 +70,7 @@ public void Should_Use_Specified_Files_And_Token()
                 "somethingelse.dsa"
             };
 
-            var token = "My-Really-Awesome-Token";
+            const string token = "My-Really-Awesome-Token";
             fixture.Files = files;
             fixture.Token = token;
 
@@ -91,7 +91,7 @@ public void Should_Use_Specified_File()
                 Settings = null
             };
 
-            var file = "./BUildArtifacts/TestResults/OpenCover.xml";
+            const string file = "./BUildArtifacts/TestResults/OpenCover.xml";
             fixture.File = file;
 
             var result = fixture.Run();
@@ -108,8 +108,8 @@ public void Should_Use_Specified_File_And_Token()
                 Settings = null
             };
 
-            var file = "./BUildArtifacts/TestResults/OpenCover.xml";
-            var token = "My-Still-Awesome-Token";
+            const string file = "./BUildArtifacts/TestResults/OpenCover.xml";
+            const string token = "My-Still-Awesome-Token";
             fixture.File = file;
             fixture.Token = token;
 

diff --git a/Source/Cake.Codecov.Tests/CodecovRunnerTests.cs b/Source/Cake.Codecov.Tests/CodecovRunnerTests.cs
@@ -239,7 +239,7 @@ public void Should_Enable_DisableNetwork()
             var result = fixture.Run();
 
             // Then
-            result.Args.Should().Be(@"--disable-network");
+            result.Args.Should().Be("--disable-network");
         }
 
         [Fact]
@@ -252,7 +252,7 @@ public void Should_Enable_Dump()
             var result = fixture.Run();
 
             // Then
-            result.Args.Should().Be(@"--dump");
+            result.Args.Should().Be("--dump");
         }
 
         [Fact]
@@ -330,7 +330,7 @@ public void Should_Enable_NoColor()
             var result = fixture.Run();
 
             // Then
-            result.Args.Should().Be(@"--no-color");
+            result.Args.Should().Be("--no-color");
         }
 
         [Fact]
@@ -356,7 +356,7 @@ public void Should_Enable_Required()
             var result = fixture.Run();
 
             // Then
-            result.Args.Should().Be(@"--required");
+            result.Args.Should().Be("--required");
         }
 
         [Fact]
@@ -376,7 +376,7 @@ public void Should_Set_Root()
         public void Should_Set_Slug()
         {
             // Given
-            var fixture = new CodecovRunnerFixture { Settings = { Slug = @"owner/repo" } };
+            var fixture = new CodecovRunnerFixture { Settings = { Slug = "owner/repo" } };
 
             // When
             var result = fixture.Run();
@@ -389,7 +389,7 @@ public void Should_Set_Slug()
         public void Should_Set_Tag()
         {
             // Given
-            var fixture = new CodecovRunnerFixture { Settings = { Tag = @"v1.0.0" } };
+            var fixture = new CodecovRunnerFixture { Settings = { Tag = "v1.0.0" } };
 
             // When
             var result = fixture.Run();
@@ -402,7 +402,7 @@ public void Should_Set_Tag()
         public void Should_Set_Token()
         {
             // Given
-            var fixture = new CodecovRunnerFixture { Settings = { Token = @"00000000-0000-0000-0000-000000000000" } };
+            var fixture = new CodecovRunnerFixture { Settings = { Token = "00000000-0000-0000-0000-000000000000" } };
 
             // When
             var result = fixture.Run();
@@ -434,7 +434,7 @@ public void Should_Enable_Verbose()
             var result = fixture.Run();
 
             // Then
-            result.Args.Should().Be(@"--verbose");
+            result.Args.Should().Be("--verbose");
         }
     }
 }