diff --git a/source/Octopus.Manager.Tentacle/Octopus.Manager.Tentacle.csproj b/source/Octopus.Manager.Tentacle/Octopus.Manager.Tentacle.csproj
index b88e55e6b..c6d8367c8 100644
--- a/source/Octopus.Manager.Tentacle/Octopus.Manager.Tentacle.csproj
+++ b/source/Octopus.Manager.Tentacle/Octopus.Manager.Tentacle.csproj
@@ -94,28 +94,22 @@
True
- ..\packages\NuGet.Common.3.6.0-octopus-58455\lib\net45\NuGet.Common.dll
- True
+ ..\packages\NuGet.Common.3.6.0-octopus-58672\lib\net45\NuGet.Common.dll
- ..\packages\NuGet.Frameworks.3.6.0-octopus-58455\lib\net45\NuGet.Frameworks.dll
- True
+ ..\packages\NuGet.Frameworks.3.6.0-octopus-58672\lib\net45\NuGet.Frameworks.dll
- ..\packages\NuGet.Packaging.3.6.0-octopus-58455\lib\net45\NuGet.Packaging.dll
- True
+ ..\packages\NuGet.Packaging.3.6.0-octopus-58672\lib\net45\NuGet.Packaging.dll
- ..\packages\NuGet.Packaging.Core.3.6.0-octopus-58455\lib\net45\NuGet.Packaging.Core.dll
- True
+ ..\packages\NuGet.Packaging.Core.3.6.0-octopus-58672\lib\net45\NuGet.Packaging.Core.dll
- ..\packages\NuGet.Packaging.Core.Types.3.6.0-octopus-58455\lib\net45\NuGet.Packaging.Core.Types.dll
- True
+ ..\packages\NuGet.Packaging.Core.Types.3.6.0-octopus-58672\lib\net45\NuGet.Packaging.Core.Types.dll
- ..\packages\NuGet.Versioning.3.6.0-octopus-58455\lib\net45\NuGet.Versioning.dll
- True
+ ..\packages\NuGet.Versioning.3.6.0-octopus-58672\lib\net45\NuGet.Versioning.dll
..\packages\Octopus.Client.4.15.7\lib\net45\Octopus.Client.dll
@@ -126,11 +120,11 @@
..\packages\Octopus.Diagnostics.1.0.12\lib\netstandard1.0\Octopus.Diagnostics.dll
-
- ..\packages\Octopus.Manager.Core.3.14.0-ci0053\lib\Octopus.Manager.Core.dll
+
+ ..\packages\Octopus.Manager.Core.3.14.2-bug-noconsolelog0005\lib\Octopus.Manager.Core.dll
-
- ..\packages\Octopus.Shared.3.14.0-ci0053\lib\Octopus.Shared.dll
+
+ ..\packages\Octopus.Shared.3.14.2-bug-noconsolelog0005\lib\Octopus.Shared.dll
..\packages\Octopus.Time.1.0.9\lib\netstandard1.0\Octopus.Time.dll
diff --git a/source/Octopus.Manager.Tentacle/packages.config b/source/Octopus.Manager.Tentacle/packages.config
index e10eb5b6e..2065cdc00 100644
--- a/source/Octopus.Manager.Tentacle/packages.config
+++ b/source/Octopus.Manager.Tentacle/packages.config
@@ -9,17 +9,17 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
diff --git a/source/Octopus.Tentacle.Tests/Integration/ScriptLogFixture.cs b/source/Octopus.Tentacle.Tests/Integration/ScriptLogFixture.cs
index c106add5a..5bf51a92e 100644
--- a/source/Octopus.Tentacle.Tests/Integration/ScriptLogFixture.cs
+++ b/source/Octopus.Tentacle.Tests/Integration/ScriptLogFixture.cs
@@ -31,6 +31,7 @@ public void ShouldAppend()
var logs = log.GetOutput(long.MinValue, out next);
Assert.That(logs.Count, Is.EqualTo(2));
Assert.That(logs[0].Text, Is.EqualTo("Hello"));
+ Assert.That(logs[0].Source, Is.EqualTo(ProcessOutputSource.StdOut));
Assert.That(logs[1].Text, Is.EqualTo("World"));
appender.WriteOutput(ProcessOutputSource.StdOut, "More");
@@ -40,6 +41,14 @@ public void ShouldAppend()
Assert.That(logs.Count, Is.EqualTo(2));
Assert.That(logs[0].Text, Is.EqualTo("More"));
Assert.That(logs[1].Text, Is.EqualTo("Output"));
+
+ appender.WriteOutput(ProcessOutputSource.StdErr, "ErrorHappened");
+
+ logs = log.GetOutput(next, out next);
+ Assert.That(logs.Count, Is.EqualTo(1));
+ Assert.That(logs[0].Text, Is.EqualTo("ErrorHappened"));
+ Assert.That(logs[0].Source, Is.EqualTo(ProcessOutputSource.StdErr));
+
appender.Dispose();
}
finally
diff --git a/source/Octopus.Tentacle.Tests/Octopus.Tentacle.Tests.csproj b/source/Octopus.Tentacle.Tests/Octopus.Tentacle.Tests.csproj
index eab42bd2c..2a63fc3f2 100644
--- a/source/Octopus.Tentacle.Tests/Octopus.Tentacle.Tests.csproj
+++ b/source/Octopus.Tentacle.Tests/Octopus.Tentacle.Tests.csproj
@@ -103,9 +103,23 @@
..\packages\NSubstitute.1.8.2.0\lib\net45\NSubstitute.dll
True
+
+ ..\packages\NuGet.Common.3.6.0-octopus-58672\lib\net45\NuGet.Common.dll
+
+
+ ..\packages\NuGet.Frameworks.3.6.0-octopus-58672\lib\net45\NuGet.Frameworks.dll
+
+
+ ..\packages\NuGet.Packaging.3.6.0-octopus-58672\lib\net45\NuGet.Packaging.dll
+
+
+ ..\packages\NuGet.Packaging.Core.3.6.0-octopus-58672\lib\net45\NuGet.Packaging.Core.dll
+
+
+ ..\packages\NuGet.Packaging.Core.Types.3.6.0-octopus-58672\lib\net45\NuGet.Packaging.Core.Types.dll
+
- ..\packages\NuGet.Versioning.3.6.0-octopus-58455\lib\net45\NuGet.Versioning.dll
- True
+ ..\packages\NuGet.Versioning.3.6.0-octopus-58672\lib\net45\NuGet.Versioning.dll
..\packages\NUnit.2.6.4\lib\nunit.framework.dll
@@ -124,8 +138,8 @@
..\packages\Octopus.Diagnostics.1.0.12\lib\netstandard1.0\Octopus.Diagnostics.dll
-
- ..\packages\Octopus.Shared.3.14.0-ci0053\lib\Octopus.Shared.dll
+
+ ..\packages\Octopus.Shared.3.14.2-bug-noconsolelog0005\lib\Octopus.Shared.dll
..\packages\Octopus.Time.1.0.9\lib\netstandard1.0\Octopus.Time.dll
diff --git a/source/Octopus.Tentacle.Tests/packages.config b/source/Octopus.Tentacle.Tests/packages.config
index 8d3f4dfdd..8898597bb 100644
--- a/source/Octopus.Tentacle.Tests/packages.config
+++ b/source/Octopus.Tentacle.Tests/packages.config
@@ -26,15 +26,15 @@
-
+
-
-
-
-
+
+
+
+
-
+
@@ -42,7 +42,7 @@
-
+
diff --git a/source/Octopus.Tentacle/Octopus.Tentacle.csproj b/source/Octopus.Tentacle/Octopus.Tentacle.csproj
index 515e6ba9b..5c32a60af 100644
--- a/source/Octopus.Tentacle/Octopus.Tentacle.csproj
+++ b/source/Octopus.Tentacle/Octopus.Tentacle.csproj
@@ -16,7 +16,7 @@
-
+
all
diff --git a/source/Octopus.Tentacle/tentacle.exe.nlog b/source/Octopus.Tentacle/tentacle.exe.nlog
index 1ca925669..49ca75088 100644
--- a/source/Octopus.Tentacle/tentacle.exe.nlog
+++ b/source/Octopus.Tentacle/tentacle.exe.nlog
@@ -16,6 +16,8 @@
+
+
-
-
-
-
-
+
+
-
-
+