From f32d58861596c1d0fc76a792d20cac3b67ea7795 Mon Sep 17 00:00:00 2001
From: Graeme Foster <graeme.foster@cashconverters.com>
Date: Mon, 9 May 2016 13:45:00 +0800
Subject: [PATCH 1/3] Breaking change in Octopus Client breaks this for 3.3.x
 installs. Upgrading client, and fixing.

---
 .../AzureWebFarm.OctopusDeploy.Tests.csproj                   | 4 ++--
 AzureWebFarm.OctopusDeploy.Tests/packages.config              | 2 +-
 AzureWebFarm.OctopusDeploy/AzureWebFarm.OctopusDeploy.csproj  | 4 ++--
 AzureWebFarm.OctopusDeploy/Infrastructure/OctopusDeploy.cs    | 4 ++--
 AzureWebFarm.OctopusDeploy/packages.config                    | 2 +-
 ExampleWebFarm/ExampleWebFarm.csproj                          | 4 ++--
 ExampleWebFarm/packages.config                                | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/AzureWebFarm.OctopusDeploy.Tests/AzureWebFarm.OctopusDeploy.Tests.csproj b/AzureWebFarm.OctopusDeploy.Tests/AzureWebFarm.OctopusDeploy.Tests.csproj
index 7ff314b..7adb584 100644
--- a/AzureWebFarm.OctopusDeploy.Tests/AzureWebFarm.OctopusDeploy.Tests.csproj
+++ b/AzureWebFarm.OctopusDeploy.Tests/AzureWebFarm.OctopusDeploy.Tests.csproj
@@ -60,8 +60,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NSubstitute.1.7.2.0\lib\NET45\NSubstitute.dll</HintPath>
     </Reference>
-    <Reference Include="Octopus.Client, Version=3.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Octopus.Client.3.2.1\lib\net40\Octopus.Client.dll</HintPath>
+    <Reference Include="Octopus.Client, Version=3.3.11.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Octopus.Client.3.3.11\lib\net40\Octopus.Client.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Shouldly">
diff --git a/AzureWebFarm.OctopusDeploy.Tests/packages.config b/AzureWebFarm.OctopusDeploy.Tests/packages.config
index 882ef03..0b1e18f 100644
--- a/AzureWebFarm.OctopusDeploy.Tests/packages.config
+++ b/AzureWebFarm.OctopusDeploy.Tests/packages.config
@@ -7,7 +7,7 @@
   <package id="Microsoft.Web.Xdt" version="1.0.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
   <package id="NSubstitute" version="1.7.2.0" targetFramework="net45" />
-  <package id="Octopus.Client" version="3.2.1" targetFramework="net45" />
+  <package id="Octopus.Client" version="3.3.11" targetFramework="net45" />
   <package id="Shouldly" version="1.1.1.1" targetFramework="net45" />
   <package id="xunit" version="1.9.2" targetFramework="net45" />
   <package id="xunit.extensions" version="1.9.2" targetFramework="net45" />
diff --git a/AzureWebFarm.OctopusDeploy/AzureWebFarm.OctopusDeploy.csproj b/AzureWebFarm.OctopusDeploy/AzureWebFarm.OctopusDeploy.csproj
index 43c4cbb..0c9273d 100644
--- a/AzureWebFarm.OctopusDeploy/AzureWebFarm.OctopusDeploy.csproj
+++ b/AzureWebFarm.OctopusDeploy/AzureWebFarm.OctopusDeploy.csproj
@@ -59,8 +59,8 @@
       <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Octopus.Client, Version=3.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Octopus.Client.3.2.1\lib\net40\Octopus.Client.dll</HintPath>
+    <Reference Include="Octopus.Client, Version=3.3.11.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Octopus.Client.3.3.11\lib\net40\Octopus.Client.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Serilog, Version=1.2.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
diff --git a/AzureWebFarm.OctopusDeploy/Infrastructure/OctopusDeploy.cs b/AzureWebFarm.OctopusDeploy/Infrastructure/OctopusDeploy.cs
index 815c4b7..68bab89 100644
--- a/AzureWebFarm.OctopusDeploy/Infrastructure/OctopusDeploy.cs
+++ b/AzureWebFarm.OctopusDeploy/Infrastructure/OctopusDeploy.cs
@@ -99,8 +99,8 @@ public void DeployAllCurrentReleasesToThisMachine()
                                .Steps
                                .Any(s =>
                                {
-                                   string value;
-                                   return s.Properties.TryGetValue(targetRolePropertyName, out value) && value == _config.TentacleRole;
+                                   PropertyValueResource value;
+                                   return s.Properties.TryGetValue(targetRolePropertyName, out value) && value != null && value.Value == _config.TentacleRole;
                                }))
                     .Select(p => p.Id);
 
