Skip to content

Commit c0d6441

Browse files
Remove NaturalSort.Extension for net10 in-built CompareOptions.NumericOrdering
1 parent eafccdb commit c0d6441

File tree

4 files changed

+2
-32
lines changed

4 files changed

+2
-32
lines changed

Directory.Packages.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
3232
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
3333
<PackageVersion Include="Mono.Cecil" Version="0.11.6" />
34-
<PackageVersion Include="NaturalSort.Extension" Version="4.3.0" />
3534
<PackageVersion Include="NSubstitute" Version="5.3.0" />
3635
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
3736
<PackageVersion Include="NUnit" Version="4.3.2" />

ILSpy/ILSpy.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
5050
<PackageReference Include="DataGridExtensions" />
5151
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" />
52-
<PackageReference Include="NaturalSort.Extension" />
5352
<PackageReference Include="TomsToolbox.Composition.MicrosoftExtensions" />
5453
<PackageReference Include="TomsToolbox.Wpf.Composition.AttributedModel" />
5554
<PackageReference Include="TomsToolbox.Wpf.Styles" />

ILSpy/TreeNodes/NaturalStringComparer.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818

1919
using System;
2020
using System.Collections.Generic;
21-
22-
using NaturalSort.Extension;
21+
using System.Globalization;
2322

2423
namespace ICSharpCode.ILSpy.TreeNodes
2524
{
@@ -28,6 +27,6 @@ namespace ICSharpCode.ILSpy.TreeNodes
2827
/// </summary>
2928
public sealed class NaturalStringComparer
3029
{
31-
public static readonly IComparer<string> Instance = StringComparison.CurrentCultureIgnoreCase.WithNaturalSort();
30+
public static readonly IComparer<string> Instance = StringComparer.Create(CultureInfo.CurrentCulture, CompareOptions.NumericOrdering);
3231
}
3332
}

doc/third-party-notices.txt

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -499,33 +499,6 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
499499
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
500500

501501

502-
License Notice for NaturalSort.Extension (part of ILSpy)
503-
---------------------------
504-
505-
https://github.com/tompazourek/NaturalSort.Extension/blob/master/LICENSE
506-
507-
The MIT License (MIT)
508-
509-
Copyright (c) 2022 Tomáš Pažourek
510-
511-
Permission is hereby granted, free of charge, to any person obtaining a copy of
512-
this software and associated documentation files (the "Software"), to deal in
513-
the Software without restriction, including without limitation the rights to
514-
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
515-
the Software, and to permit persons to whom the Software is furnished to do so,
516-
subject to the following conditions:
517-
518-
The above copyright notice and this permission notice shall be included in all
519-
copies or substantial portions of the Software.
520-
521-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
522-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
523-
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
524-
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
525-
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
526-
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
527-
528-
529502
License Notice for Tom's Toolbox (part of ILSpy)
530503
---------------------------
531504

0 commit comments

Comments
 (0)