Skip to content

Commit 0e4f372

Browse files
robdmoorerobdmoore
committed
Merge pull request #8 from MRCollective/latest-version
Latest version
2 parents 93b5328 + 7531576 commit 0e4f372

13 files changed

+70
-84
lines changed

‎AzureWebFarm.OctopusDeploy.Tests/AzureWebFarm.OctopusDeploy.Tests.csproj

+14-13
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,13 @@
4141
<Reference Include="ApprovalUtilities">
4242
<HintPath>..\packages\ApprovalUtilities.3.0.5\lib\net35\ApprovalUtilities.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Autofac">
45-
<HintPath>..\packages\Autofac.3.0.2\lib\net40\Autofac.dll</HintPath>
46-
</Reference>
47-
<Reference Include="Autofac.Configuration">
48-
<HintPath>..\packages\Autofac.3.0.2\lib\net40\Autofac.Configuration.dll</HintPath>
44+
<Reference Include="Autofac, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
45+
<SpecificVersion>False</SpecificVersion>
46+
<HintPath>..\packages\Autofac.3.3.0\lib\net40\Autofac.dll</HintPath>
4947
</Reference>
50-
<Reference Include="AutofacContrib.NSubstitute">
51-
<HintPath>..\packages\AutofacContrib.NSubstitute.3.1.3\lib\NET40\AutofacContrib.NSubstitute.dll</HintPath>
48+
<Reference Include="AutofacContrib.NSubstitute, Version=3.2.0.0, Culture=neutral, processorArchitecture=MSIL">
49+
<SpecificVersion>False</SpecificVersion>
50+
<HintPath>..\packages\AutofacContrib.NSubstitute.3.2.0\lib\NET40\AutofacContrib.NSubstitute.dll</HintPath>
5251
</Reference>
5352
<Reference Include="Microsoft.Web.XmlTransform">
5453
<HintPath>..\packages\Microsoft.Web.Xdt.1.0.0\lib\net40\Microsoft.Web.XmlTransform.dll</HintPath>
@@ -57,16 +56,17 @@
5756
<SpecificVersion>False</SpecificVersion>
5857
<HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
5958
</Reference>
60-
<Reference Include="NSubstitute">
61-
<HintPath>..\packages\NSubstitute.1.6.1.0\lib\NET40\NSubstitute.dll</HintPath>
59+
<Reference Include="NSubstitute, Version=1.7.2.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
60+
<SpecificVersion>False</SpecificVersion>
61+
<HintPath>..\packages\NSubstitute.1.7.2.0\lib\NET45\NSubstitute.dll</HintPath>
6262
</Reference>
63-
<Reference Include="Octopus.Client, Version=2.0.8.0, Culture=neutral, processorArchitecture=MSIL">
63+
<Reference Include="Octopus.Client, Version=2.0.12.0, Culture=neutral, processorArchitecture=MSIL">
6464
<SpecificVersion>False</SpecificVersion>
65-
<HintPath>..\packages\Octopus.Client.2.0.8.977\lib\net40\Octopus.Client.dll</HintPath>
65+
<HintPath>..\packages\Octopus.Client.2.0.12.1092\lib\net40\Octopus.Client.dll</HintPath>
6666
</Reference>
67-
<Reference Include="Octopus.Platform, Version=2.0.8.0, Culture=neutral, processorArchitecture=MSIL">
67+
<Reference Include="Octopus.Platform, Version=2.0.12.0, Culture=neutral, processorArchitecture=MSIL">
6868
<SpecificVersion>False</SpecificVersion>
69-
<HintPath>..\packages\Octopus.Client.2.0.8.977\lib\net40\Octopus.Platform.dll</HintPath>
69+
<HintPath>..\packages\Octopus.Client.2.0.12.1092\lib\net40\Octopus.Platform.dll</HintPath>
7070
</Reference>
7171
<Reference Include="Shouldly">
7272
<HintPath>..\packages\Shouldly.1.1.1.1\lib\35\Shouldly.dll</HintPath>
@@ -95,6 +95,7 @@
9595
<Compile Include="Tools\XdtTests.cs" />
9696
</ItemGroup>
9797
<ItemGroup>
98+
<None Include="app.config" />
9899
<None Include="packages.config" />
99100
<None Include="Tools\ExampleFiles\CloudProject.ccproj">
100101
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

