diff --git a/SabreTools.Core/NaturalSort/NaturalComparer.cs b/NaturalSort/NaturalComparer.cs similarity index 98% rename from SabreTools.Core/NaturalSort/NaturalComparer.cs rename to NaturalSort/NaturalComparer.cs index ae3a55b9..15fe03e3 100644 --- a/SabreTools.Core/NaturalSort/NaturalComparer.cs +++ b/NaturalSort/NaturalComparer.cs @@ -14,7 +14,6 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; -// TODO: Split into separate library namespace NaturalSort { public class NaturalComparer : Comparer, IDisposable diff --git a/SabreTools.Core/NaturalSort/NaturalComparerUtil.cs b/NaturalSort/NaturalComparerUtil.cs similarity index 98% rename from SabreTools.Core/NaturalSort/NaturalComparerUtil.cs rename to NaturalSort/NaturalComparerUtil.cs index 86158295..6209d5e5 100644 --- a/SabreTools.Core/NaturalSort/NaturalComparerUtil.cs +++ b/NaturalSort/NaturalComparerUtil.cs @@ -1,6 +1,5 @@ using System.IO; -// TODO: Split into separate library namespace NaturalSort { public static class NaturalComparerUtil diff --git a/SabreTools.Core/NaturalSort/NaturalReversedComparer.cs b/NaturalSort/NaturalReversedComparer.cs similarity index 98% rename from SabreTools.Core/NaturalSort/NaturalReversedComparer.cs rename to NaturalSort/NaturalReversedComparer.cs index d0a44975..75b9395b 100644 --- a/SabreTools.Core/NaturalSort/NaturalReversedComparer.cs +++ b/NaturalSort/NaturalReversedComparer.cs @@ -14,7 +14,6 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; -// TODO: Split into separate library namespace NaturalSort { public class NaturalReversedComparer : Comparer, IDisposable diff --git a/NaturalSort/NaturalSort.csproj b/NaturalSort/NaturalSort.csproj new file mode 100644 index 00000000..5e3ed4b4 --- /dev/null +++ b/NaturalSort/NaturalSort.csproj @@ -0,0 +1,8 @@ + + + + net6.0;net7.0 + enable + + + diff --git a/SabreTools.DatFiles/SabreTools.DatFiles.csproj b/SabreTools.DatFiles/SabreTools.DatFiles.csproj index 7a73c75f..328b3431 100644 --- a/SabreTools.DatFiles/SabreTools.DatFiles.csproj +++ b/SabreTools.DatFiles/SabreTools.DatFiles.csproj @@ -6,6 +6,7 @@ + diff --git a/SabreTools.DatItems/SabreTools.DatItems.csproj b/SabreTools.DatItems/SabreTools.DatItems.csproj index 1884a695..63c32082 100644 --- a/SabreTools.DatItems/SabreTools.DatItems.csproj +++ b/SabreTools.DatItems/SabreTools.DatItems.csproj @@ -6,6 +6,7 @@ + diff --git a/SabreTools.DatTools/SabreTools.DatTools.csproj b/SabreTools.DatTools/SabreTools.DatTools.csproj index 833314e0..e0f710fd 100644 --- a/SabreTools.DatTools/SabreTools.DatTools.csproj +++ b/SabreTools.DatTools/SabreTools.DatTools.csproj @@ -5,6 +5,7 @@ + diff --git a/SabreTools.FileTypes/SabreTools.FileTypes.csproj b/SabreTools.FileTypes/SabreTools.FileTypes.csproj index 4305e2a2..9f1f86ad 100644 --- a/SabreTools.FileTypes/SabreTools.FileTypes.csproj +++ b/SabreTools.FileTypes/SabreTools.FileTypes.csproj @@ -5,6 +5,7 @@ + diff --git a/SabreTools.IO/PathTool.cs b/SabreTools.IO/PathTool.cs index 8ded7c1a..60f6f517 100644 --- a/SabreTools.IO/PathTool.cs +++ b/SabreTools.IO/PathTool.cs @@ -1,9 +1,6 @@ -using System; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Reflection; - using NaturalSort; namespace SabreTools.IO diff --git a/SabreTools.IO/SabreTools.IO.csproj b/SabreTools.IO/SabreTools.IO.csproj index 5a4dc941..4a9437e2 100644 --- a/SabreTools.IO/SabreTools.IO.csproj +++ b/SabreTools.IO/SabreTools.IO.csproj @@ -6,6 +6,7 @@ + diff --git a/SabreTools.sln b/SabreTools.sln index eb6964ec..b024fb3c 100644 --- a/SabreTools.sln +++ b/SabreTools.sln @@ -44,6 +44,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Serialization", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Filter", "SabreTools.Filter\SabreTools.Filter.csproj", "{2A7A27A9-5FB9-4F6D-88F3-67120668A029}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NaturalSort", "NaturalSort\NaturalSort.csproj", "{F7180B1C-7CFB-4526-8FF5-C31E7B049378}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -188,6 +190,14 @@ Global {2A7A27A9-5FB9-4F6D-88F3-67120668A029}.Release|Any CPU.Build.0 = Release|Any CPU {2A7A27A9-5FB9-4F6D-88F3-67120668A029}.Release|x64.ActiveCfg = Release|Any CPU {2A7A27A9-5FB9-4F6D-88F3-67120668A029}.Release|x64.Build.0 = Release|Any CPU + {F7180B1C-7CFB-4526-8FF5-C31E7B049378}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F7180B1C-7CFB-4526-8FF5-C31E7B049378}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F7180B1C-7CFB-4526-8FF5-C31E7B049378}.Debug|x64.ActiveCfg = Debug|Any CPU + {F7180B1C-7CFB-4526-8FF5-C31E7B049378}.Debug|x64.Build.0 = Debug|Any CPU + {F7180B1C-7CFB-4526-8FF5-C31E7B049378}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F7180B1C-7CFB-4526-8FF5-C31E7B049378}.Release|Any CPU.Build.0 = Release|Any CPU + {F7180B1C-7CFB-4526-8FF5-C31E7B049378}.Release|x64.ActiveCfg = Release|Any CPU + {F7180B1C-7CFB-4526-8FF5-C31E7B049378}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE