Skip to content

Breaking change in Octopus Client 3.3.x #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
graemefoster wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Breaking change in Octopus Client 3.3.x #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f32d588
Breaking change in Octopus Client breaks this for 3.3.x installs. Upg…
May 9, 2016
e4be60b
Original doesn't work when a step is assigned to multiple roles.
May 9, 2016
08b89f6
Updated nuspec file
May 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions AzureWebFarm.OctopusDeploy.Tests/AzureWebFarm.OctopusDeploy.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion AzureWebFarm.OctopusDeploy.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions AzureWebFarm.OctopusDeploy/AzureWebFarm.OctopusDeploy.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion AzureWebFarm.OctopusDeploy/AzureWebFarm.OctopusDeploy.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
6 changes: 4 additions & 2 deletions AzureWebFarm.OctopusDeploy/Infrastructure/OctopusDeploy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,10 @@ 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.Split(',').Any(x => x.ToLowerInvariant() == _config.TentacleRole.ToLowerInvariant());
}))
.Select(p => p.Id);

Expand Down
2 changes: 1 addition & 1 deletion AzureWebFarm.OctopusDeploy/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions ExampleWebFarm/ExampleWebFarm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion ExampleWebFarm/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down