‎AzureWebFarm.OctopusDeploy.Tests/Infrastructure/OctopusDeployTests.WhenConfiguringTentacle_ThenTheCorrectCommandsShouldBeSentToTentacleExe.approved.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
c:\Install\Tentacle\Agent\Tentacle.exe create-instance --instance "Tentacle" --config "c:\Install\Tentacle.config" --console
2-
c:\Install\Tentacle\Agent\Tentacle.exe new-certificate --instance "Tentacle" --console
3-
c:\Install\Tentacle\Agent\Tentacle.exe configure --instance "Tentacle" --home "c:\Deployment" --console
4-
c:\Install\Tentacle\Agent\Tentacle.exe configure --instance "Tentacle" --app "c:\Deployments\Applications" --console
5-
c:\Install\Tentacle\Agent\Tentacle.exe register-with --instance "Tentacle" --server "%OctopusServer%" --environment "%TentacleEnvironment%" --role "%TentacleRole%" --apiKey "%OctopusApiKey%" --name "%machineName%" --comms-style TentacleActive --force --console
6-
c:\Install\Tentacle\Agent\Tentacle.exe service --instance "Tentacle" --install --start --console
1+
c:\Install\Tentacle\Tentacle.exe create-instance --instance "Tentacle" --config "c:\Install\Tentacle.config" --console
2+
c:\Install\Tentacle\Tentacle.exe new-certificate --instance "Tentacle" --console
3+
c:\Install\Tentacle\Tentacle.exe configure --instance "Tentacle" --home "c:\Deployment" --console
4+
c:\Install\Tentacle\Tentacle.exe configure --instance "Tentacle" --app "c:\Deployments\Applications" --console
5+
c:\Install\Tentacle\Tentacle.exe register-with --instance "Tentacle" --server "%OctopusServer%" --environment "%TentacleEnvironment%" --role "%TentacleRole%" --apiKey "%OctopusApiKey%" --name "%machineName%" --comms-style TentacleActive --force --console
6+
c:\Install\Tentacle\Tentacle.exe service --instance "Tentacle" --install --start --console

‎AzureWebFarm.OctopusDeploy.Tests/app.config

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="NSubstitute" publicKeyToken="92dd2e9066daa5ca" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-1.7.2.0" newVersion="1.7.2.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎AzureWebFarm.OctopusDeploy.Tests/packages.config

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<packages>
33
<package id="ApprovalTests" version="3.0.5" targetFramework="net45" />
44
<package id="ApprovalUtilities" version="3.0.5" targetFramework="net45" />
5-
<package id="Autofac" version="3.0.2" targetFramework="net45" />
6-
<package id="AutofacContrib.NSubstitute" version="3.1.3" targetFramework="net45" />
5+
<package id="Autofac" version="3.3.0" targetFramework="net45" />
6+
<package id="AutofacContrib.NSubstitute" version="3.2.0" targetFramework="net45" />
77
<package id="Microsoft.Web.Xdt" version="1.0.0" targetFramework="net45" />
88
<package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
9-
<package id="NSubstitute" version="1.6.1.0" targetFramework="net45" />
10-
<package id="Octopus.Client" version="2.0.8.977" targetFramework="net45" />
9+
<package id="NSubstitute" version="1.7.2.0" targetFramework="net45" />
10+
<package id="Octopus.Client" version="2.0.12.1092" targetFramework="net45" />
1111
<package id="Shouldly" version="1.1.1.1" targetFramework="net45" />
1212
<package id="Sprache" version="1.10.0.35" targetFramework="net45" />
1313
<package id="xunit" version="1.9.2" targetFramework="net45" />

