From 0cdedf0f9b4307c82ac6b690581f756f03ba4196 Mon Sep 17 00:00:00 2001
From: Chris Huseman <chris@huseman.net>
Date: Thu, 21 Nov 2019 08:11:36 -0600
Subject: [PATCH] Add GitVersion_NoNormalizeEnabled property for GitVersionTask

---
 .../GitVersionTaskBase.cs                     |  2 +
 src/GitVersionTask/GitVersionTasks.cs         |  3 +-
 src/GitVersionTask/build/GitVersionTask.props |  1 +
 .../build/GitVersionTask.targets              | 40 +++++++++++--------
 .../GitVersionTask.targets                    | 10 ++++-
 5 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/GitVersionTask.MsBuild/GitVersionTaskBase.cs b/src/GitVersionTask.MsBuild/GitVersionTaskBase.cs
index dbc89cd723..d4e318be4f 100644
--- a/src/GitVersionTask.MsBuild/GitVersionTaskBase.cs
+++ b/src/GitVersionTask.MsBuild/GitVersionTaskBase.cs
@@ -11,5 +11,7 @@ public abstract class GitVersionTaskBase : Task
         public string ConfigFilePath { get; set; }
 
         public bool NoFetch { get; set; }
+
+        public bool NoNormalize { get; set; }
     }
 }
diff --git a/src/GitVersionTask/GitVersionTasks.cs b/src/GitVersionTask/GitVersionTasks.cs
index f6ec5a3bb4..bad81b4db9 100644
--- a/src/GitVersionTask/GitVersionTasks.cs
+++ b/src/GitVersionTask/GitVersionTasks.cs
@@ -63,7 +63,8 @@ private static IServiceProvider BuildServiceProvider(GitVersionTaskBase task)
             {
                 TargetPath = task.SolutionDirectory,
                 ConfigFile = task.ConfigFilePath,
-                NoFetch = task.NoFetch
+                NoFetch = task.NoFetch,
+                NoNormalize = task.NoNormalize
             };
 
             services.AddSingleton(_ => Options.Create(arguments));
diff --git a/src/GitVersionTask/build/GitVersionTask.props b/src/GitVersionTask/build/GitVersionTask.props
index 1f05cd57b6..a27bbcad0d 100644
--- a/src/GitVersionTask/build/GitVersionTask.props
+++ b/src/GitVersionTask/build/GitVersionTask.props
@@ -9,6 +9,7 @@
         <GitVersionPath Condition="'$(GitVersionPath)' == ''">$(MSBuildProjectDirectory)</GitVersionPath>
 
         <GitVersion_NoFetchEnabled Condition="$(GitVersion_NoFetchEnabled) == ''">false</GitVersion_NoFetchEnabled>
+        <GitVersion_NoNormalizeEnabled Condition="$(GitVersion_NoNormalizeEnabled) == ''">false</GitVersion_NoNormalizeEnabled>
 
         <DisableGitVersionTask Condition=" '$(DisableGitVersionTask)' == '' ">false</DisableGitVersionTask>
 
diff --git a/src/GitVersionTask/build/GitVersionTask.targets b/src/GitVersionTask/build/GitVersionTask.targets
index 32552e7d22..a648f106b6 100644
--- a/src/GitVersionTask/build/GitVersionTask.targets
+++ b/src/GitVersionTask/build/GitVersionTask.targets
@@ -7,20 +7,23 @@
 
     <Target Name="WriteVersionInfoToBuildLog" BeforeTargets="CoreCompile;GetAssemblyVersion;GenerateNuspec" Condition="$(WriteVersionInfoToBuildLog) == 'true'">
 
-        <WriteVersionInfoToBuildLog SolutionDirectory="$(GitVersionPath)" ConfigFilePath="$(GitVersionConfig)" NoFetch="$(GitVersion_NoFetchEnabled)"/>
+        <WriteVersionInfoToBuildLog SolutionDirectory="$(GitVersionPath)"
+                                    ConfigFilePath="$(GitVersionConfig)"
+                                    NoFetch="$(GitVersion_NoFetchEnabled)"
+                                    NoNormalize="$(GitVersion_NoNormalizeEnabled)" />
 
     </Target>
 
     <Target Name="UpdateAssemblyInfo" BeforeTargets="CoreCompile" Condition="$(UpdateAssemblyInfo) == 'true'">
 
-        <UpdateAssemblyInfo
-            SolutionDirectory="$(GitVersionPath)"
-            ConfigFilePath="$(GitVersionConfig)"
-            NoFetch="$(GitVersion_NoFetchEnabled)"
-            ProjectFile="$(MSBuildProjectFullPath)"
-            IntermediateOutputPath="$(IntermediateOutputPath)"
-            Language="$(Language)"
-            CompileFiles ="@(Compile)">
+        <UpdateAssemblyInfo SolutionDirectory="$(GitVersionPath)"
+                            ConfigFilePath="$(GitVersionConfig)"
+                            NoFetch="$(GitVersion_NoFetchEnabled)"
+                            NoNormalize="$(GitVersion_NoNormalizeEnabled)"
+                            ProjectFile="$(MSBuildProjectFullPath)"
+                            IntermediateOutputPath="$(IntermediateOutputPath)"
+                            Language="$(Language)"
+                            CompileFiles ="@(Compile)">
 
             <Output TaskParameter="AssemblyInfoTempFilePath" PropertyName="AssemblyInfoTempFilePath" />
         </UpdateAssemblyInfo>
