Merge branch 'release/3.0.0'

cake-contrib · Jul 13, 2023 · e80450b · e80450b
2 parents f9929da + 702694a
commit e80450b
Show file tree

Hide file tree

Showing 20 changed files with 233 additions and 192 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -10,10 +10,9 @@ install:
   - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
   - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
   - ps: Invoke-WebRequest -Uri "https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1"
-  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 2.1.818 -InstallDir $env:DOTNET_INSTALL_DIR'
-  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 3.1.414 -InstallDir $env:DOTNET_INSTALL_DIR'
-  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 5.0.402 -InstallDir $env:DOTNET_INSTALL_DIR'
-  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 6.0.100 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 5.0.408 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 6.0.405 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 7.0.102 -InstallDir $env:DOTNET_INSTALL_DIR'
   - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
   - ps: dotnet --info
 

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "0.38.5",
+      "version": "1.3.0",
       "commands": [
         "dotnet-cake"
       ]

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,20 +8,14 @@ updates:
   open-pull-requests-limit: 10
   ignore:
   - dependency-name: Cake.Core
-    versions:
-    - "(,3.0)"
+    update-types: ["version-update:semver-minor"]
   - dependency-name: Cake.Testing
-    versions:
-    - "(,3.0)"
+    update-types: ["version-update:semver-minor"]
   - dependency-name: Cake.AzureDevOps
-    versions:
-    - "> 1.0.0, < 2"
+    update-types: ["version-update:semver-minor"]
   - dependency-name: Cake.Issues
-    versions:
-    - "> 1.0.0, < 2"
+    update-types: ["version-update:semver-minor"]
   - dependency-name: Cake.Issues.Testing
-    versions:
-    - "> 1.0.0, < 2"
+    update-types: ["version-update:semver-minor"]
   - dependency-name: Cake.Issues.PullRequests
-    versions:
-    - "> 1.0.0, < 2"
+    update-types: ["version-update:semver-minor"]
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -14,6 +14,16 @@ jobs:
   pool:
     vmImage: 'windows-2022'
   steps:
+  # .NET 5 required for GitVersion
+  - task: UseDotNet@2
+    inputs:
+      version: '5.x'
+  - task: UseDotNet@2
+    inputs:
+      version: '6.x'
+  - task: UseDotNet@2
+    inputs:
+      version: '7.x'
   - powershell: |
       $ENV:CAKE_SKIP_GITVERSION=([string]::IsNullOrEmpty($ENV:SYSTEM_PULLREQUEST_PULLREQUESTID) -eq $False).ToString()
       .\build.ps1
@@ -22,34 +32,36 @@ jobs:
 
 - job: macOS
   pool:
-    vmImage: 'macOS-10.15'
+    vmImage: 'macOS-11'
   steps:
+  # .NET 5 required for GitVersion
   - task: UseDotNet@2
     inputs:
-      version: '6.x'
+      version: '5.x'
   - task: UseDotNet@2
     inputs:
-      version: '5.x'
+      version: '6.x'
   - task: UseDotNet@2
     inputs:
-      version: '3.x'
+      version: '7.x'
   - bash: |
       ./build.sh
     displayName: 'Cake Build'
 
 - job: Ubuntu
   pool:
-    vmImage: 'ubuntu-18.04'
+    vmImage: 'ubuntu-20.04'
   steps:
+  # .NET 5 required for GitVersion
   - task: UseDotNet@2
     inputs:
-      version: '6.x'
+      version: '5.x'
   - task: UseDotNet@2
     inputs:
-      version: '5.x'
+      version: '6.x'
   - task: UseDotNet@2
     inputs:
-      version: '3.x'
+      version: '7.x'
   - bash: |
       ./build.sh --verbosity=diagnostic
     displayName: 'Cake Build'
diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
     "sdk": {
         "allowPrerelease": true,
-        "version": "6.0.100",
+        "version": "7.0.100",
         "rollForward": "latestFeature"
     }
 }