‎AzureWebFarm.OctopusDeploy/AzureWebFarm.OctopusDeploy.csproj

+15-10
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,25 @@
5858
<Reference Include="Newtonsoft.Json">
5959
<HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
6060
</Reference>
61-
<Reference Include="Octopus.Client">
62-
<HintPath>..\packages\Octopus.Client.2.0.8.977\lib\net40\Octopus.Client.dll</HintPath>
61+
<Reference Include="Octopus.Client, Version=2.0.12.0, Culture=neutral, processorArchitecture=MSIL">
62+
<SpecificVersion>False</SpecificVersion>
63+
<HintPath>..\packages\Octopus.Client.2.0.12.1092\lib\net40\Octopus.Client.dll</HintPath>
6364
</Reference>
64-
<Reference Include="Octopus.Platform">
65-
<HintPath>..\packages\Octopus.Client.2.0.8.977\lib\net40\Octopus.Platform.dll</HintPath>
65+
<Reference Include="Octopus.Platform, Version=2.0.12.0, Culture=neutral, processorArchitecture=MSIL">
66+
<SpecificVersion>False</SpecificVersion>
67+
<HintPath>..\packages\Octopus.Client.2.0.12.1092\lib\net40\Octopus.Platform.dll</HintPath>
6668
</Reference>
67-
<Reference Include="Serilog">
68-
<HintPath>..\packages\Serilog.1.2.4\lib\net45\Serilog.dll</HintPath>
69+
<Reference Include="Serilog, Version=1.2.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
70+
<SpecificVersion>False</SpecificVersion>
71+
<HintPath>..\packages\Serilog.1.2.25\lib\net45\Serilog.dll</HintPath>
6972
</Reference>
70-
<Reference Include="Serilog.FullNetFx">
71-
<HintPath>..\packages\Serilog.1.2.4\lib\net45\Serilog.FullNetFx.dll</HintPath>
73+
<Reference Include="Serilog.FullNetFx, Version=1.2.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
74+
<SpecificVersion>False</SpecificVersion>
75+
<HintPath>..\packages\Serilog.1.2.25\lib\net45\Serilog.FullNetFx.dll</HintPath>
7276
</Reference>
73-
<Reference Include="Serilog.Sinks.AzureTableStorage">
74-
<HintPath>..\packages\Serilog.Sinks.AzureTableStorage.0.9.9\lib\net45\Serilog.Sinks.AzureTableStorage.dll</HintPath>
77+
<Reference Include="Serilog.Sinks.AzureTableStorage, Version=1.2.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
78+
<SpecificVersion>False</SpecificVersion>
79+
<HintPath>..\packages\Serilog.Sinks.AzureTableStorage.1.2.25\lib\net45\Serilog.Sinks.AzureTableStorage.dll</HintPath>
7580
</Reference>
7681
<Reference Include="Sprache">
7782
<HintPath>..\packages\Sprache.1.10.0.35\lib\net40\Sprache.dll</HintPath>

‎AzureWebFarm.OctopusDeploy/AzureWebFarm.OctopusDeploy.nuspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
en-US
3333
</language>
3434
<dependencies>
35-
<dependency id="Octopus.Client" version="2.0.8.977" />
35+
<dependency id="Octopus.Client" version="2.0.12.1092" />
3636
<dependency id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" />
3737
<dependency id="WindowsAzure.Storage" version="2.1.0.3" />
38-
<dependency id="Serilog" version="1.2.4" />
39-
<dependency id="Serilog.Sinks.AzureTableStorage" version="0.9.9" />
38+
<dependency id="Serilog" version="1.2.25" />
39+
<dependency id="Serilog.Sinks.AzureTableStorage" version="1.2.25" />
4040
<dependency id="Microsoft.Web.Administration" version="7.0.0.0" />
4141
<dependency id="Microsoft.Web.Xdt" version="1.0.0" />
4242
</dependencies>

