Merge branch 'release/2.0.0'

cake-contrib · Nov 30, 2022 · e6ff244 · e6ff244
2 parents 14209b8 + f6e33ec
commit e6ff244
Show file tree

Hide file tree

Showing 66 changed files with 1,896 additions and 466 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -6,7 +6,7 @@ environment:
 #---------------------------------#
 #  Build Image                    #
 #---------------------------------#
-image: Visual Studio 2019
+image: Visual Studio 2022
 
 #---------------------------------#
 #  Build Script                   #

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,15 @@
+version: 2
+updates:
+- package-ecosystem: nuget
+  directory: "/src"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: Cake.Core
+    versions:
+    - "> 1.0.0, < 2"
+  - dependency-name: Cake.Testing
+    versions:
+    - "> 1.0.0, < 2"
diff --git a/README.md b/README.md
@@ -29,11 +29,11 @@ and for general information about the Cake build automation system see the [Cake
 
 - [Documentation](https://cakeissues.net)
 
-## Chat Room
+## Discussion
 
-Come join in the conversation about this addin in our Gitter Chat Room.
+For questions and to discuss ideas & feature requests, use the [GitHub discussions on the Cake GitHub repository](https://github.com/cake-build/cake/discussions), under the [Extension Q&A](https://github.com/cake-build/cake/discussions/categories/extension-q-a) category.
 
-[![Join the chat at https://gitter.im/cake-contrib/Lobby](https://badges.gitter.im/cake-contrib/Lobby.svg)](https://gitter.im/cake-contrib/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join in the discussion on the Cake repository](https://img.shields.io/badge/GitHub-Discussions-green?logo=github)](https://github.com/cake-build/cake/discussions)
 
 ## Contributing
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -12,7 +12,7 @@ pr:
 jobs:
 - job: Windows
   pool:
-    vmImage: 'vs2017-win2016'
+    vmImage: 'windows-2022'
   steps:
   - powershell: ./build.ps1
     displayName: 'Cake Build'
diff --git a/nuspec/nuget/Cake.Issues.PullRequests.nuspec b/nuspec/nuget/Cake.Issues.PullRequests.nuspec
@@ -22,12 +22,18 @@ See the Project Site for an overview of the whole ecosystem of addins for workin
     <repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
     <copyright>Copyright © BBT Software AG and contributors</copyright>
     <tags>Cake Script Cake-Issues CodeAnalysis Linting Issues Pull-Requests</tags>
-    <releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/1.0.0</releaseNotes>
+    <releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/2.0.0</releaseNotes>
   </metadata>
   <files>
     <file src="..\..\..\..\nuspec\nuget\icon.png" target="" />
-    <file src="netstandard2.0\Cake.Issues.PullRequests.dll" target="lib\netstandard2.0" />
-    <file src="netstandard2.0\Cake.Issues.PullRequests.pdb" target="lib\netstandard2.0" />
-    <file src="netstandard2.0\Cake.Issues.PullRequests.xml" target="lib\netstandard2.0" />
+    <file src="netcoreapp3.1\Cake.Issues.PullRequests.dll" target="lib\netcoreapp3.1" />
+    <file src="netcoreapp3.1\Cake.Issues.PullRequests.pdb" target="lib\netcoreapp3.1" />
+    <file src="netcoreapp3.1\Cake.Issues.PullRequests.xml" target="lib\netcoreapp3.1" />
+    <file src="net5.0\Cake.Issues.PullRequests.dll" target="lib\net5.0" />
+    <file src="net5.0\Cake.Issues.PullRequests.pdb" target="lib\net5.0" />
+    <file src="net5.0\Cake.Issues.PullRequests.xml" target="lib\net5.0" />
+    <file src="net6.0\Cake.Issues.PullRequests.dll" target="lib\net6.0" />
+    <file src="net6.0\Cake.Issues.PullRequests.pdb" target="lib\net6.0" />
+    <file src="net6.0\Cake.Issues.PullRequests.xml" target="lib\net6.0" />
   </files>
 </package>
diff --git a/nuspec/nuget/Cake.Issues.Reporting.nuspec b/nuspec/nuget/Cake.Issues.Reporting.nuspec
@@ -22,12 +22,18 @@ See the Project Site for an overview of the whole ecosystem of addins for workin
     <repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
     <copyright>Copyright © BBT Software AG and contributors</copyright>
     <tags>Cake Script Cake-Issues CodeAnalysis Linting Issues Reporting</tags>
-    <releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/1.0.0</releaseNotes>
+    <releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/2.0.0</releaseNotes>
   </metadata>
   <files>
     <file src="..\..\..\..\nuspec\nuget\icon.png" target="" />
-    <file src="netstandard2.0\Cake.Issues.Reporting.dll" target="lib\netstandard2.0" />
-    <file src="netstandard2.0\Cake.Issues.Reporting.pdb" target="lib\netstandard2.0" />
-    <file src="netstandard2.0\Cake.Issues.Reporting.xml" target="lib\netstandard2.0" />
+    <file src="netcoreapp3.1\Cake.Issues.Reporting.dll" target="lib\netcoreapp3.1" />
+    <file src="netcoreapp3.1\Cake.Issues.Reporting.pdb" target="lib\netcoreapp3.1" />
+    <file src="netcoreapp3.1\Cake.Issues.Reporting.xml" target="lib\netcoreapp3.1" />
+    <file src="net5.0\Cake.Issues.Reporting.dll" target="lib\net5.0" />
+    <file src="net5.0\Cake.Issues.Reporting.pdb" target="lib\net5.0" />
+    <file src="net5.0\Cake.Issues.Reporting.xml" target="lib\net5.0" />
+    <file src="net6.0\Cake.Issues.Reporting.dll" target="lib\net6.0" />
+    <file src="net6.0\Cake.Issues.Reporting.pdb" target="lib\net6.0" />
+    <file src="net6.0\Cake.Issues.Reporting.xml" target="lib\net6.0" />
   </files>
 </package>
diff --git a/nuspec/nuget/Cake.Issues.Testing.nuspec b/nuspec/nuget/Cake.Issues.Testing.nuspec
@@ -17,12 +17,18 @@ Common helpers for testing add-ins based on Cake.Issues
     <repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
     <copyright>Copyright © BBT Software AG and contributors</copyright>
     <tags>Cake Script Cake-Issues Issues Testing</tags>
-    <releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/1.0.0</releaseNotes>
+    <releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/2.0.0</releaseNotes>
   </metadata>
   <files>
     <file src="..\..\..\..\nuspec\nuget\icon.png" target="" />
-    <file src="netstandard2.0\Cake.Issues.Testing.dll" target="lib\netstandard2.0" />
-    <file src="netstandard2.0\Cake.Issues.Testing.pdb" target="lib\netstandard2.0" />
-    <file src="netstandard2.0\Cake.Issues.Testing.xml" target="lib\netstandard2.0" />
+    <file src="netcoreapp3.1\Cake.Issues.Testing.dll" target="lib\netcoreapp3.1" />
+    <file src="netcoreapp3.1\Cake.Issues.Testing.pdb" target="lib\netcoreapp3.1" />
+    <file src="netcoreapp3.1\Cake.Issues.Testing.xml" target="lib\netcoreapp3.1" />
+    <file src="net5.0\Cake.Issues.Testing.dll" target="lib\net5.0" />
+    <file src="net5.0\Cake.Issues.Testing.pdb" target="lib\net5.0" />
+    <file src="net5.0\Cake.Issues.Testing.xml" target="lib\net5.0" />
+    <file src="net6.0\Cake.Issues.Testing.dll" target="lib\net6.0" />
+    <file src="net6.0\Cake.Issues.Testing.pdb" target="lib\net6.0" />
+    <file src="net6.0\Cake.Issues.Testing.xml" target="lib\net6.0" />
   </files>
 </package>
diff --git a/nuspec/nuget/Cake.Issues.nuspec b/nuspec/nuget/Cake.Issues.nuspec
@@ -24,12 +24,18 @@ See the Project Site for an overview of the whole ecosystem of addins for workin
     <repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
     <copyright>Copyright © BBT Software AG and contributors</copyright>
     <tags>cake cake-addin cake-issues code-analysis linting issues</tags>
-    <releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/1.0.0</releaseNotes>
+    <releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/2.0.0</releaseNotes>
   </metadata>
   <files>
     <file src="..\..\..\..\nuspec\nuget\icon.png" target="" />
-    <file src="netstandard2.0\Cake.Issues.dll" target="lib\netstandard2.0" />
-    <file src="netstandard2.0\Cake.Issues.pdb" target="lib\netstandard2.0" />
-    <file src="netstandard2.0\Cake.Issues.xml" target="lib\netstandard2.0" />
+    <file src="netcoreapp3.1\Cake.Issues.dll" target="lib\netcoreapp3.1" />
+    <file src="netcoreapp3.1\Cake.Issues.pdb" target="lib\netcoreapp3.1" />
+    <file src="netcoreapp3.1\Cake.Issues.xml" target="lib\netcoreapp3.1" />
+    <file src="net5.0\Cake.Issues.dll" target="lib\net5.0" />
+    <file src="net5.0\Cake.Issues.pdb" target="lib\net5.0" />
+    <file src="net5.0\Cake.Issues.xml" target="lib\net5.0" />
+    <file src="net6.0\Cake.Issues.dll" target="lib\net6.0" />
+    <file src="net6.0\Cake.Issues.pdb" target="lib\net6.0" />
+    <file src="net6.0\Cake.Issues.xml" target="lib\net6.0" />
   </files>
 </package>
diff --git a/recipe.cake b/recipe.cake
@@ -1,4 +1,4 @@
-#load nuget:?package=Cake.Recipe&version=2.0.1
+#load nuget:?package=Cake.Recipe&version=2.2.1
 
 Environment.SetVariableNames();
 
@@ -27,4 +27,8 @@ ToolSettings.SetToolSettings(
     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.2.0");
+
 Build.RunDotNetCore();
diff --git a/src/Cake.Issues.PullRequests.Tests/BaseDiscussionThreadsCapabilityTests.cs b/src/Cake.Issues.PullRequests.Tests/BaseDiscussionThreadsCapabilityTests.cs
@@ -116,13 +116,13 @@ public void Should_Call_InternalFetchDiscussionThreads()
                                 new PullRequestDiscussionComment()
                                 {
                                     Content = "Message Foo",
-                                    IsDeleted = false
-                                }
+                                    IsDeleted = false,
+                                },
                             })
                         {
                             CommentIdentifier = "Message Foo",
                             CommentSource = settings.CommentSource,
-                        }
+                        },
                     };
                 var capability = new FakeDiscussionThreadsCapability(log, pullRequestSystem, discussionThreads);
 
@@ -172,8 +172,8 @@ public void Should_Call_InternalResolveDiscussionThreads()
                             new PullRequestDiscussionComment()
                             {
                                 Content = "Message Foo",
-                                IsDeleted = false
-                            }
+                                IsDeleted = false,
+                            },
                         })
                     {
                         CommentIdentifier = "Message Foo",
@@ -189,8 +189,8 @@ public void Should_Call_InternalResolveDiscussionThreads()
                             new PullRequestDiscussionComment()
                             {
                                 Content = "Message Bar",
-                                IsDeleted = false
-                            }
+                                IsDeleted = false,
+                            },
                         })
                     {
                         CommentIdentifier = "Message Bar",
@@ -199,7 +199,8 @@ public void Should_Call_InternalResolveDiscussionThreads()
                 var discussionThreads =
                     new List<IPullRequestDiscussionThread>
                     {
-                        discussionThread1, discussionThread2
+                        discussionThread1,
+                        discussionThread2,
                     };
                 var capability = new FakeDiscussionThreadsCapability(log, pullRequestSystem, discussionThreads);
 
@@ -208,7 +209,7 @@ public void Should_Call_InternalResolveDiscussionThreads()
                 capability.ResolveDiscussionThreads(
                     new List<IPullRequestDiscussionThread>
                     {
-                        discussionThread1
+                        discussionThread1,
                     });
 
                 // Then
@@ -253,8 +254,8 @@ public void Should_Call_InternalReopenDiscussionThreads()
                             new PullRequestDiscussionComment()
                             {
                                 Content = "Message Foo",
-                                IsDeleted = false
-                            }
+                                IsDeleted = false,
+                            },
                         })
                     {
                         CommentIdentifier = "Message Foo",
@@ -270,16 +271,17 @@ public void Should_Call_InternalReopenDiscussionThreads()
                                 new PullRequestDiscussionComment()
                                 {
                                     Content = "Message Bar",
-                                    IsDeleted = false
-                                }
+                                    IsDeleted = false,
+                                },
                             })
                     {
                         CommentSource = settings.CommentSource,
                     };
                 var discussionThreads =
                     new List<IPullRequestDiscussionThread>
                     {
-                        discussionThread1, discussionThread2
+                        discussionThread1,
+                        discussionThread2,
                     };
                 var capability = new FakeDiscussionThreadsCapability(log, pullRequestSystem, discussionThreads);
 
