feature: Added GitVersion Extensions (#674)

fixed setting assembly to the full semantic version
RocketSurgeonsGuild · Mar 26, 2022 · 648abe4 · 648abe4
1 parent 2eb6ed5
commit 648abe4
Showing 8 changed files with 31 additions and 11 deletions.
diff --git a/src/Nuke/GitVersionEx.cs b/src/Nuke/GitVersionEx.cs
@@ -0,0 +1,19 @@
+using Nuke.Common.Tools.GitVersion;
+
+namespace Rocket.Surgery.Nuke;
+
+/// <summary>
+///     <see cref="GitVersion" /> extensions.
+/// </summary>
+public static class GitVersionEx
+{
+    /// <summary>
+    ///     Gets the full semantic version from <see cref="GitVersion" />.
+    /// </summary>
+    /// <param name="gitVersion">The git version.</param>
+    /// <returns>The converted semantic version.</returns>
+    public static string FullSemanticVersion(this GitVersion gitVersion)
+    {
+        return gitVersion.FullSemVer.Replace('+', '.');
+    }
+}
diff --git a/src/Nuke/Xamarin/ICanBuildXamarin.cs b/src/Nuke/Xamarin/ICanBuildXamarin.cs
@@ -26,7 +26,7 @@ public interface ICanBuildXamarin : IHaveRestoreTarget,
                                                     .SetConfiguration(Configuration)
                                                     .SetDefaultLoggers(LogsDirectory / "build.log")
                                                     .SetGitVersionEnvironment(GitVersion)
-                                                    .SetAssemblyVersion(GitVersion?.AssemblySemVer)
+                                                    .SetAssemblyVersion(GitVersion?.FullSemanticVersion())
                                                     .SetPackageVersion(GitVersion?.NuGetVersionV2)
                                     )
                                 );

diff --git a/src/Nuke/Xamarin/ICanTestXamarin.cs b/src/Nuke/Xamarin/ICanTestXamarin.cs
@@ -22,7 +22,7 @@ public interface ICanTestXamarin : IHaveTestTarget,
     /// </summary>
     public new Target Test => _ => _
                                   .DependsOn(Build)
-                                  .OnlyWhenStatic(() => FileSystemTasks.DirectoryExists(TestsDirectory))
+                                  .OnlyWhenStatic(() => TestsDirectory.DirectoryExists())
                                   .Executes(
                                        () =>
                                        {

diff --git a/src/Nuke/Xamarin/ios/ICanArchiveiOS.cs b/src/Nuke/Xamarin/ios/ICanArchiveiOS.cs
@@ -34,7 +34,7 @@ public interface ICanArchiveiOS : IHavePackTarget,
                                                                    .SetConfiguration(Configuration)
                                                                    .SetDefaultLoggers(LogsDirectory / "package.log")
                                                                    .SetGitVersionEnvironment(GitVersion)
-                                                                   .SetAssemblyVersion(GitVersion?.AssemblySemVer)
+                                                                   .SetAssemblyVersion(GitVersion?.FullSemanticVersion())
                                                                    .SetPackageVersion(GitVersion?.NuGetVersionV2)
                                                    )
                                            );

diff --git a/src/Nuke/Xamarin/ios/ICanBuildXamariniOS.cs b/src/Nuke/Xamarin/ios/ICanBuildXamariniOS.cs
@@ -42,7 +42,7 @@ public interface ICanBuildXamariniOS : IHaveBuildTarget,
                                                                   .SetConfiguration(Configuration)
                                                                   .SetDefaultLoggers(LogsDirectory / "build.log")
                                                                   .SetGitVersionEnvironment(GitVersion)
-                                                                  .SetAssemblyVersion(GitVersion?.AssemblySemVer)
+                                                                  .SetAssemblyVersion(GitVersion?.FullSemanticVersion())
                                                                   .SetPackageVersion(GitVersion?.NuGetVersionV2)
                                           )
                                       );

