Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ csharp_space_between_method_call_empty_parameter_list_parentheses = false
# Wrapping preferences
csharp_preserve_single_line_statements = true
csharp_preserve_single_line_blocks = true
csharp_style_namespace_declarations = file_scoped:warning
###############################
# VB Coding Conventions #
###############################
Expand Down
2 changes: 1 addition & 1 deletion src/GuardClauses/GuardAgainstInvalidFormatExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System;
using System.Text.RegularExpressions;
using JetBrainsInvokerParameterNameAttribute = JetBrains.Annotations.InvokerParameterNameAttribute;
using JetBrainsNotNullAttribute = JetBrains.Annotations.NotNullAttribute;
using JetBrainsRegexPattern = JetBrains.Annotations.RegexPatternAttribute;
using JetBrainsInvokerParameterNameAttribute = JetBrains.Annotations.InvokerParameterNameAttribute;

namespace Ardalis.GuardClauses
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Ardalis.GuardClauses;
using System;
using System;
using Ardalis.GuardClauses;
using Xunit;

namespace GuardClauses.UnitTests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Ardalis.GuardClauses;
using System;
using System;
using Ardalis.GuardClauses;
using Xunit;

namespace GuardClauses.UnitTests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Ardalis.GuardClauses;
using System;
using System;
using Ardalis.GuardClauses;
using Xunit;

namespace GuardClauses.UnitTests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Ardalis.GuardClauses;
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using Ardalis.GuardClauses;
using Xunit;

namespace GuardClauses.UnitTests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Ardalis.GuardClauses;
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using Ardalis.GuardClauses;
using Xunit;

namespace GuardClauses.UnitTests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Ardalis.GuardClauses;
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using Ardalis.GuardClauses;
using Xunit;

namespace GuardClauses.UnitTests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Ardalis.GuardClauses;
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using Ardalis.GuardClauses;
using Xunit;

namespace GuardClauses.UnitTests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Ardalis.GuardClauses;
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using Ardalis.GuardClauses;
using Xunit;

namespace GuardClauses.UnitTests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Ardalis.GuardClauses;
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using Ardalis.GuardClauses;
using Xunit;

namespace GuardClauses.UnitTests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Ardalis.GuardClauses;
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Ardalis.GuardClauses;
using Xunit;

namespace GuardClauses.UnitTests
Expand Down
4 changes: 2 additions & 2 deletions test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForFloat.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Ardalis.GuardClauses;
using System;
using System;
using Ardalis.GuardClauses;
using Xunit;

namespace GuardClauses.UnitTests
Expand Down
4 changes: 2 additions & 2 deletions test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForInt.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Ardalis.GuardClauses;
using System;
using System;
using Ardalis.GuardClauses;
using Xunit;

namespace GuardClauses.UnitTests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Ardalis.GuardClauses;
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using Ardalis.GuardClauses;
using Microsoft.VisualBasic;
using Xunit;

Expand Down
4 changes: 2 additions & 2 deletions test/GuardClauses.UnitTests/GuardAgainstOutOfRangeForShort.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Ardalis.GuardClauses;
using System;
using System;
using Ardalis.GuardClauses;
using Xunit;

namespace GuardClauses.UnitTests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Ardalis.GuardClauses;
using System;
using System;
using Ardalis.GuardClauses;
using Xunit;

namespace GuardClauses.UnitTests
Expand Down
2 changes: 1 addition & 1 deletion test/GuardClauses.UnitTests/GuardClauses.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>

<IsPackable>false</IsPackable>
<LangVersion>10</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
21 changes: 10 additions & 11 deletions test/GuardClauses.UnitTests/NamespaceSeparate/ExtendingGuard.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,20 @@
using System.Runtime.CompilerServices;

// By using the same namespace, the required using for Ardalis.GuardClauses will include custom guards regardless of location.
namespace Ardalis.GuardClauses
namespace Ardalis.GuardClauses;

/// <summary>
/// An example Guard extension method. Throws if input is "foo".
/// </summary>
public static class FooGuard
{
/// <summary>
/// An example Guard extension method. Throws if input is "foo".
/// </summary>
public static class FooGuard
{
#if NETSTANDARD || NETFRAMEWORK
public static void Foo(this IGuardClause guardClause, string input, string parameterName)
#else
public static void Foo(this IGuardClause guardClause, string input, [CallerArgumentExpression("input")] string? parameterName = null)
public static void Foo(this IGuardClause guardClause, string input, [CallerArgumentExpression("input")] string? parameterName = null)
#endif
{
if (input?.ToLower() == "foo")
throw new ArgumentException("Should not have been foo!", parameterName);
}
{
if (input?.ToLower() == "foo")
throw new ArgumentException("Should not have been foo!", parameterName);
}
}