Remove GitVersion extension methods for normalized AssemblyVersion and FileVersion

matkoch · matkoch · commit 8f10bfcc6cb1 · 2019-10-26T01:30:11.000+03:00
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,6 +1,8 @@
-assembly-versioning-scheme: MajorMinor
 mode: ContinuousDelivery
 
+assembly-versioning-scheme: MajorMinor
+assembly-file-versioning-scheme: MajorMinorPatch
+
 branches:
   master:
     tag: ''
diff --git a/build/Build.cs b/build/Build.cs
@@ -133,15 +133,15 @@ partial class Build : NukeBuild
                 .SetProjectFile(Solution)
                 .EnableNoRestore()
                 .SetConfiguration(Configuration)
-                .SetAssemblyVersion(GitVersion.GetNormalizedAssemblyVersion())
-                .SetFileVersion(GitVersion.GetNormalizedFileVersion())
+                .SetAssemblyVersion(GitVersion.AssemblySemVer)
+                .SetFileVersion(GitVersion.AssemblySemFileVer)
                 .SetInformationalVersion(GitVersion.InformationalVersion));
 
             DotNetPublish(_ => _
                     .EnableNoRestore()
                     .SetConfiguration(Configuration)
-                    .SetAssemblyVersion(GitVersion.GetNormalizedAssemblyVersion())
-                    .SetFileVersion(GitVersion.GetNormalizedFileVersion())
+                    .SetAssemblyVersion(GitVersion.AssemblySemVer)
+                    .SetFileVersion(GitVersion.AssemblySemFileVer)
                     .SetInformationalVersion(GitVersion.InformationalVersion)
                     .CombineWith(
                         from project in new[] { GlobalToolProject, MSBuildTaskRunnerProject }
diff --git a/source/Nuke.Common/Tools/GitVersion/GitVersionTasks.cs b/source/Nuke.Common/Tools/GitVersion/GitVersionTasks.cs
@@ -48,18 +48,4 @@ protected override JsonProperty CreateProperty([NotNull] MemberInfo member, Memb
             }
         }
     }
-
-    [PublicAPI]
-    public static class GitVersionExtensions
-    {
-        public static string GetNormalizedAssemblyVersion(this GitVersion gitVersion)
-        {
-            return $"{gitVersion.Major}.{gitVersion.Minor}.0";
-        }
-
-        public static string GetNormalizedFileVersion(this GitVersion gitVersion)
-        {
-            return gitVersion.MajorMinorPatch;
-        }
-    }
 }
diff --git a/source/Nuke.GlobalTool/templates/Build.cs b/source/Nuke.GlobalTool/templates/Build.cs
@@ -78,16 +78,16 @@ class Build : NukeBuild
                 .SetTargetPath(Solution)                                                        // MSBUILD
                 .SetTargets("Rebuild")                                                          // MSBUILD
                 .SetConfiguration(Configuration)                                                // MSBUILD
-                .SetAssemblyVersion(GitVersion.GetNormalizedAssemblyVersion())                  // MSBUILD && GITVERSION
-                .SetFileVersion(GitVersion.GetNormalizedFileVersion())                          // MSBUILD && GITVERSION
+                .SetAssemblyVersion(GitVersion.AssemblySemVer)                                  // MSBUILD && GITVERSION
+                .SetFileVersion(GitVersion.AssemblySemFileVer)                                  // MSBUILD && GITVERSION
                 .SetInformationalVersion(GitVersion.InformationalVersion)                       // MSBUILD && GITVERSION
                 .SetMaxCpuCount(Environment.ProcessorCount)                                     // MSBUILD
                 .SetNodeReuse(IsLocalBuild));                                                   // MSBUILD
             DotNetBuild(_ => _                                                                  // DOTNET
                 .SetProjectFile(Solution)                                                       // DOTNET
                 .SetConfiguration(Configuration)                                                // DOTNET
-                .SetAssemblyVersion(GitVersion.GetNormalizedAssemblyVersion())                  // DOTNET && GITVERSION
-                .SetFileVersion(GitVersion.GetNormalizedFileVersion())                          // DOTNET && GITVERSION
+                .SetAssemblyVersion(GitVersion.AssemblySemVer)                                  // DOTNET && GITVERSION
+                .SetFileVersion(GitVersion.AssemblySemFileVer)                                  // DOTNET && GITVERSION
                 .SetInformationalVersion(GitVersion.InformationalVersion)                       // DOTNET && GITVERSION
                 .EnableNoRestore());                                                            // DOTNET
         });

Original file line number	Diff line number	Diff line change
`@@ -48,18 +48,4 @@ protected override JsonProperty CreateProperty([NotNull] MemberInfo member, Memb`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`}`
`51`		`-`
`52`		`- [PublicAPI]`
`53`		`- public static class GitVersionExtensions`
`54`		`- {`
`55`		`- public static string GetNormalizedAssemblyVersion(this GitVersion gitVersion)`
`56`		`- {`
`57`		`- return $"{gitVersion.Major}.{gitVersion.Minor}.0";`
`58`		`- }`
`59`		`-`
`60`		`- public static string GetNormalizedFileVersion(this GitVersion gitVersion)`
`61`		`- {`
`62`		`- return gitVersion.MajorMinorPatch;`
`63`		`- }`
`64`		`- }`
`65`	`51`	`}`