Merge branch 'master' into simon/uniqueprnuget

simonejsing · web-flow · commit dfad961d75af · 2016-07-07T10:17:27.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,11 @@
 language: csharp
 solution: src/GitVersion.sln
 sudo: false
+mono:
+  - latest
+os:
+  - linux
+  - osx
 before_install: # We need to download nuget.exe due to: https://github.com/travis-ci/travis-ci/issues/5932
   - mkdir -p .nuget
   - wget -O .nuget/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -18,7 +18,7 @@ The global configuration options are:
 
  - **`next-version:`** Allows you to bump the next version explicitly, useful for bumping `master` or a feature with breaking changes a major increment.
 
- - **`assembly-versioning-scheme:`** When updating assembly info tells GitVersion how to treat the `AssemblyVersion` attribute. Useful to lock the major when using Strong Naming.
+ - **`assembly-versioning-scheme:`** When updating assembly info 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.
 
  - **`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}`)
 
diff --git a/src/GitVersionCore/AssemblyVersioningScheme.cs b/src/GitVersionCore/AssemblyVersioningScheme.cs
@@ -5,6 +5,7 @@ public enum AssemblyVersioningScheme
         MajorMinorPatchTag,
         MajorMinorPatch,
         MajorMinor,
-        Major
+        Major,
+        None
     }
 }
diff --git a/src/GitVersionCore/AssemblyVersionsGenerator.cs b/src/GitVersionCore/AssemblyVersionsGenerator.cs
@@ -18,6 +18,8 @@ public static string GetAssemblyVersion(
                     return string.Format("{0}.{1}.{2}.0", sv.Major, sv.Minor, sv.Patch);
                 case AssemblyVersioningScheme.MajorMinorPatchTag:
                     return string.Format("{0}.{1}.{2}.{3}", sv.Major, sv.Minor, sv.Patch, sv.PreReleaseTag.Number ?? 0);
+                case AssemblyVersioningScheme.None:
+                    return null;
                 default:
                     throw new ArgumentException(string.Format("Unexpected value ({0}).", scheme), "scheme");
             }
diff --git a/src/GitVersionCore/Configuration/Init/SetConfig/AssemblyVersioningSchemeSetting.cs b/src/GitVersionCore/Configuration/Init/SetConfig/AssemblyVersioningSchemeSetting.cs
@@ -33,6 +33,10 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
                     config.AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatchTag;
                     steps.Enqueue(new EditConfigStep(Console, FileSystem));
                     return StepResult.Ok();
+                case "5":
+                    config.AssemblyVersioningScheme = AssemblyVersioningScheme.None;
+                    steps.Enqueue(new EditConfigStep(Console, FileSystem));
+                    return StepResult.Ok();
             }
 
             return StepResult.InvalidResponseSelected();
@@ -46,7 +50,9 @@ protected override string GetPrompt(Config config, string workingDirectory)
 1) Major.0.0.0
 2) Major.Minor.0.0
 3) Major.Minor.Patch.0   (default)
-4) Major.Minor.Patch.TagCount (Allows different pre-release tags to cause assembly version to change)";
+4) Major.Minor.Patch.TagCount (Allows different pre-release tags to cause assembly version to change)
+5) None (skip's updating AssemblyVersion)";
+
         }
 
         protected override string DefaultResult
diff --git a/src/GitVersionExe.Tests/Approved/cs/AssemblyInfoFileUpdateTests.ShouldNotAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFileWhenVersionSchemeIsNone.approved.txt b/src/GitVersionExe.Tests/Approved/cs/AssemblyInfoFileUpdateTests.ShouldNotAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFileWhenVersionSchemeIsNone.approved.txt
@@ -0,0 +1,2 @@
+[assembly: AssemblyFileVersion("2.3.1.0")]
+[assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")]
diff --git a/src/GitVersionExe.Tests/Approved/cs/AssemblyInfoFileUpdateTests.ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone.approved.txt b/src/GitVersionExe.Tests/Approved/cs/AssemblyInfoFileUpdateTests.ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone.approved.txt
@@ -0,0 +1,2 @@
+[assembly: AssemblyFileVersion("2.3.1.0")]
+[assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")]
diff --git a/src/GitVersionExe.Tests/Approved/fs/AssemblyInfoFileUpdateTests.ShouldNotAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFileWhenVersionSchemeIsNone.approved.txt b/src/GitVersionExe.Tests/Approved/fs/AssemblyInfoFileUpdateTests.ShouldNotAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFileWhenVersionSchemeIsNone.approved.txt
@@ -0,0 +1,2 @@
+[<assembly: AssemblyFileVersion("2.3.1.0")>]
+[<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>]
diff --git a/src/GitVersionExe.Tests/Approved/fs/AssemblyInfoFileUpdateTests.ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone.approved.txt b/src/GitVersionExe.Tests/Approved/fs/AssemblyInfoFileUpdateTests.ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone.approved.txt
@@ -0,0 +1,2 @@
+[<assembly: AssemblyFileVersion("2.3.1.0")>]
+[<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>]
diff --git a/src/GitVersionExe.Tests/Approved/vb/AssemblyInfoFileUpdateTests.ShouldNotAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFileWhenVersionSchemeIsNone.approved.txt b/src/GitVersionExe.Tests/Approved/vb/AssemblyInfoFileUpdateTests.ShouldNotAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFileWhenVersionSchemeIsNone.approved.txt
@@ -0,0 +1,2 @@
+<Assembly: AssemblyFileVersion("2.3.1.0")>
+<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>
diff --git a/src/GitVersionExe.Tests/Approved/vb/AssemblyInfoFileUpdateTests.ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone.approved.txt b/src/GitVersionExe.Tests/Approved/vb/AssemblyInfoFileUpdateTests.ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone.approved.txt
@@ -0,0 +1,2 @@
+<Assembly: AssemblyFileVersion("2.3.1.0")>
+<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>
diff --git a/src/GitVersionExe.Tests/AssemblyInfoFileUpdateTests.cs b/src/GitVersionExe.Tests/AssemblyInfoFileUpdateTests.cs
@@ -206,6 +206,36 @@ public void ShouldReplaceAssemblyVersion(string fileExtension, string assemblyFi
         });
     }
 
