Merge branch 'develop' into bamboo-build

CODEOFCONDUCT.md

@@ -0,0 +1,24 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+- The use of sexualized language or imagery
+- Personal attacks
+- Trolling or insulting/derogatory comments
+- Public or private harassment
+- Publishing other's private information, such as physical or electronic addresses, without explicit permission
+- Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at [cake-build@outlook.com](mailto:cake-build@outlook.com). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.
+
+This Code of Conduct is adapted from the Contributor Covenant, version 1.3.0, available from http://contributor-covenant.org/version/1/3/0/

src/Cake.Common.Tests/Cake.Common.Tests.csproj

@@ -62,8 +62,6 @@
     <Compile Include="Fixtures\Build\BambooInfoFixture.cs" />
     <Compile Include="Fixtures\AssemblyInfoFixture.cs" />
     <Compile Include="Fixtures\AssemblyInfoParserFixture.cs" />
-    <Compile Include="Fixtures\ToolFixture.cs" />
-    <Compile Include="Fixtures\ToolFixtureResult.cs" />
     <Compile Include="Fixtures\Tools\CakeRunnerFixture.cs" />
     <Compile Include="Fixtures\IO\FileCopyFixture.cs" />
     <Compile Include="Fixtures\IO\FileDeleteFixture.cs" />
@@ -266,6 +264,10 @@
       <Project>{8074B833-11B8-459F-BB98-BFBA2BC5C698}</Project>
       <Name>Cake.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Cake.Testing.Shared\Cake.Testing.Shared.csproj">
+      <Project>{8e5a518a-eb84-4a1b-a091-d9d66c8ff979}</Project>
+      <Name>Cake.Testing.Shared</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Cake.Testing.Xunit\Cake.Testing.Xunit.csproj">
       <Project>{5AF751D1-BB54-4268-9E42-3A898B034B06}</Project>
       <Name>Cake.Testing.Xunit</Name>

src/Cake.Common.Tests/Fixtures/Tools/CakeRunnerFixture.cs

@@ -2,6 +2,7 @@
 using Cake.Core;
 using Cake.Core.IO;
 using Cake.Testing;
+using Cake.Testing.Shared;
 using NSubstitute;
 
 namespace Cake.Common.Tests.Fixtures.Tools

