Skip to content

Commit 80d8a9c

Browse files
EvangelinkEvangelink
committed
Enable nullable feature on GitVersion.Core
1 parent 5742f38 commit 80d8a9c

File tree

146 files changed

+1000
-773
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+1000
-773
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Text;
2+
using GitVersion.Extensions;
23

34
namespace GitVersion.App.Tests
45
{
@@ -36,27 +37,27 @@ public override string ToString()
3637

3738
arguments.AppendFormat(" /targetpath \"{0}\"", workingDirectory);
3839

39-
if (!string.IsNullOrWhiteSpace(exec))
40+
if (!StringExtensions.IsNullOrWhiteSpace(exec))
4041
{
4142
arguments.AppendFormat(" /exec \"{0}\"", exec);
4243
}
4344

44-
if (!string.IsNullOrWhiteSpace(execArgs))
45+
if (!StringExtensions.IsNullOrWhiteSpace(execArgs))
4546
{
4647
arguments.AppendFormat(" /execArgs \"{0}\"", execArgs);
4748
}
4849

49-
if (!string.IsNullOrWhiteSpace(projectFile))
50+
if (!StringExtensions.IsNullOrWhiteSpace(projectFile))
5051
{
5152
arguments.AppendFormat(" /proj \"{0}\"", projectFile);
5253
}
5354

54-
if (!string.IsNullOrWhiteSpace(projectArgs))
55+
if (!StringExtensions.IsNullOrWhiteSpace(projectArgs))
5556
{
5657
arguments.AppendFormat(" /projargs \"{0}\"", projectArgs);
5758
}
5859

59-
if (!string.IsNullOrWhiteSpace(logFile))
60+
if (!StringExtensions.IsNullOrWhiteSpace(logFile))
6061
{
6162
arguments.AppendFormat(" /l \"{0}\"", logFile);
6263
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using GitVersion.BuildAgents;
77
using GitVersion.Helpers;
88
using GitVersion.Core.Tests.Helpers;
9+
using GitVersion.Extensions;
910

1011
namespace GitVersion.App.Tests
1112
{
@@ -100,7 +101,7 @@ params KeyValuePair<string, string>[] environments
100101
Console.WriteLine();
101102
Console.WriteLine("-------------------------------------------------------");
102103

103-
if (string.IsNullOrWhiteSpace(arguments.LogFile) || !File.Exists(arguments.LogFile))
104+
if (StringExtensions.IsNullOrWhiteSpace(arguments.LogFile) || !File.Exists(arguments.LogFile))
104105
{
105106
return new ExecutionResults(exitCode, output.ToString(), null);
106107
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using GitVersion.OutputVariables;
88
using GitVersion.Core.Tests.Helpers;
99
using Microsoft.Extensions.DependencyInjection;
10+
using GitVersion.Extensions;
1011

1112
namespace GitVersion.App.Tests
1213
{
@@ -61,7 +62,7 @@ public async Task<ProgramFixtureResult> Run(params string[] args)
6162
// Create the application and override registrations.
6263
var program = new Program(builder => Overrides.ForEach(action => action(builder)));
6364

64-
if (!string.IsNullOrWhiteSpace(workingDirectory))
65+
if (!StringExtensions.IsNullOrWhiteSpace(workingDirectory))
6566
{
6667
args = new[] { "-targetpath", workingDirectory }.Concat(args).ToArray();
6768
}
@@ -86,7 +87,7 @@ public VersionVariables OutputVariables
8687
{
8788
get
8889
{
89-
if (string.IsNullOrWhiteSpace(Output)) return null;
90+
if (StringExtensions.IsNullOrWhiteSpace(Output)) return null;
9091

9192
var jsonStartIndex = Output.IndexOf("{", StringComparison.Ordinal);
9293
var jsonEndIndex = Output.IndexOf("}", StringComparison.Ordinal);

‎src/GitVersion.App/ArgumentParser.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,13 @@ private void ParseSwitchArguments(Arguments arguments, NameValueCollection switc
128128
private void AddAuthentication(Arguments arguments)
129129
{
130130
var username = environment.GetEnvironmentVariable("GITVERSION_REMOTE_USERNAME");
131-
if (!string.IsNullOrWhiteSpace(username))
131+
if (!StringExtensions.IsNullOrWhiteSpace(username))
132132
{
133133
arguments.Authentication.Username = username;
134134
}
135135

136136
var password = environment.GetEnvironmentVariable("GITVERSION_REMOTE_PASSWORD");
137-
if (!string.IsNullOrWhiteSpace(password))
137+
if (!StringExtensions.IsNullOrWhiteSpace(password))
138138
{
139139
arguments.Authentication.Password = password;
140140
}
@@ -362,7 +362,7 @@ private static void ParseShowVariable(Arguments arguments, string value, string
362362
{
363363
string versionVariable = null;
364364

365-
if (!string.IsNullOrWhiteSpace(value))
365+
if (!StringExtensions.IsNullOrWhiteSpace(value))
366366
{
367367
versionVariable = VersionVariables.AvailableVariables.SingleOrDefault(av => av.Equals(value.Replace("'", ""), StringComparison.CurrentCultureIgnoreCase));
368368
}
@@ -563,7 +563,7 @@ private static NameValueCollection CollectSwitchesAndValuesFromArguments(IList<s
563563
else if (currentKey != null)
564564
{
565565
// 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.
566-
if (string.IsNullOrEmpty(switchesAndValues[currentKey]))
566+
if (StringExtensions.IsNullOrEmpty(switchesAndValues[currentKey]))
567567
{
568568
switchesAndValues[currentKey] = arg;
569569
}

‎src/GitVersion.App/QuotedStringHelpers.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Collections.Generic;
22
using System.Linq;
33
using System.Text;
4+
using GitVersion.Extensions;
45

56
namespace GitVersion
67
{
@@ -54,7 +55,7 @@ public static string[] SplitUnquoted(string input, char splitChar)
5455

5556
splitted.Add(input.Substring(startIndex, input.Length - startIndex));
5657

57-
return splitted.Where(argument => !string.IsNullOrEmpty(argument)).ToArray();
58+
return splitted.Where(argument => !StringExtensions.IsNullOrEmpty(argument)).ToArray();
5859
}
5960

6061
/// <summary>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.IO;
33
using GitVersion.Configuration;
44
using GitVersion.Core.Tests.Helpers;
5+
using GitVersion.Extensions;
56
using GitVersion.Logging;
67
using Microsoft.Extensions.DependencyInjection;
78
using Microsoft.Extensions.Options;
@@ -219,9 +220,9 @@ public void ThrowsExceptionOnCustomYmlFileDoesNotExist()
219220

220221
private string SetupConfigFileContent(string text, string fileName = null, string path = null)
221222
{
222-
if (string.IsNullOrEmpty(fileName)) fileName = configFileLocator.FilePath;
223+
if (StringExtensions.IsNullOrEmpty(fileName)) fileName = configFileLocator.FilePath;
223224
var filePath = fileName;
224-
if (!string.IsNullOrEmpty(path))
225+
if (!StringExtensions.IsNullOrEmpty(path))
225226
filePath = Path.Combine(path, filePath);
226227
fileSystem.WriteAllText(filePath, text);
227228
return filePath;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ namespace GitVersion.BuildAgents
66
public interface IBuildAgent
77
{
88
bool CanApplyToCurrentContext();
9-
void WriteIntegration(Action<string> writer, VersionVariables variables, bool updateBuildNumber = true);
10-
string GetCurrentBranch(bool usingDynamicRepos);
9+
void WriteIntegration(Action<string?> writer, VersionVariables variables, bool updateBuildNumber = true);
10+
string? GetCurrentBranch(bool usingDynamicRepos);
1111
bool PreventFetch();
1212
bool ShouldCleanUpRemotes();
1313
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ namespace GitVersion.BuildAgents
22
{
33
public interface IBuildAgentResolver
44
{
5-
ICurrentBuildAgent Resolve();
5+
ICurrentBuildAgent? Resolve();
66
}
77
}

‎src/GitVersion.Core/BuildAgents/AppVeyor.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using GitVersion.Logging;
55
using GitVersion.OutputVariables;
66
using System.Text.Json;
7+
using GitVersion.Extensions;
78

89
namespace GitVersion.BuildAgents
910
{
@@ -69,7 +70,7 @@ private HttpClient GetHttpClient()
6970
public override string GetCurrentBranch(bool usingDynamicRepos)
7071
{
7172
var pullRequestBranchName = Environment.GetEnvironmentVariable("APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH");
72-
if (!string.IsNullOrWhiteSpace(pullRequestBranchName))
73+
if (!StringExtensions.IsNullOrWhiteSpace(pullRequestBranchName))
7374
{
7475
return pullRequestBranchName;
7576
}

‎src/GitVersion.Core/BuildAgents/AzurePipelines.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public override string GenerateSetVersionMessage(VersionVariables variables)
3838
// For AzurePipelines, we'll get the Build Number and insert GitVersion variables where
3939
// specified
4040
var buildNumberEnv = Environment.GetEnvironmentVariable("BUILD_BUILDNUMBER");
41-
if (string.IsNullOrWhiteSpace(buildNumberEnv))
41+
if (StringExtensions.IsNullOrWhiteSpace(buildNumberEnv))
4242
return variables.FullSemVer;
4343

4444
var newBuildNumber = variables.Aggregate(buildNumberEnv, ReplaceVariables);

0 commit comments

Comments
 (0)