Merge branch 'master' into bugfix/1257

Author: JakeGinnivan

docs/configuration.md

@@ -44,6 +44,7 @@ legacy-semver-padding: 4
 build-metadata-padding: 4
 commits-since-version-source-padding: 4
 commit-message-incrementing: Enabled
+commit-date-format: 'yyyy-MM-dd'
 ignore:
   sha: []
   commits-before: yyyy-MM-ddTHH:mm:ss
@@ -60,19 +61,21 @@ When updating assembly info, `assembly-versioning-scheme` tells GitVersion how
 to treat the `AssemblyVersion` attribute. Useful to lock the major when using
 Strong Naming. Note: you can use `None` to skip updating the `AssemblyVersion`
 while still updating the `AssemblyFileVersion` and `AssemblyInformationVersion`
-attributes.
+attributes. Valid values: `MajorMinorPatchTag`, `MajorMinorPatch`, `MajorMinor`,
+`Major`, `None`.
 
 ### assembly-file-versioning-scheme
 When updating assembly info, `assembly-file-versioning-scheme` tells GitVersion how
 to treat the `AssemblyFileVersion` attribute. Note: you can use `None` to skip updating the `AssemblyFileVersion`
 while still updating the `AssemblyVersion` and `AssemblyInformationVersion`
-attributes.
+attributes. Valid values: `MajorMinorPatchTag`, `MajorMinorPatch`, `MajorMinor`,
+`Major`, `None`.
 
 ### assembly-informational-format
 Set this to any of the available [variables](/more-info/variables) to change the
 value of the `AssemblyInformationalVersion` attribute. Default set to
 `{InformationalVersion}`. It also supports string interpolation
-(`{MajorMinorPatch}+{Branch}`)
+(`{MajorMinorPatch}+{BranchName}`)
 
 ### mode
 Sets the `mode` of how GitVersion should create a new version. Read more at
@@ -134,6 +137,9 @@ Sets whether it should be possible to increment the version with special syntax
 in the commit message. See the `*-version-bump-message` options above for
 details on the syntax. Default set to `Enabled`; set to `Disabled` to disable.
 
+### commit-date-format
+Sets the format which will be used to format the `CommitDate` output variable.
+
 ### ignore
 The header for ignore configuration.
 

src/GitVersionExe.Tests/Approved/cs/AssemblyInfoFileUpdateTests.ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile.approved.txt renamed to src/GitVersionCore.Tests/Approved/cs/AssemblyInfoFileUpdaterTests.ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile.approved.txt

@@ -0,0 +1,41 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     GitVersion
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+[global::System.Runtime.CompilerServices.CompilerGenerated]
+static class GitVersionInformation
+{
+    public static string Major = "1";
+    public static string Minor = "2";
+    public static string Patch = "3";
+    public static string PreReleaseTag = "unstable.4";
+    public static string PreReleaseTagWithDash = "-unstable.4";
+    public static string PreReleaseLabel = "unstable";
+    public static string PreReleaseNumber = "4";
+    public static string BuildMetaData = "5";
+    public static string BuildMetaDataPadded = "0005";
+    public static string FullBuildMetaData = "5.Branch.feature1.Sha.commitSha";
+    public static string MajorMinorPatch = "1.2.3";
+    public static string SemVer = "1.2.3-unstable.4";
+    public static string LegacySemVer = "1.2.3-unstable4";
+    public static string LegacySemVerPadded = "1.2.3-unstable0004";
+    public static string AssemblySemVer = "1.2.3.0";
+    public static string AssemblySemFileVer = "1.2.3.0";
+    public static string FullSemVer = "1.2.3-unstable.4+5";
+    public static string InformationalVersion = "1.2.3-unstable.4+5.Branch.feature1.Sha.commitSha";
+    public static string BranchName = "feature1";
+    public static string Sha = "commitSha";
+    public static string NuGetVersionV2 = "1.2.3-unstable0004";
+    public static string NuGetVersion = "1.2.3-unstable0004";
+    public static string NuGetPreReleaseTagV2 = "unstable0004";
+    public static string NuGetPreReleaseTag = "unstable0004";
+    public static string CommitsSinceVersionSource = "5";
+    public static string CommitsSinceVersionSourcePadded = "0005";
+    public static string CommitDate = "2014-03-06";
+}

src/GitVersionExe.Tests/Approved/cs/AssemblyInfoFileUpdateTests.ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt renamed to src/GitVersionCore.Tests/Approved/cs/AssemblyInfoFileUpdaterTests.ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt

@@ -5,6 +5,7 @@
 // You can modify this code as we will not overwrite it when re-executing GitVersion
 // </auto-generated> 
 //------------------------------------------------------------------------------
+namespace GitVersionAssemblyInfoFile
 
 open System.Reflection