Created test which verifies fix

Author: JakeGinnivan

GitVersionCore.Tests/ConfigProviderTests.cs

@@ -13,14 +13,14 @@
 [TestFixture]
 public class ConfigProviderTests
 {
-    string gitDirectory;
+    string repoPath;
     IFileSystem fileSystem;
 
     [SetUp]
     public void Setup()
     {
         fileSystem = new TestFileSystem();
-        gitDirectory = "c:\\MyGitRepo\\.git";
+        repoPath = "c:\\MyGitRepo";
     }
 
     [Test]
@@ -41,7 +41,7 @@ public void CanReadDocument()
 ";
         SetupConfigFileContent(text);
 
-        var config = ConfigurationProvider.Provide(gitDirectory, fileSystem);
+        var config = ConfigurationProvider.Provide(repoPath, fileSystem);
         config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinor);
         config.NextVersion.ShouldBe("2.0.0");
         config.TagPrefix.ShouldBe("[vV|version-]");
@@ -61,7 +61,7 @@ public void CanReadOldDocument()
 release-branch-tag: rc
 ";
         SetupConfigFileContent(text);
-        var error = Should.Throw<OldConfigurationException>(() => ConfigurationProvider.Provide(gitDirectory, fileSystem));
+        var error = Should.Throw<OldConfigurationException>(() => ConfigurationProvider.Provide(repoPath, fileSystem));
         error.Message.ShouldContainWithoutWhitespace(@"GitVersionConfig.yaml contains old configuration, please fix the following errors:
 assemblyVersioningScheme has been replaced by assembly-versioning-scheme
 develop-branch-tag has been replaced by branch specific configuration.See https://github.com/ParticularLabs/GitVersion/wiki/Branch-Specific-Configuration
@@ -79,7 +79,7 @@ public void OverwritesDefaultsWithProvidedConfig()
         tag: dev";
         SetupConfigFileContent(text);
         var defaultConfig = new Config();
-        var config = ConfigurationProvider.Provide(gitDirectory, fileSystem);
+        var config = ConfigurationProvider.Provide(repoPath, fileSystem);
 
         config.NextVersion.ShouldBe("2.0.0");
         config.AssemblyVersioningScheme.ShouldBe(defaultConfig.AssemblyVersioningScheme);
@@ -97,7 +97,7 @@ public void CanProvideConfigForNewBranch()
     bug[/-]:
         tag: bugfix";
         SetupConfigFileContent(text);
-        var config = ConfigurationProvider.Provide(gitDirectory, fileSystem);
+        var config = ConfigurationProvider.Provide(repoPath, fileSystem);
 
         config.Branches["bug[/-]"].Tag.ShouldBe("bugfix");
     }
@@ -106,7 +106,7 @@ public void CanProvideConfigForNewBranch()
     [MethodImpl(MethodImplOptions.NoInlining)]
     public void CanWriteOutEffectiveConfiguration()
     {
-        var config = ConfigurationProvider.GetEffectiveConfigAsString(gitDirectory, fileSystem);
+        var config = ConfigurationProvider.GetEffectiveConfigAsString(repoPath, fileSystem);
 
         Approvals.Verify(config);
     }
@@ -116,7 +116,7 @@ public void CanReadDefaultDocument()
     {
         const string text = "";
         SetupConfigFileContent(text);
-        var config = ConfigurationProvider.Provide(gitDirectory, fileSystem);
+        var config = ConfigurationProvider.Provide(repoPath, fileSystem);
         config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
         config.Branches["develop"].Tag.ShouldBe("unstable");
         config.Branches["release[/-]"].Tag.ShouldBe("beta");
@@ -156,6 +156,6 @@ public void VerifyAliases()
 
     void SetupConfigFileContent(string text)
     {
-        fileSystem.WriteAllText(Path.Combine(Directory.GetParent(gitDirectory).FullName, "GitVersionConfig.yaml"), text);
+        fileSystem.WriteAllText(Path.Combine(repoPath, "GitVersionConfig.yaml"), text);
     }
 }

GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -53,7 +53,7 @@ public static void WriteSample(string workingDirectory, IFileSystem fileSystem)
 
         static string GetConfigFilePath(string workingDirectory)
         {
-            return Path.Combine(Directory.GetParent(workingDirectory).FullName, "GitVersionConfig.yaml");
+            return Path.Combine(workingDirectory, "GitVersionConfig.yaml");
         }
     }
 }

GitVersionCore/ExecuteCore.cs

@@ -14,6 +14,7 @@ public static VersionVariables ExecuteGitVersion(IFileSystem fileSystem, string
             gitPreparer.Initialise();
             var dotGitDirectory = gitPreparer.GetDotGitDirectory();
             var projectRoot = gitPreparer.GetProjectRootDirectory();
+            Logger.WriteInfo(string.Format("Project root is: " + projectRoot));
             if (string.IsNullOrEmpty(dotGitDirectory) || string.IsNullOrEmpty(projectRoot))
             {
                 // TODO Link to wiki article

GitVersionExe.Tests/ArgumentBuilder.cs

@@ -19,11 +19,12 @@ public ArgumentBuilder(string workingDirectory, string exec, string execArgs, st
         this.isTeamCity = isTeamCity;
     }
 
-    public ArgumentBuilder(string workingDirectory, string additionalArguments, bool isTeamCity)
+    public ArgumentBuilder(string workingDirectory, string additionalArguments, bool isTeamCity, string logFile)
     {
         this.workingDirectory = workingDirectory;
         this.isTeamCity = isTeamCity;
         this.additionalArguments = additionalArguments;
+        this.logFile = logFile;
     }
 
 

GitVersionExe.Tests/GitPreparerTests.cs

@@ -181,5 +181,32 @@ public void WorksCorrectlyWithLocalRepository()
         gitPreparer.IsDynamicGitRepository.ShouldBe(false);
     }
 
+    [Test]
+    public void UsesGitVersionConfigWhenCreatingDynamicRepository()
+    {
+        string localRepoPath = PathHelper.GetTempPath();
+        string repoBasePath = Path.GetDirectoryName(PathHelper.GetTempPath());
+        Directory.CreateDirectory(localRepoPath);
+
+        try
+        {
+            using (var remote = new EmptyRepositoryFixture(new Config()))
+            {
+                remote.Repository.MakeACommit();
+                var configFile = Path.Combine(localRepoPath, "GitVersionConfig.yaml");
+                File.WriteAllText(configFile, "next-version: 1.0.0");
+ 
+                var arguments = string.Format(" /url {0} /dynamicRepoLocation {1}", remote.RepositoryPath, repoBasePath);
+                var results = GitVersionHelper.ExecuteIn(localRepoPath, arguments, false);
+                results.OutputVariables.SemVer.ShouldBe("1.0.0");
+            }
+        }
+        finally
+        {
+            DeleteHelper.DeleteGitRepository(localRepoPath);
+            DeleteHelper.DeleteGitRepository(repoBasePath);
+        }
+    }
+
     // TODO test around normalisation
 }

GitVersionExe.Tests/GitVersionHelper.cs

@@ -17,7 +17,8 @@ public static ExecutionResults ExecuteIn(string workingDirectory,
 
     public static ExecutionResults ExecuteIn(string workingDirectory, string arguments, bool isTeamCity = false)
     {
-        var args = new ArgumentBuilder(workingDirectory, arguments, isTeamCity);
+        var logFile = Path.Combine(workingDirectory, "log.txt");
+        var args = new ArgumentBuilder(workingDirectory, arguments, isTeamCity, logFile);
         return ExecuteIn(args);
     }
 
@@ -46,7 +47,7 @@ static ExecutionResults ExecuteIn(ArgumentBuilder arguments)
         Console.WriteLine();
         Console.WriteLine("-------------------------------------------------------");
 
-        if (string.IsNullOrWhiteSpace(arguments.LogFile))
+        if (string.IsNullOrWhiteSpace(arguments.LogFile) || !File.Exists(arguments.LogFile))
         {
             return new ExecutionResults(exitCode, output.ToString(), null);
         }