Merge remote-tracking branch 'GeirGrusom/bugfix/issue-406'

GitTools · Apr 6, 2015 · fe1063f · fe1063f
2 parents 3049e66 + a0f8e39
commit fe1063f
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/GitVersionTask.Tests/GitVersionTask.Tests.csproj
@@ -112,6 +112,7 @@
     <Compile Include="Helpers\Lg2sHelperBase.cs" />
     <Compile Include="UpdateAssemblyInfoTests.cs" />
     <Compile Include="ModuleInitializer.cs" />
+    <Compile Include="WriteVersionInfoToBuildLogTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

diff --git a/GitVersionTask.Tests/WriteVersionInfoToBuildLogTests.cs b/GitVersionTask.Tests/WriteVersionInfoToBuildLogTests.cs
@@ -0,0 +1,22 @@
+
+namespace GitVersionTask.Tests
+{
+    using System.IO;
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class WriteVersionInfoToBuildLogTests
+    {
+        [Test]
+        public void UsingInvalidGitDirectory_ThrowsDirectoryNotFoundException()
+        {
+            var task = new WriteVersionInfoToBuildLog
+            {
+                BuildEngine = new MockBuildEngine(),
+                SolutionDirectory = Path.GetTempPath()
+            };
+
+            Assert.That(task.InnerExecute, Throws.InstanceOf<DirectoryNotFoundException>());
+        }
+    }
+}
diff --git a/GitVersionTask/WriteVersionInfoToBuildLog.cs b/GitVersionTask/WriteVersionInfoToBuildLog.cs
@@ -1,11 +1,12 @@
 namespace GitVersionTask
 {
-    using System;
-    using System.Collections.Generic;
     using GitVersion;
     using GitVersion.Helpers;
     using Microsoft.Build.Framework;
     using Microsoft.Build.Utilities;
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
     using Logger = GitVersion.Logger;
 
     public class WriteVersionInfoToBuildLog : Task
@@ -53,6 +54,10 @@ public void InnerExecute()
         {
             Tuple<CachedVersion, GitVersionContext> result;
             var gitDirectory = GitDirFinder.TreeWalkForDotGitDir(SolutionDirectory);
+
+            if (gitDirectory == null)
+                throw new DirectoryNotFoundException(string.Format("Unable to locate a git repository in \"{0}\". Make sure that the solution is located in a git controlled folder. If you are using continous integration make sure that the sources are checked out on the build agent.", SolutionDirectory));
+
             var configuration = ConfigurationProvider.Provide(gitDirectory, fileSystem);
             if (!VersionAndBranchFinder.TryGetVersion(SolutionDirectory, out result, configuration, NoFetch))
             {
@@ -68,8 +73,8 @@ public void InnerExecute()
             var versioningMode = config.VersioningMode;
 
             var variablesFor = VariableProvider.GetVariablesFor(
-                cachedVersion.SemanticVersion, assemblyVersioningScheme, versioningMode, 
-                config.ContinuousDeploymentFallbackTag, 
+                cachedVersion.SemanticVersion, assemblyVersioningScheme, versioningMode,
+                config.ContinuousDeploymentFallbackTag,
                 gitVersionContext.IsCurrentCommitTagged);
             WriteIntegrationParameters(cachedVersion, BuildServerList.GetApplicableBuildServers(authentication), variablesFor);
         }