From e7bc559ea03678ef3907d7edfc9d5246a08d41db Mon Sep 17 00:00:00 2001 From: benb Date: Mon, 6 Jan 2020 10:48:42 -0800 Subject: [PATCH] Move MpqTool into Hereos.ReplayParser, for simpler NuGet packaging --- .../ConsoleApplication.sln | 14 ++------------ .../Foole.Mpq/BitStream.cs | 0 .../Foole.Mpq/MpqArchive.cs | 0 .../Foole.Mpq/MpqEntry.cs | 0 .../Foole.Mpq/MpqHuffman.cs | 0 .../Foole.Mpq/MpqParserException.cs | Bin .../Foole.Mpq/MpqStream.cs | 0 .../Foole.Mpq/MpqWavCompression.cs | 0 .../Foole.Mpq/PKLibDecompress.cs | 0 .../Foole.Mpq}/README.txt | 0 Heroes.ReplayParser/Heroes.ReplayParser.csproj | 6 ++---- MpqTool/MpqTool.csproj | 12 ------------ 12 files changed, 4 insertions(+), 28 deletions(-) rename {MpqTool => Heroes.ReplayParser}/Foole.Mpq/BitStream.cs (100%) rename {MpqTool => Heroes.ReplayParser}/Foole.Mpq/MpqArchive.cs (100%) rename {MpqTool => Heroes.ReplayParser}/Foole.Mpq/MpqEntry.cs (100%) rename {MpqTool => Heroes.ReplayParser}/Foole.Mpq/MpqHuffman.cs (100%) rename {MpqTool => Heroes.ReplayParser}/Foole.Mpq/MpqParserException.cs (100%) rename {MpqTool => Heroes.ReplayParser}/Foole.Mpq/MpqStream.cs (100%) rename {MpqTool => Heroes.ReplayParser}/Foole.Mpq/MpqWavCompression.cs (100%) rename {MpqTool => Heroes.ReplayParser}/Foole.Mpq/PKLibDecompress.cs (100%) rename {MpqTool => Heroes.ReplayParser/Foole.Mpq}/README.txt (100%) delete mode 100644 MpqTool/MpqTool.csproj diff --git a/Heroes.ReplayParser.ConsoleApplication/ConsoleApplication.sln b/Heroes.ReplayParser.ConsoleApplication/ConsoleApplication.sln index 4587ed9..5bade33 100644 --- a/Heroes.ReplayParser.ConsoleApplication/ConsoleApplication.sln +++ b/Heroes.ReplayParser.ConsoleApplication/ConsoleApplication.sln @@ -1,14 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26730.16 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29521.150 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApplication", "ConsoleApplication.csproj", "{861DB181-6C12-48CB-AA2A-19B374ECA319}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Heroes.ReplayParser", "..\Heroes.ReplayParser\Heroes.ReplayParser.csproj", "{AAF78D53-A1DA-424A-B1AA-09895EAB3B2B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MpqTool", "..\MpqTool\MpqTool.csproj", "{FA50E172-836B-47BB-8745-60595E4FB12A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -31,14 +29,6 @@ Global {AAF78D53-A1DA-424A-B1AA-09895EAB3B2B}.Release|Any CPU.Build.0 = Release|Any CPU {AAF78D53-A1DA-424A-B1AA-09895EAB3B2B}.Release|x86.ActiveCfg = Release|Any CPU {AAF78D53-A1DA-424A-B1AA-09895EAB3B2B}.Release|x86.Build.0 = Release|Any CPU - {FA50E172-836B-47BB-8745-60595E4FB12A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA50E172-836B-47BB-8745-60595E4FB12A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA50E172-836B-47BB-8745-60595E4FB12A}.Debug|x86.ActiveCfg = Debug|Any CPU - {FA50E172-836B-47BB-8745-60595E4FB12A}.Debug|x86.Build.0 = Debug|Any CPU - {FA50E172-836B-47BB-8745-60595E4FB12A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA50E172-836B-47BB-8745-60595E4FB12A}.Release|Any CPU.Build.0 = Release|Any CPU - {FA50E172-836B-47BB-8745-60595E4FB12A}.Release|x86.ActiveCfg = Release|Any CPU - {FA50E172-836B-47BB-8745-60595E4FB12A}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MpqTool/Foole.Mpq/BitStream.cs b/Heroes.ReplayParser/Foole.Mpq/BitStream.cs similarity index 100% rename from MpqTool/Foole.Mpq/BitStream.cs rename to Heroes.ReplayParser/Foole.Mpq/BitStream.cs diff --git a/MpqTool/Foole.Mpq/MpqArchive.cs b/Heroes.ReplayParser/Foole.Mpq/MpqArchive.cs similarity index 100% rename from MpqTool/Foole.Mpq/MpqArchive.cs rename to Heroes.ReplayParser/Foole.Mpq/MpqArchive.cs diff --git a/MpqTool/Foole.Mpq/MpqEntry.cs b/Heroes.ReplayParser/Foole.Mpq/MpqEntry.cs similarity index 100% rename from MpqTool/Foole.Mpq/MpqEntry.cs rename to Heroes.ReplayParser/Foole.Mpq/MpqEntry.cs diff --git a/MpqTool/Foole.Mpq/MpqHuffman.cs b/Heroes.ReplayParser/Foole.Mpq/MpqHuffman.cs similarity index 100% rename from MpqTool/Foole.Mpq/MpqHuffman.cs rename to Heroes.ReplayParser/Foole.Mpq/MpqHuffman.cs diff --git a/MpqTool/Foole.Mpq/MpqParserException.cs b/Heroes.ReplayParser/Foole.Mpq/MpqParserException.cs similarity index 100% rename from MpqTool/Foole.Mpq/MpqParserException.cs rename to Heroes.ReplayParser/Foole.Mpq/MpqParserException.cs diff --git a/MpqTool/Foole.Mpq/MpqStream.cs b/Heroes.ReplayParser/Foole.Mpq/MpqStream.cs similarity index 100% rename from MpqTool/Foole.Mpq/MpqStream.cs rename to Heroes.ReplayParser/Foole.Mpq/MpqStream.cs diff --git a/MpqTool/Foole.Mpq/MpqWavCompression.cs b/Heroes.ReplayParser/Foole.Mpq/MpqWavCompression.cs similarity index 100% rename from MpqTool/Foole.Mpq/MpqWavCompression.cs rename to Heroes.ReplayParser/Foole.Mpq/MpqWavCompression.cs diff --git a/MpqTool/Foole.Mpq/PKLibDecompress.cs b/Heroes.ReplayParser/Foole.Mpq/PKLibDecompress.cs similarity index 100% rename from MpqTool/Foole.Mpq/PKLibDecompress.cs rename to Heroes.ReplayParser/Foole.Mpq/PKLibDecompress.cs diff --git a/MpqTool/README.txt b/Heroes.ReplayParser/Foole.Mpq/README.txt similarity index 100% rename from MpqTool/README.txt rename to Heroes.ReplayParser/Foole.Mpq/README.txt diff --git a/Heroes.ReplayParser/Heroes.ReplayParser.csproj b/Heroes.ReplayParser/Heroes.ReplayParser.csproj index d5b2923..6aaa799 100644 --- a/Heroes.ReplayParser/Heroes.ReplayParser.csproj +++ b/Heroes.ReplayParser/Heroes.ReplayParser.csproj @@ -2,6 +2,7 @@ netstandard2.0 + WITH_SHARPCOMPRESS Heroes.ReplayParser Ben Barrett barrett777 @@ -14,10 +15,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + \ No newline at end of file diff --git a/MpqTool/MpqTool.csproj b/MpqTool/MpqTool.csproj deleted file mode 100644 index b5f1219..0000000 --- a/MpqTool/MpqTool.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netstandard2.0 - WITH_SHARPCOMPRESS - - - - - - -