GitTools · SimonCropp · Mar 8, 2014 · Mar 6, 2014 · Mar 7, 2014
diff --git a/.gitignore b/.gitignore
@@ -48,6 +48,8 @@ ForSample/
 _ReSharper*
 
 !GitFlowRepo/**/*
+!GitFlowVersionRepo/**/*
+!GitVersionRepo/**/*
 
 # Others
 [Bb]in

diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
@@ -1,8 +1,8 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyTitle("GitFlowVersion")]
-[assembly: AssemblyProduct("GitFlowVersion")]
+[assembly: AssemblyTitle("GitVersion")]
+[assembly: AssemblyProduct("GitVersion")]
 [assembly: AssemblyVersion("0.19.0")]
 [assembly: AssemblyFileVersion("0.19.0")]
 [assembly: InternalsVisibleTo("Tests")]
diff --git a/GitFlowVersion/GemAssets/gitflowversion b/GitFlowVersion/GemAssets/gitflowversion
diff --git a/GitFlowVersion/NugetExeAssets/chocolateyInstall.ps1 b/GitFlowVersion/NugetExeAssets/chocolateyInstall.ps1
diff --git a/GitFlowVersion/NugetExeAssets/chocolateyUninstall.ps1 b/GitFlowVersion/NugetExeAssets/chocolateyUninstall.ps1
diff --git a/GitFlowVersion/OutputFormatters/BuildOutputFormatter.cs b/GitFlowVersion/OutputFormatters/BuildOutputFormatter.cs
diff --git a/GitFlowVersion.sln → GitVersion.sln b/GitFlowVersion.sln → GitVersion.sln
@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitFlowVersion", "GitFlowVersion\GitFlowVersion.csproj", "{C3578A7B-09A6-4444-9383-0DEAFA4958BD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersion", "GitVersion\GitVersion.csproj", "{C3578A7B-09A6-4444-9383-0DEAFA4958BD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{5A86453B-96FB-4B6E-A283-225BB9F753D3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitFlowVersionTask", "GitFlowVersionTask\GitFlowVersionTask.csproj", "{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersionTask", "GitVersionTask\GitVersionTask.csproj", "{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/GitFlowVersion.sln.DotSettings → GitVersion.sln.DotSettings b/GitFlowVersion.sln.DotSettings → GitVersion.sln.DotSettings
diff --git a/GitVersion.sln.GhostDoc.xml b/GitVersion.sln.GhostDoc.xml
@@ -0,0 +1,35 @@
+<GhostDoc>
+  <SpellChecker>
+    <IncludeExtensions>
+    </IncludeExtensions>
+    <IgnoreExtensions>
+    </IgnoreExtensions>
+    <IgnoreFiles>
+    </IgnoreFiles>
+  </SpellChecker>
+<HelpConfigurations selected="HelpFile">
+  <HelpConfiguration name="HelpFile">
+    <OutputPath>C:\Source\GitVersion\Help</OutputPath>
+    <ImageFolderPath />
+    <HtmlFormats>
+      <HtmlHelp>true</HtmlHelp>
+      <MSHelpViewer>false</MSHelpViewer>
+      <MSHelp2>false</MSHelp2>
+      <Website>false</Website>
+    </HtmlFormats>
+    <IncludeScopes>
+      <Public>true</Public>
+      <Internal>false</Internal>
+      <Protected>false</Protected>
+      <Private>false</Private>
+      <Inherited>true</Inherited>
+      <EnableTags>false</EnableTags>
+      <TagList />
+    </IncludeScopes>
+    <ResolveCrefLinks>true</ResolveCrefLinks>
+    <HeaderText />
+    <FooterText />
+    <SelectedProjects />
+  </HelpConfiguration>
+</HelpConfigurations>
+</GhostDoc>
diff --git a/GitFlowVersion.v2.ncrunchsolution → GitVersion.v2.ncrunchsolution b/GitFlowVersion.v2.ncrunchsolution → GitVersion.v2.ncrunchsolution
diff --git a/GitFlowVersion/ArgumentParser.cs → GitVersion/ArgumentParser.cs b/GitFlowVersion/ArgumentParser.cs → GitVersion/ArgumentParser.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.Collections.Generic;

diff --git a/GitFlowVersion/Arguments.cs → GitVersion/Arguments.cs b/GitFlowVersion/Arguments.cs → GitVersion/Arguments.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     class Arguments
     {

diff --git a/...owVersion/BuildServers/BuildServerList.cs → GitVersion/BuildServers/BuildServerList.cs b/...owVersion/BuildServers/BuildServerList.cs → GitVersion/BuildServers/BuildServerList.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.Collections.Generic;

diff --git a/GitFlowVersion/BuildServers/ContinuaCi.cs → GitVersion/BuildServers/ContinuaCi.cs b/GitFlowVersion/BuildServers/ContinuaCi.cs → GitVersion/BuildServers/ContinuaCi.cs
@@ -1,6 +1,5 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
-    using GitFlowVersion;
     using Microsoft.Win32;
 
     public class ContinuaCi : IBuildServer
@@ -23,9 +22,12 @@ public void PerformPreProcessingSteps(string gitDirectory)
             GitHelper.NormalizeGitDirectory(gitDirectory);
         }
 
-        public string GenerateSetParameterMessage(string name, string value)
+        public string[] GenerateSetParameterMessage(string name, string value)
         {
-            return string.Format("@@continua[setVariable name='GitFlowVersion.{0}' value='{1}']", name, value);
+            return new []
+            {
+                string.Format("@@continua[setVariable name='GitVersion.{0}' value='{1}']", name, value)
+            };
         }
 
         public string GenerateSetVersionMessage(string versionToUseForBuildNumber)

diff --git a/GitFlowVersion/BuildServers/GitHelper.cs → GitVersion/BuildServers/GitHelper.cs b/GitFlowVersion/BuildServers/GitHelper.cs → GitVersion/BuildServers/GitHelper.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion.GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.Linq;

diff --git a/GitFlowVersion/BuildServers/IBuildServer.cs → GitVersion/BuildServers/IBuildServer.cs b/GitFlowVersion/BuildServers/IBuildServer.cs → GitVersion/BuildServers/IBuildServer.cs
@@ -1,10 +1,10 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     public interface IBuildServer
     {
         bool CanApplyToCurrentContext();
         void PerformPreProcessingSteps(string gitDirectory);
         string GenerateSetVersionMessage(string versionToUseForBuildNumber);
-        string GenerateSetParameterMessage(string name, string value);
+        string[] GenerateSetParameterMessage(string name, string value);
     }
 }
diff --git a/GitFlowVersion/BuildServers/TeamCity.cs → GitVersion/BuildServers/TeamCity.cs b/GitFlowVersion/BuildServers/TeamCity.cs → GitVersion/BuildServers/TeamCity.cs
@@ -1,7 +1,6 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
-    using GitFlowVersion;
 
     public class TeamCity : IBuildServer
     {
@@ -20,9 +19,14 @@ public void PerformPreProcessingSteps(string gitDirectory)
             GitHelper.NormalizeGitDirectory(gitDirectory);
         }
 
-        public string GenerateSetParameterMessage(string name, string value)
+        public string[] GenerateSetParameterMessage(string name, string value)
         {
-            return string.Format("##teamcity[setParameter name='GitFlowVersion.{0}' value='{1}']", name, EscapeValue(value));
+            return new[]
+            {
+                // Note: see discussion at https://github.com/Particular/GitVersion/issues/90, keep GitFlowVersion for now
+                string.Format("##teamcity[setParameter name='GitFlowVersion.{0}' value='{1}']", name, EscapeValue(value)),
+                string.Format("##teamcity[setParameter name='GitVersion.{0}' value='{1}']", name, EscapeValue(value))
+            };
         }
 
         public string GenerateSetVersionMessage(string versionToUseForBuildNumber)

diff --git a/GitFlowVersion/CachedVersion.cs → GitVersion/CachedVersion.cs b/GitFlowVersion/CachedVersion.cs → GitVersion/CachedVersion.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     class CachedVersion
     {

diff --git a/GitFlowVersion/DirectoryDateFinder.cs → GitVersion/DirectoryDateFinder.cs b/GitFlowVersion/DirectoryDateFinder.cs → GitVersion/DirectoryDateFinder.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.IO;

diff --git a/GitFlowVersion/ErrorException.cs → GitVersion/ErrorException.cs b/GitFlowVersion/ErrorException.cs → GitVersion/ErrorException.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.Runtime.Serialization;

diff --git a/GitFlowVersion/ExtensionMethods.cs → GitVersion/ExtensionMethods.cs b/GitFlowVersion/ExtensionMethods.cs → GitVersion/ExtensionMethods.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.Text;

diff --git a/GitFlowVersion/Fody.targets → GitVersion/Fody.targets b/GitFlowVersion/Fody.targets → GitVersion/Fody.targets
diff --git a/GitFlowVersion/FodyWeavers.xml → GitVersion/FodyWeavers.xml b/GitFlowVersion/FodyWeavers.xml → GitVersion/FodyWeavers.xml
diff --git a/GitVersion/GemAssets/gitversion b/GitVersion/GemAssets/gitversion
@@ -0,0 +1,2 @@
+result = system(File.dirname(__FILE__) + "/GitVersion.exe " + ARGV.join(' '))
+exit 1 unless result
diff --git a/...wVersion/GemAssets/gitflowversion.gemspec → GitVersion/GemAssets/gitversion.gemspec b/...wVersion/GemAssets/gitflowversion.gemspec → GitVersion/GemAssets/gitversion.gemspec
@@ -1,11 +1,11 @@
 Gem::Specification.new do |spec|
   spec.platform    = Gem::Platform::RUBY
-  spec.name        = 'gitflowversion'
+  spec.name        = 'gitversion'
   spec.licenses    = ['MIT']
   spec.version     = '0.14.0'
   spec.files = Dir['bin/**/*']
   spec.bindir = 'bin'
-  spec.executables << 'gitflowversion'
+  spec.executables << 'gitversion'
 
   spec.summary     = 'Derives SemVer information from a repository following GitFlow.'
   spec.description = <<-EOF 
@@ -14,6 +14,6 @@ EOF
 
   spec.authors           = ['NServiceBus','Simon Cropp']
   spec.email             = '[email protected]'
-  spec.homepage          = 'http://github.com/Particular/GitFlowVersion'
-  spec.rubyforge_project = 'GitFlowVersion'
+  spec.homepage          = 'http://github.com/Particular/GitVersion'
+  spec.rubyforge_project = 'GitVersion'
 end
diff --git a/GitFlowVersion/GitDirFinder.cs → GitVersion/GitDirFinder.cs b/GitFlowVersion/GitDirFinder.cs → GitVersion/GitDirFinder.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System.IO;
     using LibGit2Sharp;

diff --git a/GitFlowVersion/GitFlow/BranchClassifier.cs → GitVersion/GitFlow/BranchClassifier.cs b/GitFlowVersion/GitFlow/BranchClassifier.cs → GitVersion/GitFlow/BranchClassifier.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using LibGit2Sharp;

diff --git a/...hFinders/DevelopBasedVersionFinderBase.cs → ...hFinders/DevelopBasedVersionFinderBase.cs b/...hFinders/DevelopBasedVersionFinderBase.cs → ...hFinders/DevelopBasedVersionFinderBase.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System.Linq;
     using LibGit2Sharp;

diff --git a/...low/BranchFinders/DevelopVersionFinder.cs → ...low/BranchFinders/DevelopVersionFinder.cs b/...low/BranchFinders/DevelopVersionFinder.cs → ...low/BranchFinders/DevelopVersionFinder.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System.Linq;
 

diff --git a/...low/BranchFinders/FeatureVersionFinder.cs → ...low/BranchFinders/FeatureVersionFinder.cs b/...low/BranchFinders/FeatureVersionFinder.cs → ...low/BranchFinders/FeatureVersionFinder.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     class FeatureVersionFinder : DevelopBasedVersionFinderBase
     {

diff --git a/...Flow/BranchFinders/HotfixVersionFinder.cs → ...Flow/BranchFinders/HotfixVersionFinder.cs b/...Flow/BranchFinders/HotfixVersionFinder.cs → ...Flow/BranchFinders/HotfixVersionFinder.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     class HotfixVersionFinder : OptionallyTaggedBranchVersionFinderBase
     {

diff --git a/...Flow/BranchFinders/MasterVersionFinder.cs → ...Flow/BranchFinders/MasterVersionFinder.cs b/...Flow/BranchFinders/MasterVersionFinder.cs → ...Flow/BranchFinders/MasterVersionFinder.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using LibGit2Sharp;
 

diff --git a/...ptionallyTaggedBranchVersionFinderBase.cs → ...ptionallyTaggedBranchVersionFinderBase.cs b/...ptionallyTaggedBranchVersionFinderBase.cs → ...ptionallyTaggedBranchVersionFinderBase.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.Collections.Generic;

diff --git a/...itFlow/BranchFinders/PullVersionFinder.cs → ...itFlow/BranchFinders/PullVersionFinder.cs b/...itFlow/BranchFinders/PullVersionFinder.cs → ...itFlow/BranchFinders/PullVersionFinder.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     class PullVersionFinder : DevelopBasedVersionFinderBase
     {

diff --git a/...low/BranchFinders/ReleaseVersionFinder.cs → ...low/BranchFinders/ReleaseVersionFinder.cs b/...low/BranchFinders/ReleaseVersionFinder.cs → ...low/BranchFinders/ReleaseVersionFinder.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     class ReleaseVersionFinder : OptionallyTaggedBranchVersionFinderBase
     {

diff --git a/GitFlowVersion/GitFlow/BranchType.cs → GitVersion/GitFlow/BranchType.cs b/GitFlowVersion/GitFlow/BranchType.cs → GitVersion/GitFlow/BranchType.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     public enum BranchType
     {

diff --git a/...ersion/GitFlow/GitFlowVariableProvider.cs → ...ersion/GitFlow/GitFlowVariableProvider.cs b/...ersion/GitFlow/GitFlowVariableProvider.cs → ...ersion/GitFlow/GitFlowVariableProvider.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.Collections.Generic;

diff --git a/...owVersion/GitFlow/GitFlowVersionFinder.cs → GitVersion/GitFlow/GitFlowVersionFinder.cs b/...owVersion/GitFlow/GitFlowVersionFinder.cs → GitVersion/GitFlow/GitFlowVersionFinder.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     public class GitFlowVersionFinder
     {

diff --git a/GitFlowVersion/GitFlow/MergeMessageParser.cs → GitVersion/GitFlow/MergeMessageParser.cs b/GitFlowVersion/GitFlow/MergeMessageParser.cs → GitVersion/GitFlow/MergeMessageParser.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System.Linq;
     using LibGit2Sharp;

diff --git a/GitFlowVersion/GitFlow/ReleaseInformation.cs → GitVersion/GitFlow/ReleaseInformation.cs b/GitFlowVersion/GitFlow/ReleaseInformation.cs → GitVersion/GitFlow/ReleaseInformation.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     public class ReleaseInformation
     {

diff --git a/...n/GitFlow/ReleaseInformationCalculator.cs → ...n/GitFlow/ReleaseInformationCalculator.cs b/...n/GitFlow/ReleaseInformationCalculator.cs → ...n/GitFlow/ReleaseInformationCalculator.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.Text.RegularExpressions;

diff --git a/GitFlowVersion/GitFlow/Stability.cs → GitVersion/GitFlow/Stability.cs b/GitFlowVersion/GitFlow/Stability.cs → GitVersion/GitFlow/Stability.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     public enum Stability
     {

diff --git a/GitFlowVersion/GitFlow/VersionAndBranch.cs → GitVersion/GitFlow/VersionAndBranch.cs b/GitFlowVersion/GitFlow/VersionAndBranch.cs → GitVersion/GitFlow/VersionAndBranch.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     public class VersionAndBranch
     {

diff --git a/...ersion/GitFlow/VersionAndBranchAndDate.cs → ...ersion/GitFlow/VersionAndBranchAndDate.cs b/...ersion/GitFlow/VersionAndBranchAndDate.cs → ...ersion/GitFlow/VersionAndBranchAndDate.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     public class VersionAndBranchAndDate : VersionAndBranch
     {

diff --git a/...rsion/GitHubFlow/BuildNumberCalculator.cs → ...rsion/GitHubFlow/BuildNumberCalculator.cs b/...rsion/GitHubFlow/BuildNumberCalculator.cs → ...rsion/GitHubFlow/BuildNumberCalculator.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.Linq;

diff --git a/...ion/GitHubFlow/GitHubFlowVersionFinder.cs → ...ion/GitHubFlow/GitHubFlowVersionFinder.cs b/...ion/GitHubFlow/GitHubFlowVersionFinder.cs → ...ion/GitHubFlow/GitHubFlowVersionFinder.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     public class GitHubFlowVersionFinder
     {

diff --git a/...ion/GitHubFlow/LastTaggedReleaseFinder.cs → ...ion/GitHubFlow/LastTaggedReleaseFinder.cs b/...ion/GitHubFlow/LastTaggedReleaseFinder.cs → ...ion/GitHubFlow/LastTaggedReleaseFinder.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.IO;

diff --git a/...ersion/GitHubFlow/NextSemverCalculator.cs → ...ersion/GitHubFlow/NextSemverCalculator.cs b/...ersion/GitHubFlow/NextSemverCalculator.cs → ...ersion/GitHubFlow/NextSemverCalculator.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     public class NextSemverCalculator
     {

diff --git a/...on/GitHubFlow/NextVersionTxtFileFinder.cs → ...on/GitHubFlow/NextVersionTxtFileFinder.cs b/...on/GitHubFlow/NextVersionTxtFileFinder.cs → ...on/GitHubFlow/NextVersionTxtFileFinder.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.IO;

diff --git a/...Version/GitHubFlow/VersionTaggedCommit.cs → GitVersion/GitHubFlow/VersionTaggedCommit.cs b/...Version/GitHubFlow/VersionTaggedCommit.cs → GitVersion/GitHubFlow/VersionTaggedCommit.cs
@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using LibGit2Sharp;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		result = system(File.dirname(__FILE__) + "/GitVersion.exe " + ARGV.join(' '))
		exit 1 unless result