From ed11a5a0b11cefd06b3af5deae7bfe1c2cc87109 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Mon, 29 Jul 2024 14:59:49 +1000 Subject: [PATCH] cleanup --- src/DeterministicTests/DeterministicTests.csproj | 1 - src/ModuleInitDocs/ModuleInitDocs.csproj | 1 - src/StaticSettingsTests/StaticSettingsTests.csproj | 1 - src/StrictJsonTests/StrictJsonTests.csproj | 1 - .../Verify.ClipboardAccept.Tests.csproj | 1 - .../Verify.ExceptionParsing.Tests.csproj | 1 - .../Verify.MSTest.DerivePaths.Tests.csproj | 1 - src/Verify.MSTest.Tests/Verify.MSTest.Tests.csproj | 1 - .../Verify.NUnit.DerivePaths.Tests.csproj | 1 - src/Verify.NUnit.Tests/Verify.NUnit.Tests.csproj | 1 - src/Verify.Tests/Verify.Tests.csproj | 1 - .../Verify.Xunit.DerivePaths.Tests.csproj | 1 - src/Verify.Xunit.Tests/Verify.Xunit.Tests.csproj | 1 - src/Verify/GlobalUsings.cs | 1 + src/Verify/SettingsTask.cs | 14 ++++++++++++++ src/Verify/VerifySettings.cs | 14 ++++++++++++++ usages/FixieNugetUsage/FixieNugetUsage.csproj | 1 - usages/MSTestNugetUsage/MSTestNugetUsage.csproj | 1 - usages/NUnitNugetUsage/NUnitNugetUsage.csproj | 1 - usages/XunitNugetUsage/XunitNugetUsage.csproj | 1 - 20 files changed, 29 insertions(+), 17 deletions(-) diff --git a/src/DeterministicTests/DeterministicTests.csproj b/src/DeterministicTests/DeterministicTests.csproj index b7e41b6d55..7e5b0a9d1c 100644 --- a/src/DeterministicTests/DeterministicTests.csproj +++ b/src/DeterministicTests/DeterministicTests.csproj @@ -1,4 +1,3 @@ - net9.0 diff --git a/src/ModuleInitDocs/ModuleInitDocs.csproj b/src/ModuleInitDocs/ModuleInitDocs.csproj index 173bbbcd9d..a622221654 100644 --- a/src/ModuleInitDocs/ModuleInitDocs.csproj +++ b/src/ModuleInitDocs/ModuleInitDocs.csproj @@ -1,4 +1,3 @@ - net9.0 diff --git a/src/StaticSettingsTests/StaticSettingsTests.csproj b/src/StaticSettingsTests/StaticSettingsTests.csproj index fb1ea8bd72..e6097bcb5b 100644 --- a/src/StaticSettingsTests/StaticSettingsTests.csproj +++ b/src/StaticSettingsTests/StaticSettingsTests.csproj @@ -1,4 +1,3 @@ - net9.0 diff --git a/src/StrictJsonTests/StrictJsonTests.csproj b/src/StrictJsonTests/StrictJsonTests.csproj index 891c94881a..6a2fb86ac8 100644 --- a/src/StrictJsonTests/StrictJsonTests.csproj +++ b/src/StrictJsonTests/StrictJsonTests.csproj @@ -1,4 +1,3 @@ - net9.0 diff --git a/src/Verify.ClipboardAccept.Tests/Verify.ClipboardAccept.Tests.csproj b/src/Verify.ClipboardAccept.Tests/Verify.ClipboardAccept.Tests.csproj index 013c9d82f0..67aff44f40 100644 --- a/src/Verify.ClipboardAccept.Tests/Verify.ClipboardAccept.Tests.csproj +++ b/src/Verify.ClipboardAccept.Tests/Verify.ClipboardAccept.Tests.csproj @@ -1,4 +1,3 @@ - net48 diff --git a/src/Verify.ExceptionParsing.Tests/Verify.ExceptionParsing.Tests.csproj b/src/Verify.ExceptionParsing.Tests/Verify.ExceptionParsing.Tests.csproj index c7e58e6986..e0dfea05b9 100644 --- a/src/Verify.ExceptionParsing.Tests/Verify.ExceptionParsing.Tests.csproj +++ b/src/Verify.ExceptionParsing.Tests/Verify.ExceptionParsing.Tests.csproj @@ -1,4 +1,3 @@ - diff --git a/src/Verify.MSTest.DerivePaths.Tests/Verify.MSTest.DerivePaths.Tests.csproj b/src/Verify.MSTest.DerivePaths.Tests/Verify.MSTest.DerivePaths.Tests.csproj index be60c22c78..ea2ffa55a2 100644 --- a/src/Verify.MSTest.DerivePaths.Tests/Verify.MSTest.DerivePaths.Tests.csproj +++ b/src/Verify.MSTest.DerivePaths.Tests/Verify.MSTest.DerivePaths.Tests.csproj @@ -1,4 +1,3 @@ - net9.0 diff --git a/src/Verify.MSTest.Tests/Verify.MSTest.Tests.csproj b/src/Verify.MSTest.Tests/Verify.MSTest.Tests.csproj index 93f642f455..8523f958d8 100644 --- a/src/Verify.MSTest.Tests/Verify.MSTest.Tests.csproj +++ b/src/Verify.MSTest.Tests/Verify.MSTest.Tests.csproj @@ -1,4 +1,3 @@ - diff --git a/src/Verify.NUnit.DerivePaths.Tests/Verify.NUnit.DerivePaths.Tests.csproj b/src/Verify.NUnit.DerivePaths.Tests/Verify.NUnit.DerivePaths.Tests.csproj index 1714ccfc9c..454f5f8d48 100644 --- a/src/Verify.NUnit.DerivePaths.Tests/Verify.NUnit.DerivePaths.Tests.csproj +++ b/src/Verify.NUnit.DerivePaths.Tests/Verify.NUnit.DerivePaths.Tests.csproj @@ -1,4 +1,3 @@ - net9.0 diff --git a/src/Verify.NUnit.Tests/Verify.NUnit.Tests.csproj b/src/Verify.NUnit.Tests/Verify.NUnit.Tests.csproj index 2cd4246d31..af4332ccdc 100644 --- a/src/Verify.NUnit.Tests/Verify.NUnit.Tests.csproj +++ b/src/Verify.NUnit.Tests/Verify.NUnit.Tests.csproj @@ -1,4 +1,3 @@ - diff --git a/src/Verify.Tests/Verify.Tests.csproj b/src/Verify.Tests/Verify.Tests.csproj index 74cdba91eb..801e2d0000 100644 --- a/src/Verify.Tests/Verify.Tests.csproj +++ b/src/Verify.Tests/Verify.Tests.csproj @@ -1,4 +1,3 @@ - diff --git a/src/Verify.Xunit.DerivePaths.Tests/Verify.Xunit.DerivePaths.Tests.csproj b/src/Verify.Xunit.DerivePaths.Tests/Verify.Xunit.DerivePaths.Tests.csproj index 2c62c6d761..8a3d731a62 100644 --- a/src/Verify.Xunit.DerivePaths.Tests/Verify.Xunit.DerivePaths.Tests.csproj +++ b/src/Verify.Xunit.DerivePaths.Tests/Verify.Xunit.DerivePaths.Tests.csproj @@ -1,4 +1,3 @@ - net9.0 diff --git a/src/Verify.Xunit.Tests/Verify.Xunit.Tests.csproj b/src/Verify.Xunit.Tests/Verify.Xunit.Tests.csproj index 3e09269155..8df43921a6 100644 --- a/src/Verify.Xunit.Tests/Verify.Xunit.Tests.csproj +++ b/src/Verify.Xunit.Tests/Verify.Xunit.Tests.csproj @@ -1,4 +1,3 @@ - diff --git a/src/Verify/GlobalUsings.cs b/src/Verify/GlobalUsings.cs index b3d6f96a75..537ce515bb 100644 --- a/src/Verify/GlobalUsings.cs +++ b/src/Verify/GlobalUsings.cs @@ -1,5 +1,6 @@ global using System.Buffers; global using System.Collections.Frozen; +global using System.ComponentModel; global using System.Diagnostics.Contracts; global using System.IO.Hashing; global using VerifyTests; diff --git a/src/Verify/SettingsTask.cs b/src/Verify/SettingsTask.cs index c4ad9fa004..e001b3eb98 100644 --- a/src/Verify/SettingsTask.cs +++ b/src/Verify/SettingsTask.cs @@ -396,4 +396,18 @@ public TaskAwaiter GetAwaiter() => [Pure] public static implicit operator Task(SettingsTask settingsTask) => settingsTask.ToTask(); + + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => + // ReSharper disable once BaseObjectGetHashCodeCallInGetHashCode + base.GetHashCode(); + + [EditorBrowsable(EditorBrowsableState.Never)] + public override string? ToString() => + base.ToString(); + + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object? obj) => + // ReSharper disable once BaseObjectEqualsIsObjectEquals + base.Equals(obj); } \ No newline at end of file diff --git a/src/Verify/VerifySettings.cs b/src/Verify/VerifySettings.cs index e4c53751ff..7f056853ec 100644 --- a/src/Verify/VerifySettings.cs +++ b/src/Verify/VerifySettings.cs @@ -129,4 +129,18 @@ public void AutoVerify(AutoVerify autoVerify, bool includeBuildServer = true) } } } + + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => + // ReSharper disable once BaseObjectGetHashCodeCallInGetHashCode + base.GetHashCode(); + + [EditorBrowsable(EditorBrowsableState.Never)] + public override string? ToString() => + base.ToString(); + + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object? obj) => + // ReSharper disable once BaseObjectEqualsIsObjectEquals + base.Equals(obj); } \ No newline at end of file diff --git a/usages/FixieNugetUsage/FixieNugetUsage.csproj b/usages/FixieNugetUsage/FixieNugetUsage.csproj index 827c130a65..a4ab740d04 100644 --- a/usages/FixieNugetUsage/FixieNugetUsage.csproj +++ b/usages/FixieNugetUsage/FixieNugetUsage.csproj @@ -1,4 +1,3 @@ - net9.0 diff --git a/usages/MSTestNugetUsage/MSTestNugetUsage.csproj b/usages/MSTestNugetUsage/MSTestNugetUsage.csproj index 70e266b1bb..6185c5a41c 100644 --- a/usages/MSTestNugetUsage/MSTestNugetUsage.csproj +++ b/usages/MSTestNugetUsage/MSTestNugetUsage.csproj @@ -1,4 +1,3 @@ - net9.0 diff --git a/usages/NUnitNugetUsage/NUnitNugetUsage.csproj b/usages/NUnitNugetUsage/NUnitNugetUsage.csproj index 3e4ca29b79..1a1514d5e0 100644 --- a/usages/NUnitNugetUsage/NUnitNugetUsage.csproj +++ b/usages/NUnitNugetUsage/NUnitNugetUsage.csproj @@ -1,4 +1,3 @@ - net9.0 diff --git a/usages/XunitNugetUsage/XunitNugetUsage.csproj b/usages/XunitNugetUsage/XunitNugetUsage.csproj index 62de593cf2..910ef1c3ba 100644 --- a/usages/XunitNugetUsage/XunitNugetUsage.csproj +++ b/usages/XunitNugetUsage/XunitNugetUsage.csproj @@ -1,4 +1,3 @@ - net9.0