Changed to assembly-informational-format

Updated the code to provide assembly-informational-format in the yaml
config to customize how the assembly informational data will be
formatted.

Author: MarkZuber

src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt

@@ -1,5 +1,4 @@
 assembly-versioning-scheme: MajorMinorPatch
-assembly-informational-versioning-scheme: FullInformationalVersion
 mode: ContinuousDelivery
 tag-prefix: '[vV]'
 continuous-delivery-fallback-tag: ci

src/GitVersionCore.Tests/ConfigProviderTests.cs

@@ -43,7 +43,7 @@ public void CanReadDocumentAndMigrate()
 
         var config = ConfigurationProvider.Provide(repoPath, fileSystem);
         config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinor);
-        config.AssemblyInformationalVersioningScheme.ShouldBe(AssemblyInformationalVersioningScheme.FullInformationalVersion);
+        config.AssemblyInformationalFormat.ShouldBe(null);
         config.NextVersion.ShouldBe("2.0.0");
         config.TagPrefix.ShouldBe("[vV|version-]");
         config.VersioningMode.ShouldBe(VersioningMode.ContinuousDelivery);
@@ -116,13 +116,13 @@ public void CanUpdateAssemblyInformationalVersioningScheme()
     {
         const string text = @"
 assembly-versioning-scheme: MajorMinor
-assembly-informational-versioning-scheme: NugetVersion";
+assembly-informational-format: '{NugetVersion}'";
 
         SetupConfigFileContent(text);
 
         var config = ConfigurationProvider.Provide(repoPath, fileSystem);
         config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinor);
-        config.AssemblyInformationalVersioningScheme.ShouldBe(AssemblyInformationalVersioningScheme.NugetVersion);
+        config.AssemblyInformationalFormat.ShouldBe("{NugetVersion}");
     }
 
     [Test]
@@ -132,7 +132,7 @@ public void CanReadDefaultDocument()
         SetupConfigFileContent(text);
         var config = ConfigurationProvider.Provide(repoPath, fileSystem);
         config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
-        config.AssemblyInformationalVersioningScheme.ShouldBe(AssemblyInformationalVersioningScheme.FullInformationalVersion);
+        config.AssemblyInformationalFormat.ShouldBe(null);
         config.Branches["dev(elop)?(ment)?$"].Tag.ShouldBe("unstable");
         config.Branches["releases?[/-]"].Tag.ShouldBe("beta");
         config.TagPrefix.ShouldBe(ConfigurationProvider.DefaultTagPrefix);

src/GitVersionCore.Tests/TestEffectiveConfiguration.cs

