Merge pull request #312 from unic/fixAssemblyPatching

Fixed assemblyinfo patching with stars

Author: JakeGinnivan

GitVersionExe.Tests/AssemblyInfoFileUpdateTests.cs

@@ -1,5 +1,6 @@
 namespace GitVersionExe.Tests
 {
+    using System;
     using System.Collections.Generic;
     using System.IO;
     using GitVersion;
@@ -19,5 +20,81 @@ public void ShouldStartSearchFromWorkingDirectory()
                 fileSystem.Received().DirectoryGetFiles(Arg.Is(workingDir), Arg.Any<string>(), Arg.Any<SearchOption>());
             }
         }
+
+        [Test]
+        public void ShouldReplaceAssemblyVersion()
+        {
+            var fileSystem = Substitute.For<IFileSystem>();
+            var version = new SemanticVersion()
+                {
+                    BuildMetaData = new SemanticVersionBuildMetaData(3, "foo", "hash", DateTimeOffset.Now),
+                    Major = 2,
+                    Minor = 3,
+                    Patch = 1
+                };
+
+            const string workingDir = "C:\\Testing";
+            const string assemblyInfoFile = @"AssemblyVersion(""1.0.0.0"");
+AssemblyInformationalVersion(""1.0.0.0"");
+AssemblyFileVersion(""1.0.0.0"");";
+            
+            fileSystem.Exists("C:\\Testing\\AssemblyInfo.cs").Returns(true);
+            fileSystem.ReadAllText("C:\\Testing\\AssemblyInfo.cs").Returns(assemblyInfoFile);
+            var config = new Config()
+                             {
+                                 AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch
+                             };
+            var variable = VariableProvider.GetVariablesFor(version, config); 
+            var args = new Arguments
+                           {
+                               UpdateAssemblyInfo = true,
+                               UpdateAssemblyInfoFileName = "AssemblyInfo.cs"
+                           };
+            using (new AssemblyInfoFileUpdate(args, workingDir, variable, fileSystem))
+            {
+                const string expected = @"AssemblyVersion(""2.3.0.0"");
+AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"");
+AssemblyFileVersion(""2.3.1.0"");";
+                fileSystem.Received().WriteAllText("C:\\Testing\\AssemblyInfo.cs", expected);
+            }
+        }
+
+        [Test]
+        public void ShouldReplaceAssemblyVersionWithStar()
+        {
+            var fileSystem = Substitute.For<IFileSystem>();
+            var version = new SemanticVersion()
+                              {
+                                  BuildMetaData = new SemanticVersionBuildMetaData(3, "foo", "hash", DateTimeOffset.Now),
+                                  Major = 2,
+                                  Minor = 3,
+                                  Patch = 1
+                              };
+
+            const string workingDir = "C:\\Testing";
+            const string assemblyInfoFile = @"AssemblyVersion(""1.0.0.*"");
+AssemblyInformationalVersion(""1.0.0.*"");
+AssemblyFileVersion(""1.0.0.*"");";
+
+            fileSystem.Exists("C:\\Testing\\AssemblyInfo.cs").Returns(true);
+            fileSystem.ReadAllText("C:\\Testing\\AssemblyInfo.cs").Returns(assemblyInfoFile);
+            var config = new Config()
+                             {
+                                 AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch
+                             };
+            var variable = VariableProvider.GetVariablesFor(version, config);
+            var args = new Arguments
+                           {
+                               UpdateAssemblyInfo = true,
+                               UpdateAssemblyInfoFileName = "AssemblyInfo.cs"
+                           };
+            using (new AssemblyInfoFileUpdate(args, workingDir, variable, fileSystem))
+            {
+                const string expected = @"AssemblyVersion(""2.3.0.0"");
+AssemblyInformationalVersion(""2.3.1+3.Branch.foo.Sha.hash"");
+AssemblyFileVersion(""2.3.1.0"");";
+                fileSystem.Received().WriteAllText("C:\\Testing\\AssemblyInfo.cs", expected);
+            }
+        }
     }
 }

GitVersionExe/AssemblyInfoFileUpdate.cs

@@ -35,9 +35,9 @@ public AssemblyInfoFileUpdate(Arguments args, string workingDirectory, Dictionar
                 var assemblyInfoVersion = variables[VariableProvider.InformationalVersion];
                 var assemblyFileVersion = variables[VariableProvider.AssemblySemVer];
                 var fileContents = fileSystem.ReadAllText(assemblyInfoFile)
-                    .RegexReplace(@"AssemblyVersion\(""\d+.\d+.\d+(.\d+|\*)?""\)", string.Format("AssemblyVersion(\"{0}\")", assemblyVersion))
-                    .RegexReplace(@"AssemblyInformationalVersion\(""\d+.\d+.\d+(.\d+|\*)?""\)", string.Format("AssemblyInformationalVersion(\"{0}\")", assemblyInfoVersion))
-                    .RegexReplace(@"AssemblyFileVersion\(""\d+.\d+.\d+(.\d+|\*)?""\)", string.Format("AssemblyFileVersion(\"{0}\")", assemblyFileVersion));
+                    .RegexReplace(@"AssemblyVersion\(""\d+.\d+.\d+(.(\d+|\*))?""\)", string.Format("AssemblyVersion(\"{0}\")", assemblyVersion))
+                    .RegexReplace(@"AssemblyInformationalVersion\(""\d+.\d+.\d+(.(\d+|\*))?""\)", string.Format("AssemblyInformationalVersion(\"{0}\")", assemblyInfoVersion))
+                    .RegexReplace(@"AssemblyFileVersion\(""\d+.\d+.\d+(.(\d+|\*))?""\)", string.Format("AssemblyFileVersion(\"{0}\")", assemblyFileVersion));
 
                 fileSystem.WriteAllText(assemblyInfoFile, fileContents);
             }