Merge branch 'master' into add-dockerfile-with-centos

arturcic · web-flow · commit 1ab4f27c842c · 2019-02-20T14:31:06.000Z
diff --git a/build.cake b/build.cake
@@ -66,40 +66,47 @@ Setup<BuildParameters>(context =>
 
 Teardown<BuildParameters>((context, parameters) =>
 {
-    Information("Starting Teardown...");
+    try
+    {
+        Information("Starting Teardown...");
 
-    Information("Repository info : IsMainRepo {0}, IsMainBranch {1}, IsTagged: {2}, IsPullRequest: {3}",
-        parameters.IsMainRepo,
-        parameters.IsMainBranch,
-        parameters.IsTagged,
-        parameters.IsPullRequest);
+        Information("Repository info : IsMainRepo {0}, IsMainBranch {1}, IsTagged: {2}, IsPullRequest: {3}",
+            parameters.IsMainRepo,
+            parameters.IsMainBranch,
+            parameters.IsTagged,
+            parameters.IsPullRequest);
 
-    if(context.Successful)
+        if(context.Successful)
+        {
+            // if(parameters.ShouldPublish)
+            // {
+            //     if(parameters.CanPostToGitter)
+            //     {
+            //         var message = "@/all Version " + parameters.Version.SemVersion + " of the GitVersion has just been released, https://www.nuget.org/packages/GitVersion.";
+
+            //         var postMessageResult = Gitter.Chat.PostMessage(
+            //             message: message,
+            //             messageSettings: new GitterChatMessageSettings { Token = parameters.Gitter.Token, RoomId = parameters.Gitter.RoomId}
+            //         );
+
+            //         if (postMessageResult.Ok)
+            //         {
+            //             Information("Message {0} succcessfully sent", postMessageResult.TimeStamp);
+            //         }
+            //         else
+            //         {
+            //             Error("Failed to send message: {0}", postMessageResult.Error);
+            //         }
+            //     }
+            // }
+        }
+
+        Information("Finished running tasks.");
+    }
+    catch (Exception exception)
     {
-        // if(parameters.ShouldPublish)
-        // {
-        //     if(parameters.CanPostToGitter)
-        //     {
-        //         var message = "@/all Version " + parameters.Version.SemVersion + " of the GitVersion has just been released, https://www.nuget.org/packages/GitVersion.";
-
-        //         var postMessageResult = Gitter.Chat.PostMessage(
-        //             message: message,
-        //             messageSettings: new GitterChatMessageSettings { Token = parameters.Gitter.Token, RoomId = parameters.Gitter.RoomId}
-        //         );
-
-        //         if (postMessageResult.Ok)
-        //         {
-        //             Information("Message {0} succcessfully sent", postMessageResult.TimeStamp);
-        //         }
-        //         else
-        //         {
-        //             Error("Failed to send message: {0}", postMessageResult.Error);
-        //         }
-        //     }
-        // }
-    }
-
-    Information("Finished running tasks.");
+        Error(exception.Dump());
+    }
 });
 
 //////////////////////////////////////////////////////////////////////
diff --git a/src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs b/src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs
@@ -9,7 +9,8 @@
 using Shouldly;
 
 [TestFixture]