@@ -6,7 +6,7 @@ public class TestEffectiveConfiguration : EffectiveConfiguration
     {
         public TestEffectiveConfiguration(
             AssemblyVersioningScheme assemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch, 
-            AssemblyInformationalVersioningScheme assemblyInformationalVersioningScheme = AssemblyInformationalVersioningScheme.FullInformationalVersion,
+            string assemblyInformationalFormat = null,
             VersioningMode versioningMode = VersioningMode.ContinuousDelivery, 
             string gitTagPrefix = "v", 
             string tag = "",
@@ -22,7 +22,7 @@ public TestEffectiveConfiguration(
             CommitMessageIncrementMode commitMessageMode = CommitMessageIncrementMode.Enabled,
             int legacySemVerPadding = 4,
             int buildMetaDataPadding = 4) : 
-                base(assemblyVersioningScheme, assemblyInformationalVersioningScheme, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch, 
+                base(assemblyVersioningScheme, assemblyInformationalFormat, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch, 
                     branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern, continuousDeploymentFallbackTag,
                     trackMergeTarget,
                     majorMessage, minorMessage, patchMessage,

src/GitVersionCore/AssemblyInformationalVersioningScheme.cs

@@ -22,21 +22,5 @@ public static string GetAssemblyVersion(
                     throw new ArgumentException(string.Format("Unexpected value ({0}).", scheme), "scheme");
             }
         }
-
-        public static string GetAssemblyInformationalVersion(
-            this SemanticVersion sv,
-            AssemblyInformationalVersioningScheme scheme)
-        {
-            switch (scheme)
-            {
-                case AssemblyInformationalVersioningScheme.FullInformationalVersion:
-                    return sv.ToString("i");
-                case AssemblyInformationalVersioningScheme.NugetVersion:
-                    return sv.ToString("lp");
-                default:
-                    throw new ArgumentException(string.Format("Unexpected value ({0}).", scheme), "scheme");
-            }
-        }
-
     }
 }

src/GitVersionCore/AssemblyVersionsGenerator.cs

@@ -11,8 +11,8 @@ public class Config
         [YamlMember(Alias = "assembly-versioning-scheme")]
         public AssemblyVersioningScheme? AssemblyVersioningScheme { get; set; }
 
-        [YamlMember(Alias = "assembly-informational-versioning-scheme")]
-        public AssemblyInformationalVersioningScheme? AssemblyInformationalVersioningScheme { get; set; }
+        [YamlMember(Alias = "assembly-informational-format")]
+        public string AssemblyInformationalFormat { get; set; }
 
         [YamlMember(Alias = "mode")]
         public VersioningMode? VersioningMode { get; set; }

src/GitVersionCore/Configuration/Config.cs

@@ -24,7 +24,7 @@ public static void ApplyDefaultsTo(Config config)
             MigrateBranches(config);
 
             config.AssemblyVersioningScheme = config.AssemblyVersioningScheme ?? AssemblyVersioningScheme.MajorMinorPatch;
-            config.AssemblyInformationalVersioningScheme = config.AssemblyInformationalVersioningScheme ?? AssemblyInformationalVersioningScheme.FullInformationalVersion;
+            config.AssemblyInformationalFormat = config.AssemblyInformationalFormat;
             config.TagPrefix = config.TagPrefix ?? DefaultTagPrefix;
             config.VersioningMode = config.VersioningMode ?? VersioningMode.ContinuousDelivery;
             config.ContinuousDeploymentFallbackTag = config.ContinuousDeploymentFallbackTag ?? "ci";

src/GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -39,9 +39,6 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
                     steps.Enqueue(new AssemblyVersioningSchemeSetting(Console, FileSystem));
                     return StepResult.Ok();
                 case "7":
-                    steps.Enqueue(new AssemblyInformationalVersioningSchemeSetting(Console, FileSystem));
-                    return StepResult.Ok();
-                case "8":
                     steps.Enqueue(new SetupBuildScripts(Console, FileSystem));
                     return StepResult.Ok();
             }
@@ -61,8 +58,7 @@ protected override string GetPrompt(Config config, string workingDirectory)
 4) Branch specific configuration
 5) Branch Increment mode (per commit/after tag) (Current: {0})
 6) Assembly versioning scheme (Current: {1})
-7) Assembly informational versioning scheme (Current: {2})
-8) Setup build scripts", config.VersioningMode, config.AssemblyVersioningScheme, config.AssemblyInformationalVersioningScheme);
+7) Setup build scripts", config.VersioningMode, config.AssemblyVersioningScheme);
         }
 
         protected override string DefaultResult

src/GitVersionCore/Configuration/Init/EditConfigStep.cs

@@ -7,7 +7,7 @@ public class EffectiveConfiguration
     {
         public EffectiveConfiguration(
             AssemblyVersioningScheme assemblyVersioningScheme, 
-            AssemblyInformationalVersioningScheme assemblyInformationalVersioningScheme,
+            string assemblyInformationalFormat,
             VersioningMode versioningMode, string gitTagPrefix, 
             string tag, string nextVersion, IncrementStrategy increment, 
             string branchPrefixToTrim, 
@@ -24,7 +24,7 @@ int buildMetaDataPadding
             )
         {
             AssemblyVersioningScheme = assemblyVersioningScheme;
-            AssemblyInformationalVersioningScheme = assemblyInformationalVersioningScheme;
+            AssemblyInformationalFormat = assemblyInformationalFormat;
             VersioningMode = versioningMode;
             GitTagPrefix = gitTagPrefix;
             Tag = tag;
@@ -46,7 +46,7 @@ int buildMetaDataPadding
         public VersioningMode VersioningMode { get; private set; }
 
         public AssemblyVersioningScheme AssemblyVersioningScheme { get; private set; }
-        public AssemblyInformationalVersioningScheme AssemblyInformationalVersioningScheme { get; private set; }
+        public string AssemblyInformationalFormat { get; private set; }
 
         /// <summary>
         /// Git tag prefix