src/Cake.Common.Tests/Fixtures/Tools/CandleFixture.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Cake.Common.Tools.WiX;
 using Cake.Core.IO;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools
 {

src/Cake.Common.Tests/Fixtures/Tools/Chocolatey/ChocolateyFixture.cs

@@ -2,6 +2,7 @@
 using Cake.Core.Diagnostics;
 using Cake.Core.IO;
 using Cake.Core.Tooling;
+using Cake.Testing.Shared;
 using NSubstitute;
 
 namespace Cake.Common.Tests.Fixtures.Tools.Chocolatey

src/Cake.Common.Tests/Fixtures/Tools/Chocolatey/Packer/ChocolateyPackerFixtureResult.cs

@@ -3,6 +3,7 @@
 using Cake.Core;
 using Cake.Core.IO;
 using Cake.Testing;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools.Chocolatey.Packer
 {

src/Cake.Common.Tests/Fixtures/Tools/DNU/DNUFixture.cs

@@ -1,5 +1,6 @@
 using Cake.Core.IO;
 using Cake.Core.Tooling;
+using Cake.Testing.Shared;
 using NSubstitute;
 
 namespace Cake.Common.Tests.Fixtures.Tools.DNU

src/Cake.Common.Tests/Fixtures/Tools/DupFinder/DupFinderRunnerConfigFixture.cs

@@ -1,6 +1,7 @@
 using Cake.Common.Tools.DupFinder;
 using Cake.Core.Diagnostics;
 using Cake.Core.IO;
+using Cake.Testing.Shared;
 using NSubstitute;
 
 namespace Cake.Common.Tests.Fixtures.Tools.DupFinder

src/Cake.Common.Tests/Fixtures/Tools/DupFinder/DupFinderRunnerFixture.cs

@@ -5,6 +5,7 @@
 using Cake.Core.Diagnostics;
 using Cake.Core.IO;
 using Cake.Testing;
+using Cake.Testing.Shared;
 using NSubstitute;
 
 namespace Cake.Common.Tests.Fixtures.Tools.DupFinder

src/Cake.Common.Tests/Fixtures/Tools/FixieRunnerFixture.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Cake.Common.Tools.Fixie;
 using Cake.Core.IO;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools
 {

src/Cake.Common.Tests/Fixtures/Tools/GitReleaseManagerFixture.cs

@@ -1,6 +1,7 @@
 using Cake.Common.Tools.GitReleaseManager;
 using Cake.Core.Diagnostics;
 using Cake.Core.Tooling;
+using Cake.Testing.Shared;
 using NSubstitute;
 
 namespace Cake.Common.Tests.Fixtures.Tools

src/Cake.Common.Tests/Fixtures/Tools/GitReleaseNotesRunnerFixture.cs

@@ -1,5 +1,6 @@
 using Cake.Common.Tools.GitReleaseNotes;
 using Cake.Core.IO;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools
 {

src/Cake.Common.Tests/Fixtures/Tools/GitVersionRunnerFixture.cs

@@ -4,6 +4,7 @@
 using Cake.Core.Diagnostics;
 using NSubstitute;
 using System.Runtime.Serialization.Json;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools
 {

src/Cake.Common.Tests/Fixtures/Tools/ILMergeRunnerFixture.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Cake.Common.Tools.ILMerge;
 using Cake.Core.IO;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools
 {

src/Cake.Common.Tests/Fixtures/Tools/InspectCode/InspectCodeFixture.cs

@@ -1,5 +1,6 @@
 using Cake.Common.Tools.InspectCode;
 using Cake.Core.IO;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools.InspectCode
 {

src/Cake.Common.Tests/Fixtures/Tools/MSBuildRunnerFixture.cs

@@ -2,6 +2,7 @@
 using Cake.Common.Tools.MSBuild;
 using Cake.Core.IO;
 using Cake.Testing;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools
 {

src/Cake.Common.Tests/Fixtures/Tools/MSTestRunnerFixture.cs

@@ -1,5 +1,6 @@
 using Cake.Common.Tools.MSTest;
 using Cake.Core.IO;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools
 {

src/Cake.Common.Tests/Fixtures/Tools/NSISFixture.cs

@@ -1,5 +1,6 @@
 using Cake.Common.Tools.NSIS;
 using Cake.Core.IO;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools
 {

src/Cake.Common.Tests/Fixtures/Tools/NUnit3RunnerFixture.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Cake.Common.Tools.NUnit;
 using Cake.Core.IO;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools
 {

src/Cake.Common.Tests/Fixtures/Tools/NUnitRunnerFixture.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Cake.Common.Tools.NUnit;
 using Cake.Core.IO;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools
 {

src/Cake.Common.Tests/Fixtures/Tools/NuGet/NuGetFixture.cs

@@ -2,6 +2,7 @@
 using Cake.Core.IO;
 using Cake.Core.IO.NuGet;
 using Cake.Core.Tooling;
+using Cake.Testing.Shared;
 using NSubstitute;
 
 namespace Cake.Common.Tests.Fixtures.Tools.NuGet

src/Cake.Common.Tests/Fixtures/Tools/NuGet/Packer/NugetPackerFixtureResult.cs

@@ -3,6 +3,7 @@
 using Cake.Core;
 using Cake.Core.IO;
 using Cake.Testing;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools.NuGet.Packer
 {

src/Cake.Common.Tests/Fixtures/Tools/OctopusDeployReleaseCreatorFixture.cs

@@ -1,4 +1,5 @@
 using Cake.Common.Tools.OctopusDeploy;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools
 {

src/Cake.Common.Tests/Fixtures/Tools/OpenCoverFixture.cs

@@ -3,6 +3,7 @@
 using Cake.Core;
 using Cake.Core.Diagnostics;
 using Cake.Core.IO;
+using Cake.Testing.Shared;
 using NSubstitute;
 
 namespace Cake.Common.Tests.Fixtures.Tools

src/Cake.Common.Tests/Fixtures/Tools/ReportGeneratorRunnerFixture.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Cake.Common.Tools.ReportGenerator;
 using Cake.Core.IO;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools
 {

src/Cake.Common.Tests/Fixtures/Tools/ReportUnit/ReportUnitDirectoryFixture.cs

@@ -1,5 +1,6 @@
 using Cake.Common.Tools.ReportUnit;
 using Cake.Core.IO;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools.ReportUnit
 {

src/Cake.Common.Tests/Fixtures/Tools/ReportUnit/ReportUnitFileFixture.cs

@@ -1,5 +1,6 @@
 using Cake.Common.Tools.ReportUnit;
 using Cake.Core.IO;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools.ReportUnit
 {

src/Cake.Common.Tests/Fixtures/Tools/RoundhouseRunnerFixture.cs

@@ -1,4 +1,5 @@
 using Cake.Common.Tools.Roundhouse;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools
 {

src/Cake.Common.Tests/Fixtures/Tools/SignToolSignRunnerFixture.cs

@@ -2,6 +2,7 @@
 using Cake.Common.Tools.SignTool;
 using Cake.Core.IO;
 using Cake.Testing;
+using Cake.Testing.Shared;
 using NSubstitute;
 
 namespace Cake.Common.Tests.Fixtures.Tools

src/Cake.Common.Tests/Fixtures/Tools/WiXFixture.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Cake.Common.Tools.WiX;
 using Cake.Core.IO;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools
 {

src/Cake.Common.Tests/Fixtures/Tools/XUnit2RunnerFixture.cs

@@ -1,5 +1,6 @@
 using Cake.Common.Tools.XUnit;
 using Cake.Core.IO;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools
 {

src/Cake.Common.Tests/Fixtures/Tools/XUnitRunnerFixture.cs

@@ -1,5 +1,6 @@
 using Cake.Common.Tools.XUnit;
 using Cake.Core.IO;
+using Cake.Testing.Shared;
 
 namespace Cake.Common.Tests.Fixtures.Tools
 {

src/Cake.Core.Tests/Cake.Core.Tests.csproj

@@ -56,6 +56,7 @@
   <ItemGroup>
     <Compile Include="Extensions\StringExtensions.cs" />
     <Compile Include="Fixtures\CakeContextFixture.cs" />
+    <Compile Include="Fixtures\DummyToolFixture.cs" />
     <Compile Include="Fixtures\PropertyAliasGeneratorFixture.cs" />
     <Compile Include="Fixtures\MethodAliasGeneratorFixture.cs" />
     <Compile Include="Fixtures\ScriptAnalyzerFixture.cs" />
@@ -64,6 +65,8 @@
     <Compile Include="Fixtures\ScriptHostFixture.cs" />
     <Compile Include="Fixtures\ScriptProcessorFixture.cs" />
     <Compile Include="Fixtures\ScriptRunnerFixture.cs" />
+    <Compile Include="Stubs\DummySettings.cs" />
+    <Compile Include="Stubs\DummyTool.cs" />
     <Compile Include="Unit\ActionTaskTests.cs" />
     <Compile Include="Unit\Annotations\CakeAliasCategoryAttributeTests.cs" />
     <Compile Include="Unit\Annotations\CakeNamespaceImportAttributeTests.cs" />
@@ -117,6 +120,7 @@
     <Compile Include="Unit\TaskSetupContextTests.cs" />
     <Compile Include="Unit\TaskTeardownContextTests.cs" />
     <Compile Include="Unit\Text\TextTransformationTemplateTests.cs" />
+    <Compile Include="Unit\Tooling\ToolTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config">
@@ -148,6 +152,10 @@
       <Project>{8074B833-11B8-459F-BB98-BFBA2BC5C698}</Project>
       <Name>Cake.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Cake.Testing.Shared\Cake.Testing.Shared.csproj">
+      <Project>{8e5a518a-eb84-4a1b-a091-d9d66c8ff979}</Project>
+      <Name>Cake.Testing.Shared</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Cake.Testing.Xunit\Cake.Testing.Xunit.csproj">
       <Project>{5AF751D1-BB54-4268-9E42-3A898B034B06}</Project>
       <Name>Cake.Testing.Xunit</Name>

src/Cake.Core.Tests/Fixtures/DummyToolFixture.cs

@@ -0,0 +1,20 @@
+using Cake.Core.Tests.Stubs;
+using Cake.Testing.Shared;
+
+namespace Cake.Core.Tests.Fixtures
+{
+    public sealed class DummyToolFixture : ToolFixture<DummySettings>
+    {
+        public DummyToolFixture()
+            : base("dummy.exe")
+        {
+        }
+
+        protected override void RunTool()
+        {
+            var tool = new DummyTool(FileSystem, Environment, ProcessRunner, Globber);
+            tool.Run(Settings);
+        }
+    }
+
+}

src/Cake.Core.Tests/Stubs/DummySettings.cs

@@ -0,0 +1,8 @@
+using Cake.Core.Tooling;
+
+namespace Cake.Core.Tests.Stubs
+{
+    public sealed class DummySettings : ToolSettings
+    {
+    }
+}

src/Cake.Core.Tests/Stubs/DummyTool.cs

@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using Cake.Core.IO;
+using Cake.Core.Tooling;
+
+namespace Cake.Core.Tests.Stubs
+{
+    public sealed class DummyTool : Tool<DummySettings>
+    {
+        public DummyTool(IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, IGlobber globber)
+            : base(fileSystem, environment, processRunner, globber)
+        {
+        }
+
+        public void Run(DummySettings settings)
+        {
+            Run(settings, new ProcessArgumentBuilder().Append("--foo"));
+        }
+
+        protected override string GetToolName()
+        {
+            return "dummy";
+        }
+
+        protected override IEnumerable<string> GetToolExecutableNames()
+        {
+            return new[] { "dummy.exe" };
+        }
+    }
+}