-public class AssemblyInfoFileUpdaterTests : TestBase
+[Parallelizable(ParallelScope.None)]
+public class AssemblyInfoFileUpdaterTests
 {
     [SetUp]
     public void Setup()
diff --git a/src/GitVersionCore.Tests/AssemblyParallelizable.cs b/src/GitVersionCore.Tests/AssemblyParallelizable.cs
@@ -0,0 +1,3 @@
+﻿using NUnit.Framework;
+
+[assembly: Parallelizable(ParallelScope.Fixtures)]
diff --git a/src/GitVersionCore.Tests/ExecuteCoreTests.cs b/src/GitVersionCore.Tests/ExecuteCoreTests.cs
@@ -9,6 +9,7 @@
 using System.Text;
 
 [TestFixture]
+[Parallelizable(ParallelScope.None)]
 public class ExecuteCoreTests : TestBase
 {
     IFileSystem fileSystem;
diff --git a/src/GitVersionCore.Tests/GitVersionInformationGeneratorTests.cs b/src/GitVersionCore.Tests/GitVersionInformationGeneratorTests.cs
@@ -7,7 +7,8 @@
 namespace GitVersionCore.Tests
 {
     [TestFixture]
-    public class GitVersionInformationGeneratorTests : TestBase
+    [Parallelizable(ParallelScope.None)]
+    public class GitVersionInformationGeneratorTests
     {
         [SetUp]
         public void Setup()
diff --git a/src/GitVersionCore/Logger.cs b/src/GitVersionCore/Logger.cs
@@ -26,7 +26,8 @@ public static IDisposable IndentLog(string operationDescription)
             indent = indent + "  ";
             return new ActionDisposable(() =>
             {
-                indent = indent.Substring(0, indent.Length - 2);
+                var length = indent.Length - 2;
+                indent = length > 0 ? indent.Substring(0, length) : indent;
                 WriteInfo(string.Format(CultureInfo.InvariantCulture, "End: {0} (Took: {1:N}ms)", operationDescription, DateTime.Now.Subtract(start).TotalMilliseconds));
             });
         }
diff --git a/src/GitVersionExe.Tests/AssemblyParallelizable.cs b/src/GitVersionExe.Tests/AssemblyParallelizable.cs
@@ -0,0 +1,3 @@
+﻿using NUnit.Framework;
+
+[assembly: Parallelizable(ParallelScope.Fixtures)]
diff --git a/src/GitVersionExe.Tests/ExecCmdLineArgumentTest.cs b/src/GitVersionExe.Tests/ExecCmdLineArgumentTest.cs
@@ -8,6 +8,7 @@
 using Shouldly;
 
 [TestFixture]
+[Parallelizable(ParallelScope.None)]
 public class ExecCmdLineArgumentTest
 {
     [Test]
diff --git a/src/GitVersionTask.Tests/AssemblyParallelizable.cs b/src/GitVersionTask.Tests/AssemblyParallelizable.cs
@@ -0,0 +1,3 @@
+﻿using NUnit.Framework;
+
+[assembly: Parallelizable(ParallelScope.Fixtures)]
diff --git a/src/GitVersionTfsTask/GitVersion.ts b/src/GitVersionTfsTask/GitVersion.ts
@@ -12,10 +12,13 @@ export class GitVersionTask {
             const updateAssemblyInfo = tl.getBoolInput('updateAssemblyInfo');
             const updateAssemblyInfoFilename = tl.getInput('updateAssemblyInfoFilename');
             const additionalArguments = tl.getInput('additionalArguments');
+            const targetPath = tl.getInput('targetPath');
             const preferBundledVersion = tl.getBoolInput('preferBundledVersion');
 
             const currentDirectory = __dirname;
-            const sourcesDirectory = tl.getVariable("Build.SourcesDirectory") || ".";
+            const workingDirectory = !targetPath
+                    ? tl.getVariable("Build.SourcesDirectory")
+                    : path.join(tl.getVariable("Build.SourcesDirectory"), targetPath);
 
             let gitVersionPath = tl.getInput('gitVersionPath');
             if (!gitVersionPath) {
@@ -69,7 +72,7 @@ export class GitVersionTask {
             }
 
             toolRunner.arg([
-                sourcesDirectory,
+                workingDirectory,
                 "/output",
                 "buildserver",
                 "/nofetch"]);
diff --git a/src/GitVersionTfsTask/GitVersionTask/task.json b/src/GitVersionTfsTask/GitVersionTask/task.json
@@ -54,6 +54,15 @@
             "helpMarkDown": "Optionally supply the path to GitVersion.exe",
             "groupName": "additional"
         },
+        {
+            "name": "targetPath",
+            "type": "string",
+            "label": "Working directory path",
+            "defaultValue": "",
+            "required": false,
+            "helpMarkDown": "Optionally supply the path to the working directory",
+            "groupName": "additional"
+        },
         {
             "name": "preferBundledVersion",
             "type": "boolean",

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@`
`9`	`9`	`using Shouldly;`
`10`	`10`
`11`	`11`	`[TestFixture]`
`12`		`-public class AssemblyInfoFileUpdaterTests : TestBase`
	`12`	`+[Parallelizable(ParallelScope.None)]`
	`13`	`+public class AssemblyInfoFileUpdaterTests`
`13`	`14`	`{`
`14`	`15`	`[SetUp]`
`15`	`16`	`public void Setup()`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+using NUnit.Framework;`
	`2`	`+`
	`3`	`+[assembly: Parallelizable(ParallelScope.Fixtures)]`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`using System.Text;`
`10`	`10`
`11`	`11`	`[TestFixture]`
	`12`	`+[Parallelizable(ParallelScope.None)]`
`12`	`13`	`public class ExecuteCoreTests : TestBase`
`13`	`14`	`{`
`14`	`15`	`IFileSystem fileSystem;`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@`
`7`	`7`	`namespace GitVersionCore.Tests`
`8`	`8`	`{`
`9`	`9`	`[TestFixture]`
`10`		`- public class GitVersionInformationGeneratorTests : TestBase`
	`10`	`+ [Parallelizable(ParallelScope.None)]`
	`11`	`+ public class GitVersionInformationGeneratorTests`
`11`	`12`	`{`
`12`	`13`	`[SetUp]`
`13`	`14`	`public void Setup()`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@ public static IDisposable IndentLog(string operationDescription)`
`26`	`26`	`indent = indent + " ";`
`27`	`27`	`return new ActionDisposable(() =>`
`28`	`28`	`{`
`29`		`- indent = indent.Substring(0, indent.Length - 2);`
	`29`	`+ var length = indent.Length - 2;`
	`30`	`+ indent = length > 0 ? indent.Substring(0, length) : indent;`
`30`	`31`	`WriteInfo(string.Format(CultureInfo.InvariantCulture, "End: {0} (Took: {1:N}ms)", operationDescription, DateTime.Now.Subtract(start).TotalMilliseconds));`
`31`	`32`	`});`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`using Shouldly;`
`9`	`9`
`10`	`10`	`[TestFixture]`
	`11`	`+[Parallelizable(ParallelScope.None)]`
`11`	`12`	`public class ExecCmdLineArgumentTest`
`12`	`13`	`{`
`13`	`14`	`[Test]`