Skip to content

use ArgumentNullException.ThrowIfNull #4572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 7, 2025
Merged

use ArgumentNullException.ThrowIfNull #4572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
517a5be
use ArgumentNullException.ThrowIfNull
SimonCropp Aug 27, 2025
178b5a9
fix: correct parameter name in CakeNamespaceImportAttribute test
devlead Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 1 addition & 4 deletions src/Cake.Cli/Features/InfoFeature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ public InfoFeature(IVersionResolver resolver)
/// <inheritdoc/>
public void Run(IConsole console)
{
if (console is null)
{
throw new ArgumentNullException(nameof(console));
}
ArgumentNullException.ThrowIfNull(console);

var version = _resolver.GetVersion();
var product = _resolver.GetProductVersion();
Expand Down
5 changes: 1 addition & 4 deletions src/Cake.Cli/Features/VersionFeature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@ public VersionFeature(IVersionResolver resolver)
/// <inheritdoc/>
public void Run(IConsole console)
{
if (console is null)
{
throw new ArgumentNullException(nameof(console));
}
ArgumentNullException.ThrowIfNull(console);

console.WriteLine(_resolver.GetVersion());
}
Expand Down
40 changes: 8 additions & 32 deletions src/Cake.Common/ArgumentAliases.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,7 @@ public static class ArgumentAliases
[CakeMethodAlias]
public static bool HasArgument(this ICakeContext context, string name)
{
if (context == null)
{
throw new ArgumentNullException(nameof(context));
}
ArgumentNullException.ThrowIfNull(context);
return context.Arguments.HasArgument(name);
}

Expand All @@ -73,10 +70,7 @@ public static bool HasArgument(this ICakeContext context, string name)
[CakeMethodAlias]
public static T Argument<T>(this ICakeContext context, string name)
{
if (context == null)
{
throw new ArgumentNullException(nameof(context));
}
ArgumentNullException.ThrowIfNull(context);

var value = context.Arguments.GetArguments(name).LastOrDefault();
if (value == null)
Expand Down Expand Up @@ -106,10 +100,7 @@ public static T Argument<T>(this ICakeContext context, string name)
[CakeMethodAlias]
public static ICollection<T> Arguments<T>(this ICakeContext context, string name)
{
if (context == null)
{
throw new ArgumentNullException(nameof(context));
}
ArgumentNullException.ThrowIfNull(context);

var values = context.Arguments.GetArguments(name);
if (values == null || values.Count == 0)
Expand Down Expand Up @@ -141,10 +132,7 @@ public static ICollection<T> Arguments<T>(this ICakeContext context, string name
[CakeMethodAlias]
public static ICollection<T> Arguments<T>(this ICakeContext context, string name, T defaultValue)
{
if (context == null)
{
throw new ArgumentNullException(nameof(context));
}
ArgumentNullException.ThrowIfNull(context);

var values = context.Arguments.GetArguments(name);
if (values == null || values.Count == 0)
Expand Down Expand Up @@ -174,10 +162,7 @@ public static ICollection<T> Arguments<T>(this ICakeContext context, string name
[CakeMethodAlias]
public static ICollection<T> Arguments<T>(this ICakeContext context, string name, ICollection<T> defaultValues)
{
if (context == null)
{
throw new ArgumentNullException(nameof(context));
}
ArgumentNullException.ThrowIfNull(context);

var values = context.Arguments.GetArguments(name);
if (values == null || values.Count == 0)
Expand Down Expand Up @@ -207,10 +192,7 @@ public static ICollection<T> Arguments<T>(this ICakeContext context, string name
[CakeMethodAlias]
public static ICollection<T> Arguments<T>(this ICakeContext context, string name, Func<ICakeContext, ICollection<T>> defaultValues)
{
if (context == null)
{
throw new ArgumentNullException(nameof(context));
}
ArgumentNullException.ThrowIfNull(context);

var values = context.Arguments.GetArguments(name);
if (values == null || values.Count == 0)
Expand Down Expand Up @@ -243,10 +225,7 @@ public static ICollection<T> Arguments<T>(this ICakeContext context, string name
[CakeMethodAlias]
public static T Argument<T>(this ICakeContext context, string name, T defaultValue)
{
if (context == null)
{
throw new ArgumentNullException(nameof(context));
}
ArgumentNullException.ThrowIfNull(context);

var value = context.Arguments.GetArguments(name)?.LastOrDefault();
return value == null
Expand Down Expand Up @@ -281,10 +260,7 @@ public static T Argument<T>(this ICakeContext context, string name, T defaultVal
[CakeMethodAlias]
public static IDictionary<string, ICollection<string>> Arguments(this ICakeContext context)
{
if (context == null)
{
throw new ArgumentNullException(nameof(context));
}
ArgumentNullException.ThrowIfNull(context);
return context.Arguments.GetArguments();
}

Expand Down
30 changes: 6 additions & 24 deletions src/Cake.Common/Build/AppVeyor/AppVeyorProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,8 @@ public void UploadArtifact(FilePath path)
/// <inheritdoc/>
public void UploadArtifact(FilePath path, AppVeyorUploadArtifactsSettings settings)
{
if (path == null)
{
throw new ArgumentNullException(nameof(path));
}
if (settings == null)
{
throw new ArgumentNullException(nameof(settings));
}
ArgumentNullException.ThrowIfNull(path);
ArgumentNullException.ThrowIfNull(settings);

if (!IsRunningOnAppVeyor)
{
Expand Down Expand Up @@ -91,10 +85,7 @@ public void UploadArtifact(FilePath path, AppVeyorUploadArtifactsSettings settin
/// <inheritdoc/>
public void UploadArtifact(FilePath path, Action<AppVeyorUploadArtifactsSettings> settingsAction)
{
if (settingsAction == null)
{
throw new ArgumentNullException(nameof(settingsAction));
}
ArgumentNullException.ThrowIfNull(settingsAction);

var settings = new AppVeyorUploadArtifactsSettings();
settingsAction(settings);
Expand All @@ -104,10 +95,7 @@ public void UploadArtifact(FilePath path, Action<AppVeyorUploadArtifactsSettings
/// <inheritdoc/>
public void UploadTestResults(FilePath path, AppVeyorTestResultsType resultsType)
{
if (path == null)
{
throw new ArgumentNullException(nameof(path));
}
ArgumentNullException.ThrowIfNull(path);

if (!IsRunningOnAppVeyor)
{
Expand Down Expand Up @@ -138,10 +126,7 @@ public void UploadTestResults(FilePath path, AppVeyorTestResultsType resultsType
/// <inheritdoc/>
public void UpdateBuildVersion(string version)
{
if (version == null)
{
throw new ArgumentNullException(nameof(version));
}
ArgumentNullException.ThrowIfNull(version);
if (string.IsNullOrWhiteSpace(version))
{
throw new CakeException("The build version cannot be empty.");
Expand All @@ -164,10 +149,7 @@ public void UpdateBuildVersion(string version)
/// <inheritdoc/>
public void AddMessage(string message, AppVeyorMessageCategoryType category = AppVeyorMessageCategoryType.Information, string details = null)
{
if (message == null)
{
throw new ArgumentNullException(nameof(message));
}
ArgumentNullException.ThrowIfNull(message);
if (string.IsNullOrWhiteSpace(message))
{
throw new CakeException("The message cannot be empty.");
Expand Down
20 changes: 4 additions & 16 deletions src/Cake.Common/Build/AppVeyor/AppVeyorProviderAddMessageExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ public static class AppVeyorProviderAddMessageExtensions
/// <param name="args">The args.</param>
public static void AddInformationalMessage(this IAppVeyorProvider provider, string format, params object[] args)
{
if (provider == null)
{
throw new ArgumentNullException(nameof(provider));
}
ArgumentNullException.ThrowIfNull(provider);
provider.AddMessage(string.Format(CultureInfo.InvariantCulture, format, args));
}

Expand All @@ -35,10 +32,7 @@ public static void AddInformationalMessage(this IAppVeyorProvider provider, stri
/// <param name="args">The args.</param>
public static void AddWarningMessage(this IAppVeyorProvider provider, string format, params object[] args)
{
if (provider == null)
{
throw new ArgumentNullException(nameof(provider));
}
ArgumentNullException.ThrowIfNull(provider);
provider.AddMessage(string.Format(CultureInfo.InvariantCulture, format, args), AppVeyorMessageCategoryType.Warning);
}

Expand All @@ -50,10 +44,7 @@ public static void AddWarningMessage(this IAppVeyorProvider provider, string for
/// <param name="args">The args.</param>
public static void AddErrorMessage(this IAppVeyorProvider provider, string format, params object[] args)
{
if (provider == null)
{
throw new ArgumentNullException(nameof(provider));
}
ArgumentNullException.ThrowIfNull(provider);
provider.AddMessage(string.Format(CultureInfo.InvariantCulture, format, args), AppVeyorMessageCategoryType.Error);
}

Expand All @@ -65,10 +56,7 @@ public static void AddErrorMessage(this IAppVeyorProvider provider, string forma
/// <param name="exception">The exception.</param>
public static void AddErrorMessage(this IAppVeyorProvider provider, string message, Exception exception)
{
if (provider == null)
{
throw new ArgumentNullException(nameof(provider));
}
ArgumentNullException.ThrowIfNull(provider);
provider.AddMessage(message, AppVeyorMessageCategoryType.Error,
exception?.ToString());
}
Expand Down
25 changes: 5 additions & 20 deletions src/Cake.Common/Build/AzurePipelines/AzurePipelinesCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,26 +220,17 @@ public void UploadArtifact(string folderName, FilePath file, string artifactName
/// <inheritdoc/>
public void UploadArtifactDirectory(DirectoryPath directory)
{
if (directory == null)
{
throw new ArgumentNullException(nameof(directory));
}
ArgumentNullException.ThrowIfNull(directory);

UploadArtifactDirectory(directory, directory.GetDirectoryName());
}

/// <inheritdoc/>
public void UploadArtifactDirectory(DirectoryPath directory, string artifactName)
{
if (directory == null)
{
throw new ArgumentNullException(nameof(directory));
}
ArgumentNullException.ThrowIfNull(directory);

if (artifactName == null)
{
throw new ArgumentNullException(nameof(artifactName));
}
ArgumentNullException.ThrowIfNull(artifactName);

WriteLoggingCommand("artifact.upload", new Dictionary<string, string>
{
Expand Down Expand Up @@ -283,10 +274,7 @@ public void PublishCodeCoverage(AzurePipelinesPublishCodeCoverageData data)
/// <inheritdoc/>
public void PublishCodeCoverage(FilePath summaryFilePath, AzurePipelinesPublishCodeCoverageData data)
{
if (summaryFilePath == null)
{
throw new ArgumentNullException(nameof(summaryFilePath));
}
ArgumentNullException.ThrowIfNull(summaryFilePath);

var properties = data.GetProperties(_environment, summaryFilePath);
WriteLoggingCommand("codecoverage.publish", properties, string.Empty);
Expand All @@ -295,10 +283,7 @@ public void PublishCodeCoverage(FilePath summaryFilePath, AzurePipelinesPublishC
/// <inheritdoc/>
public void PublishCodeCoverage(FilePath summaryFilePath, Action<AzurePipelinesPublishCodeCoverageData> action)
{
if (action == null)
{
throw new ArgumentNullException(nameof(action));
}
ArgumentNullException.ThrowIfNull(action);

var data = new AzurePipelinesPublishCodeCoverageData();
action(data);
Expand Down
5 changes: 1 addition & 4 deletions src/Cake.Common/Build/AzurePipelines/Data/AzurePipelinesPublishCodeCoverageData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,7 @@ public class AzurePipelinesPublishCodeCoverageData

internal Dictionary<string, string> GetProperties(ICakeEnvironment environment, FilePath summaryFilePath = null)
{
if (environment == null)
{
throw new ArgumentNullException(nameof(environment));
}
ArgumentNullException.ThrowIfNull(environment);

var properties = new Dictionary<string, string>();

Expand Down
5 changes: 1 addition & 4 deletions src/Cake.Common/Build/AzurePipelines/Data/AzurePipelinesPublishTestResultsData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,7 @@ public class AzurePipelinesPublishTestResultsData

internal Dictionary<string, string> GetProperties(ICakeEnvironment environment)
{
if (environment == null)
{
throw new ArgumentNullException(nameof(environment));
}
ArgumentNullException.ThrowIfNull(environment);

var properties = new Dictionary<string, string>();

Expand Down
70 changes: 14 additions & 56 deletions src/Cake.Common/Build/BuildSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,62 +59,20 @@ public BuildSystem(
IAzurePipelinesProvider azurePipelinesProvider,
IWoodpeckerCIProvider woodpeckerCIProvider)
{
if (appVeyorProvider == null)
{
throw new ArgumentNullException(nameof(appVeyorProvider));
}
if (teamCityProvider == null)
{
throw new ArgumentNullException(nameof(teamCityProvider));
}
if (myGetProvider == null)
{
throw new ArgumentNullException(nameof(myGetProvider));
}
if (bambooProvider == null)
{
throw new ArgumentNullException(nameof(bambooProvider));
}
if (continuaCIProvider == null)
{
throw new ArgumentNullException(nameof(continuaCIProvider));
}
if (jenkinsProvider == null)
{
throw new ArgumentNullException(nameof(jenkinsProvider));
}
if (bitriseProvider == null)
{
throw new ArgumentNullException(nameof(bitriseProvider));
}
if (travisCIProvider == null)
{
throw new ArgumentNullException(nameof(travisCIProvider));
}
if (bitbucketPipelinesProvider == null)
{
throw new ArgumentNullException(nameof(bitbucketPipelinesProvider));
}
if (goCDProvider == null)
{
throw new ArgumentNullException(nameof(goCDProvider));
}
if (gitLabCIProvider == null)
{
throw new ArgumentNullException(nameof(gitLabCIProvider));
}
if (gitHubActionsProvider == null)
{
throw new ArgumentNullException(nameof(gitHubActionsProvider));
}
if (azurePipelinesProvider == null)
{
throw new ArgumentNullException(nameof(azurePipelinesProvider));
}
if (woodpeckerCIProvider == null)
{
throw new ArgumentNullException(nameof(woodpeckerCIProvider));
}
ArgumentNullException.ThrowIfNull(appVeyorProvider);
ArgumentNullException.ThrowIfNull(teamCityProvider);
ArgumentNullException.ThrowIfNull(myGetProvider);
ArgumentNullException.ThrowIfNull(bambooProvider);
ArgumentNullException.ThrowIfNull(continuaCIProvider);
ArgumentNullException.ThrowIfNull(jenkinsProvider);
ArgumentNullException.ThrowIfNull(bitriseProvider);
ArgumentNullException.ThrowIfNull(travisCIProvider);
ArgumentNullException.ThrowIfNull(bitbucketPipelinesProvider);
ArgumentNullException.ThrowIfNull(goCDProvider);
ArgumentNullException.ThrowIfNull(gitLabCIProvider);
ArgumentNullException.ThrowIfNull(gitHubActionsProvider);
ArgumentNullException.ThrowIfNull(azurePipelinesProvider);
ArgumentNullException.ThrowIfNull(woodpeckerCIProvider);

AppVeyor = appVeyorProvider;
TeamCity = teamCityProvider;
Expand Down
Loading
Loading