‎AzureWebFarm.OctopusDeploy/Infrastructure/OctopusDeploy.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void ConfigureTentacle()
3232
var tentacleDeploymentsPath = _config.TentacleDeploymentsPath;
3333
var tentacleInstallPath = _config.TentacleInstallPath;
3434
var tentacleDir = Path.Combine(tentacleInstallPath, "Tentacle");
35-
var tentaclePath = Path.Combine(Path.Combine(tentacleDir, "Agent"), "Tentacle.exe");
35+
var tentaclePath = Path.Combine(tentacleDir, "Tentacle.exe");
3636

3737
_processRunner.Run(tentaclePath, string.Format("create-instance {0} --config \"{1}\" --console", instanceArg, Path.Combine(tentacleInstallPath, "Tentacle.config")));
3838
_processRunner.Run(tentaclePath, string.Format("new-certificate {0} --console", instanceArg));

‎AzureWebFarm.OctopusDeploy/packages.config

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<package id="Microsoft.Web.Administration" version="7.0.0.0" targetFramework="net45" />
77
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
88
<package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
9-
<package id="Octopus.Client" version="2.0.8.977" targetFramework="net45" />
10-
<package id="Serilog" version="1.2.4" targetFramework="net45" />
11-
<package id="Serilog.Sinks.AzureTableStorage" version="0.9.9" targetFramework="net45" />
9+
<package id="Octopus.Client" version="2.0.12.1092" targetFramework="net45" />
10+
<package id="Serilog" version="1.2.25" targetFramework="net45" />
11+
<package id="Serilog.Sinks.AzureTableStorage" version="1.2.25" targetFramework="net45" />
1212
<package id="Sprache" version="1.10.0.35" targetFramework="net45" />
1313
<package id="System.Spatial" version="5.2.0" targetFramework="net45" />
1414
<package id="WindowsAzure.Storage" version="2.1.0.3" targetFramework="net45" />

‎ExampleWebFarm/App.config

+1-16
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,4 @@
11
<?xml version="1.0"?>
22
<configuration>
3-
<runtime>
4-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
<dependentAssembly>
6-
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
8-
</dependentAssembly>
9-
<dependentAssembly>
10-
<assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
12-
</dependentAssembly>
13-
<dependentAssembly>
14-
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.3" newVersion="2.1.0.3" />
16-
</dependentAssembly>
17-
</assemblyBinding>
18-
</runtime>
3+
194
</configuration>