diff --git a/recipe.cake b/recipe.cake
@@ -1,4 +1,8 @@
-#load nuget:?package=Cake.Recipe&version=2.2.1
+#load nuget:?package=Cake.Recipe&version=3.0.0
+
+//*************************************************************************************************
+// Settings
+//*************************************************************************************************
 
 Environment.SetVariableNames();
 
@@ -10,27 +14,37 @@ BuildParameters.SetParameters(
     repositoryOwner: "cake-contrib",
     repositoryName: "Cake.Issues.PullRequests.AzureDevOps",
     appVeyorAccountName: "cakecontrib",
+    shouldRunCoveralls: false, // Disabled because it's currently failing
     shouldGenerateDocumentation: false,
-    shouldCalculateVersion: true,
-    shouldRunDupFinder: false, // dupFinder is missing in 2021.3.0-eap
-    shouldRunCodecov: false,
     shouldRunDotNetCorePack: true);
 
 BuildParameters.PrintParameters(Context);
 
 ToolSettings.SetToolSettings(
     context: Context,
-    dupFinderExcludePattern: new string[] { BuildParameters.RootDirectoryPath + "/src/Cake.Issues.PullRequests.AzureDevOps.Tests/Capabilities/*.cs" },
     testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Common]* -[Cake.Testing]* -[*.Tests]* -[Cake.Issues]* -[Cake.Issues.Testing]* -[Cake.Issues.PullRequests]* -[Cake.AzureDevOps]* -[Shouldly]* -[DiffEngine]* -[EmptyFiles]*",
     testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
     testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
 
-// Workaround until https://github.com/cake-contrib/Cake.Recipe/issues/862 has been fixed in Cake.Recipe
-ToolSettings.SetToolPreprocessorDirectives(
-    reSharperTools: "#tool nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2021.3.1",
-    gitVersionGlobalTool: "#tool dotnet:?package=GitVersion.Tool&version=5.8.1");
+//*************************************************************************************************
+// Custom tasks
+//*************************************************************************************************
+
+Task("BreakBuildOnIssues")
+    .Description("Breaks build if any issues in the code are found.")
+    .Does<IssuesData>((data) =>
+{
+    if (data.Issues.Any())
+    {
+        throw new Exception("Issues found in code.");
+    }
+});
+
+IssuesBuildTasks.IssuesTask
+    .IsDependentOn("BreakBuildOnIssues");
 
-// Disable Upload-Coveralls-Report task since it fails to install the tool on AppVeyor
-BuildParameters.Tasks.UploadCoverallsReportTask.WithCriteria(() => false);
+//*************************************************************************************************
+// Execution
+//*************************************************************************************************
 
 Build.RunDotNetCore();
diff --git a/src/Cake.Issues.PullRequests.AzureDevOps.Tests/AzureDevOpsPullRequestSystemSettingsTests.cs b/src/Cake.Issues.PullRequests.AzureDevOps.Tests/AzureDevOpsPullRequestSystemSettingsTests.cs
@@ -5,6 +5,7 @@
     using Cake.Issues.Testing;
     using Xunit;
 