@@ -288,7 +290,7 @@ public void Should_Call_InternalReopenDiscussionThreads()
                 capability.ReopenDiscussionThreads(
                     new List<IPullRequestDiscussionThread>
                     {
-                        discussionThread1
+                        discussionThread1,
                     });
 
                 // Then

diff --git a/src/Cake.Issues.PullRequests.Tests/Cake.Issues.PullRequests.Tests.csproj b/src/Cake.Issues.PullRequests.Tests/Cake.Issues.PullRequests.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Product>Cake.Issues</Product>
     <Copyright>Copyright © BBT Software AG and contributors</Copyright>
@@ -10,9 +10,9 @@
     <CodeAnalysisRuleSet>..\Cake.Issues.Tests.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="Cake.Core" Version="1.0.0" />
-    <PackageReference Include="Cake.Testing" Version="1.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Cake.Core" Version="2.0.0" />
+    <PackageReference Include="Cake.Testing" Version="2.0.0" />
     <PackageReference Include="Shouldly" Version="4.0.3" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
     <PackageReference Include="xunit" Version="2.4.1" />

diff --git a/src/Cake.Issues.PullRequests.Tests/FakeDiscussionThreadsCapability.cs b/src/Cake.Issues.PullRequests.Tests/FakeDiscussionThreadsCapability.cs
@@ -8,9 +8,9 @@
     /// </summary>
     public class FakeDiscussionThreadsCapability : BaseDiscussionThreadsCapability<FakePullRequestSystem>
     {
-        private readonly List<IPullRequestDiscussionThread> discussionThreads = new List<IPullRequestDiscussionThread>();
-        private readonly List<IPullRequestDiscussionThread> resolvedThreads = new List<IPullRequestDiscussionThread>();
-        private readonly List<IPullRequestDiscussionThread> reopenedThreads = new List<IPullRequestDiscussionThread>();
+        private readonly List<IPullRequestDiscussionThread> discussionThreads = new ();
+        private readonly List<IPullRequestDiscussionThread> resolvedThreads = new ();
+        private readonly List<IPullRequestDiscussionThread> reopenedThreads = new ();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="FakeDiscussionThreadsCapability"/> class.

diff --git a/src/Cake.Issues.PullRequests.Tests/FakeFilteringByModifiedFilesCapability.cs b/src/Cake.Issues.PullRequests.Tests/FakeFilteringByModifiedFilesCapability.cs
@@ -9,7 +9,7 @@
     /// </summary>
     public class FakeFilteringByModifiedFilesCapability : BaseFilteringByModifiedFilesCapability<FakePullRequestSystem>
     {
-        private readonly List<FilePath> modifiedFiles = new List<FilePath>();
+        private readonly List<FilePath> modifiedFiles = new ();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="FakeFilteringByModifiedFilesCapability"/> class.

diff --git a/src/Cake.Issues.PullRequests.Tests/FakePullRequestSystem.cs b/src/Cake.Issues.PullRequests.Tests/FakePullRequestSystem.cs
@@ -8,7 +8,7 @@
     /// </summary>
     public class FakePullRequestSystem : BasePullRequestSystem
     {
-        private readonly List<IIssue> postedIssues = new List<IIssue>();
+        private readonly List<IIssue> postedIssues = new ();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="FakePullRequestSystem"/> class.

diff --git a/src/Cake.Issues.PullRequests.Tests/FakePullRequestSystemBuilder.cs b/src/Cake.Issues.PullRequests.Tests/FakePullRequestSystemBuilder.cs
@@ -11,8 +11,8 @@
     public class FakePullRequestSystemBuilder
     {
         private readonly ICakeLog log;
-        private readonly List<IPullRequestDiscussionThread> discussionThreads = new List<IPullRequestDiscussionThread>();
-        private readonly List<FilePath> modifiedFiles = new List<FilePath>();
+        private readonly List<IPullRequestDiscussionThread> discussionThreads = new ();
+        private readonly List<FilePath> modifiedFiles = new ();
         private bool withCheckingCommitIdCapability;
         private bool withDiscussionThreadsCapability;
         private bool withFilteringByModifiedFilesCapability;