Merge pull request #96 from GeertvanHorrik/master

GV-90: Renamed all solution directories, packages and usages from GitFlowVersion to GitVersion

Author: SimonCropp

.gitignore

@@ -48,6 +48,8 @@ ForSample/
 _ReSharper*
 
 !GitFlowRepo/**/*
+!GitFlowVersionRepo/**/*
+!GitVersionRepo/**/*
 
 # Others
 [Bb]in

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")]

GitFlowVersion/GemAssets/gitflowversion

@@ -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

GitFlowVersion/NugetExeAssets/chocolateyInstall.ps1

@@ -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>

GitFlowVersion/NugetExeAssets/chocolateyUninstall.ps1

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.Collections.Generic;

GitFlowVersion/OutputFormatters/BuildOutputFormatter.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     class Arguments
     {

GitFlowVersion.sln renamed to GitVersion.sln

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.Collections.Generic;

GitFlowVersion.sln.DotSettings renamed to GitVersion.sln.DotSettings

@@ -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)

GitVersion.sln.GhostDoc.xml

@@ -1,4 +1,4 @@
-namespace GitFlowVersion.GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.Linq;

GitFlowVersion.v2.ncrunchsolution renamed to GitVersion.v2.ncrunchsolution

@@ -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);
     }
 }

GitFlowVersion/ArgumentParser.cs renamed to GitVersion/ArgumentParser.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)

GitFlowVersion/Arguments.cs renamed to GitVersion/Arguments.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     class CachedVersion
     {

GitFlowVersion/BuildServers/BuildServerList.cs renamed to GitVersion/BuildServers/BuildServerList.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.IO;

GitFlowVersion/BuildServers/ContinuaCi.cs renamed to GitVersion/BuildServers/ContinuaCi.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.Runtime.Serialization;

GitFlowVersion/BuildServers/GitHelper.cs renamed to GitVersion/BuildServers/GitHelper.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.Text;

GitFlowVersion/BuildServers/IBuildServer.cs renamed to GitVersion/BuildServers/IBuildServer.cs

@@ -0,0 +1,2 @@
+result = system(File.dirname(__FILE__) + "/GitVersion.exe " + ARGV.join(' '))
+exit 1 unless result

GitFlowVersion/BuildServers/TeamCity.cs renamed to GitVersion/BuildServers/TeamCity.cs

@@ -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

GitFlowVersion/CachedVersion.cs renamed to GitVersion/CachedVersion.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System.IO;
     using LibGit2Sharp;

GitFlowVersion/DirectoryDateFinder.cs renamed to GitVersion/DirectoryDateFinder.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using LibGit2Sharp;

GitFlowVersion/ErrorException.cs renamed to GitVersion/ErrorException.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System.Linq;
     using LibGit2Sharp;

GitFlowVersion/ExtensionMethods.cs renamed to GitVersion/ExtensionMethods.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System.Linq;
 

GitFlowVersion/Fody.targets renamed to GitVersion/Fody.targets

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     class FeatureVersionFinder : DevelopBasedVersionFinderBase
     {

GitFlowVersion/FodyWeavers.xml renamed to GitVersion/FodyWeavers.xml

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     class HotfixVersionFinder : OptionallyTaggedBranchVersionFinderBase
     {

GitVersion/GemAssets/gitversion

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using LibGit2Sharp;
 

GitFlowVersion/GemAssets/gitflowversion.gemspec renamed to GitVersion/GemAssets/gitversion.gemspec

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.Collections.Generic;

GitFlowVersion/GitDirFinder.cs renamed to GitVersion/GitDirFinder.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     class PullVersionFinder : DevelopBasedVersionFinderBase
     {

GitFlowVersion/GitFlow/BranchClassifier.cs renamed to GitVersion/GitFlow/BranchClassifier.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     class ReleaseVersionFinder : OptionallyTaggedBranchVersionFinderBase
     {

GitFlowVersion/GitFlow/BranchFinders/DevelopBasedVersionFinderBase.cs renamed to GitVersion/GitFlow/BranchFinders/DevelopBasedVersionFinderBase.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     public enum BranchType
     {

GitFlowVersion/GitFlow/BranchFinders/DevelopVersionFinder.cs renamed to GitVersion/GitFlow/BranchFinders/DevelopVersionFinder.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.Collections.Generic;

GitFlowVersion/GitFlow/BranchFinders/FeatureVersionFinder.cs renamed to GitVersion/GitFlow/BranchFinders/FeatureVersionFinder.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     public class GitFlowVersionFinder
     {

GitFlowVersion/GitFlow/BranchFinders/HotfixVersionFinder.cs renamed to GitVersion/GitFlow/BranchFinders/HotfixVersionFinder.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System.Linq;
     using LibGit2Sharp;

GitFlowVersion/GitFlow/BranchFinders/MasterVersionFinder.cs renamed to GitVersion/GitFlow/BranchFinders/MasterVersionFinder.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     public class ReleaseInformation
     {

GitFlowVersion/GitFlow/BranchFinders/OptionallyTaggedBranchVersionFinderBase.cs renamed to GitVersion/GitFlow/BranchFinders/OptionallyTaggedBranchVersionFinderBase.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.Text.RegularExpressions;

GitFlowVersion/GitFlow/BranchFinders/PullVersionFinder.cs renamed to GitVersion/GitFlow/BranchFinders/PullVersionFinder.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     public enum Stability
     {

GitFlowVersion/GitFlow/BranchFinders/ReleaseVersionFinder.cs renamed to GitVersion/GitFlow/BranchFinders/ReleaseVersionFinder.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     public class VersionAndBranch
     {

GitFlowVersion/GitFlow/BranchType.cs renamed to GitVersion/GitFlow/BranchType.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     public class VersionAndBranchAndDate : VersionAndBranch
     {

GitFlowVersion/GitFlow/GitFlowVariableProvider.cs renamed to GitVersion/GitFlow/GitFlowVariableProvider.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.Linq;

GitFlowVersion/GitFlow/GitFlowVersionFinder.cs renamed to GitVersion/GitFlow/GitFlowVersionFinder.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     public class GitHubFlowVersionFinder
     {

GitFlowVersion/GitFlow/MergeMessageParser.cs renamed to GitVersion/GitFlow/MergeMessageParser.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.IO;

GitFlowVersion/GitFlow/ReleaseInformation.cs renamed to GitVersion/GitFlow/ReleaseInformation.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     public class NextSemverCalculator
     {

GitFlowVersion/GitFlow/ReleaseInformationCalculator.cs renamed to GitVersion/GitFlow/ReleaseInformationCalculator.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using System;
     using System.IO;

GitFlowVersion/GitFlow/Stability.cs renamed to GitVersion/GitFlow/Stability.cs

@@ -1,4 +1,4 @@
-namespace GitFlowVersion
+namespace GitVersion
 {
     using LibGit2Sharp;