diff --git a/build/parameters.cake b/build/parameters.cake
index 8fa4aba9eb..8c03ffdfa9 100644
--- a/build/parameters.cake
+++ b/build/parameters.cake
@@ -56,7 +56,7 @@ public class BuildParameters
             IsLocalBuild = buildSystem.IsLocalBuild,
             IsRunningOnUnix = context.IsRunningOnUnix(),
             IsRunningOnWindows = context.IsRunningOnWindows(),
-            IsRunningOnAppVeyor = context.IsRunningOnWindows(),
+            IsRunningOnAppVeyor = buildSystem.AppVeyor.IsRunningOnAppVeyor,
             IsPullRequest = buildSystem.AppVeyor.Environment.PullRequest.IsPullRequest,
             IsMainCakeRepo = StringComparer.OrdinalIgnoreCase.Equals("cake-build/cake", buildSystem.AppVeyor.Environment.Repository.Name),
             IsMainCakeBranch = StringComparer.OrdinalIgnoreCase.Equals("main", buildSystem.AppVeyor.Environment.Repository.Branch),
diff --git a/src/Cake.Common.Tests/Unit/Build/AppVeyor/AppVeyorProviderTests.cs b/src/Cake.Common.Tests/Unit/Build/AppVeyor/AppVeyorProviderTests.cs
index 0ba7f2c7ae..160f9ac4f7 100644
--- a/src/Cake.Common.Tests/Unit/Build/AppVeyor/AppVeyorProviderTests.cs
+++ b/src/Cake.Common.Tests/Unit/Build/AppVeyor/AppVeyorProviderTests.cs
@@ -198,5 +198,37 @@ public void Should_Update_Build_Version()
                     Arg.Is<ProcessSettings>(p => p.Arguments.Render() == "UpdateBuild -Version \"build-123\""));
             }
         }
