From 12179b21c016ec3ae639f95a94f514b01fdc2b84 Mon Sep 17 00:00:00 2001 From: "C. Augusto Proiete" Date: Tue, 15 Nov 2022 01:20:17 -0500 Subject: [PATCH] Drop support for .NET Framework 4.6.1 in favor or .NET Framework 4.6.2 (#75) --- sample/SampleConsole/SampleConsole.csproj | 2 +- .../NaturalStringComparer.cs | 8 ++++---- .../NaturalStringExtensions.csproj | 10 +++++----- .../NaturalStringExtensions.Tests.csproj | 16 ++++++++-------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sample/SampleConsole/SampleConsole.csproj b/sample/SampleConsole/SampleConsole.csproj index 9f3cc7f..ef2d4ec 100644 --- a/sample/SampleConsole/SampleConsole.csproj +++ b/sample/SampleConsole/SampleConsole.csproj @@ -2,7 +2,7 @@ Exe - net7.0;net6.0;net5.0;netcoreapp3.1;net461 + net7.0;net6.0;net5.0;netcoreapp3.1;net462 diff --git a/src/NaturalStringExtensions/NaturalStringComparer.cs b/src/NaturalStringExtensions/NaturalStringComparer.cs index d21f152..a8d6d52 100644 --- a/src/NaturalStringExtensions/NaturalStringComparer.cs +++ b/src/NaturalStringExtensions/NaturalStringComparer.cs @@ -16,7 +16,7 @@ using System.Collections.Generic; using System.ComponentModel; -#if !NETSTANDARD2_0 && !NETFRAMEWORK_461 +#if !NETSTANDARD2_0 && !NETFRAMEWORK_462 using System.Diagnostics.CodeAnalysis; #endif @@ -131,7 +131,7 @@ public int Compare(string? left, string? right) while (leftSegments.MoveNext() && rightSegments.MoveNext()) { -#if NETSTANDARD2_0 || NETFRAMEWORK_461 +#if NETSTANDARD2_0 || NETFRAMEWORK_462 var leftIsNumber = int.TryParse(leftSegments.Current.ToString(), out var leftValue); var rightIsNumber = int.TryParse(rightSegments.Current.ToString(), out var rightValue); #else @@ -273,7 +273,7 @@ public bool Equals(string? x, string? y) } /// -#if NETSTANDARD2_0 || NETFRAMEWORK_461 +#if NETSTANDARD2_0 || NETFRAMEWORK_462 public int GetHashCode(string? obj) #else public int GetHashCode([DisallowNull] string? obj) @@ -284,7 +284,7 @@ public int GetHashCode([DisallowNull] string? obj) throw new ArgumentNullException(nameof(obj)); } -#if NETSTANDARD2_0 || NETFRAMEWORK_461 +#if NETSTANDARD2_0 || NETFRAMEWORK_462 return obj.GetHashCode(); #else if (_comparer is null) diff --git a/src/NaturalStringExtensions/NaturalStringExtensions.csproj b/src/NaturalStringExtensions/NaturalStringExtensions.csproj index 24ab80d..79a609b 100644 --- a/src/NaturalStringExtensions/NaturalStringExtensions.csproj +++ b/src/NaturalStringExtensions/NaturalStringExtensions.csproj @@ -1,7 +1,7 @@  - net7.0;net6.0;net5.0;netstandard2.0;net461 + net7.0;net6.0;net5.0;netstandard2.0;net462 NaturalStringExtensions 0.0.1.0 @@ -41,16 +41,16 @@ https://github.com/augustoproiete/NaturalStringExtensions.git - + true - $(DefineConstants);NETFRAMEWORK_461 + $(DefineConstants);NETFRAMEWORK_462 $(DefineConstants);NETSTANDARD2_0 - + @@ -74,7 +74,7 @@ - + diff --git a/test/NaturalStringExtensions.Tests/NaturalStringExtensions.Tests.csproj b/test/NaturalStringExtensions.Tests/NaturalStringExtensions.Tests.csproj index 1eeec01..64ca189 100644 --- a/test/NaturalStringExtensions.Tests/NaturalStringExtensions.Tests.csproj +++ b/test/NaturalStringExtensions.Tests/NaturalStringExtensions.Tests.csproj @@ -1,12 +1,12 @@  - net7.0;net6.0;net5.0;netcoreapp3.1;net461 + net7.0;net6.0;net5.0;netcoreapp3.1;net462 false - - $(DefineConstants);NETFRAMEWORK_461 + + $(DefineConstants);NETFRAMEWORK_462 @@ -14,19 +14,19 @@ - - + + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - +