From d63fbf95d99f844c3cbe27a9d7ed6225410a2909 Mon Sep 17 00:00:00 2001
From: Pascal Berger <pascal.berger@gmail.com>
Date: Mon, 27 Oct 2025 22:21:33 +0100
Subject: [PATCH 1/2] Change AppVeyor to be a build system

---
 ...=> Cake.Frosting.Issues.Build.AppVeyor.md} |  2 +-
 ...ake.Frosting.Issues.Build.AppVeyor.nuspec} | 22 +++++++++---------
 ...ke.Frosting.Issues.Build.AppVeyor.targets} |  2 +-
 ...Veyor.md => Cake.Issues.Build.AppVeyor.md} |  2 +-
 ...spec => Cake.Issues.Build.AppVeyor.nuspec} | 14 +++++------
 .../AppVeyorBuildServerSystemTests.cs}        |  8 +++----
 .../AppVeyorBuildSettingsTests.cs             |  2 +-
 .../Cake.Issues.Build.AppVeyor.Tests.csproj   | 13 +++++++++++
 .../CakeContextFixture.cs                     |  2 +-
 .../packages.lock.json                        | 12 +++++-----
 .../AppVeyorBuildServerSystem.cs}             | 10 ++++----
 .../AppVeyorBuildSettings.cs                  |  2 +-
 .../AppVeyorBuildsAliases.cs                  | 18 +++++++--------
 .../Cake.Issues.Build.AppVeyor.csproj}        |  2 +-
 .../IIssueExtensions.cs                       |  2 +-
 .../packages.lock.json                        |  4 ++--
 .../BuildServerAliasConstants.cs              | 13 +++++++----
 ....Issues.PullRequests.AppVeyor.Tests.csproj | 13 -----------
 src/Cake.Issues.slnx                          | 23 ++++++++++---------
 19 files changed, 86 insertions(+), 80 deletions(-)
 rename nuspec/nuget/{Cake.Frosting.Issues.PullRequests.AppVeyor.md => Cake.Frosting.Issues.Build.AppVeyor.md} (93%)
 rename nuspec/nuget/{Cake.Frosting.Issues.PullRequests.AppVeyor.nuspec => Cake.Frosting.Issues.Build.AppVeyor.nuspec} (61%)
 rename nuspec/nuget/{Cake.Frosting.Issues.PullRequests.AppVeyor.targets => Cake.Frosting.Issues.Build.AppVeyor.targets} (72%)
 rename nuspec/nuget/{Cake.Issues.PullRequests.AppVeyor.md => Cake.Issues.Build.AppVeyor.md} (95%)
 rename nuspec/nuget/{Cake.Issues.PullRequests.AppVeyor.nuspec => Cake.Issues.Build.AppVeyor.nuspec} (73%)
 rename src/{Cake.Issues.PullRequests.AppVeyor.Tests/AppVeyorPullRequestSystemTests.cs => Cake.Issues.Build.AppVeyor.Tests/AppVeyorBuildServerSystemTests.cs} (71%)
 rename src/{Cake.Issues.PullRequests.AppVeyor.Tests => Cake.Issues.Build.AppVeyor.Tests}/AppVeyorBuildSettingsTests.cs (97%)
 create mode 100644 src/Cake.Issues.Build.AppVeyor.Tests/Cake.Issues.Build.AppVeyor.Tests.csproj
 rename src/{Cake.Issues.PullRequests.AppVeyor.Tests => Cake.Issues.Build.AppVeyor.Tests}/CakeContextFixture.cs (96%)
 rename src/{Cake.Issues.PullRequests.AppVeyor.Tests => Cake.Issues.Build.AppVeyor.Tests}/packages.lock.json (99%)
 rename src/{Cake.Issues.PullRequests.AppVeyor/AppVeyorPullRequestSystem.cs => Cake.Issues.Build.AppVeyor/AppVeyorBuildServerSystem.cs} (72%)
 rename src/{Cake.Issues.PullRequests.AppVeyor => Cake.Issues.Build.AppVeyor}/AppVeyorBuildSettings.cs (96%)
 rename src/{Cake.Issues.PullRequests.AppVeyor => Cake.Issues.Build.AppVeyor}/AppVeyorBuildsAliases.cs (79%)
 rename src/{Cake.Issues.PullRequests.AppVeyor/Cake.Issues.PullRequests.AppVeyor.csproj => Cake.Issues.Build.AppVeyor/Cake.Issues.Build.AppVeyor.csproj} (74%)
 rename src/{Cake.Issues.PullRequests.AppVeyor => Cake.Issues.Build.AppVeyor}/IIssueExtensions.cs (95%)
 rename src/{Cake.Issues.PullRequests.AppVeyor => Cake.Issues.Build.AppVeyor}/packages.lock.json (99%)
 delete mode 100644 src/Cake.Issues.PullRequests.AppVeyor.Tests/Cake.Issues.PullRequests.AppVeyor.Tests.csproj