+
+        public sealed class TheUploadTestResultsMethod
+        {
+            [Fact]
+            public void Should_Throw_If_Path_Is_Null()
+            {
+                // Given
+                var fixture = new AppVeyorFixture();
+                var appVeyor = fixture.CreateAppVeyorService();
+
+                // When
+                var result = Record.Exception(() => appVeyor.UploadTestResults(null, AppVeyorTestResultsType.XUnit));
+
+                // Then
+                Assert.IsArgumentNullException(result, "path");
+            }
+
+            [Fact]
+            public void Should_Throw_If_Not_Running_On_AppVeyor()
+            {
+                // Given
+                var fixture = new AppVeyorFixture();
+                var appVeyor = fixture.CreateAppVeyorService();
+
+                // When
+                var result = Record.Exception(() => appVeyor.UploadTestResults("./file.xml", AppVeyorTestResultsType.XUnit));
+
+                // Then
+                Assert.IsExceptionWithMessage<CakeException>(result,
+                    "The current build is not running on AppVeyor.");
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Cake.Common/Build/AppVeyor/AppVeyorProvider.cs b/src/Cake.Common/Build/AppVeyor/AppVeyorProvider.cs
index e853260e28..43c55d420e 100644
--- a/src/Cake.Common/Build/AppVeyor/AppVeyorProvider.cs
+++ b/src/Cake.Common/Build/AppVeyor/AppVeyorProvider.cs
@@ -1,4 +1,7 @@
 using System;
+using System.Globalization;
+using System.IO;
+using System.Net.Http;
 using Cake.Common.Build.AppVeyor.Data;
 using Cake.Core;
 using Cake.Core.IO;
@@ -87,6 +90,39 @@ public void UploadArtifact(FilePath path)
             _processRunner.Start("appveyor", new ProcessSettings { Arguments = arguments });
         }
 
+        /// <summary>
+        /// Uploads test results XML file to AppVeyor. Results type can be one of the following: mstest, xunit, nunit, nunit3, junit.
+        /// </summary>
+        /// <param name="path">The file path of the test results XML to upload.</param>
+        /// <param name="resultsType">The results type. Can be mstest, xunit, nunit, nunit3 or junit.</param>
+        public void UploadTestResults(FilePath path, AppVeyorTestResultsType resultsType)
+        {
+            if (path == null)
+            {
+                throw new ArgumentNullException("path");
+            }
+
+            if (!IsRunningOnAppVeyor)
+            {
+                throw new CakeException("The current build is not running on AppVeyor.");
+            }
+
+            var baseUri = _environment.GetEnvironmentVariable("APPVEYOR_URL").TrimEnd('/');
+
+            if (string.IsNullOrWhiteSpace(baseUri))
+            {
+                throw new CakeException("Failed to get AppVeyor API url.");
+            }
+
+            var url = string.Format(CultureInfo.InvariantCulture, "{0}/api/testresults/{1}/{2}", baseUri, resultsType, Environment.JobId);
+
+            using (var stream = File.OpenRead(path.FullPath))
+            using (var client = new HttpClient())
+            {
+                client.PostAsync(url, new StreamContent(stream)).Wait();
+            }
+        }
+
         /// <summary>
         /// Updates the build version.
         /// </summary>
diff --git a/src/Cake.Common/Build/AppVeyor/AppVeyorTestResultsType.cs b/src/Cake.Common/Build/AppVeyor/AppVeyorTestResultsType.cs
new file mode 100644
index 0000000000..6a09d1cdab
--- /dev/null
+++ b/src/Cake.Common/Build/AppVeyor/AppVeyorTestResultsType.cs
@@ -0,0 +1,33 @@
+namespace Cake.Common.Build.AppVeyor
+{
+    /// <summary>
+    /// Provides the known values for the AppVeyor test results types.
+    /// </summary>
+    public enum AppVeyorTestResultsType
+    {
+        /// <summary>
+        /// MSTest test results.
+        /// </summary>
+        MSTest,
+
+        /// <summary>
+        /// XUnit test results.
+        /// </summary>
+        XUnit,
+
+        /// <summary>
+        /// NUnit test results.
+        /// </summary>
+        NUnit,
+
+        /// <summary>
+        /// NUnit v3 test results.
+        /// </summary>
+        NUnit3,
+
+        /// <summary>
+        /// JUnit test results.
+        /// </summary>
+        JUnit
+    }
+}
diff --git a/src/Cake.Common/Build/AppVeyor/IAppVeyorProvider.cs b/src/Cake.Common/Build/AppVeyor/IAppVeyorProvider.cs
index 8ce5cb86d9..ffdc84cdd0 100644
--- a/src/Cake.Common/Build/AppVeyor/IAppVeyorProvider.cs
+++ b/src/Cake.Common/Build/AppVeyor/IAppVeyorProvider.cs
@@ -30,6 +30,13 @@ public interface IAppVeyorProvider
         /// <param name="path">The file path of the artifact to upload.</param>
         void UploadArtifact(FilePath path);
 
+        /// <summary>
+        /// Uploads test results XML file to AppVeyor. Results type can be one of the following: mstest, xunit, nunit, nunit3, junit.
+        /// </summary>
+        /// <param name="path">The file path of the test results XML to upload.</param>
+        /// <param name="resultsType">The results type. Can be mstest, xunit, nunit, nunit3 or junit.</param>
+        void UploadTestResults(FilePath path, AppVeyorTestResultsType resultsType);
+
         /// <summary>
         /// Updates the build version.
         /// </summary>
diff --git a/src/Cake.Common/Build/BuildSystemAliases.cs b/src/Cake.Common/Build/BuildSystemAliases.cs
index f6ece79f03..821f7448c8 100644
--- a/src/Cake.Common/Build/BuildSystemAliases.cs
+++ b/src/Cake.Common/Build/BuildSystemAliases.cs
@@ -60,6 +60,8 @@ public static BuildSystem BuildSystem(this ICakeContext context)
         /// <param name="context">The context.</param>
         /// <returns>A <see cref="Cake.Common.Build.AppVeyor"/> instance.</returns>
         [CakePropertyAlias(Cache = true)]
+        [CakeNamespaceImport("Cake.Common.Build.AppVeyor")]
+        [CakeNamespaceImport("Cake.Common.Build.AppVeyor.Data")]
         public static IAppVeyorProvider AppVeyor(this ICakeContext context)
         {
             if (context == null)
diff --git a/src/Cake.Common/Cake.Common.csproj b/src/Cake.Common/Cake.Common.csproj
index a9eb7c85a2..d9817d0d79 100644
--- a/src/Cake.Common/Cake.Common.csproj
+++ b/src/Cake.Common/Cake.Common.csproj
@@ -53,6 +53,7 @@
     <Reference Include="System.IO.Compression.FileSystem" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Build\AppVeyor\AppVeyorTestResultsType.cs" />
     <Compile Include="Build\AppVeyor\Data\AppVeyorEnvironmentInfo.cs" />
     <Compile Include="Build\AppVeyor\AppVeyorInfo.cs" />
     <Compile Include="Build\AppVeyor\AppVeyorProvider.cs" />
diff --git a/src/Cake.Common/Tools/Chocolatey/ChocolateyAliases.cs b/src/Cake.Common/Tools/Chocolatey/ChocolateyAliases.cs
index ad2157af6d..164bdef6a5 100644
--- a/src/Cake.Common/Tools/Chocolatey/ChocolateyAliases.cs
+++ b/src/Cake.Common/Tools/Chocolatey/ChocolateyAliases.cs
@@ -15,7 +15,12 @@
 namespace Cake.Common.Tools.Chocolatey
 {
     /// <summary>
-    /// Contains functionality for working with Chocolatey.
+    /// <para>Contains functionality for working with <see href="https://github.com/chocolatey/choco">Chocolatey</see>.</para>
+    /// <para>
+    /// In order to use the commands for this alias, Chocolatey will require to be installed on the machine where the build script
+    /// is being run.  See this <see href="https://github.com/chocolatey/choco/wiki/Installation">page</see> for details on how
+    /// Chocolatey can be installed.
+    /// </para>
     /// </summary>
     [CakeAliasCategory("Chocolatey")]
     public static class ChocolateyAliases
diff --git a/src/Cake.Common/Tools/DNU/DNUAliases.cs b/src/Cake.Common/Tools/DNU/DNUAliases.cs
index ff66f4c2ad..724d792d72 100644
--- a/src/Cake.Common/Tools/DNU/DNUAliases.cs
+++ b/src/Cake.Common/Tools/DNU/DNUAliases.cs
@@ -2,6 +2,7 @@
 using Cake.Common.Tools.DNU.Build;
 using Cake.Common.Tools.DNU.Pack;
 using Cake.Common.Tools.DNU.Restore;
+using Cake.Common.Tools.DotNetCore;
 using Cake.Core;
 using Cake.Core.Annotations;
 using Cake.Core.IO;
@@ -10,6 +11,7 @@ namespace Cake.Common.Tools.DNU
 {
     /// <summary>
     /// Contains functionality for working with the DNU Utility.
+    /// <para>These aliases have been marked as Obsolete.  Use the <see cref="DotNetCoreAliases" /> instead.</para>
     /// </summary>
     [CakeAliasCategory("DNU")]
     public static class DNUAliases
diff --git a/src/Cake.Common/Tools/DotCover/DotCoverAliases.cs b/src/Cake.Common/Tools/DotCover/DotCoverAliases.cs
index 5828537932..86fa683078 100644
--- a/src/Cake.Common/Tools/DotCover/DotCoverAliases.cs
+++ b/src/Cake.Common/Tools/DotCover/DotCoverAliases.cs
@@ -8,7 +8,14 @@
 namespace Cake.Common.Tools.DotCover
 {
     /// <summary>
-    /// Contains functionality related to DotCover.
+    /// <para>Contains functionality related to <see href="https://www.jetbrains.com/dotcover/">DotCover</see>.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the appropriate settings class:
+    /// <code>
+    /// #tool "nuget:?package=JetBrains.dotCover.CommandLineTools"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("DotCover")]
     public static class DotCoverAliases
diff --git a/src/Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cs b/src/Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cs
index 0cd06d037b..68ae9667db 100644
--- a/src/Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cs
+++ b/src/Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cs
@@ -13,7 +13,12 @@
 namespace Cake.Common.Tools.DotNetCore
 {
     /// <summary>
-    /// Contains functionality for working with the .NET Core CLI.
+    /// <para>Contains functionality related to <see href="https://github.com/dotnet/cli">.NET Core CLI</see>.</para>
+    /// <para>
+    /// In order to use the commands for this alias, the .Net Core CLI tools will need to be installed on the machine where
+    /// the Cake script is being executed.  See this <see href="https://www.microsoft.com/net/core">page</see> for information
+    /// on how to install.
+    /// </para>
     /// </summary>
     [CakeAliasCategory("DotNetCore")]
     public static class DotNetCoreAliases
diff --git a/src/Cake.Common/Tools/DupFinder/DupFinderAliases.cs b/src/Cake.Common/Tools/DupFinder/DupFinderAliases.cs
index ef9990e5fa..bb5f6a8ac7 100644
--- a/src/Cake.Common/Tools/DupFinder/DupFinderAliases.cs
+++ b/src/Cake.Common/Tools/DupFinder/DupFinderAliases.cs
@@ -9,7 +9,14 @@
 namespace Cake.Common.Tools.DupFinder
 {
     /// <summary>
-    ///  Contains functionality related to ReSharper's duplication finder
+    /// <para>Contains functionality related to ReSharper's <see href="https://www.jetbrains.com/help/resharper/2016.1/dupFinder.html">dupFinder</see> tool.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the <see cref="DupFinderSettings" /> class:
+    /// <code>
+    /// #tool "nuget:?package=JetBrains.ReSharper.CommandLineTools"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("ReSharper")]
     public static class DupFinderAliases
diff --git a/src/Cake.Common/Tools/Fixie/FixieAliases.cs b/src/Cake.Common/Tools/Fixie/FixieAliases.cs
index 2a9ca1a1c4..8aa259c0e6 100644
--- a/src/Cake.Common/Tools/Fixie/FixieAliases.cs
+++ b/src/Cake.Common/Tools/Fixie/FixieAliases.cs
@@ -9,7 +9,14 @@
 namespace Cake.Common.Tools.Fixie
 {
     /// <summary>
-    /// Contains functionality related to running Fixie tests.
+    /// <para>Contains functionality related to running <see href="https://github.com/fixie/fixie">Fixie</see> tests.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the <see cref="FixieSettings" /> class:
+    /// <code>
+    /// #tool "nuget:?package=Fixie"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("Fixie")]
     public static class FixieAliases
diff --git a/src/Cake.Common/Tools/GitLink/GitLinkAliases.cs b/src/Cake.Common/Tools/GitLink/GitLinkAliases.cs
index c7dda3c705..7e4a7fae7b 100644
--- a/src/Cake.Common/Tools/GitLink/GitLinkAliases.cs
+++ b/src/Cake.Common/Tools/GitLink/GitLinkAliases.cs
@@ -6,7 +6,14 @@
 namespace Cake.Common.Tools.GitLink
 {
     /// <summary>
-    /// Contains functionality for working with GitLink.
+    /// <para>Contains functionality related to <see href="https://github.com/gittools/gitlink">GitLink</see>.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the <see cref="GitLinkSettings" /> class:
+    /// <code>
+    /// #tool "nuget:?package=gitlink"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("GitTools")]
     public static class GitLinkAliases
diff --git a/src/Cake.Common/Tools/GitReleaseManager/GitReleaseManagerAliases.cs b/src/Cake.Common/Tools/GitReleaseManager/GitReleaseManagerAliases.cs
index c087c0d808..b24c76de37 100644
--- a/src/Cake.Common/Tools/GitReleaseManager/GitReleaseManagerAliases.cs
+++ b/src/Cake.Common/Tools/GitReleaseManager/GitReleaseManagerAliases.cs
@@ -11,7 +11,14 @@
 namespace Cake.Common.Tools.GitReleaseManager
 {
     /// <summary>
-    /// Contains functionality for working with GitReleaseManager.
+    /// <para>Contains functionality related to <see href="https://github.com/gittools/gitreleasemanager">GitReleaseManager</see>.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the appropriate settings class:
+    /// <code>
+    /// #tool "nuget:?package=gitreleasemanager"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("GitReleaseManager")]
     public static class GitReleaseManagerAliases
@@ -249,7 +256,7 @@ public static void GitReleaseManagerPublish(this ICakeContext context, string us
             {
                 throw new ArgumentNullException("context");
             }
-            
+
             var publisher = new GitReleaseManagerPublisher(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
             publisher.Publish(userName, password, owner, repository, tagName, settings);
         }
@@ -305,7 +312,7 @@ public static void GitReleaseManagerExport(this ICakeContext context, string use
             {
                 throw new ArgumentNullException("context");
             }
-            
+
             var publisher = new GitReleaseManagerExporter(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
             publisher.Export(userName, password, owner, repository, fileOutputPath, settings);
         }
diff --git a/src/Cake.Common/Tools/GitReleaseNotes/GitReleaseNotesAliases.cs b/src/Cake.Common/Tools/GitReleaseNotes/GitReleaseNotesAliases.cs
index 09d303b4fb..1c1ea35716 100644
--- a/src/Cake.Common/Tools/GitReleaseNotes/GitReleaseNotesAliases.cs
+++ b/src/Cake.Common/Tools/GitReleaseNotes/GitReleaseNotesAliases.cs
@@ -6,7 +6,14 @@
 namespace Cake.Common.Tools.GitReleaseNotes
 {
     /// <summary>
-    ///  Contains functionality related to GitReleaseNotes
+    /// <para>Contains functionality related to <see href="https://github.com/gittools/gitreleasenotes">GitReleaseNotes</see>.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the <see cref="GitReleaseNotesSettings" /> class:
+    /// <code>
+    /// #tool "nuget:?package=GitReleaseNotes"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("GitReleaseNotes")]
     public static class GitReleaseNotesAliases
diff --git a/src/Cake.Common/Tools/GitVersion/GitVersionAliases.cs b/src/Cake.Common/Tools/GitVersion/GitVersionAliases.cs
index 6ca69d737a..76ec0b7446 100644
--- a/src/Cake.Common/Tools/GitVersion/GitVersionAliases.cs
+++ b/src/Cake.Common/Tools/GitVersion/GitVersionAliases.cs
@@ -5,9 +5,14 @@
 namespace Cake.Common.Tools.GitVersion
 {
     /// <summary>
-    /// Contains functionality related to GitVersion.
-    /// <see href="http://gitversion.readthedocs.org/en/latest/">GitVersion Documentation</see>
-    /// <see href="https://www.nuget.org/packages/GitVersion.CommandLine/">GitVersion NuGet Package</see>
+    /// <para>Contains functionality related to <see href="https://github.com/gittools/gitversion">GitVersion</see>.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the <see cref="GitVersionSettings" /> class:
+    /// <code>
+    /// #tool "nuget:?package=GitVersion.CommandLine"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("GitVersion")]
     public static class GitVersionAliases
diff --git a/src/Cake.Common/Tools/ILMerge/ILMergeAliases.cs b/src/Cake.Common/Tools/ILMerge/ILMergeAliases.cs
index 586a26223b..7add66fb3b 100644
--- a/src/Cake.Common/Tools/ILMerge/ILMergeAliases.cs
+++ b/src/Cake.Common/Tools/ILMerge/ILMergeAliases.cs
@@ -7,9 +7,10 @@
 namespace Cake.Common.Tools.ILMerge
 {
     /// <summary>
-    /// <para>Contains functionality related to ILMerge.</para>
+    /// <para>Contains functionality related to <see href="http://research.microsoft.com/en-us/people/mbarnett/ILMerge.aspx">ILMerge</see>.</para>
     /// <para>
-    /// In order to use the commands for this alias, include the following in your build.cake file to download and install from NuGet.org, or specify the ToolPath within the ILMergeSettings class:
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the <see cref="ILMergeSettings" /> class:
     /// <code>
     /// #tool "nuget:?package=ilmerge"
     /// </code>
diff --git a/src/Cake.Common/Tools/ILRepack/ILRepackAliases.cs b/src/Cake.Common/Tools/ILRepack/ILRepackAliases.cs
index 87439b63a6..de9785edaa 100644
--- a/src/Cake.Common/Tools/ILRepack/ILRepackAliases.cs
+++ b/src/Cake.Common/Tools/ILRepack/ILRepackAliases.cs
@@ -7,9 +7,10 @@
 namespace Cake.Common.Tools.ILRepack
 {
     /// <summary>
-    /// <para>Contains functionality related to ILRepack.</para>
+    /// <para>Contains functionality related to <see href="https://github.com/gluck/il-repack">ILRepack</see>.</para>
     /// <para>
-    /// In order to use the commands for this alias, include the following in your build.cake file to download and install from NuGet.org, or specify the ToolPath within the ILRepackSettings class:
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the <see cref="ILRepackSettings" /> class:
     /// <code>
     /// #tool "nuget:?package=ILRepack"
     /// </code>
diff --git a/src/Cake.Common/Tools/InspectCode/InspectCodeAliases.cs b/src/Cake.Common/Tools/InspectCode/InspectCodeAliases.cs
index 08d60f99fc..7f0c4b2dfa 100644
--- a/src/Cake.Common/Tools/InspectCode/InspectCodeAliases.cs
+++ b/src/Cake.Common/Tools/InspectCode/InspectCodeAliases.cs
@@ -6,7 +6,14 @@
 namespace Cake.Common.Tools.InspectCode
 {
     /// <summary>
-    /// Contains functionality related to Resharper's code inspection.
+    /// <para>Contains functionality related to ReSharper's <see href="https://www.jetbrains.com/help/resharper/2016.1/InspectCode.html">InspectCode</see> tool.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the <see cref="InspectCodeSettings" /> class:
+    /// <code>
+    /// #tool "nuget:?package=JetBrains.ReSharper.CommandLineTools"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("ReSharper")]
     public static class InspectCodeAliases
diff --git a/src/Cake.Common/Tools/MSBuild/MSBuildAliases.cs b/src/Cake.Common/Tools/MSBuild/MSBuildAliases.cs
index a45949baa8..f9714d01ee 100644
--- a/src/Cake.Common/Tools/MSBuild/MSBuildAliases.cs
+++ b/src/Cake.Common/Tools/MSBuild/MSBuildAliases.cs
@@ -6,7 +6,11 @@
 namespace Cake.Common.Tools.MSBuild
 {
     /// <summary>
-    /// Contains functionality related to MSBuild.
+    /// <para>Contains functionality related to <see href="https://msdn.microsoft.com/en-us/library/dd393574.aspx">MSBuild</see>.</para>
+    /// <para>
+    /// In order to use the commands for this alias, MSBuild will already have to be installed on the machine the Cake Script
+    /// is being executed.
+    /// </para>
     /// </summary>
     [CakeAliasCategory("MSBuild")]
     public static class MSBuildAliases
diff --git a/src/Cake.Common/Tools/MSTest/MSTestAliases.cs b/src/Cake.Common/Tools/MSTest/MSTestAliases.cs
index 5dd004f663..e0e1465761 100644
--- a/src/Cake.Common/Tools/MSTest/MSTestAliases.cs
+++ b/src/Cake.Common/Tools/MSTest/MSTestAliases.cs
@@ -9,7 +9,12 @@
 namespace Cake.Common.Tools.MSTest
 {
     /// <summary>
-    /// Contains functionality related to running MSTest unit tests.
+    /// <para>Contains functionality related to running <see href="https://msdn.microsoft.com/en-us/library/ms182486.aspx">MSTest</see> unit tests.</para>
+    /// <para>
+    /// In order to use the commands for this alias, MSTest will need to be installed on the machine where
+    /// the Cake script is being executed.  This is typically achieved by having either Visual Studio installed, or by
+    /// using the Micrsoft Build Tools, for example, for <see href="https://www.microsoft.com/en-us/download/details.aspx?id=48159">2015</see>.
+    /// </para>
     /// </summary>
     [CakeAliasCategory("MSTest")]
     public static class MSTestAliases
diff --git a/src/Cake.Common/Tools/NSIS/NSISAliases.cs b/src/Cake.Common/Tools/NSIS/NSISAliases.cs
index a4751058b2..ea73ea65fa 100644
--- a/src/Cake.Common/Tools/NSIS/NSISAliases.cs
+++ b/src/Cake.Common/Tools/NSIS/NSISAliases.cs
@@ -6,7 +6,12 @@
 namespace Cake.Common.Tools.NSIS
 {
     /// <summary>
-    /// Contains functionality related to running NSIS.
+    /// <para>Contains functionality related to <see href="http://nsis.sourceforge.net/Main_Page">NSIS</see>.</para>
+    /// <para>
+    /// In order to use the commands for this alias, NSIS will need to be installed on the machine where
+    /// the Cake script is being executed.  See this <see href="http://nsis.sourceforge.net/Download">page</see> for information
+    /// on how to download/install.
+    /// </para>
     /// </summary>
     [CakeAliasCategory("NSIS")]
     // ReSharper disable once InconsistentNaming
diff --git a/src/Cake.Common/Tools/NUnit/NUnit3Aliases.cs b/src/Cake.Common/Tools/NUnit/NUnit3Aliases.cs
index e85a56eba2..894da623d8 100644
--- a/src/Cake.Common/Tools/NUnit/NUnit3Aliases.cs
+++ b/src/Cake.Common/Tools/NUnit/NUnit3Aliases.cs
@@ -9,7 +9,14 @@
 namespace Cake.Common.Tools.NUnit
 {
     /// <summary>
-    /// Contains functionality related to running NUnit v2 and v3 unit tests.
+    /// <para>Contains functionality related to running <see href="https://github.com/nunit/nunit">NUnit</see> v2 and v3 unit tests.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the <see cref="NUnit3Settings" /> class:
+    /// <code>
+    /// #tool "nuget:?package=NUnit.ConsoleRunner"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("NUnit v3")]
     public static class NUnit3Aliases
diff --git a/src/Cake.Common/Tools/NUnit/NUnitAliases.cs b/src/Cake.Common/Tools/NUnit/NUnitAliases.cs
index 20f9cee948..4daa3b26e2 100644
--- a/src/Cake.Common/Tools/NUnit/NUnitAliases.cs
+++ b/src/Cake.Common/Tools/NUnit/NUnitAliases.cs
@@ -9,7 +9,14 @@
 namespace Cake.Common.Tools.NUnit
 {
     /// <summary>
-    /// Contains functionality related to running NUnit unit tests.
+    /// <para>Contains functionality related to running <see href="https://github.com/nunit/nunit">NUnit</see> tests.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the <see cref="NUnitSettings" /> class:
+    /// <code>
+    /// #tool "nuget:?package=NUnit.Runners&amp;version=2.6.4"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("NUnit")]
     public static class NUnitAliases
@@ -49,7 +56,7 @@ public static void NUnit(this ICakeContext context, string pattern)
         /// <example>
         /// <code>
         /// NUnit("./src/UnitTests/*.dll", new NUnitSettings {
-        ///     Timeout = 4000, 
+        ///     Timeout = 4000,
         ///     StopOnError = true
         ///     });
         /// </code>
diff --git a/src/Cake.Common/Tools/NuGet/NuGetAliases.cs b/src/Cake.Common/Tools/NuGet/NuGetAliases.cs
index f7c419f744..aa5256521a 100644
--- a/src/Cake.Common/Tools/NuGet/NuGetAliases.cs
+++ b/src/Cake.Common/Tools/NuGet/NuGetAliases.cs
@@ -16,8 +16,12 @@
 namespace Cake.Common.Tools.NuGet
 {
     /// <summary>
-    /// Contains functionality for working with NuGet.
+    /// Contains functionality for working with <see href="https://www.nuget.org/">NuGet</see>.
     /// </summary>
+    /// <para>
+    /// Since Cake requires NuGet to be available very early in the build pipeline, we recommend that NuGet is made
+    /// available via the <see href="https://github.com/cake-build/resources">Cake BootStrapper</see>.
+    /// </para>
     [CakeAliasCategory("NuGet")]
     public static class NuGetAliases
     {
@@ -693,7 +697,7 @@ public static void NuGetInstallFromConfig(this ICakeContext context, FilePath pa
         /// <example>
         /// <code>
         /// var packageConfigs = GetFiles("./**/packages.config");
-        /// 
+        ///
         /// NuGetInstallFromConfig(packageConfigs);
         /// </code>
         /// </example>
@@ -744,7 +748,7 @@ public static void NuGetInstallFromConfig(this ICakeContext context, FilePath pa
         /// <example>
         /// <code>
         /// var packageConfigs = GetFiles("./**/packages.config");
-        /// 
+        ///
         /// NuGetInstallFromConfig(packageConfigs, new NuGetInstallSettings {
         ///     ExcludeVersion  = true,
         ///     OutputDirectory = "./tools"
@@ -894,7 +898,7 @@ public static void NuGetUpdate(this ICakeContext context, FilePath targetFile)
         /// <example>
         /// <code>
         /// var targets = GetFiles("./**/packages.config");
-        /// 
+        ///
         /// NuGetUpdate(targets);
         /// </code>
         /// </example>
@@ -944,7 +948,7 @@ public static void NuGetUpdate(this ICakeContext context, FilePath targetFile, N
         /// <example>
         /// <code>
         /// var targets = GetFiles("./**/packages.config");
-        /// 
+        ///
         /// NuGetUpdate(targets, new NuGetUpdateSettings {
         ///     Prerelease = true,
         /// });
diff --git a/src/Cake.Common/Tools/OctopusDeploy/OctopusDeployAliases.cs b/src/Cake.Common/Tools/OctopusDeploy/OctopusDeployAliases.cs
index 5aa843cf3e..1c250dbbfa 100644
--- a/src/Cake.Common/Tools/OctopusDeploy/OctopusDeployAliases.cs
+++ b/src/Cake.Common/Tools/OctopusDeploy/OctopusDeployAliases.cs
@@ -5,7 +5,14 @@
 namespace Cake.Common.Tools.OctopusDeploy
 {
     /// <summary>
-    /// Contains functionality for working with Octopus Deploy.
+    /// <para>Contains functionality related to <see href="https://octopus.com/">Octopus Deploy</see>.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the appropriate settings class:
+    /// <code>
+    /// #tool "nuget:?package=OctopusTools"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("Octopus Deploy")]
     public static class OctopusDeployAliases
diff --git a/src/Cake.Common/Tools/OpenCover/OpenCoverAliases.cs b/src/Cake.Common/Tools/OpenCover/OpenCoverAliases.cs
index 719a0e7c4e..68a0d483f9 100644
--- a/src/Cake.Common/Tools/OpenCover/OpenCoverAliases.cs
+++ b/src/Cake.Common/Tools/OpenCover/OpenCoverAliases.cs
@@ -6,7 +6,14 @@
 namespace Cake.Common.Tools.OpenCover
 {
     /// <summary>
-    /// Contains functionality related to OpenCover.
+    /// <para>Contains functionality related to <see href="https://github.com/opencover/opencover">OpenCover</see>.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the <see cref="OpenCoverSettings" /> class:
+    /// <code>
+    /// #tool "nuget:?package=OpenCover"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("OpenCover")]
     public static class OpenCoverAliases
diff --git a/src/Cake.Common/Tools/ReportGenerator/ReportGeneratorAliases.cs b/src/Cake.Common/Tools/ReportGenerator/ReportGeneratorAliases.cs
index 1925070193..2dc2fe6f6a 100644
--- a/src/Cake.Common/Tools/ReportGenerator/ReportGeneratorAliases.cs
+++ b/src/Cake.Common/Tools/ReportGenerator/ReportGeneratorAliases.cs
@@ -7,7 +7,14 @@
 namespace Cake.Common.Tools.ReportGenerator
 {
     /// <summary>
-    /// Contains functionality related to <see href="https://github.com/danielpalme/ReportGenerator">ReportGenerator</see>.
+    /// <para>Contains functionality related to <see href="https://github.com/danielpalme/ReportGenerator">ReportGenerator</see>.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the <see cref="ReportGeneratorSettings" /> class:
+    /// <code>
+    /// #tool "nuget:?package=ReportGenerator"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("ReportGenerator")]
     public static class ReportGeneratorAliases
diff --git a/src/Cake.Common/Tools/ReportUnit/ReportUnitAliases.cs b/src/Cake.Common/Tools/ReportUnit/ReportUnitAliases.cs
index c200e1decb..2450ad7488 100644
--- a/src/Cake.Common/Tools/ReportUnit/ReportUnitAliases.cs
+++ b/src/Cake.Common/Tools/ReportUnit/ReportUnitAliases.cs
@@ -6,7 +6,14 @@
 namespace Cake.Common.Tools.ReportUnit
 {
     /// <summary>
-    /// Contains functionality related to ReportUnit.
+    /// <para>Contains functionality related to <see href="http://relevantcodes.com/reportunit-report-generator/">ReportUnit</see>.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the <see cref="ReportUnitSettings" /> class:
+    /// <code>
+    /// #tool "nuget:?package=ReportUnit"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("ReportUnit")]
     public static class ReportUnitAliases
diff --git a/src/Cake.Common/Tools/Roundhouse/RoundhouseAliases.cs b/src/Cake.Common/Tools/Roundhouse/RoundhouseAliases.cs
index 86b39f236a..8f8169f503 100644
--- a/src/Cake.Common/Tools/Roundhouse/RoundhouseAliases.cs
+++ b/src/Cake.Common/Tools/Roundhouse/RoundhouseAliases.cs
@@ -5,7 +5,14 @@
 namespace Cake.Common.Tools.Roundhouse
 {
     /// <summary>
-    /// Contains functionality to execute Roundhouse tasks.
+    /// <para>Contains functionality related to <see href="https://github.com/chucknorris/roundhouse">RoundhousE</see>.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the <see cref="RoundhouseSettings" /> class:
+    /// <code>
+    /// #tool "nuget:?package=roundhouse"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("Roundhouse")]
     public static class RoundhouseAliases
diff --git a/src/Cake.Common/Tools/SignTool/SignToolSignAliases.cs b/src/Cake.Common/Tools/SignTool/SignToolSignAliases.cs
index 674ff66271..17514b7246 100644
--- a/src/Cake.Common/Tools/SignTool/SignToolSignAliases.cs
+++ b/src/Cake.Common/Tools/SignTool/SignToolSignAliases.cs
@@ -8,7 +8,11 @@
 namespace Cake.Common.Tools.SignTool
 {
     /// <summary>
-    /// Contains functionality related to signing assemblies with PFX certificates.
+    /// <para>Contains functionality related to signing assemblies with PFX certificates using <see href="https://msdn.microsoft.com/en-gb/library/windows/desktop/aa387764(v=vs.85).aspx">SignTool</see>.</para>
+    /// <para>
+    /// In order to use the commands for this alias, SignTool will need to be installed on the machine where
+    /// the Cake script is being executed.  This is typically achieved by installing the correct Windows SDK.
+    /// </para>
     /// </summary>
     [CakeAliasCategoryAttribute("Signing")]
     public static class SignToolSignAliases
diff --git a/src/Cake.Common/Tools/SpecFlow/SpecFlowAliases.cs b/src/Cake.Common/Tools/SpecFlow/SpecFlowAliases.cs
index 9c2d63f546..996485ab61 100644
--- a/src/Cake.Common/Tools/SpecFlow/SpecFlowAliases.cs
+++ b/src/Cake.Common/Tools/SpecFlow/SpecFlowAliases.cs
@@ -8,7 +8,14 @@
 namespace Cake.Common.Tools.SpecFlow
 {
     /// <summary>
-    /// Contains functionality for working with SpecFlow.
+    /// <para>Contains functionality related to <see href="http://www.specflow.org/">SpecFlow</see>.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the appropriate settings class:
+    /// <code>
+    /// #tool "nuget:?package=SpecFlow"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("SpecFlow")]
     public static class SpecFlowAliases
diff --git a/src/Cake.Common/Tools/TextTransform/TextTransformAliases.cs b/src/Cake.Common/Tools/TextTransform/TextTransformAliases.cs
index 51ef1c6cef..30cde84da2 100644
--- a/src/Cake.Common/Tools/TextTransform/TextTransformAliases.cs
+++ b/src/Cake.Common/Tools/TextTransform/TextTransformAliases.cs
@@ -6,7 +6,14 @@
 namespace Cake.Common.Tools.TextTransform
 {
     /// <summary>
-    /// Contains functionality related to transforming templates
+    /// <para>Contains functionality related to <see href="https://github.com/mono/monodevelop/tree/master/main/src/addins/TextTemplating/TextTransform">TextTransform</see>.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the <see cref="TextTransformSettings" /> class:
+    /// <code>
+    /// #tool "nuget:?package=Mono.TextTransform"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("Text")]
     public static class TextTransformAliases
diff --git a/src/Cake.Common/Tools/WiX/WiXAliases.cs b/src/Cake.Common/Tools/WiX/WiXAliases.cs
index 87d4c0a563..65c11df856 100644
--- a/src/Cake.Common/Tools/WiX/WiXAliases.cs
+++ b/src/Cake.Common/Tools/WiX/WiXAliases.cs
@@ -9,7 +9,14 @@
 namespace Cake.Common.Tools.WiX
 {
     /// <summary>
-    /// Contains functionality related to running WiX tools.
+    /// <para>Contains functionality related to <see href="http://wixtoolset.org/">WiX</see>.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the appropriate settings class:
+    /// <code>
+    /// #tool "nuget:?package=WiX.Toolset"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("WiX")]
     public static class WiXAliases
@@ -23,7 +30,7 @@ public static class WiXAliases
         ///     Architecture = Architecture.X64,
         ///     Verbose = true
         ///     };
-        /// WiXCandle("./src/*.wxs", settings); 
+        /// WiXCandle("./src/*.wxs", settings);
         /// </code>
         /// </example>
         /// <param name="context">The context.</param>
@@ -58,7 +65,7 @@ public static void WiXCandle(this ICakeContext context, string pattern, CandleSe
         ///     Architecture = Architecture.X64,
         ///     Verbose = true
         ///     };
-        /// WiXCandle(files, settings); 
+        /// WiXCandle(files, settings);
         /// </code>
         /// </example>
         /// <param name="context">The context.</param>
@@ -85,7 +92,7 @@ public static void WiXCandle(this ICakeContext context, IEnumerable<FilePath> so
         /// LightSettings settings = new LightSettings {
         ///     RawArguments = "-O1 -pedantic -v"
         ///     };
-        /// WiXLight("./src/*.wixobj", settings); 
+        /// WiXLight("./src/*.wixobj", settings);
         /// </code>
         /// </example>
         /// <param name="context">The context.</param>
@@ -119,7 +126,7 @@ public static void WiXLight(this ICakeContext context, string pattern, LightSett
         /// LightSettings settings = new LightSettings {
         ///     RawArguments = "-O1 -pedantic -v"
         ///     };
-        /// WiXLight(files, settings); 
+        /// WiXLight(files, settings);
         /// </code>
         /// </example>
         /// <param name="context">The context.</param>
diff --git a/src/Cake.Common/Tools/XBuild/XBuildAliases.cs b/src/Cake.Common/Tools/XBuild/XBuildAliases.cs
index d78977b7dc..be9a059abb 100644
--- a/src/Cake.Common/Tools/XBuild/XBuildAliases.cs
+++ b/src/Cake.Common/Tools/XBuild/XBuildAliases.cs
@@ -6,7 +6,11 @@
 namespace Cake.Common.Tools.XBuild
 {
     /// <summary>
-    /// Contains functionality related to XBuild.
+    /// <para>Contains functionality related to <see href="http://www.mono-project.com/docs/tools+libraries/tools/xbuild/">XBuild</see>.</para>
+    /// <para>
+    /// In order to use the commands for this alias, XBuild (which is part of Mono) will already have to be installed on the machine the
+    /// Cake Script is being executed.
+    /// </para>
     /// </summary>
     [CakeAliasCategory("XBuild")]
     public static class XBuildAliases
diff --git a/src/Cake.Common/Tools/XUnit/XUnit2Aliases.cs b/src/Cake.Common/Tools/XUnit/XUnit2Aliases.cs
index 42bab36009..e4c083d435 100644
--- a/src/Cake.Common/Tools/XUnit/XUnit2Aliases.cs
+++ b/src/Cake.Common/Tools/XUnit/XUnit2Aliases.cs
@@ -9,7 +9,14 @@
 namespace Cake.Common.Tools.XUnit
 {
     /// <summary>
-    /// Contains functionality related to running xUnit.net tests.
+    /// <para>Contains functionality related to running <see href="https://github.com/xunit/xunit">xunit</see> tests.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the <see cref="XUnit2Settings" /> class:
+    /// <code>
+    /// #tool "nuget:?package=xunit.runner.console"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("xUnit v2")]
     public static class XUnit2Aliases
diff --git a/src/Cake.Common/Tools/XUnit/XUnitAliases.cs b/src/Cake.Common/Tools/XUnit/XUnitAliases.cs
index 4987134310..2be32ab08a 100644
--- a/src/Cake.Common/Tools/XUnit/XUnitAliases.cs
+++ b/src/Cake.Common/Tools/XUnit/XUnitAliases.cs
@@ -8,7 +8,14 @@
 namespace Cake.Common.Tools.XUnit
 {
     /// <summary>
-    /// Contains functionality related to running xUnit.net tests.
+    /// <para>Contains functionality related to running <see href="https://github.com/xunit/xunit">xunit</see> tests.</para>
+    /// <para>
+    /// In order to use the commands for this alias, include the following in your build.cake file to download and
+    /// install from NuGet.org, or specify the ToolPath within the <see cref="XUnitSettings" /> class:
+    /// <code>
+    /// #tool "nuget:?package=xunit.runners&amp;version=1.9.2"
+    /// </code>
+    /// </para>
     /// </summary>
     [CakeAliasCategory("xUnit")]
     public static class XUnitAliases
diff --git a/src/Cake.Core/Tooling/Tool.cs b/src/Cake.Core/Tooling/Tool.cs
index 2d4355d65d..af6cce8907 100644
--- a/src/Cake.Core/Tooling/Tool.cs
+++ b/src/Cake.Core/Tooling/Tool.cs
@@ -26,7 +26,7 @@ public abstract class Tool<TSettings> where TSettings : ToolSettings
         /// <param name="environment">The environment.</param>
         /// <param name="processRunner">The process runner.</param>
         /// <param name="globber">The globber.</param>
-        [Obsolete("Please use Tool(IFileSystem, ICakeEnvironment, IProcessRunner, IToolService) instead.")]
+        [Obsolete("Please use Tool(IFileSystem, ICakeEnvironment, IProcessRunner, IToolLocator) instead.")]
         protected Tool(IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, IGlobber globber)
             : this(fileSystem, environment, processRunner, (IToolLocator)null)
         {