@@ -36,13 +39,13 @@
 
     <Target Name="GenerateGitVersionInformation" BeforeTargets="CoreCompile" Condition="$(GenerateGitVersionInformation) == 'true'">
 
-        <GenerateGitVersionInformation
-            SolutionDirectory="$(GitVersionPath)"
-            ConfigFilePath="$(GitVersionConfig)"
-            NoFetch="$(GitVersion_NoFetchEnabled)"
-            ProjectFile="$(MSBuildProjectFullPath)"
-            IntermediateOutputPath="$(IntermediateOutputPath)"
-            Language="$(Language)">
+        <GenerateGitVersionInformation SolutionDirectory="$(GitVersionPath)"
+                                       ConfigFilePath="$(GitVersionConfig)"
+                                       NoFetch="$(GitVersion_NoFetchEnabled)"
+                                       NoNormalize="$(GitVersion_NoNormalizeEnabled)"
+                                       ProjectFile="$(MSBuildProjectFullPath)"
+                                       IntermediateOutputPath="$(IntermediateOutputPath)"
+                                       Language="$(Language)">
 
             <Output TaskParameter="GitVersionInformationFilePath" PropertyName="GitVersionInformationFilePath" />
         </GenerateGitVersionInformation>
@@ -59,7 +62,10 @@
 
     <Target Name="GetVersion" BeforeTargets="CoreCompile;GetAssemblyVersion;GenerateNuspec;_GenerateRestoreProjectSpec;_GetOutputItemsFromPack;EnsureWixToolsetInstalled" Condition="$(GetVersion) == 'true'">
 
-        <GetVersion SolutionDirectory="$(GitVersionPath)" ConfigFilePath="$(GitVersionConfig)" NoFetch="$(GitVersion_NoFetchEnabled)">
+        <GetVersion SolutionDirectory="$(GitVersionPath)"
+                    ConfigFilePath="$(GitVersionConfig)"
+                    NoFetch="$(GitVersion_NoFetchEnabled)"
+                    NoNormalize="$(GitVersion_NoNormalizeEnabled)">
             <Output TaskParameter="Major" PropertyName="GitVersion_Major" />
             <Output TaskParameter="Minor" PropertyName="GitVersion_Minor" />
             <Output TaskParameter="Patch" PropertyName="GitVersion_Patch" />
diff --git a/src/GitVersionTask/buildMultiTargeting/GitVersionTask.targets b/src/GitVersionTask/buildMultiTargeting/GitVersionTask.targets
index de0051ec0a..1de7b81388 100644
--- a/src/GitVersionTask/buildMultiTargeting/GitVersionTask.targets
+++ b/src/GitVersionTask/buildMultiTargeting/GitVersionTask.targets
@@ -4,7 +4,10 @@
     <UsingTask TaskName="WriteVersionInfoToBuildLog" AssemblyFile="$(GitVersionAssemblyFile)" />
 
     <Target Name="WriteVersionInfoToBuildLog" BeforeTargets="CoreCompile;GetAssemblyVersion;GenerateNuspec" Condition="$(WriteVersionInfoToBuildLog) == 'true'">
-        <WriteVersionInfoToBuildLog SolutionDirectory="$(GitVersionPath)" ConfigFilePath="$(GitVersionConfig)" NoFetch="$(GitVersion_NoFetchEnabled)"/>
+        <WriteVersionInfoToBuildLog SolutionDirectory="$(GitVersionPath)"
+                                    ConfigFilePath="$(GitVersionConfig)"
+                                    NoFetch="$(GitVersion_NoFetchEnabled)"
+                                    NoNormalize="$(GitVersion_NoNormalizeEnabled)" />
     </Target>
 
     <Target Name="UpdateAssemblyInfo" DependsOnTargets="_UpdateAssemblyInfo;DispatchToInnerBuilds" />
@@ -22,7 +25,10 @@
     </Target>
 
     <Target Name="GetVersion" BeforeTargets="CoreCompile;GetAssemblyVersion;GenerateNuspec;_GenerateRestoreProjectSpec;EnsureWixToolsetInstalled" Condition="$(GetVersion) == 'true'">
-        <GetVersion SolutionDirectory="$(GitVersionPath)" ConfigFilePath="$(GitVersionConfig)" NoFetch="$(GitVersion_NoFetchEnabled)">
+        <GetVersion SolutionDirectory="$(GitVersionPath)"
+                    ConfigFilePath="$(GitVersionConfig)"
+                    NoFetch="$(GitVersion_NoFetchEnabled)"
+                    NoNormalize="$(GitVersion_NoNormalizeEnabled)">
             <Output TaskParameter="Major" PropertyName="GitVersion_Major" />
             <Output TaskParameter="Minor" PropertyName="GitVersion_Minor" />
             <Output TaskParameter="Patch" PropertyName="GitVersion_Patch" />