diff --git a/AzureWebFarm.OctopusDeploy/packages.config b/AzureWebFarm.OctopusDeploy/packages.config
index f90802b..81e2a64 100644
--- a/AzureWebFarm.OctopusDeploy/packages.config
+++ b/AzureWebFarm.OctopusDeploy/packages.config
@@ -5,7 +5,7 @@
   <package id="Microsoft.Web.Administration" version="7.0.0.0" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-  <package id="Octopus.Client" version="3.2.1" targetFramework="net45" />
+  <package id="Octopus.Client" version="3.3.11" targetFramework="net45" />
   <package id="Serilog" version="1.2.25" targetFramework="net45" />
   <package id="Serilog.Sinks.AzureTableStorage" version="1.2.25" targetFramework="net45" />
   <package id="System.Spatial" version="5.2.0" targetFramework="net45" />
diff --git a/ExampleWebFarm/ExampleWebFarm.csproj b/ExampleWebFarm/ExampleWebFarm.csproj
index d04aaff..1f778cf 100644
--- a/ExampleWebFarm/ExampleWebFarm.csproj
+++ b/ExampleWebFarm/ExampleWebFarm.csproj
@@ -70,8 +70,8 @@
       <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Octopus.Client, Version=3.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Octopus.Client.3.2.1\lib\net40\Octopus.Client.dll</HintPath>
+    <Reference Include="Octopus.Client, Version=3.3.11.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Octopus.Client.3.3.11\lib\net40\Octopus.Client.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Serilog, Version=1.2.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
diff --git a/ExampleWebFarm/packages.config b/ExampleWebFarm/packages.config
index f90802b..81e2a64 100644
--- a/ExampleWebFarm/packages.config
+++ b/ExampleWebFarm/packages.config
@@ -5,7 +5,7 @@
   <package id="Microsoft.Web.Administration" version="7.0.0.0" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-  <package id="Octopus.Client" version="3.2.1" targetFramework="net45" />
+  <package id="Octopus.Client" version="3.3.11" targetFramework="net45" />
   <package id="Serilog" version="1.2.25" targetFramework="net45" />
   <package id="Serilog.Sinks.AzureTableStorage" version="1.2.25" targetFramework="net45" />
   <package id="System.Spatial" version="5.2.0" targetFramework="net45" />

From e4be60b244b02fb25adf40a8169a4fe6e13be116 Mon Sep 17 00:00:00 2001
From: Graeme Foster <graeme.foster@cashconverters.com>
Date: Mon, 9 May 2016 14:26:45 +0800
Subject: [PATCH 2/3] Original doesn't work when a step is assigned to multiple
 roles.

---
 AzureWebFarm.OctopusDeploy/Infrastructure/OctopusDeploy.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/AzureWebFarm.OctopusDeploy/Infrastructure/OctopusDeploy.cs b/AzureWebFarm.OctopusDeploy/Infrastructure/OctopusDeploy.cs
index 68bab89..9f6906d 100644
--- a/AzureWebFarm.OctopusDeploy/Infrastructure/OctopusDeploy.cs
+++ b/AzureWebFarm.OctopusDeploy/Infrastructure/OctopusDeploy.cs
@@ -100,7 +100,9 @@ public void DeployAllCurrentReleasesToThisMachine()
                                .Any(s =>
                                {
                                    PropertyValueResource value;
-                                   return s.Properties.TryGetValue(targetRolePropertyName, out value) && value != null && value.Value == _config.TentacleRole;
+                                   return s.Properties.TryGetValue(targetRolePropertyName, out value) 
+                                       && value != null 
+                                       && value.Value.Split(',').Any(x => x.ToLowerInvariant() ==  _config.TentacleRole.ToLowerInvariant());
                                }))
                     .Select(p => p.Id);
 

From 08b89f6b5ac291b6c9d3889ff7d036f4d54728fc Mon Sep 17 00:00:00 2001
From: Graeme Foster <graeme.foster@cashconverters.com>
Date: Tue, 10 May 2016 09:31:50 +0800
Subject: [PATCH 3/3] Updated nuspec file

---
 AzureWebFarm.OctopusDeploy/AzureWebFarm.OctopusDeploy.nuspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AzureWebFarm.OctopusDeploy/AzureWebFarm.OctopusDeploy.nuspec b/AzureWebFarm.OctopusDeploy/AzureWebFarm.OctopusDeploy.nuspec
index 4cfed15..a014e5d 100644
--- a/AzureWebFarm.OctopusDeploy/AzureWebFarm.OctopusDeploy.nuspec
+++ b/AzureWebFarm.OctopusDeploy/AzureWebFarm.OctopusDeploy.nuspec
@@ -32,7 +32,7 @@
       en-US
     </language>
     <dependencies>
-      <dependency id="Octopus.Client" version="2.0.12.1092" />
+      <dependency id="Octopus.Client" version="3.3.11" />
       <dependency id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" />
       <dependency id="WindowsAzure.Storage" version="2.1.0.3" />
       <dependency id="Serilog" version="1.2.25" />