From 28ed8deed0ed58f4eb4eb2a7544af68cccd74e8e Mon Sep 17 00:00:00 2001
From: Pawel Pabich <pawel@pabich.eu>
Date: Mon, 10 Mar 2025 14:48:21 +1000
Subject: [PATCH 1/4] Update halibut

---
 .../Octopus.Tentacle.Contracts.csproj                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/Octopus.Tentacle.Contracts/Octopus.Tentacle.Contracts.csproj b/source/Octopus.Tentacle.Contracts/Octopus.Tentacle.Contracts.csproj
index 8cb0811fc..a08e774b5 100644
--- a/source/Octopus.Tentacle.Contracts/Octopus.Tentacle.Contracts.csproj
+++ b/source/Octopus.Tentacle.Contracts/Octopus.Tentacle.Contracts.csproj
@@ -28,7 +28,7 @@
     </Otherwise>
   </Choose>
   <ItemGroup>
-    <PackageReference Include="Halibut" Version="8.1.1040" />
+    <PackageReference Include="Halibut" Version="8.0.1075-pull-633" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Solution Items\SolutionInfo.cs">

From 3b83f3c5e37fe2ae87efa2b724db471d856b919d Mon Sep 17 00:00:00 2001
From: Pawel Pabich <pawel@pabich.eu>
Date: Fri, 16 May 2025 14:56:42 +1000
Subject: [PATCH 2/4] Tentacle changes to accommodate changes in Halibut

---
 NuGet.Config                                               | 1 +
 .../Octopus.Tentacle.Contracts.csproj                      | 2 +-
 .../CancelWhenRequestQueuedPendingRequestQueueFactory.cs   | 5 +++++
 .../CancellationObservingPendingRequestQueueFactory.cs     | 7 +++++++
 source/Octopus.Tentacle/Tentacle.exe.nlog                  | 2 +-
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/NuGet.Config b/NuGet.Config
index 77fd4bfa8..56739bf7f 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -8,5 +8,6 @@
     <add key="NuGet.org" value="https://www.nuget.org/api/v2/" />
     <add key="feedz.io" value="https://f.feedz.io/octopus-deploy/dependencies/nuget" />
     <add key="nuget.packages.octopushq.com" value="https://nuget.packages.octopushq.com/" />
+    <add key="Local" value="C:\Code\LocalPackages" allowInsecureConnections="True" />
   </packageSources>
 </configuration>
diff --git a/source/Octopus.Tentacle.Contracts/Octopus.Tentacle.Contracts.csproj b/source/Octopus.Tentacle.Contracts/Octopus.Tentacle.Contracts.csproj
index a08e774b5..d9cf73fa0 100644
--- a/source/Octopus.Tentacle.Contracts/Octopus.Tentacle.Contracts.csproj
+++ b/source/Octopus.Tentacle.Contracts/Octopus.Tentacle.Contracts.csproj
@@ -28,7 +28,7 @@
     </Otherwise>
   </Choose>
   <ItemGroup>
-    <PackageReference Include="Halibut" Version="8.0.1075-pull-633" />
+    <PackageReference Include="Halibut" Version="8.1.1200-pull-633" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Solution Items\SolutionInfo.cs">
diff --git a/source/Octopus.Tentacle.Tests.Integration/Support/PendingRequestQueueFactories/CancelWhenRequestQueuedPendingRequestQueueFactory.cs b/source/Octopus.Tentacle.Tests.Integration/Support/PendingRequestQueueFactories/CancelWhenRequestQueuedPendingRequestQueueFactory.cs
index 4b8ac6654..a58e08c66 100644
--- a/source/Octopus.Tentacle.Tests.Integration/Support/PendingRequestQueueFactories/CancelWhenRequestQueuedPendingRequestQueueFactory.cs
+++ b/source/Octopus.Tentacle.Tests.Integration/Support/PendingRequestQueueFactories/CancelWhenRequestQueuedPendingRequestQueueFactory.cs
@@ -29,6 +29,11 @@ public IPendingRequestQueue CreateQueue(Uri endpoint)
             return new Decorator(new PendingRequestQueueAsync(halibutTimeoutsAndLimits, new LogFactory().ForEndpoint(endpoint)), cancellationTokenSource, shouldCancel);
         }
 