diff --git a/src/Nuke/Xamarin/ios/ICanPackXamariniOS.cs b/src/Nuke/Xamarin/ios/ICanPackXamariniOS.cs
@@ -33,7 +33,7 @@ public interface ICanPackXamariniOS : IHavePackTarget,
                                                                .SetConfiguration(Configuration)
                                                                .SetDefaultLoggers(LogsDirectory / "package.log")
                                                                .SetGitVersionEnvironment(GitVersion)
-                                                               .SetAssemblyVersion(GitVersion?.AssemblySemVer)
+                                                               .SetAssemblyVersion(GitVersion?.FullSemanticVersion())
                                                                .SetPackageVersion(GitVersion?.NuGetVersionV2)
                                                )
                                        );

diff --git a/src/Nuke/Xamarin/mac/ICanBuildXamarinMac.cs b/src/Nuke/Xamarin/mac/ICanBuildXamarinMac.cs
@@ -1,5 +1,6 @@
 using Nuke.Common.IO;
 using Nuke.Common.Tools.MSBuild;
+using Serilog;
 using static Nuke.Common.Tools.MSBuild.MSBuildTasks;
 
 #pragma warning disable CA1304
@@ -40,7 +41,7 @@ public interface ICanBuildXamarinMac : IHaveBuildTarget,
                                                        .SetConfiguration(Configuration)
                                                        .SetDefaultLoggers(LogsDirectory / "build.log")
                                                        .SetGitVersionEnvironment(GitVersion)
-                                                       .SetAssemblyVersion(GitVersion?.AssemblySemVer)
+                                                       .SetAssemblyVersion(GitVersion?.FullSemanticVersion())
                                                        .SetPackageVersion(GitVersion?.NuGetVersionV2)
                                         )
                                     );
@@ -52,20 +53,20 @@ public interface ICanBuildXamarinMac : IHaveBuildTarget,
        .Executes(
             () =>
             {
-                Serilog.Log.Verbose("Info.plist Path: {InfoPlist}", InfoPlist);
+                Log.Verbose("Info.plist Path: {InfoPlist}", InfoPlist);
                 var plist = Plist.Deserialize(InfoPlist);
                 var bundleIdentifier = !Equals(Configuration, XamarinConfiguration.Store.ToString())
                     ? Configuration
                     : string.Empty;
 
                 plist["CFBundleIdentifier"] = $"{BaseBundleIdentifier}.{bundleIdentifier.ToLower()}".TrimEnd('.');
-                Serilog.Log.Information("CFBundleIdentifier: {CFBundleIdentifier}", plist["CFBundleIdentifier"]);
+                Log.Information("CFBundleIdentifier: {CFBundleIdentifier}", plist["CFBundleIdentifier"]);
 
                 plist["CFBundleShortVersionString"] = $"{GitVersion?.Major}.{GitVersion?.Minor}.{GitVersion?.Patch}";
-                Serilog.Log.Information("CFBundleShortVersionString: {CFBundleShortVersionString}", plist["CFBundleShortVersionString"]);
+                Log.Information("CFBundleShortVersionString: {CFBundleShortVersionString}", plist["CFBundleShortVersionString"]);
 
                 plist["CFBundleVersion"] = $"{GitVersion?.PreReleaseNumber}";
-                Serilog.Log.Information("CFBundleVersion: {CFBundleVersion}", plist["CFBundleVersion"]);
+                Log.Information("CFBundleVersion: {CFBundleVersion}", plist["CFBundleVersion"]);
 
                 Plist.Serialize(InfoPlist, plist);
             }

diff --git a/src/Nuke/Xamarin/mac/ICanPackXamarinMac.cs b/src/Nuke/Xamarin/mac/ICanPackXamarinMac.cs
@@ -30,7 +30,7 @@ public interface IHavePackXamarinMac : IHavePackTarget,
                                                               .SetConfiguration(Configuration)
                                                               .SetDefaultLoggers(LogsDirectory / "package.log")
                                                               .SetGitVersionEnvironment(GitVersion)
-                                                              .SetAssemblyVersion(GitVersion?.AssemblySemVer)
+                                                              .SetAssemblyVersion(GitVersion?.FullSemanticVersion())
                                                               .SetPackageVersion(GitVersion?.NuGetVersionV2)
                                       )
                                   );