+    // ReSharper disable once ClassNeverInstantiated.Global
     public sealed class AzureDevOpsPullRequestSystemSettingsTests
     {
         public sealed class TheCtor

diff --git a/src/Cake.Issues.PullRequests.AzureDevOps.Tests/AzureDevOpsPullRequestSystemTests.cs b/src/Cake.Issues.PullRequests.AzureDevOps.Tests/AzureDevOpsPullRequestSystemTests.cs
@@ -7,6 +7,7 @@
     using Cake.Testing;
     using Xunit;
 
+    // ReSharper disable once ClassNeverInstantiated.Global
     public sealed class AzureDevOpsPullRequestSystemTests
     {
         public sealed class TheCtor
@@ -15,7 +16,7 @@ public sealed class TheCtor
             public void Should_Throw_If_Log_Is_Null()
             {
                 // Given
-                ICakeLog log = null;
+                const ICakeLog log = null;
                 var settings =
                     new AzureDevOpsPullRequestSystemSettings(
                         new Uri("https://google.com"),
@@ -34,7 +35,7 @@ public void Should_Throw_If_Settings_Are_Null()
             {
                 // Given
                 var log = new FakeLog();
-                AzureDevOpsPullRequestSystemSettings settings = null;
+                const AzureDevOpsPullRequestSystemSettings settings = null;
 
                 // When
                 var result = Record.Exception(() => new AzureDevOpsPullRequestSystem(log, settings));

diff --git a/...e.Issues.PullRequests.AzureDevOps.Tests/Cake.Issues.PullRequests.AzureDevOps.Tests.csproj b/...e.Issues.PullRequests.AzureDevOps.Tests/Cake.Issues.PullRequests.AzureDevOps.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Product>Cake.Issues.PullRequests.AzureDevOps</Product>
     <Copyright>Copyright © BBT Software AG and contributors</Copyright>
@@ -15,17 +15,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Issues" Version="2.0.0" />
-    <PackageReference Include="Cake.Issues.PullRequests" Version="2.0.0" />
-    <PackageReference Include="Cake.Issues.Testing" Version="2.0.0" />
-    <PackageReference Include="Cake.Testing" Version="2.0.0" />
-    <PackageReference Include="Cake.AzureDevOps" Version="2.0.0-beta0001" />
-    <PackageReference Include="NSubstitute" Version="4.3.0" />
-    <PackageReference Include="Shouldly" Version="4.0.3" />
+    <PackageReference Include="Cake.Issues" Version="3.0.0" />
+    <PackageReference Include="Cake.Issues.PullRequests" Version="3.0.0" />
+    <PackageReference Include="Cake.Issues.Testing" Version="3.0.0" />
+    <PackageReference Include="Cake.Testing" Version="3.0.0" />
+    <PackageReference Include="Cake.AzureDevOps" Version="3.0.0" />
+    <PackageReference Include="NSubstitute" Version="4.4.0" />
+    <PackageReference Include="Shouldly" Version="4.1.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...PullRequests.AzureDevOps.Tests/Capabilities/AzureDevOpsCheckingCommitIdCapabilityTests.cs b/...PullRequests.AzureDevOps.Tests/Capabilities/AzureDevOpsCheckingCommitIdCapabilityTests.cs
@@ -7,6 +7,7 @@
     using NSubstitute;
     using Xunit;
 
+    // ReSharper disable once ClassNeverInstantiated.Global
     public sealed class AzureDevOpsCheckingCommitIdCapabilityTests
     {
         public sealed class TheCtor
@@ -15,7 +16,7 @@ public sealed class TheCtor
             public void Should_Throw_If_Log_Is_Null()
             {
                 // Given
-                ICakeLog log = null;
+                const ICakeLog log = null;
                 var pullRequestSystem = Substitute.For<IAzureDevOpsPullRequestSystem>();
 
                 // When
@@ -30,7 +31,7 @@ public void Should_Throw_If_PullRequestSystem_Is_Null()
             {
                 // Given
                 var log = new FakeLog();
-                AzureDevOpsPullRequestSystem pullRequestSystem = null;
+                const AzureDevOpsPullRequestSystem pullRequestSystem = null;
 
                 // When
                 var result = Record.Exception(() => new AzureDevOpsCheckingCommitIdCapability(log, pullRequestSystem));

diff --git a/...ullRequests.AzureDevOps.Tests/Capabilities/AzureDevOpsDiscussionThreadsCapabilityTests.cs b/...ullRequests.AzureDevOps.Tests/Capabilities/AzureDevOpsDiscussionThreadsCapabilityTests.cs
@@ -7,6 +7,7 @@
     using NSubstitute;
     using Xunit;
 
+    // ReSharper disable once ClassNeverInstantiated.Global
     public sealed class AzureDevOpsDiscussionThreadsCapabilityTests
     {
         public sealed class TheCtor
@@ -15,7 +16,7 @@ public sealed class TheCtor
             public void Should_Throw_If_Log_Is_Null()
             {
                 // Given
-                ICakeLog log = null;
+                const ICakeLog log = null;
                 var pullRequestSystem = Substitute.For<IAzureDevOpsPullRequestSystem>();
 
                 // When
@@ -30,7 +31,7 @@ public void Should_Throw_If_PullRequestSystem_Is_Null()
             {
                 // Given
                 var log = new FakeLog();
-                AzureDevOpsPullRequestSystem pullRequestSystem = null;
+                const AzureDevOpsPullRequestSystem pullRequestSystem = null;
 
                 // When
                 var result = Record.Exception(() => new AzureDevOpsDiscussionThreadsCapability(log, pullRequestSystem));

diff --git a/...ests.AzureDevOps.Tests/Capabilities/AzureDevOpsFilteringByModifiedFilesCapabilityTests.cs b/...ests.AzureDevOps.Tests/Capabilities/AzureDevOpsFilteringByModifiedFilesCapabilityTests.cs
@@ -7,6 +7,7 @@
     using NSubstitute;
     using Xunit;
 
+    // ReSharper disable once ClassNeverInstantiated.Global
     public sealed class AzureDevOpsFilteringByModifiedFilesCapabilityTests
     {
         public sealed class TheCtor
@@ -15,7 +16,7 @@ public sealed class TheCtor
             public void Should_Throw_If_Log_Is_Null()
             {
                 // Given
-                ICakeLog log = null;
+                const ICakeLog log = null;
                 var pullRequestSystem = Substitute.For<IAzureDevOpsPullRequestSystem>();
 
                 // When
@@ -30,7 +31,7 @@ public void Should_Throw_If_PullRequestSystem_Is_Null()
             {
                 // Given
                 var log = new FakeLog();
-                AzureDevOpsPullRequestSystem pullRequestSystem = null;
+                const AzureDevOpsPullRequestSystem pullRequestSystem = null;
 
                 // When
                 var result = Record.Exception(() => new AzureDevOpsFilteringByModifiedFilesCapability(log, pullRequestSystem));

diff --git a/src/Cake.Issues.PullRequests.AzureDevOps.Tests/Capabilities/CommentExtensionsTests.cs b/src/Cake.Issues.PullRequests.AzureDevOps.Tests/Capabilities/CommentExtensionsTests.cs
@@ -6,6 +6,7 @@
     using Shouldly;
     using Xunit;
 
+    // ReSharper disable once ClassNeverInstantiated.Global
     public sealed class CommentExtensionsTests
     {
         public sealed class TheToPullRequestDiscussionCommentExtension
@@ -14,7 +15,7 @@ public sealed class TheToPullRequestDiscussionCommentExtension
             public void Should_Throw_If_Comment_Is_Null()
             {
                 // Given
-                AzureDevOpsComment comment = null;
+                const AzureDevOpsComment comment = null;
 
                 // When
                 var result = Record.Exception(() => comment.ToPullRequestDiscussionComment());
@@ -27,7 +28,7 @@ public void Should_Throw_If_Comment_Is_Null()
             public void Should_Set_Correct_Content()
             {
                 // Given
-                var content = "foo";
+                const string content = "foo";
                 var comment =
                     new AzureDevOpsComment
                     {

diff --git a/....Issues.PullRequests.AzureDevOps.Tests/Capabilities/CommentThreadStatusExtensionsTests.cs b/....Issues.PullRequests.AzureDevOps.Tests/Capabilities/CommentThreadStatusExtensionsTests.cs
@@ -5,6 +5,7 @@
     using Shouldly;
     using Xunit;
 
+    // ReSharper disable once ClassNeverInstantiated.Global
     public sealed class CommentThreadStatusExtensionsTests
     {
         public sealed class TheToPullRequestDiscussionStatusExtension