+        public Task<IPendingRequestQueue> CreateQueueAsync(Uri endpoint, CancellationToken cancellationToken)
+        {
+            return Task.FromResult(CreateQueue(endpoint));
+        }
+
         class Decorator : IPendingRequestQueue
         {
             readonly CancellationTokenSource cancellationTokenSource;
diff --git a/source/Octopus.Tentacle.Tests.Integration/Util/PendingRequestQueueHelpers/CancellationObservingPendingRequestQueueFactory.cs b/source/Octopus.Tentacle.Tests.Integration/Util/PendingRequestQueueHelpers/CancellationObservingPendingRequestQueueFactory.cs
index 863185379..93de6108d 100644
--- a/source/Octopus.Tentacle.Tests.Integration/Util/PendingRequestQueueHelpers/CancellationObservingPendingRequestQueueFactory.cs
+++ b/source/Octopus.Tentacle.Tests.Integration/Util/PendingRequestQueueHelpers/CancellationObservingPendingRequestQueueFactory.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Threading;
+using System.Threading.Tasks;
 using Halibut.Diagnostics;
 using Halibut.ServiceModel;
 using Octopus.Tentacle.Tests.Integration.Support;
@@ -11,5 +13,10 @@ public IPendingRequestQueue CreateQueue(Uri endpoint)
         {
             return new CancellationTokenObservingPendingRequestQueueDecorator(new PendingRequestQueueAsync(new HalibutTimeoutsAndLimitsForTestBuilder().Build(), new LogFactory().ForEndpoint(endpoint)));
         }
+
+        public Task<IPendingRequestQueue> CreateQueueAsync(Uri endpoint, CancellationToken cancellationToken)
+        {
+            return Task.FromResult(CreateQueue(endpoint));
+        }
     }
 }
\ No newline at end of file
diff --git a/source/Octopus.Tentacle/Tentacle.exe.nlog b/source/Octopus.Tentacle/Tentacle.exe.nlog
index 7a1518e38..5b285ca69 100644
--- a/source/Octopus.Tentacle/Tentacle.exe.nlog
+++ b/source/Octopus.Tentacle/Tentacle.exe.nlog
@@ -14,7 +14,7 @@
   <variable name="appName" value="Octopus Tentacle" />
   <variable name="messageLayout" value="${message}${onexception:${newline}${exception:format=ToString}}"/>
   <variable name="normalLayout" value="${longdate}  ${processid:padding=5}  ${threadid:padding=5} ${uppercase:${level}:padding=5}  ${messageLayout}"/>
-  <variable name="logLevel" value="Info" />
+  <variable name="logLevel" value="Trace" />
 
   <targets async="false">
     <target xsi:type="ColoredConsole" name="stdout" layout="${messageLayout}" />

From c80946dd7c43953337934ab1c8a0fed218124934 Mon Sep 17 00:00:00 2001
From: Pawel Pabich <pawel@pabich.eu>
Date: Fri, 16 May 2025 14:57:49 +1000
Subject: [PATCH 3/4] Rollback changes

---
 NuGet.Config                              | 1 -
 source/Octopus.Tentacle/Tentacle.exe.nlog | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/NuGet.Config b/NuGet.Config
index 56739bf7f..77fd4bfa8 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -8,6 +8,5 @@
     <add key="NuGet.org" value="https://www.nuget.org/api/v2/" />
     <add key="feedz.io" value="https://f.feedz.io/octopus-deploy/dependencies/nuget" />
     <add key="nuget.packages.octopushq.com" value="https://nuget.packages.octopushq.com/" />
-    <add key="Local" value="C:\Code\LocalPackages" allowInsecureConnections="True" />
   </packageSources>
 </configuration>
diff --git a/source/Octopus.Tentacle/Tentacle.exe.nlog b/source/Octopus.Tentacle/Tentacle.exe.nlog
index 5b285ca69..7a1518e38 100644
--- a/source/Octopus.Tentacle/Tentacle.exe.nlog
+++ b/source/Octopus.Tentacle/Tentacle.exe.nlog
@@ -14,7 +14,7 @@
   <variable name="appName" value="Octopus Tentacle" />
   <variable name="messageLayout" value="${message}${onexception:${newline}${exception:format=ToString}}"/>
   <variable name="normalLayout" value="${longdate}  ${processid:padding=5}  ${threadid:padding=5} ${uppercase:${level}:padding=5}  ${messageLayout}"/>
-  <variable name="logLevel" value="Trace" />
+  <variable name="logLevel" value="Info" />
 
   <targets async="false">
     <target xsi:type="ColoredConsole" name="stdout" layout="${messageLayout}" />

From edbe486bd20c7f692cef3b4a60af7b45823e4b5c Mon Sep 17 00:00:00 2001
From: Pawel Pabich <pawel@pabich.eu>
Date: Fri, 16 May 2025 15:56:39 +1000
Subject: [PATCH 4/4] Latest halibut

---
 .../Octopus.Tentacle.Contracts.csproj                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/Octopus.Tentacle.Contracts/Octopus.Tentacle.Contracts.csproj b/source/Octopus.Tentacle.Contracts/Octopus.Tentacle.Contracts.csproj
index d9cf73fa0..ed70c0b21 100644
--- a/source/Octopus.Tentacle.Contracts/Octopus.Tentacle.Contracts.csproj
+++ b/source/Octopus.Tentacle.Contracts/Octopus.Tentacle.Contracts.csproj
@@ -28,7 +28,7 @@
     </Otherwise>
   </Choose>
   <ItemGroup>
-    <PackageReference Include="Halibut" Version="8.1.1200-pull-633" />
+    <PackageReference Include="Halibut" Version="8.1.1201-pull-633" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Solution Items\SolutionInfo.cs">