+
+    [TestCase("cs", "[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
+    [TestCase("fs", "[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
+    [TestCase("vb", "<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
+    [Category("NoMono")]
+    [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
+    public void ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone(string fileExtension, string assemblyFileContent)
+    {
+        var workingDir = Path.GetTempPath();
+        var fileName = Path.Combine(workingDir, "AssemblyInfo." + fileExtension);
+
+        VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.None, verify: (fileSystem, variables) =>
+        {
+            var args = new Arguments
+            {
+                UpdateAssemblyInfo = true,
+                UpdateAssemblyInfoFileName = new HashSet<string>
+                {
+                    "AssemblyInfo." + fileExtension
+                }
+            };
+
+            using (new AssemblyInfoFileUpdate(args, workingDir, variables, fileSystem))
+            {
+                assemblyFileContent = fileSystem.ReadAllText(fileName);
+                assemblyFileContent.ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved", fileExtension)));
+            }
+        });
+    }
+
     [TestCase("cs", "[assembly: AssemblyVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyInformationalVersion(\"1.0.0.0\")]\r\n[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
     [TestCase("fs", "[<assembly: AssemblyVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyInformationalVersion(\"1.0.0.0\")>]\r\n[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
     [TestCase("vb", "<Assembly: AssemblyVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyInformationalVersion(\"1.0.0.0\")>\r\n<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
@@ -414,6 +444,36 @@ public void ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile
         });
     }
 
+
+    [TestCase("cs", "[assembly: AssemblyFileVersion(\"1.0.0.0\")]")]
+    [TestCase("fs", "[<assembly: AssemblyFileVersion(\"1.0.0.0\")>]")]
+    [TestCase("vb", "<Assembly: AssemblyFileVersion(\"1.0.0.0\")>")]
+    [Category("NoMono")]
+    [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
+    public void ShouldNotAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFileWhenVersionSchemeIsNone(string fileExtension, string assemblyFileContent)
+    {
+        var workingDir = Path.GetTempPath();
+        var fileName = Path.Combine(workingDir, "AssemblyInfo." + fileExtension);
+
+        VerifyAssemblyInfoFile(assemblyFileContent, fileName, AssemblyVersioningScheme.None, verify: (fileSystem, variables) =>
+        {
+            var args = new Arguments
+            {
+                UpdateAssemblyInfo = true,
+                UpdateAssemblyInfoFileName = new HashSet<string>
+                {
+                    "AssemblyInfo." + fileExtension
+                }
+            };
+
+            using (new AssemblyInfoFileUpdate(args, workingDir, variables, fileSystem))
+            {
+                assemblyFileContent = fileSystem.ReadAllText(fileName);
+                assemblyFileContent.ShouldMatchApproved(c => c.SubFolder(Path.Combine("Approved", fileExtension)));
+            }
+        });
+    }
+
     private static void VerifyAssemblyInfoFile(
         string assemblyFileContent,
         string fileName,
diff --git a/src/GitVersionExe/AssemblyInfoFileUpdate.cs b/src/GitVersionExe/AssemblyInfoFileUpdate.cs
@@ -26,7 +26,7 @@ public AssemblyInfoFileUpdate(Arguments args, string workingDirectory, VersionVa
 
             var assemblyVersion = variables.AssemblySemVer;
             var assemblyVersionRegex = new Regex(@"AssemblyVersion\s*\(\s*""[^""]*""\s*\)");
-            var assemblyVersionString = string.Format("AssemblyVersion(\"{0}\")", assemblyVersion);
+            var assemblyVersionString = !string.IsNullOrWhiteSpace(assemblyVersion) ? string.Format("AssemblyVersion(\"{0}\")", assemblyVersion) : null;
             var assemblyInfoVersion = variables.InformationalVersion;
             var assemblyInfoVersionRegex = new Regex(@"AssemblyInformationalVersion\s*\(\s*""[^""]*""\s*\)");
             var assemblyInfoVersionString = string.Format("AssemblyInformationalVersion(\"{0}\")", assemblyInfoVersion);
@@ -48,7 +48,10 @@ public AssemblyInfoFileUpdate(Arguments args, string workingDirectory, VersionVa
                 cleanupBackupTasks.Add(() => fileSystem.Delete(backupAssemblyInfo));
 
                 var fileContents = fileSystem.ReadAllText(assemblyInfoFile.FullName);
-                fileContents = ReplaceOrAppend(assemblyVersionRegex, fileContents, assemblyVersionString, assemblyInfoFile.Extension);
+                if (!string.IsNullOrWhiteSpace(assemblyVersion))
+                {
+                    fileContents = ReplaceOrAppend(assemblyVersionRegex, fileContents, assemblyVersionString, assemblyInfoFile.Extension);
+                }
                 fileContents = ReplaceOrAppend(assemblyInfoVersionRegex, fileContents, assemblyInfoVersionString, assemblyInfoFile.Extension);
                 fileContents = ReplaceOrAppend(assemblyFileVersionRegex, fileContents, assemblyFileVersionString, assemblyInfoFile.Extension);
 
diff --git a/src/GitVersionExe/HelpWriter.cs b/src/GitVersionExe/HelpWriter.cs
@@ -35,7 +35,7 @@ path            The directory containing .git. If not defined current directory
                     Specify name of AssemblyInfo file. Can also /updateAssemblyInfo GlobalAssemblyInfo.cs as a shorthand
     /ensureassemblyinfo
                     If the assembly info file specified with /updateassemblyinfo or /updateassemblyinfofilename is not found, 
-                    it be created with these attributes: AssemblyFileVersion, FileVersion and AssemblyInformationalVersion
+                    it be created with these attributes: AssemblyFileVersion, AssemblyVersion and AssemblyInformationalVersion
                     ---        
                     Supports writing version info for: C#, F#, VB    
     # Remote repository args
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs
@@ -1,14 +1,17 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using GitVersion;
 using GitVersionCore.Tests;
+using Microsoft.Build.Framework;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.VisualBasic;
+using NSubstitute;
 using NUnit.Framework;
 using Shouldly;
 
@@ -212,6 +215,36 @@ public void VerifyAssemblyVersion_MajorMinorPatchTag_NugetAssemblyInfo([ValueSou
         VerifyAssemblyVersion(compiler, AssemblyVersioningScheme.MajorMinorPatchTag, "{NugetVersion}");
     }
 
+    [Test]
+    public void GetAssemblyInfoBuilder_Empty_ThrowsWarningException()
+    {
+        var taskItems = Substitute.For<IEnumerable<ITaskItem>>();
+        var exception = Assert.Throws<GitTools.WarningException>(() => AssemblyInfoBuilder.GetAssemblyInfoBuilder(taskItems));
+        exception.Message.ShouldBe("Unable to determine which AssemblyBuilder required to generate GitVersion assembly information");
+    }
+
+    [Test]
+    public void GetAssemblyInfoBuilder_Null_ThrowsArgumentNullException()
+    {
+        var exception = Assert.Throws<ArgumentNullException>(() => AssemblyInfoBuilder.GetAssemblyInfoBuilder(null));
+        exception.ParamName.ShouldBe("compileFiles");
+    }
+
+    [TestCase("Class1.cs", typeof(CSharpAssemblyInfoBuilder))]
+    [TestCase("Class1.vb", typeof(VisualBasicAssemblyInfoBuilder))]
+    [TestCase("AssemblyInfo.cs", typeof(CSharpAssemblyInfoBuilder))]
+    [TestCase("AssemblyInfo.vb", typeof(VisualBasicAssemblyInfoBuilder))]
+    public void GetAssemblyInfoBuilder_ShouldReturnAppropriateAssemblyInfoBuilder(string fileName, Type assemblyInfoBuilderType)
+    {
+        var taskItem = Substitute.For<ITaskItem>();
+        taskItem.ItemSpec.Returns(fileName);
+
+        var assemblyInfoBuilder = AssemblyInfoBuilder.GetAssemblyInfoBuilder(new[] { taskItem });
+
+        assemblyInfoBuilder.ShouldNotBeNull();
+        assemblyInfoBuilder.ShouldBeOfType(assemblyInfoBuilderType);
+    }
+
     static void VerifyAssemblyVersion(ICompiler compiler, AssemblyVersioningScheme avs, string assemblyInformationalFormat = null)
     {
         var semanticVersion = new SemanticVersion
diff --git a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
@@ -87,6 +87,10 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
+      <HintPath>..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll</HintPath>
       <Private>True</Private>
diff --git a/src/GitVersionTask.Tests/packages.config b/src/GitVersionTask.Tests/packages.config
@@ -14,6 +14,7 @@
   <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
   <package id="ModuleInit.Fody" version="1.5.9.0" targetFramework="net45" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
+  <package id="NSubstitute" version="1.10.0.0" targetFramework="net45" />
   <package id="NUnit" version="3.2.1" targetFramework="net45" />
   <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />
   <package id="ObjectApproval" version="1.3.0" targetFramework="net45" />
diff --git a/src/GitVersionTask/AssemblyInfoBuilder/AssemblyInfoBuilder.cs b/src/GitVersionTask/AssemblyInfoBuilder/AssemblyInfoBuilder.cs
@@ -1,37 +1,44 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using GitTools;
 using GitVersion;
 using Microsoft.Build.Framework;
-using System.IO;
-using GitTools;
 
 public abstract class AssemblyInfoBuilder
 {
-    private static readonly Dictionary<string, Type> assemblyInfoBuilders = new Dictionary<string, Type>()
+    private static readonly Dictionary<string, Type> assemblyInfoBuilders = new Dictionary<string, Type>
     {
-        { ".cs", typeof(CSharpAssemblyInfoBuilder) },
-        { ".vb", typeof(VisualBasicAssemblyInfoBuilder) }
+        {".cs", typeof(CSharpAssemblyInfoBuilder)},
+        {".vb", typeof(VisualBasicAssemblyInfoBuilder)}
         // TODO: Missing FSharpAssemblyInfoBuilder
     };
 
+    public abstract string AssemblyInfoExtension { get; }
+
     public static AssemblyInfoBuilder GetAssemblyInfoBuilder(IEnumerable<ITaskItem> compileFiles)
     {
+        if (compileFiles == null)
+        {
+            throw new ArgumentNullException("compileFiles");
+        }
+
         Type builderType;
 
-        var assemblyInfoExtension = compileFiles.Select(x => x.ItemSpec)
-            .Where(compileFile => compileFile.Contains("AssemblyInfo"))
-            .Select(Path.GetExtension).FirstOrDefault();
+        var assemblyInfoExtension = compileFiles
+            .Select(x => x.ItemSpec)
+            .Select(Path.GetExtension)
+            // TODO: While it works, this seems like a bad way to discover the language is being compiled. @asbjornu
+            .FirstOrDefault(extension => assemblyInfoBuilders.ContainsKey(extension.ToLowerInvariant()));
 
-        if (assemblyInfoBuilders.TryGetValue(assemblyInfoExtension, out builderType))
+        if (assemblyInfoExtension != null && assemblyInfoBuilders.TryGetValue(assemblyInfoExtension, out builderType))
         {
             return Activator.CreateInstance(builderType) as AssemblyInfoBuilder;
         }
 
         throw new WarningException("Unable to determine which AssemblyBuilder required to generate GitVersion assembly information");
     }
 
-    public abstract string AssemblyInfoExtension { get; }
-
     public abstract string GetAssemblyInfoText(VersionVariables vars, string rootNamespace);
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ public enum AssemblyVersioningScheme`
`5`	`5`	`MajorMinorPatchTag,`
`6`	`6`	`MajorMinorPatch,`
`7`	`7`	`MajorMinor,`
`8`		`- Major`
	`8`	`+ Major,`
	`9`	`+ None`
`9`	`10`	`}`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ public static string GetAssemblyVersion(`
`18`	`18`	`return string.Format("{0}.{1}.{2}.0", sv.Major, sv.Minor, sv.Patch);`
`19`	`19`	`case AssemblyVersioningScheme.MajorMinorPatchTag:`
`20`	`20`	`return string.Format("{0}.{1}.{2}.{3}", sv.Major, sv.Minor, sv.Patch, sv.PreReleaseTag.Number ?? 0);`
	`21`	`+ case AssemblyVersioningScheme.None:`
	`22`	`+ return null;`
`21`	`23`	`default:`
`22`	`24`	`throw new ArgumentException(string.Format("Unexpected value ({0}).", scheme), "scheme");`
`23`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[assembly: AssemblyFileVersion("2.3.1.0")]`
	`2`	`+[assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[<assembly: AssemblyFileVersion("2.3.1.0")>]`
	`2`	`+[<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<Assembly: AssemblyFileVersion("2.3.1.0")>`
	`2`	`+<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>`