Natural Sort without interop (#3196)

* Use NaturalSort.Extension instead of Interop

* Update to latest NaturalSort.Extensions and update 3rd party notices

* Remove old interop implementation

Directory.Packages.props

@@ -28,6 +28,7 @@
     <PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.7.40" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
     <PackageVersion Include="Mono.Cecil" Version="0.11.5" />
+    <PackageVersion Include="NaturalSort.Extension" Version="4.3.0" />
     <PackageVersion Include="NSubstitute" Version="5.1.0" />
     <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
     <PackageVersion Include="NUnit" Version="4.1.0" />

ILSpy/ILSpy.csproj

@@ -48,6 +48,7 @@
     <PackageReference Include="Microsoft.VisualStudio.Composition" />
     <PackageReference Include="DataGridExtensions" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" />
+    <PackageReference Include="NaturalSort.Extension" />
     <PackageReference Include="TomsToolbox.Wpf.Styles" />
   </ItemGroup>
 

ILSpy/TreeNodes/NaturalStringComparer.cs

@@ -16,22 +16,18 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+using System;
 using System.Collections.Generic;
-using System.Runtime.InteropServices;
+
+using NaturalSort.Extension;
 
 namespace ICSharpCode.ILSpy.TreeNodes
 {
-	[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1060:MovePInvokesToNativeMethodsClass")]
-	public sealed class NaturalStringComparer : IComparer<string>
+	/// <summary>
+	/// .NET natural string comparison
+	/// </summary>
+	public sealed class NaturalStringComparer
 	{
-		[DllImport("shlwapi.dll", CharSet = CharSet.Unicode)]
-		static extern int StrCmpLogicalW(string psz1, string psz2);
-
-		public static readonly NaturalStringComparer Instance = new NaturalStringComparer();
-
-		public int Compare(string x, string y)
-		{
-			return StrCmpLogicalW(x, y);
-		}
+		public static readonly IComparer<string> Instance = StringComparison.CurrentCultureIgnoreCase.WithNaturalSort();
 	}
 }

doc/third-party-notices.txt

@@ -499,32 +499,31 @@ 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 OSVersionHelper (part of ILSpy)
+License Notice for NaturalSort.Extension (part of ILSpy)
 ---------------------------
 
-https://github.com/novotnyllc/OSVersionHelper/blob/master/LICENSE.txt
+https://github.com/tompazourek/NaturalSort.Extension/blob/master/LICENSE
 
 The MIT License (MIT)
 
-Copyright (c) [year] [fullname]
+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:
+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.
+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)