Enable nullable feature on GitVersion.Core

Author: Evangelink

src/GitVersion.App.Tests/Helpers/ArgumentBuilder.cs

@@ -1,4 +1,5 @@
 using System.Text;
+using GitVersion.Extensions;
 
 namespace GitVersion.App.Tests
 {
@@ -36,27 +37,27 @@ public override string ToString()
 
             arguments.AppendFormat(" /targetpath \"{0}\"", workingDirectory);
 
-            if (!string.IsNullOrWhiteSpace(exec))
+            if (!StringExtensions.IsNullOrWhiteSpace(exec))
             {
                 arguments.AppendFormat(" /exec \"{0}\"", exec);
             }
 
-            if (!string.IsNullOrWhiteSpace(execArgs))
+            if (!StringExtensions.IsNullOrWhiteSpace(execArgs))
             {
                 arguments.AppendFormat(" /execArgs \"{0}\"", execArgs);
             }
 
-            if (!string.IsNullOrWhiteSpace(projectFile))
+            if (!StringExtensions.IsNullOrWhiteSpace(projectFile))
             {
                 arguments.AppendFormat(" /proj \"{0}\"", projectFile);
             }
 
-            if (!string.IsNullOrWhiteSpace(projectArgs))
+            if (!StringExtensions.IsNullOrWhiteSpace(projectArgs))
             {
                 arguments.AppendFormat(" /projargs \"{0}\"", projectArgs);
             }
 
-            if (!string.IsNullOrWhiteSpace(logFile))
+            if (!StringExtensions.IsNullOrWhiteSpace(logFile))
             {
                 arguments.AppendFormat(" /l \"{0}\"", logFile);
             }

src/GitVersion.App.Tests/Helpers/GitVersionHelper.cs

@@ -6,6 +6,7 @@
 using GitVersion.BuildAgents;
 using GitVersion.Helpers;
 using GitVersion.Core.Tests.Helpers;
+using GitVersion.Extensions;
 
 namespace GitVersion.App.Tests
 {
@@ -100,7 +101,7 @@ params KeyValuePair<string, string>[] environments
             Console.WriteLine();
             Console.WriteLine("-------------------------------------------------------");
 
-            if (string.IsNullOrWhiteSpace(arguments.LogFile) || !File.Exists(arguments.LogFile))
+            if (StringExtensions.IsNullOrWhiteSpace(arguments.LogFile) || !File.Exists(arguments.LogFile))
             {
                 return new ExecutionResults(exitCode, output.ToString(), null);
             }

src/GitVersion.App.Tests/Helpers/ProgramFixture.cs

@@ -7,6 +7,7 @@
 using GitVersion.OutputVariables;
 using GitVersion.Core.Tests.Helpers;
 using Microsoft.Extensions.DependencyInjection;
+using GitVersion.Extensions;
 
 namespace GitVersion.App.Tests
 {
@@ -61,7 +62,7 @@ public async Task<ProgramFixtureResult> Run(params string[] args)
             // Create the application and override registrations.
             var program = new Program(builder => Overrides.ForEach(action => action(builder)));
 
-            if (!string.IsNullOrWhiteSpace(workingDirectory))
+            if (!StringExtensions.IsNullOrWhiteSpace(workingDirectory))
             {
                 args = new[] { "-targetpath", workingDirectory }.Concat(args).ToArray();
             }
@@ -86,7 +87,7 @@ public VersionVariables OutputVariables
         {
             get
             {
-                if (string.IsNullOrWhiteSpace(Output)) return null;
+                if (StringExtensions.IsNullOrWhiteSpace(Output)) return null;
 
                 var jsonStartIndex = Output.IndexOf("{", StringComparison.Ordinal);
                 var jsonEndIndex = Output.IndexOf("}", StringComparison.Ordinal);

src/GitVersion.App/ArgumentParser.cs

@@ -128,13 +128,13 @@ private void ParseSwitchArguments(Arguments arguments, NameValueCollection switc
         private void AddAuthentication(Arguments arguments)
         {
             var username = environment.GetEnvironmentVariable("GITVERSION_REMOTE_USERNAME");
-            if (!string.IsNullOrWhiteSpace(username))
+            if (!StringExtensions.IsNullOrWhiteSpace(username))
             {
                 arguments.Authentication.Username = username;
             }
 
             var password = environment.GetEnvironmentVariable("GITVERSION_REMOTE_PASSWORD");
-            if (!string.IsNullOrWhiteSpace(password))
+            if (!StringExtensions.IsNullOrWhiteSpace(password))
             {
                 arguments.Authentication.Password = password;
             }
@@ -362,7 +362,7 @@ private static void ParseShowVariable(Arguments arguments, string value, string
         {
             string versionVariable = null;
 
-            if (!string.IsNullOrWhiteSpace(value))
+            if (!StringExtensions.IsNullOrWhiteSpace(value))
             {
                 versionVariable = VersionVariables.AvailableVariables.SingleOrDefault(av => av.Equals(value.Replace("'", ""), StringComparison.CurrentCultureIgnoreCase));
             }
@@ -563,7 +563,7 @@ private static NameValueCollection CollectSwitchesAndValuesFromArguments(IList<s
                 else if (currentKey != null)
                 {
                     // And if the current switch does not have a value yet and the value is not itself a switch, set its value to this argument.
-                    if (string.IsNullOrEmpty(switchesAndValues[currentKey]))
+                    if (StringExtensions.IsNullOrEmpty(switchesAndValues[currentKey]))
                     {
                         switchesAndValues[currentKey] = arg;
                     }

src/GitVersion.App/QuotedStringHelpers.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using GitVersion.Extensions;
 
 namespace GitVersion
 {
@@ -54,7 +55,7 @@ public static string[] SplitUnquoted(string input, char splitChar)
 
             splitted.Add(input.Substring(startIndex, input.Length - startIndex));
 
-            return splitted.Where(argument => !string.IsNullOrEmpty(argument)).ToArray();
+            return splitted.Where(argument => !StringExtensions.IsNullOrEmpty(argument)).ToArray();
         }
 
         /// <summary>

src/GitVersion.Core.Tests/Configuration/DefaultConfigFileLocatorTests.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using GitVersion.Configuration;
 using GitVersion.Core.Tests.Helpers;
+using GitVersion.Extensions;
 using GitVersion.Logging;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
@@ -219,9 +220,9 @@ public void ThrowsExceptionOnCustomYmlFileDoesNotExist()
 
             private string SetupConfigFileContent(string text, string fileName = null, string path = null)
             {
-                if (string.IsNullOrEmpty(fileName)) fileName = configFileLocator.FilePath;
+                if (StringExtensions.IsNullOrEmpty(fileName)) fileName = configFileLocator.FilePath;
                 var filePath = fileName;
-                if (!string.IsNullOrEmpty(path))
+                if (!StringExtensions.IsNullOrEmpty(path))
                     filePath = Path.Combine(path, filePath);
                 fileSystem.WriteAllText(filePath, text);
                 return filePath;

src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgent.cs

@@ -6,8 +6,8 @@ namespace GitVersion.BuildAgents
     public interface IBuildAgent
     {
         bool CanApplyToCurrentContext();
-        void WriteIntegration(Action<string> writer, VersionVariables variables, bool updateBuildNumber = true);
-        string GetCurrentBranch(bool usingDynamicRepos);
+        void WriteIntegration(Action<string?> writer, VersionVariables variables, bool updateBuildNumber = true);
+        string? GetCurrentBranch(bool usingDynamicRepos);
         bool PreventFetch();
         bool ShouldCleanUpRemotes();
     }

src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgentResolver.cs

@@ -2,6 +2,6 @@ namespace GitVersion.BuildAgents
 {
     public interface IBuildAgentResolver
     {
-        ICurrentBuildAgent Resolve();
+        ICurrentBuildAgent? Resolve();
     }
 }

src/GitVersion.Core/BuildAgents/AppVeyor.cs

@@ -4,6 +4,7 @@
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
 using System.Text.Json;
+using GitVersion.Extensions;
 
 namespace GitVersion.BuildAgents
 {
@@ -69,7 +70,7 @@ private HttpClient GetHttpClient()
         public override string GetCurrentBranch(bool usingDynamicRepos)
         {
             var pullRequestBranchName = Environment.GetEnvironmentVariable("APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH");
-            if (!string.IsNullOrWhiteSpace(pullRequestBranchName))
+            if (!StringExtensions.IsNullOrWhiteSpace(pullRequestBranchName))
             {
                 return pullRequestBranchName;
             }

src/GitVersion.Core/BuildAgents/AzurePipelines.cs

@@ -38,7 +38,7 @@ public override string GenerateSetVersionMessage(VersionVariables variables)
             // For AzurePipelines, we'll get the Build Number and insert GitVersion variables where
             // specified
             var buildNumberEnv = Environment.GetEnvironmentVariable("BUILD_BUILDNUMBER");
-            if (string.IsNullOrWhiteSpace(buildNumberEnv))
+            if (StringExtensions.IsNullOrWhiteSpace(buildNumberEnv))
                 return variables.FullSemVer;
 
             var newBuildNumber = variables.Aggregate(buildNumberEnv, ReplaceVariables);