diff --git a/nuspec/nuget/Cake.Frosting.Issues.PullRequests.AppVeyor.md b/nuspec/nuget/Cake.Frosting.Issues.Build.AppVeyor.md
similarity index 93%
rename from nuspec/nuget/Cake.Frosting.Issues.PullRequests.AppVeyor.md
rename to nuspec/nuget/Cake.Frosting.Issues.Build.AppVeyor.md
index 83c0f2fcf..f00ddc9f5 100644
--- a/nuspec/nuget/Cake.Frosting.Issues.PullRequests.AppVeyor.md
+++ b/nuspec/nuget/Cake.Frosting.Issues.Build.AppVeyor.md
@@ -2,7 +2,7 @@
 
 > **NOTE**:
 > This is the version of the addin compatible with [Cake Frosting].
-> For addin compatible with [Cake .NET Tool] see [Cake.Issues.PullRequests.AppVeyor](https://www.nuget.org/packages/Cake.Issues.PullRequests.AppVeyor).
+> For addin compatible with [Cake .NET Tool] see [Cake.Issues.Build.AppVeyor](https://www.nuget.org/packages/Cake.Issues.Build.AppVeyor).
 
 AppVeyor support for the Cake.Issues addin for Cake allows you to write found issues as message to AppVeyor builds.
 
diff --git a/nuspec/nuget/Cake.Frosting.Issues.PullRequests.AppVeyor.nuspec b/nuspec/nuget/Cake.Frosting.Issues.Build.AppVeyor.nuspec
similarity index 61%
rename from nuspec/nuget/Cake.Frosting.Issues.PullRequests.AppVeyor.nuspec
rename to nuspec/nuget/Cake.Frosting.Issues.Build.AppVeyor.nuspec
index 4f3d5c3f0..a04b30716 100644
--- a/nuspec/nuget/Cake.Frosting.Issues.PullRequests.AppVeyor.nuspec
+++ b/nuspec/nuget/Cake.Frosting.Issues.Build.AppVeyor.nuspec
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <id>Cake.Frosting.Issues.PullRequests.AppVeyor</id>
-    <title>Cake.Frosting.Issues.PullRequests.AppVeyor</title>
+    <id>Cake.Frosting.Issues.Build.AppVeyor</id>
+    <title>Cake.Frosting.Issues.Build.AppVeyor</title>
     <version>0.0.0</version>
     <authors>Cake Issues contributors</authors>
     <owners>pascalberger, cake-contrib</owners>
@@ -11,13 +11,13 @@
 AppVeyor support for the Cake.Issues addin for Cake allows you to write found issues as message to AppVeyor builds.
 
 This addin provides the aliases for writing to AppVeyor builds.
-It also requires the core Cake.Issues and Cake.Issues.PullRequests addins and one or more issue providers.
+It also requires the core Cake.Issues and Cake.Issues.Build addins and one or more issue providers.
 
 See the Project Site for an overview of the whole ecosystem of addins for working with issues in Cake scripts.
 
 NOTE:
 This is the version of the addin compatible with Cake Frosting.
-For addin compatible with Cake Script Runners see Cake.Issues.PullRequests.AppVeyor.
+For addin compatible with Cake Script Runners see Cake.Issues.Build.AppVeyor.
     </description>
     <license type="expression">MIT</license>
     <projectUrl>https://cakeissues.net</projectUrl>
@@ -25,25 +25,25 @@ For addin compatible with Cake Script Runners see Cake.Issues.PullRequests.AppVe
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
     <copyright>Copyright © Cake Issues contributors</copyright>
-    <tags>cake cake-addin cake-issues cake-pullrequestsystem issues pullrequest buildserver appveyor</tags>
+    <tags>cake cake-addin cake-issues cake-issues-buildserver issues buildserver appveyor</tags>
     <readme>docs\README.md</readme>
     <releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/5.9.1</releaseNotes>
     <dependencies>
       <group targetFramework="net8.0">
         <dependency id="Cake.Common" version="5.0" exclude="Build,Analyzers" />
-        <dependency id="Cake.Frosting.Issues.PullRequests" version="[5.0.0-beta0001,6.0)" exclude="Build,Analyzers" />
+        <dependency id="Cake.Frosting.Issues.Build" version="[5.0.0-beta0001,6.0)" exclude="Build,Analyzers" />
       </group>
       <group targetFramework="net9.0">
         <dependency id="Cake.Common" version="5.0" exclude="Build,Analyzers" />
-        <dependency id="Cake.Frosting.Issues.PullRequests" version="[5.0.0-beta0001,6.0)" exclude="Build,Analyzers" />
+        <dependency id="Cake.Frosting.Issues.Build" version="[5.0.0-beta0001,6.0)" exclude="Build,Analyzers" />
       </group>
     </dependencies>
   </metadata>
   <files>
     <file src="icon.png" target="" />
-    <file src="Cake.Frosting.Issues.PullRequests.AppVeyor.targets" target="build" />
-    <file src="Cake.Frosting.Issues.PullRequests.AppVeyor.targets" target="buildTransitive" />
-    <file src="Cake.Frosting.Issues.PullRequests.AppVeyor.md" target="docs\README.md" />
-    <file src="..\..\src\Cake.Issues.PullRequests.AppVeyor\bin\Release\**\Cake.Issues.PullRequests.AppVeyor.*" target="lib" exclude="**\*.deps.json" />
+    <file src="Cake.Frosting.Issues.Build.AppVeyor.targets" target="build" />
+    <file src="Cake.Frosting.Issues.Build.AppVeyor.targets" target="buildTransitive" />
+    <file src="Cake.Frosting.Issues.Build.AppVeyor.md" target="docs\README.md" />
+    <file src="..\..\src\Cake.Issues.Build.AppVeyor\bin\Release\**\Cake.Issues.Build.AppVeyor.*" target="lib" exclude="**\*.deps.json" />
   </files>
 </package>
\ No newline at end of file
diff --git a/nuspec/nuget/Cake.Frosting.Issues.PullRequests.AppVeyor.targets b/nuspec/nuget/Cake.Frosting.Issues.Build.AppVeyor.targets
similarity index 72%
rename from nuspec/nuget/Cake.Frosting.Issues.PullRequests.AppVeyor.targets
rename to nuspec/nuget/Cake.Frosting.Issues.Build.AppVeyor.targets
index d41f84037..52e1eadcd 100644
--- a/nuspec/nuget/Cake.Frosting.Issues.PullRequests.AppVeyor.targets
+++ b/nuspec/nuget/Cake.Frosting.Issues.Build.AppVeyor.targets
@@ -1,5 +1,5 @@
 <Project>
   <ItemGroup Condition="'$(Language)' == 'C#' AND ('$(ImplicitUsings)' == 'true' or '$(ImplicitUsings)' == 'enable')">
-    <Using Include="Cake.Issues.PullRequests.AppVeyor" />
+    <Using Include="Cake.Issues.Build.AppVeyor" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/nuspec/nuget/Cake.Issues.PullRequests.AppVeyor.md b/nuspec/nuget/Cake.Issues.Build.AppVeyor.md
similarity index 95%
rename from nuspec/nuget/Cake.Issues.PullRequests.AppVeyor.md
rename to nuspec/nuget/Cake.Issues.Build.AppVeyor.md
index 4301e2f09..b757582b7 100644
--- a/nuspec/nuget/Cake.Issues.PullRequests.AppVeyor.md
+++ b/nuspec/nuget/Cake.Issues.Build.AppVeyor.md
@@ -2,7 +2,7 @@
 
 > **NOTE**:
 > This is the version of the addin compatible with [Cake .NET Tool].
-> For addin compatible with [Cake Frosting] see [Cake.Frosting.Issues.PullRequests.AppVeyor](https://www.nuget.org/packages/Cake.Frosting.Issues.PullRequests.AppVeyor).
+> For addin compatible with [Cake Frosting] see [Cake.Frosting.Issues.Build.AppVeyor](https://www.nuget.org/packages/Cake.Frosting.Issues.Build.AppVeyor).
 
 AppVeyor support for the Cake.Issues addin for Cake allows you to write found issues as message to AppVeyor builds.
 
diff --git a/nuspec/nuget/Cake.Issues.PullRequests.AppVeyor.nuspec b/nuspec/nuget/Cake.Issues.Build.AppVeyor.nuspec
similarity index 73%
rename from nuspec/nuget/Cake.Issues.PullRequests.AppVeyor.nuspec
rename to nuspec/nuget/Cake.Issues.Build.AppVeyor.nuspec
index d5bfd6831..0ab5c8d75 100644
--- a/nuspec/nuget/Cake.Issues.PullRequests.AppVeyor.nuspec
+++ b/nuspec/nuget/Cake.Issues.Build.AppVeyor.nuspec
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <id>Cake.Issues.PullRequests.AppVeyor</id>
-    <title>Cake.Issues.PullRequests.AppVeyor</title>
+    <id>Cake.Issues.Build.AppVeyor</id>
+    <title>Cake.Issues.Build.AppVeyor</title>
     <version>0.0.0</version>
     <authors>Cake Issues contributors</authors>
     <owners>pascalberger, cake-contrib</owners>
@@ -11,13 +11,13 @@
 AppVeyor support for the Cake.Issues addin for Cake allows you to write found issues as message to AppVeyor builds.
 
 This addin provides the aliases for writing to AppVeyor builds.
-It also requires the core Cake.Issues and Cake.Issues.PullRequests addins and one or more issue providers.
+It also requires the core Cake.Issues and Cake.Issues.Build addins and one or more issue providers.
 
 See the Project Site for an overview of the whole ecosystem of addins for working with issues in Cake scripts.
 
 NOTE:
 This is the version of the addin compatible with Cake Script Runners.
-For addin compatible with Cake Frosting see Cake.Frosting.Issues.PullRequests.AppVeyor.
+For addin compatible with Cake Frosting see Cake.Frosting.Issues.Build.AppVeyor.
     </description>
     <license type="expression">MIT</license>
     <projectUrl>https://cakeissues.net</projectUrl>
@@ -25,7 +25,7 @@ For addin compatible with Cake Frosting see Cake.Frosting.Issues.PullRequests.Ap
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <repository type="git" url="https://github.com/cake-contrib/Cake.Issues.git"/>
     <copyright>Copyright © Cake Issues contributors</copyright>
-    <tags>cake cake-addin cake-issues cake-pullrequestsystem issues pullrequest buildserver appveyor</tags>
+    <tags>cake cake-addin cake-issues cake-issues-buildserver issues buildserver appveyor</tags>
     <readme>docs\README.md</readme>
     <releaseNotes>https://github.com/cake-contrib/Cake.Issues/releases/tag/5.9.1</releaseNotes>
     <dependencies>
@@ -37,7 +37,7 @@ For addin compatible with Cake Frosting see Cake.Frosting.Issues.PullRequests.Ap
   </metadata>
   <files>
     <file src="icon.png" target="" />
-    <file src="Cake.Issues.PullRequests.AppVeyor.md" target="docs\README.md" />
-    <file src="..\..\src\Cake.Issues.PullRequests.AppVeyor\bin\Release\**\Cake.Issues.PullRequests.AppVeyor.*" target="lib" exclude="**\*.deps.json" />
+    <file src="Cake.Issues.Build.AppVeyor.md" target="docs\README.md" />
+    <file src="..\..\src\Cake.Issues.Build.AppVeyor\bin\Release\**\Cake.Issues.Build.AppVeyor.*" target="lib" exclude="**\*.deps.json" />
   </files>
 </package>
\ No newline at end of file
diff --git a/src/Cake.Issues.PullRequests.AppVeyor.Tests/AppVeyorPullRequestSystemTests.cs b/src/Cake.Issues.Build.AppVeyor.Tests/AppVeyorBuildServerSystemTests.cs
similarity index 71%
rename from src/Cake.Issues.PullRequests.AppVeyor.Tests/AppVeyorPullRequestSystemTests.cs
rename to src/Cake.Issues.Build.AppVeyor.Tests/AppVeyorBuildServerSystemTests.cs
index b81bc12a6..407e5f470 100644
--- a/src/Cake.Issues.PullRequests.AppVeyor.Tests/AppVeyorPullRequestSystemTests.cs
+++ b/src/Cake.Issues.Build.AppVeyor.Tests/AppVeyorBuildServerSystemTests.cs
@@ -1,8 +1,8 @@
-namespace Cake.Issues.PullRequests.AppVeyor.Tests;
+namespace Cake.Issues.Build.AppVeyor.Tests;
 
 using Cake.Core;
 
-public sealed class AppVeyorPullRequestSystemTests
+public sealed class AppVeyorBuildServerSystemTests
 {
     public sealed class TheCtor
     {
@@ -14,7 +14,7 @@ public void Should_Throw_If_Context_Is_Null()
             var settings = new AppVeyorBuildSettings();
 
             // When
-            var result = Record.Exception(() => new AppVeyorPullRequestSystem(context, settings));
+            var result = Record.Exception(() => new AppVeyorBuildServerSystem(context, settings));
 
             // Then
             result.IsArgumentNullException("context");
@@ -29,7 +29,7 @@ public void Should_Throw_If_Settings_Are_Null()
             const AppVeyorBuildSettings settings = null;
 
             // When
-            var result = Record.Exception(() => new AppVeyorPullRequestSystem(context, settings));
+            var result = Record.Exception(() => new AppVeyorBuildServerSystem(context, settings));
 
             // Then
             result.IsArgumentNullException("settings");
diff --git a/src/Cake.Issues.PullRequests.AppVeyor.Tests/AppVeyorBuildSettingsTests.cs b/src/Cake.Issues.Build.AppVeyor.Tests/AppVeyorBuildSettingsTests.cs
similarity index 97%
rename from src/Cake.Issues.PullRequests.AppVeyor.Tests/AppVeyorBuildSettingsTests.cs
rename to src/Cake.Issues.Build.AppVeyor.Tests/AppVeyorBuildSettingsTests.cs
index ab6cd6e15..27d38e317 100644
--- a/src/Cake.Issues.PullRequests.AppVeyor.Tests/AppVeyorBuildSettingsTests.cs
+++ b/src/Cake.Issues.Build.AppVeyor.Tests/AppVeyorBuildSettingsTests.cs
@@ -1,4 +1,4 @@
-namespace Cake.Issues.PullRequests.AppVeyor.Tests;
+namespace Cake.Issues.Build.AppVeyor.Tests;
 
 using System.Diagnostics.CodeAnalysis;
 
diff --git a/src/Cake.Issues.Build.AppVeyor.Tests/Cake.Issues.Build.AppVeyor.Tests.csproj b/src/Cake.Issues.Build.AppVeyor.Tests/Cake.Issues.Build.AppVeyor.Tests.csproj
new file mode 100644
index 000000000..cfe8016b0
--- /dev/null
+++ b/src/Cake.Issues.Build.AppVeyor.Tests/Cake.Issues.Build.AppVeyor.Tests.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Tests for the Cake.Issues.Build.AppVeyor addin</Description>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NSubstitute" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Cake.Issues.Build.AppVeyor\Cake.Issues.Build.AppVeyor.csproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Cake.Issues.PullRequests.AppVeyor.Tests/CakeContextFixture.cs b/src/Cake.Issues.Build.AppVeyor.Tests/CakeContextFixture.cs
similarity index 96%
rename from src/Cake.Issues.PullRequests.AppVeyor.Tests/CakeContextFixture.cs
rename to src/Cake.Issues.Build.AppVeyor.Tests/CakeContextFixture.cs
index 9dd4cd896..44926b578 100644
--- a/src/Cake.Issues.PullRequests.AppVeyor.Tests/CakeContextFixture.cs
+++ b/src/Cake.Issues.Build.AppVeyor.Tests/CakeContextFixture.cs
@@ -1,4 +1,4 @@
-namespace Cake.Issues.PullRequests.AppVeyor.Tests;
+namespace Cake.Issues.Build.AppVeyor.Tests;
 
 using Cake.Core;
 using Cake.Core.Configuration;
diff --git a/src/Cake.Issues.PullRequests.AppVeyor.Tests/packages.lock.json b/src/Cake.Issues.Build.AppVeyor.Tests/packages.lock.json
similarity index 99%
rename from src/Cake.Issues.PullRequests.AppVeyor.Tests/packages.lock.json
rename to src/Cake.Issues.Build.AppVeyor.Tests/packages.lock.json
index 7742b6ae1..c0b1cbce1 100644
--- a/src/Cake.Issues.PullRequests.AppVeyor.Tests/packages.lock.json
+++ b/src/Cake.Issues.Build.AppVeyor.Tests/packages.lock.json
@@ -290,18 +290,18 @@
           "Cake.Core": "[5.0.0, )"
         }
       },
-      "cake.issues.pullrequests": {
+      "cake.issues.build": {
         "type": "Project",
         "dependencies": {
           "Cake.Issues": "[1.0.0, )",
           "Spectre.Console": "[0.50.0, )"
         }
       },
-      "cake.issues.pullrequests.appveyor": {
+      "cake.issues.build.appveyor": {
         "type": "Project",
         "dependencies": {
           "Cake.Common": "[5.0.0, )",
-          "Cake.Issues.PullRequests": "[1.0.0, )"
+          "Cake.Issues.Build": "[1.0.0, )"
         }
       },
       "cake.issues.testing": {
@@ -652,18 +652,18 @@
           "Cake.Core": "[5.0.0, )"
         }
       },
-      "cake.issues.pullrequests": {
+      "cake.issues.build": {
         "type": "Project",
         "dependencies": {
           "Cake.Issues": "[1.0.0, )",
           "Spectre.Console": "[0.50.0, )"
         }
       },
-      "cake.issues.pullrequests.appveyor": {
+      "cake.issues.build.appveyor": {
         "type": "Project",
         "dependencies": {
           "Cake.Common": "[5.0.0, )",
-          "Cake.Issues.PullRequests": "[1.0.0, )"
+          "Cake.Issues.Build": "[1.0.0, )"
         }
       },
       "cake.issues.testing": {
diff --git a/src/Cake.Issues.PullRequests.AppVeyor/AppVeyorPullRequestSystem.cs b/src/Cake.Issues.Build.AppVeyor/AppVeyorBuildServerSystem.cs
similarity index 72%
rename from src/Cake.Issues.PullRequests.AppVeyor/AppVeyorPullRequestSystem.cs
rename to src/Cake.Issues.Build.AppVeyor/AppVeyorBuildServerSystem.cs
index 87a2d1ea4..64553a6a3 100644
--- a/src/Cake.Issues.PullRequests.AppVeyor/AppVeyorPullRequestSystem.cs
+++ b/src/Cake.Issues.Build.AppVeyor/AppVeyorBuildServerSystem.cs
@@ -1,4 +1,4 @@
-namespace Cake.Issues.PullRequests.AppVeyor;
+namespace Cake.Issues.Build.AppVeyor;
 
 using System;
 using System.Collections.Generic;
@@ -8,17 +8,17 @@
 /// <summary>
 /// Class for posting issues to AppVeyor.
 /// </summary>
-public class AppVeyorPullRequestSystem : BasePullRequestSystem
+public class AppVeyorBuildServerSystem : BaseBuildServerSystem
 {
     private readonly ICakeContext context;
     private readonly AppVeyorBuildSettings settings;
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="AppVeyorPullRequestSystem"/> class.
+    /// Initializes a new instance of the <see cref="AppVeyorBuildServerSystem"/> class.
     /// </summary>
     /// <param name="context">The Cake context.</param>
     /// <param name="settings">Settings for writing issues to AppVeyor.</param>
-    public AppVeyorPullRequestSystem(ICakeContext context, AppVeyorBuildSettings settings)
+    public AppVeyorBuildServerSystem(ICakeContext context, AppVeyorBuildSettings settings)
         : base(context?.Log ?? throw new ArgumentNullException(nameof(context)))
     {
         settings.NotNull();
@@ -28,7 +28,7 @@ public AppVeyorPullRequestSystem(ICakeContext context, AppVeyorBuildSettings set
     }
 
     /// <inheritdoc />
-    protected override void InternalPostDiscussionThreads(IEnumerable<IIssue> issues, string commentSource)
+    protected override void InternalPostIssues(IEnumerable<IIssue> issues)
     {
         foreach (var issue in issues)
         {
diff --git a/src/Cake.Issues.PullRequests.AppVeyor/AppVeyorBuildSettings.cs b/src/Cake.Issues.Build.AppVeyor/AppVeyorBuildSettings.cs
similarity index 96%
rename from src/Cake.Issues.PullRequests.AppVeyor/AppVeyorBuildSettings.cs
rename to src/Cake.Issues.Build.AppVeyor/AppVeyorBuildSettings.cs
index fa8f23283..d7729b169 100644
--- a/src/Cake.Issues.PullRequests.AppVeyor/AppVeyorBuildSettings.cs
+++ b/src/Cake.Issues.Build.AppVeyor/AppVeyorBuildSettings.cs
@@ -1,4 +1,4 @@
-namespace Cake.Issues.PullRequests.AppVeyor;
+namespace Cake.Issues.Build.AppVeyor;
 
 /// <summary>
 /// Settings for <see cref="AppVeyorBuildsAliases"/>.
diff --git a/src/Cake.Issues.PullRequests.AppVeyor/AppVeyorBuildsAliases.cs b/src/Cake.Issues.Build.AppVeyor/AppVeyorBuildsAliases.cs
similarity index 79%
rename from src/Cake.Issues.PullRequests.AppVeyor/AppVeyorBuildsAliases.cs
rename to src/Cake.Issues.Build.AppVeyor/AppVeyorBuildsAliases.cs
index fbbb6e0fa..81b556d4c 100644
--- a/src/Cake.Issues.PullRequests.AppVeyor/AppVeyorBuildsAliases.cs
+++ b/src/Cake.Issues.Build.AppVeyor/AppVeyorBuildsAliases.cs
@@ -1,4 +1,4 @@
-namespace Cake.Issues.PullRequests.AppVeyor;
+namespace Cake.Issues.Build.AppVeyor;
 
 using Cake.Core;
 using Cake.Core.Annotations;
@@ -18,7 +18,7 @@ public static class AppVeyorBuildsAliases
     /// <para>Report code analysis issues reported as MsBuild warnings to an AppVeyor build:</para>
     /// <code>
     /// <![CDATA[
-    ///     ReportCodeAnalysisIssuesToPullRequest(
+    ///     ReportIssuesToBuildServer(
     ///         MsBuildCodeAnalysis(
     ///             @"c:\build\msbuild.log",
     ///             MsBuildXmlFileLoggerFormat),
@@ -28,13 +28,13 @@ public static class AppVeyorBuildsAliases
     /// </code>
     /// </example>
     [CakeMethodAlias]
-    [CakeAliasCategory(PullRequestsAliasConstants.PullRequestSystemCakeAliasCategory)]
-    public static IPullRequestSystem AppVeyorBuilds(
+    [CakeAliasCategory(BuildServerAliasConstants.BuildServerCakeAliasCategory)]
+    public static IBuildServerSystem AppVeyorBuilds(
         this ICakeContext context)
     {
         context.NotNull();
 
-        return new AppVeyorPullRequestSystem(context, new AppVeyorBuildSettings());
+        return new AppVeyorBuildServerSystem(context, new AppVeyorBuildSettings());
     }
 
     /// <summary>
@@ -53,7 +53,7 @@ public static IPullRequestSystem AppVeyorBuilds(
     ///             MessagePattern = "Project: {ProjectName}, File: {FilePath}, Line: {Line}"
     ///         };
     ///
-    ///     ReportCodeAnalysisIssuesToPullRequest(
+    ///     ReportIssuesToBuildServer(
     ///         MsBuildCodeAnalysis(
     ///             @"c:\build\msbuild.log",
     ///             MsBuildXmlFileLoggerFormat),
@@ -63,14 +63,14 @@ public static IPullRequestSystem AppVeyorBuilds(
     /// </code>
     /// </example>
     [CakeMethodAlias]
-    [CakeAliasCategory(PullRequestsAliasConstants.PullRequestSystemCakeAliasCategory)]
-    public static IPullRequestSystem AppVeyorBuilds(
+    [CakeAliasCategory(BuildServerAliasConstants.BuildServerCakeAliasCategory)]
+    public static IBuildServerSystem AppVeyorBuilds(
         this ICakeContext context,
         AppVeyorBuildSettings settings)
     {
         context.NotNull();
         settings.NotNull();
 
-        return new AppVeyorPullRequestSystem(context, settings);
+        return new AppVeyorBuildServerSystem(context, settings);
     }
 }
diff --git a/src/Cake.Issues.PullRequests.AppVeyor/Cake.Issues.PullRequests.AppVeyor.csproj b/src/Cake.Issues.Build.AppVeyor/Cake.Issues.Build.AppVeyor.csproj
similarity index 74%
rename from src/Cake.Issues.PullRequests.AppVeyor/Cake.Issues.PullRequests.AppVeyor.csproj
rename to src/Cake.Issues.Build.AppVeyor/Cake.Issues.Build.AppVeyor.csproj
index ec56b8d24..1505b7232 100644
--- a/src/Cake.Issues.PullRequests.AppVeyor/Cake.Issues.PullRequests.AppVeyor.csproj
+++ b/src/Cake.Issues.Build.AppVeyor/Cake.Issues.Build.AppVeyor.csproj
@@ -8,6 +8,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Cake.Issues.PullRequests\Cake.Issues.PullRequests.csproj" />
+    <ProjectReference Include="..\Cake.Issues.Build\Cake.Issues.Build.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Cake.Issues.PullRequests.AppVeyor/IIssueExtensions.cs b/src/Cake.Issues.Build.AppVeyor/IIssueExtensions.cs
similarity index 95%
rename from src/Cake.Issues.PullRequests.AppVeyor/IIssueExtensions.cs
rename to src/Cake.Issues.Build.AppVeyor/IIssueExtensions.cs
index f8b1c9467..bc3f38de2 100644
--- a/src/Cake.Issues.PullRequests.AppVeyor/IIssueExtensions.cs
+++ b/src/Cake.Issues.Build.AppVeyor/IIssueExtensions.cs
@@ -1,4 +1,4 @@
-namespace Cake.Issues.PullRequests.AppVeyor;
+namespace Cake.Issues.Build.AppVeyor;
 
 using Cake.Common.Build.AppVeyor;
 
diff --git a/src/Cake.Issues.PullRequests.AppVeyor/packages.lock.json b/src/Cake.Issues.Build.AppVeyor/packages.lock.json
similarity index 99%
rename from src/Cake.Issues.PullRequests.AppVeyor/packages.lock.json
rename to src/Cake.Issues.Build.AppVeyor/packages.lock.json
index 4926f8c49..c26666bcd 100644
--- a/src/Cake.Issues.PullRequests.AppVeyor/packages.lock.json
+++ b/src/Cake.Issues.Build.AppVeyor/packages.lock.json
@@ -102,7 +102,7 @@
           "Cake.Core": "[5.0.0, )"
         }
       },
-      "cake.issues.pullrequests": {
+      "cake.issues.build": {
         "type": "Project",
         "dependencies": {
           "Cake.Issues": "[1.0.0, )",
@@ -237,7 +237,7 @@
           "Cake.Core": "[5.0.0, )"
         }
       },
-      "cake.issues.pullrequests": {
+      "cake.issues.build": {
         "type": "Project",
         "dependencies": {
           "Cake.Issues": "[1.0.0, )",
diff --git a/src/Cake.Issues.Build/BuildServerAliasConstants.cs b/src/Cake.Issues.Build/BuildServerAliasConstants.cs
index f0736c536..2b701cfa1 100644
--- a/src/Cake.Issues.Build/BuildServerAliasConstants.cs
+++ b/src/Cake.Issues.Build/BuildServerAliasConstants.cs
@@ -1,12 +1,17 @@
 namespace Cake.Issues.Build;
 
 /// <summary>
-/// Class for constants used for Cake aliases.
+/// Class containing constants used for defining Cake aliases.
 /// </summary>
-internal static class BuildServerAliasConstants
+public static class BuildServerAliasConstants
 {
     /// <summary>
-    /// Main category for build server aliases.
+    /// Category to use for all Cake aliases creating build server.
     /// </summary>
-    public const string ReportIssuesToBuildServerCakeAliasCategory = "Report Issues To Build Server";
+    public const string BuildServerCakeAliasCategory = "Build Server";
+
+    /// <summary>
+    /// Category to use for all Cake aliases providing functionality for writing issues to build servers.
+    /// </summary>
+    public const string ReportIssuesToBuildServerCakeAliasCategory = "Reporting Issues To Build Server";
 }
\ No newline at end of file
diff --git a/src/Cake.Issues.PullRequests.AppVeyor.Tests/Cake.Issues.PullRequests.AppVeyor.Tests.csproj b/src/Cake.Issues.PullRequests.AppVeyor.Tests/Cake.Issues.PullRequests.AppVeyor.Tests.csproj
deleted file mode 100644
index 3c2a472d1..000000000
--- a/src/Cake.Issues.PullRequests.AppVeyor.Tests/Cake.Issues.PullRequests.AppVeyor.Tests.csproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <Description>Tests for the Cake.Issues.PullRequests.AppVeyor addin</Description>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="NSubstitute" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Cake.Issues.PullRequests.AppVeyor\Cake.Issues.PullRequests.AppVeyor.csproj" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Cake.Issues.slnx b/src/Cake.Issues.slnx
index dee487b25..51f41baa8 100644
--- a/src/Cake.Issues.slnx
+++ b/src/Cake.Issues.slnx
@@ -1,4 +1,16 @@
 <Solution>
+  <Folder Name="/Build System/" />
+  <Folder Name="/Build System/AppVeyor/">
+    <Project Path="Cake.Issues.Build.AppVeyor.Tests/Cake.Issues.Build.AppVeyor.Tests.csproj" />
+    <Project Path="Cake.Issues.Build.AppVeyor/Cake.Issues.Build.AppVeyor.csproj" />
+  </Folder>
+  <Folder Name="/Build System/AppVeyor/NuGet/">
+    <File Path="../nuspec/nuget/Cake.Frosting.Issues.Build.AppVeyor.md" />
+    <File Path="../nuspec/nuget/Cake.Frosting.Issues.Build.AppVeyor.nuspec" />
+    <File Path="../nuspec/nuget/Cake.Frosting.Issues.Build.AppVeyor.targets" />
+    <File Path="../nuspec/nuget/Cake.Issues.Build.AppVeyor.md" />
+    <File Path="../nuspec/nuget/Cake.Issues.Build.AppVeyor.nuspec" />
+  </Folder>
   <Folder Name="/Build/">
     <File Path="../recipe.cake" />
   </Folder>
@@ -156,17 +168,6 @@
     <File Path="../nuspec/nuget/Cake.Issues.Terraform.nuspec" />
   </Folder>
   <Folder Name="/Pull Request Systems/" />
-  <Folder Name="/Pull Request Systems/AppVeyor/">
-    <Project Path="Cake.Issues.PullRequests.AppVeyor.Tests/Cake.Issues.PullRequests.AppVeyor.Tests.csproj" />
-    <Project Path="Cake.Issues.PullRequests.AppVeyor/Cake.Issues.PullRequests.AppVeyor.csproj" />
-  </Folder>
-  <Folder Name="/Pull Request Systems/AppVeyor/NuGet/">
-    <File Path="../nuspec/nuget/Cake.Frosting.Issues.PullRequests.AppVeyor.md" />
-    <File Path="../nuspec/nuget/Cake.Frosting.Issues.PullRequests.AppVeyor.nuspec" />
-    <File Path="../nuspec/nuget/Cake.Frosting.Issues.PullRequests.AppVeyor.targets" />
-    <File Path="../nuspec/nuget/Cake.Issues.PullRequests.AppVeyor.md" />
-    <File Path="../nuspec/nuget/Cake.Issues.PullRequests.AppVeyor.nuspec" />
-  </Folder>
   <Folder Name="/Pull Request Systems/AzureDevOps/">
     <Project Path="Cake.Issues.PullRequests.AzureDevOps.Tests/Cake.Issues.PullRequests.AzureDevOps.Tests.csproj" />
     <Project Path="Cake.Issues.PullRequests.AzureDevOps/Cake.Issues.PullRequests.AzureDevOps.csproj" />

From c09b2f23906e9a3a94e708cfbc307ccb141eb2b3 Mon Sep 17 00:00:00 2001
From: Pascal Berger <pascal.berger@gmail.com>
Date: Wed, 29 Oct 2025 07:42:58 +0100
Subject: [PATCH 2/2] Update src/Cake.Issues.Build/BuildServerAliasConstants.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 src/Cake.Issues.Build/BuildServerAliasConstants.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Cake.Issues.Build/BuildServerAliasConstants.cs b/src/Cake.Issues.Build/BuildServerAliasConstants.cs
index 2b701cfa1..8a1f71463 100644
--- a/src/Cake.Issues.Build/BuildServerAliasConstants.cs
+++ b/src/Cake.Issues.Build/BuildServerAliasConstants.cs
@@ -6,7 +6,7 @@ namespace Cake.Issues.Build;
 public static class BuildServerAliasConstants
 {
     /// <summary>
-    /// Category to use for all Cake aliases creating build server.
+    /// Category to use for all Cake aliases creating a build server.
     /// </summary>
     public const string BuildServerCakeAliasCategory = "Build Server";