From 8bdc747ba128d4aac8086581985f6fc0ebc1dcad Mon Sep 17 00:00:00 2001 From: AdmiringWorm Date: Sat, 4 May 2024 19:15:49 +0200 Subject: [PATCH 1/5] (#218) Update Cake to 2.0.0 This commit updates the referenced cake version used to version 2.0.0. This provides support for this version of Cake. --- Source/Cake.Codecov.Tests/Cake.Codecov.Tests.csproj | 2 +- Source/Cake.Codecov/Cake.Codecov.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Cake.Codecov.Tests/Cake.Codecov.Tests.csproj b/Source/Cake.Codecov.Tests/Cake.Codecov.Tests.csproj index fabe834..3d95c39 100644 --- a/Source/Cake.Codecov.Tests/Cake.Codecov.Tests.csproj +++ b/Source/Cake.Codecov.Tests/Cake.Codecov.Tests.csproj @@ -7,7 +7,7 @@ - + runtime; build; native; contentfiles; analyzers all diff --git a/Source/Cake.Codecov/Cake.Codecov.csproj b/Source/Cake.Codecov/Cake.Codecov.csproj index fdb3b96..39fc7e7 100644 --- a/Source/Cake.Codecov/Cake.Codecov.csproj +++ b/Source/Cake.Codecov/Cake.Codecov.csproj @@ -35,7 +35,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + From a126065d3edc56dd579d965ded144cfd28a496ff Mon Sep 17 00:00:00 2001 From: AdmiringWorm Date: Sat, 4 May 2024 19:15:50 +0200 Subject: [PATCH 2/5] (#288) Remove target framework .NET Framework 4.6.1 --- Source/Cake.Codecov.Tests/Cake.Codecov.Tests.csproj | 3 +-- Source/Cake.Codecov/Cake.Codecov.csproj | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/Cake.Codecov.Tests/Cake.Codecov.Tests.csproj b/Source/Cake.Codecov.Tests/Cake.Codecov.Tests.csproj index 3d95c39..9110e01 100644 --- a/Source/Cake.Codecov.Tests/Cake.Codecov.Tests.csproj +++ b/Source/Cake.Codecov.Tests/Cake.Codecov.Tests.csproj @@ -1,7 +1,6 @@ - net5.0;netcoreapp2.1;net461 - net5.0;netcoreapp2.1 + net5.0;netcoreapp2.1 8.0 false diff --git a/Source/Cake.Codecov/Cake.Codecov.csproj b/Source/Cake.Codecov/Cake.Codecov.csproj index 39fc7e7..cc489fd 100644 --- a/Source/Cake.Codecov/Cake.Codecov.csproj +++ b/Source/Cake.Codecov/Cake.Codecov.csproj @@ -8,7 +8,7 @@ Cake addin that extends Cake with the ability to use the official Codecov CLI. bin\$(Configuration)\$(TargetFramework)\Cake.Codecov.xml en-GB - net5.0;netstandard2.0;net461 + net5.0;netstandard2.0 8.0 From ca0ffa6cc2548e56b9e62062a7cbe0ac63a08883 Mon Sep 17 00:00:00 2001 From: AdmiringWorm Date: Sat, 4 May 2024 19:15:50 +0200 Subject: [PATCH 3/5] (#285) Add framework .NET 6 and .NET Core 3.1 --- .github/workflows/build.yml | 2 +- .github/workflows/pre-release-notes.yml | 2 +- .github/workflows/release-notes.yml | 2 +- Source/Cake.Codecov.Tests/Cake.Codecov.Tests.csproj | 2 +- Source/Cake.Codecov/Cake.Codecov.csproj | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d26ae92..465d77d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,7 +51,7 @@ jobs: # codecov in cake.recipe needs 2.1! # version used for GitReleaseManager needs .NET Core 3.0 dotnet-version: | - 2.1.x + 3.1.x 5.0.x 6.0.x - name: Build Addin diff --git a/.github/workflows/pre-release-notes.yml b/.github/workflows/pre-release-notes.yml index 8ad76f1..6f37562 100644 --- a/.github/workflows/pre-release-notes.yml +++ b/.github/workflows/pre-release-notes.yml @@ -25,7 +25,7 @@ jobs: # codecov in cake.recipe needs 2.1! # version used for GitReleaseManager needs .NET Core 3.0 dotnet-version: | - 2.1.x + 3.1.x 5.0.x 6.0.x - name: Set up git version diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index 0e0f530..12adea7 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -25,7 +25,7 @@ jobs: # codecov in cake.recipe needs 2.1! # version used for GitReleaseManager needs .NET Core 3.0 dotnet-version: | - 2.1.x + 3.1.x 5.0.x 6.0.x - name: Set up git version diff --git a/Source/Cake.Codecov.Tests/Cake.Codecov.Tests.csproj b/Source/Cake.Codecov.Tests/Cake.Codecov.Tests.csproj index 9110e01..e95d69b 100644 --- a/Source/Cake.Codecov.Tests/Cake.Codecov.Tests.csproj +++ b/Source/Cake.Codecov.Tests/Cake.Codecov.Tests.csproj @@ -1,6 +1,6 @@ - net5.0;netcoreapp2.1 + net6.0;net5.0;netcoreapp3.1 8.0 false diff --git a/Source/Cake.Codecov/Cake.Codecov.csproj b/Source/Cake.Codecov/Cake.Codecov.csproj index cc489fd..5b65d34 100644 --- a/Source/Cake.Codecov/Cake.Codecov.csproj +++ b/Source/Cake.Codecov/Cake.Codecov.csproj @@ -8,7 +8,7 @@ Cake addin that extends Cake with the ability to use the official Codecov CLI. bin\$(Configuration)\$(TargetFramework)\Cake.Codecov.xml en-GB - net5.0;netstandard2.0 + net6.0;net5.0;netcoreapp3.1 8.0 @@ -27,7 +27,7 @@ - + From 4ee4916aa9eff111f6ea0d0481120ff5e0fb2eb0 Mon Sep 17 00:00:00 2001 From: AdmiringWorm Date: Sat, 4 May 2024 19:15:51 +0200 Subject: [PATCH 4/5] (maint) Disable dogfooding of Addin Until Cake.Recipe has been updated to the same Cake version we are referencing in the Cake.Codecov library, we need to use the 1.1.0 of the Codecov library. --- setup.cake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.cake b/setup.cake index d87c4e0..72bbde9 100644 --- a/setup.cake +++ b/setup.cake @@ -38,7 +38,8 @@ ToolSettings.SetToolPreprocessorDirectives( BuildParameters.Tasks.UploadCodecovReportTask .IsDependentOn("DotNetCore-Pack") .Does((version) => RequireTool(ToolSettings.CodecovTool, () => { - var nugetPkg = $"nuget:file://{MakeAbsolute(BuildParameters.Paths.Directories.NuGetPackages)}?package=Cake.Codecov&version={version.SemVersion}&prerelease"; + // var nugetPkg = $"nuget:file://{MakeAbsolute(BuildParameters.Paths.Directories.NuGetPackages)}?package=Cake.Codecov&version={version.SemVersion}&prerelease"; + var nugetPkg = "nuget:?package=Cake.Codecov&version=1.1.0"; // We are unable to dogfood the library until Cake.Recipe supports Cake 2.0.0 Information("PATH: " + nugetPkg); var coverageFilter = BuildParameters.Paths.Directories.TestCoverage + "/coverlet/*.xml"; From 52c308e554625f655443624f3e47e7e58c5cf536 Mon Sep 17 00:00:00 2001 From: AdmiringWorm Date: Sat, 4 May 2024 19:28:10 +0200 Subject: [PATCH 5/5] (#310) Resolve windows binary only on windows --- Source/Cake.Codecov.Tests/CodecovRunnerFixture.cs | 9 +++++---- Source/Cake.Codecov/CodecovRunner.cs | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Source/Cake.Codecov.Tests/CodecovRunnerFixture.cs b/Source/Cake.Codecov.Tests/CodecovRunnerFixture.cs index 17ae0ff..8b9130b 100644 --- a/Source/Cake.Codecov.Tests/CodecovRunnerFixture.cs +++ b/Source/Cake.Codecov.Tests/CodecovRunnerFixture.cs @@ -1,3 +1,4 @@ +using System.Runtime.InteropServices; using Cake.Codecov.Internals; using Cake.Testing.Fixtures; @@ -8,7 +9,7 @@ internal class CodecovRunnerFixture : ToolFixture private readonly IPlatformDetector _platformDetector; public CodecovRunnerFixture() - : base("codecov.exe") + : base(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "codecov.exe" : "codecov") { } @@ -20,9 +21,9 @@ public CodecovRunnerFixture(IPlatformDetector platformDetector, string expectedE protected override void RunTool() { - var tool = _platformDetector != null ? - new CodecovRunner(_platformDetector, FileSystem, Environment, ProcessRunner, Tools) : - new CodecovRunner(FileSystem, Environment, ProcessRunner, Tools); + var tool = _platformDetector != null + ? new CodecovRunner(_platformDetector, FileSystem, Environment, ProcessRunner, Tools) + : new CodecovRunner(FileSystem, Environment, ProcessRunner, Tools); tool.Run(Settings); } } diff --git a/Source/Cake.Codecov/CodecovRunner.cs b/Source/Cake.Codecov/CodecovRunner.cs index b35cfa9..d024b63 100644 --- a/Source/Cake.Codecov/CodecovRunner.cs +++ b/Source/Cake.Codecov/CodecovRunner.cs @@ -55,10 +55,11 @@ protected override IEnumerable GetToolExecutableNames() } else { - // Just to make sonarlint happy :) + // The official version of Codecov CLI can not run with the exe + // on anything other than Windows. As such we only return this + // in the else statement. + yield return "codecov.exe"; } - - yield return "codecov.exe"; } protected override string GetToolName() => "Codecov";