Use AssemblyInfoFileUpdater in UpdateAssemblyInfo

Author: bording

src/GitVersionCore/VersionAssemblyInfoResources/AssemblyInfoFileUpdater.cs

@@ -8,7 +8,7 @@ namespace GitVersion
     using System.Text.RegularExpressions;
     using GitVersion.VersionAssemblyInfoResources;
 
-    class AssemblyInfoFileUpdater : IDisposable
+    public class AssemblyInfoFileUpdater : IDisposable
     {
         readonly List<Action> restoreBackupTasks = new List<Action>();
         readonly List<Action> cleanupBackupTasks = new List<Action>();

src/GitVersionTask/AssemblyInfoBuilder/UpdateAssemblyInfo.cs

@@ -1,16 +1,13 @@
 namespace GitVersionTask
 {
     using System;
+    using System.Collections.Generic;
     using System.ComponentModel;
     using System.IO;
-    using System.Text;
-
     using GitVersion;
     using GitVersion.Helpers;
-
     using Microsoft.Build.Framework;
 
-    // TODO: Consolidate this with GitVersion.AssemblyInfoFileUpdate in GitVersionExe. @asbjornu
     public class UpdateAssemblyInfo : GitVersionTaskBase
     {
         TaskLogger logger;
@@ -37,7 +34,7 @@ public UpdateAssemblyInfo()
         public ITaskItem[] CompileFiles { get; set; }
 
         [Required]
-        public string RootNamespace { get; set; }
+        public string Language { get; set; }
 
         [Output]
         public string AssemblyInfoTempFilePath { get; set; }
@@ -78,45 +75,47 @@ void InnerExecute()
             {
                 return;
             }
+
             CreateTempAssemblyInfo(versionVariables);
         }
 
         void CreateTempAssemblyInfo(VersionVariables versionVariables)
         {
-            var assemblyInfoBuilder = AssemblyInfoBuilder.GetAssemblyInfoBuilder(CompileFiles);
+            var fileExtension = GetFileExtension();
+            var assemblyInfoFileName = $"GitVersionTaskAssemblyInfo.g.{fileExtension}";
 
             if (IntermediateOutputPath == null)
             {
-                var tempFileName = string.Format("AssemblyInfo_{0}_{1}.g.{2}", Path.GetFileNameWithoutExtension(ProjectFile), Path.GetRandomFileName(), assemblyInfoBuilder.AssemblyInfoExtension);
-                AssemblyInfoTempFilePath = Path.Combine(TempFileTracker.TempPath, tempFileName);
-            }
-            else
-            {
-                AssemblyInfoTempFilePath = Path.Combine(IntermediateOutputPath, string.Format("GitVersionTaskAssemblyInfo.g.{0}", assemblyInfoBuilder.AssemblyInfoExtension));
+                assemblyInfoFileName = $"AssemblyInfo_{Path.GetFileNameWithoutExtension(ProjectFile)}_{Path.GetRandomFileName()}.g.{fileExtension}";
             }
 
-            var assemblyInfo = assemblyInfoBuilder.GetAssemblyInfoText(versionVariables, RootNamespace).Trim();
-            var encoding = EncodingHelper.DetectEncoding(AssemblyInfoTempFilePath) ?? Encoding.UTF8;
+            var workingDirectory = IntermediateOutputPath ?? TempFileTracker.TempPath;
 
-            // We need to try to read the existing text first if the file exists and see if it's the same
-            // This is to avoid writing when there's no differences and causing a rebuild
-            try
+            AssemblyInfoTempFilePath = Path.Combine(workingDirectory, assemblyInfoFileName);
+
+            using (var assemblyInfoFileUpdater = new AssemblyInfoFileUpdater(assemblyInfoFileName, workingDirectory, versionVariables, new FileSystem(), true))
             {
-                if (File.Exists(AssemblyInfoTempFilePath))
-                {
-                    var content = File.ReadAllText(AssemblyInfoTempFilePath, encoding).Trim();
-                    if (string.Equals(assemblyInfo, content, StringComparison.Ordinal))
-                    {
-                        return; // nothign to do as the file matches what we'd create
-                    }
-                }
+                assemblyInfoFileUpdater.Update();
+                assemblyInfoFileUpdater.DoNotRestoreAssemblyInfo();
             }
-            catch (Exception)
+        }
+
+        string GetFileExtension()
+        {
+            switch(Language)
             {
-                // Something happened reading the file, try to overwrite anyway
-            }
+                case "C#":
+                    return "cs";
 
-            File.WriteAllText(AssemblyInfoTempFilePath, assemblyInfo, encoding);
+                case "F#":
+                    return "fs";
+
+                case "VB":
+                    return "vb";
+
+                default:
+                    throw new Exception($"Unknown language detected: '{Language}'");
+            }
         }
     }
 }

src/GitVersionTask/NugetAssets/build/GitVersionTask.targets

@@ -55,7 +55,7 @@
     NoFetch="$(GitVersion_NoFetchEnabled)"
     ProjectFile="$(MSBuildProjectFullPath)"
     IntermediateOutputPath="$(IntermediateOutputPath)"
-    RootNamespace="$(RootNamespace)"
+    Language="$(Language)"
     CompileFiles ="@(Compile)">
       <Output
         TaskParameter="AssemblyInfoTempFilePath"