Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonCropp committed Dec 19, 2024
1 parent f783079 commit 22b02bd
Show file tree
Hide file tree
Showing 22 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion docs/serializer-settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -1367,7 +1367,7 @@ The default mapping is:
{
typeof(BigInteger), (target, _) => ((BigInteger) target).ToString(Culture.InvariantCulture)
},
#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER
{
typeof(Half), (target, _) => ((Half) target).ToString(Culture.InvariantCulture)
},
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.Expecto/Verifier_Directory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace VerifyExpecto;

public static partial class Verifier
{
#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER

/// <summary>
/// Verifies the contents of <paramref name="path" />.
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.Fixie/Verifier_Directory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

public static partial class Verifier
{
#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER

/// <summary>
/// Verifies the contents of <paramref name="path" />.
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.MSTest/Verifier_Directory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ namespace VerifyMSTest;

partial class Verifier
{
#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER

/// <summary>
/// Verifies the contents of <paramref name="path" />.
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.MSTest/VerifyBase_Directory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ namespace VerifyMSTest;
partial class VerifyBase
{
#pragma warning disable CA1822 // Mark members as static
#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER

/// <summary>
/// Verifies the contents of <paramref name="path" />.
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.NUnit/Verifier_Directory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

public static partial class Verifier
{
#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER

/// <summary>
/// Verifies the contents of <paramref name="path" />.
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.NUnit/VerifyBase_Directory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

public partial class VerifyBase
{
#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER

/// <summary>
/// Verifies the contents of <paramref name="path" />.
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.TUnit/Verifier_Directory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

public static partial class Verifier
{
#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER

/// <summary>
/// Verifies the contents of <paramref name="path" />.
Expand Down
2 changes: 1 addition & 1 deletion src/Verify.Tests/Naming/NameForParameterTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public Task StringInvalidPathChar() =>
public Task Int() =>
Verify(VerifierSettings.GetNameForParameter(10));

#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER
[Fact]
public Task Half() =>
Verify(VerifierSettings.GetNameForParameter((Half) 10));
Expand Down
6 changes: 3 additions & 3 deletions src/Verify.Tests/Serialization/SerializationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public Task WithExtraDateTimeFormat() =>

#endregion

#if NET5_0_OR_GREATER || net48
#if NET6_0_OR_GREATER || net48
[Fact]
public Task ValueTasks()
{
Expand Down Expand Up @@ -1425,7 +1425,7 @@ public Task ScrubInlineDateTimesWrappedInSymbols()
.ScrubInlineDateTimes("f");
}

#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER

[Fact]
public async Task ScrubInlineDateTimesInValidFormat()
Expand Down Expand Up @@ -1893,7 +1893,7 @@ public Task ScrubUserProfile()
return Verify(target);
}

#if !NET5_0_OR_GREATER
#if !NET6_0_OR_GREATER
[Fact]
public Task ScrubCodeBaseLocation()
{
Expand Down
4 changes: 2 additions & 2 deletions src/Verify.Tests/SimpleTypeTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
public class SimpleTypeTests
{
#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER
[Theory]
[MemberData(nameof(GetData))]
public Task Run(object arg)
Expand Down Expand Up @@ -39,7 +39,7 @@ public Task Null() =>
public Task NullWrappedInTask() =>
Verify(Task.FromResult<int?>(null!));

#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER
[Fact]
public Task DateTimeWrappedInTask() =>
Verify(Task.FromResult(new DateTime(2000, 1, 1, 1, 1, 1, DateTimeKind.Utc)));
Expand Down
2 changes: 1 addition & 1 deletion src/Verify/Naming/Namer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ static string GetOSPlatform()
return "OSX";
}

#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER

if (OperatingSystem.IsAndroid())
{
Expand Down
2 changes: 1 addition & 1 deletion src/Verify/Naming/UniquenessList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public override string ToString()
return string.Empty;
}

#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER
return '.' + string.Join('.', inner);
#else
return '.' + string.Join(".", inner);
Expand Down
2 changes: 1 addition & 1 deletion src/Verify/Naming/VerifierSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public static partial class VerifierSettings
{
typeof(decimal), _ => ((decimal) _).ToString(Culture.InvariantCulture)
},
#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER
{
typeof(Half), _ => ((Half) _).ToString(Culture.InvariantCulture)
},
Expand Down
2 changes: 1 addition & 1 deletion src/Verify/Serialization/Scrubbers/ApplyScrubbers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static void UseAssembly(string? solutionDir, string projectDir)
replacements[currentDir] = "{CurrentDirectory}";
replacements[altCurrentDir + IoHelpers.AltDirectorySeparator] = "{CurrentDirectory}";
replacements[altCurrentDir] = "{CurrentDirectory}";
#if !NET5_0_OR_GREATER
#if !NET6_0_OR_GREATER
if (CodeBaseLocation.CurrentDirectory is not null)
{
var codeBaseLocation = CleanPath(CodeBaseLocation.CurrentDirectory);
Expand Down
2 changes: 1 addition & 1 deletion src/Verify/Serialization/Scrubbers/CodeBaseLocation.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ReSharper disable ConditionIsAlwaysTrueOrFalse

#if !NET5_0_OR_GREATER
#if !NET6_0_OR_GREATER
static class CodeBaseLocation
{
static CodeBaseLocation()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public static void ScrubInlineDateTimeOffsets(
DateScrubber.BuildDateTimeOffsetScrubber(format, culture),
location);

#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER

/// <summary>
/// Replace inline <see cref="Date" />s with a placeholder.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void ScrubInlineDateTimeOffsets(
DateScrubber.BuildDateTimeOffsetScrubber(format, culture),
location);

#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER

/// <summary>
/// Replace inline <see cref="Date" />s with a placeholder.
Expand Down
2 changes: 1 addition & 1 deletion src/Verify/Serialization/VerifierSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public static bool TryGetToString(
{
typeof(BigInteger), (target, _) => ((BigInteger) target).ToString(Culture.InvariantCulture)
},
#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER
{
typeof(Half), (target, _) => ((Half) target).ToString(Culture.InvariantCulture)
},
Expand Down
2 changes: 1 addition & 1 deletion src/Verify/SettingsTask_Scrubbing.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public SettingsTask ScrubInlineDateTimeOffsets(string format, Culture? culture =
return this;
}

#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER

/// <summary>
/// Replace inline <see cref="Date" />s with a placeholder.
Expand Down
2 changes: 1 addition & 1 deletion src/Verify/Verifier/InnerVerifier_Directory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

partial class InnerVerifier
{
#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER

public async Task<VerifyResult> VerifyDirectory(
string path,
Expand Down
2 changes: 1 addition & 1 deletion src/Verify/Verifier/InnerVerifier_Xml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public async Task<VerifyResult> VerifyXml(Stream? target)
return await VerifyInner(target, null, emptyTargets, true);
}

#if NET5_0_OR_GREATER
#if NET6_0_OR_GREATER
var document = await XDocument.LoadAsync(target, LoadOptions.None, default);
#else
var document = XDocument.Load(target, LoadOptions.None);
Expand Down

0 comments on commit 22b02bd

Please sign in to comment.