‎ExampleWebFarm/ExampleWebFarm.csproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -69,25 +69,25 @@
6969
<SpecificVersion>False</SpecificVersion>
7070
<HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
7171
</Reference>
72-
<Reference Include="Octopus.Client, Version=2.0.8.0, Culture=neutral, processorArchitecture=MSIL">
72+
<Reference Include="Octopus.Client, Version=2.0.12.0, Culture=neutral, processorArchitecture=MSIL">
7373
<SpecificVersion>False</SpecificVersion>
74-
<HintPath>..\packages\Octopus.Client.2.0.8.977\lib\net40\Octopus.Client.dll</HintPath>
74+
<HintPath>..\packages\Octopus.Client.2.0.12.1092\lib\net40\Octopus.Client.dll</HintPath>
7575
</Reference>
76-
<Reference Include="Octopus.Platform, Version=2.0.8.0, Culture=neutral, processorArchitecture=MSIL">
76+
<Reference Include="Octopus.Platform, Version=2.0.12.0, Culture=neutral, processorArchitecture=MSIL">
7777
<SpecificVersion>False</SpecificVersion>
78-
<HintPath>..\packages\Octopus.Client.2.0.8.977\lib\net40\Octopus.Platform.dll</HintPath>
78+
<HintPath>..\packages\Octopus.Client.2.0.12.1092\lib\net40\Octopus.Platform.dll</HintPath>
7979
</Reference>
8080
<Reference Include="Serilog, Version=1.2.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
8181
<SpecificVersion>False</SpecificVersion>
82-
<HintPath>..\packages\Serilog.1.2.4\lib\net45\Serilog.dll</HintPath>
82+
<HintPath>..\packages\Serilog.1.2.25\lib\net45\Serilog.dll</HintPath>
8383
</Reference>
8484
<Reference Include="Serilog.FullNetFx, Version=1.2.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
8585
<SpecificVersion>False</SpecificVersion>
86-
<HintPath>..\packages\Serilog.1.2.4\lib\net45\Serilog.FullNetFx.dll</HintPath>
86+
<HintPath>..\packages\Serilog.1.2.25\lib\net45\Serilog.FullNetFx.dll</HintPath>
8787
</Reference>
88-
<Reference Include="Serilog.Sinks.AzureTableStorage, Version=0.9.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
88+
<Reference Include="Serilog.Sinks.AzureTableStorage, Version=1.2.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
8989
<SpecificVersion>False</SpecificVersion>
90-
<HintPath>..\packages\Serilog.Sinks.AzureTableStorage.0.9.9\lib\net45\Serilog.Sinks.AzureTableStorage.dll</HintPath>
90+
<HintPath>..\packages\Serilog.Sinks.AzureTableStorage.1.2.25\lib\net45\Serilog.Sinks.AzureTableStorage.dll</HintPath>
9191
</Reference>
9292
<Reference Include="Sprache, Version=1.10.0.35, Culture=neutral, processorArchitecture=MSIL">
9393
<SpecificVersion>False</SpecificVersion>

‎ExampleWebFarm/Startup/startup.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
try
44
{
5-
$TentacleDownloadPath = "http://download.octopusdeploy.com/octopus/Octopus.Tentacle.2.0.8.977.msi"
5+
$TentacleDownloadPath = "http://download.octopusdeploy.com/octopus/Octopus.Tentacle.2.1.3.1223-x64.msi"
66
$TentacleLocalDebuggingPath = "C:\Octopus.Tentacle.msi"
77
$PathToInstall = $env:PathToInstall
88
$PathToDeployments = $env:PathToDeployments

‎ExampleWebFarm/Web.config

-16
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,4 @@
1111
<compilation debug="true" targetFramework="4.5" />
1212
<httpRuntime targetFramework="4.5" />
1313
</system.web>
14-
<runtime>
15-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
16-
<dependentAssembly>
17-
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
18-
<bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0" />
19-
</dependentAssembly>
20-
<dependentAssembly>
21-
<assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral" />
22-
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
23-
</dependentAssembly>
24-
<dependentAssembly>
25-
<assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
26-
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
27-
</dependentAssembly>
28-
</assemblyBinding>
29-
</runtime>
3014
</configuration>

‎ExampleWebFarm/packages.config

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<package id="Microsoft.Web.Administration" version="7.0.0.0" targetFramework="net45" />
66
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
77
<package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
8-
<package id="Octopus.Client" version="2.0.8.977" targetFramework="net45" />
9-
<package id="Serilog" version="1.2.4" targetFramework="net45" />
10-
<package id="Serilog.Sinks.AzureTableStorage" version="0.9.9" targetFramework="net45" />
8+
<package id="Octopus.Client" version="2.0.12.1092" targetFramework="net45" />
9+
<package id="Serilog" version="1.2.25" targetFramework="net45" />
10+
<package id="Serilog.Sinks.AzureTableStorage" version="1.2.25" targetFramework="net45" />
1111
<package id="Sprache" version="1.10.0.35" targetFramework="net45" />
1212
<package id="System.Spatial" version="5.2.0" targetFramework="net45" />
1313
<package id="WindowsAzure.Storage" version="2.1.0.3" targetFramework="net45" />

0 commit comments

Comments
 (0)