diff --git a/Directory.Packages.props b/Directory.Packages.props index 8607daa90..37ef9ac32 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -31,7 +31,6 @@ - diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj index 3896678ed..23ad9faf5 100644 --- a/ILSpy/ILSpy.csproj +++ b/ILSpy/ILSpy.csproj @@ -49,7 +49,6 @@ - diff --git a/ILSpy/TreeNodes/NaturalStringComparer.cs b/ILSpy/TreeNodes/NaturalStringComparer.cs index 40f32bb11..a9308e7a8 100644 --- a/ILSpy/TreeNodes/NaturalStringComparer.cs +++ b/ILSpy/TreeNodes/NaturalStringComparer.cs @@ -18,8 +18,7 @@ using System; using System.Collections.Generic; - -using NaturalSort.Extension; +using System.Globalization; namespace ICSharpCode.ILSpy.TreeNodes { @@ -28,6 +27,6 @@ namespace ICSharpCode.ILSpy.TreeNodes /// public sealed class NaturalStringComparer { - public static readonly IComparer Instance = StringComparison.CurrentCultureIgnoreCase.WithNaturalSort(); + public static readonly IComparer Instance = StringComparer.Create(CultureInfo.CurrentCulture, CompareOptions.NumericOrdering); } } diff --git a/doc/third-party-notices.txt b/doc/third-party-notices.txt index 4a9e010b8..e2c72c3c2 100644 --- a/doc/third-party-notices.txt +++ b/doc/third-party-notices.txt @@ -499,33 +499,6 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -License Notice for NaturalSort.Extension (part of ILSpy) ---------------------------- - -https://github.com/tompazourek/NaturalSort.Extension/blob/master/LICENSE - -The MIT License (MIT) - -Copyright (c) 2022 Tomáš Pažourek - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - License Notice for Tom's Toolbox (part of ILSpy) ---------------------------