diff --git a/.vscode/settings.json b/.vscode/settings.json index c2f1d208..14c0824e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "dotnet.defaultSolution": "BurnOutSharp.sln" + "dotnet.defaultSolution": "BinaryObjectScanner.sln" } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 06b8718d..1ec3ff7e 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,7 +7,7 @@ "type": "process", "args": [ "build", - "${workspaceFolder}/BurnOutSharp.sln", + "${workspaceFolder}/BinaryObjectScanner.sln", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], @@ -19,7 +19,7 @@ "type": "process", "args": [ "publish", - "${workspaceFolder}/BurnOutSharp.sln", + "${workspaceFolder}/BinaryObjectScanner.sln", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], @@ -32,7 +32,7 @@ "args": [ "watch", "run", - "${workspaceFolder}/BurnOutSharp.sln", + "${workspaceFolder}/BinaryObjectScanner.sln", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], diff --git a/BurnOutSharp.sln b/BinaryObjectScanner.sln similarity index 74% rename from BurnOutSharp.sln rename to BinaryObjectScanner.sln index 258321e8..13ffaf70 100644 --- a/BurnOutSharp.sln +++ b/BinaryObjectScanner.sln @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.1.32407.343 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BurnOutSharp", "BurnOutSharp\BurnOutSharp.csproj", "{1DA4212E-6071-4951-B45D-BB74A7838246}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "Test\Test.csproj", "{88735BA2-778D-4192-8EB2-FFF6843719E2}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{68D10531-99CB-40B1-8912-73FA286C9433}" @@ -22,10 +20,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1DA4212E-6071-4951-B45D-BB74A7838246}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DA4212E-6071-4951-B45D-BB74A7838246}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DA4212E-6071-4951-B45D-BB74A7838246}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DA4212E-6071-4951-B45D-BB74A7838246}.Release|Any CPU.Build.0 = Release|Any CPU {88735BA2-778D-4192-8EB2-FFF6843719E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {88735BA2-778D-4192-8EB2-FFF6843719E2}.Debug|Any CPU.Build.0 = Debug|Any CPU {88735BA2-778D-4192-8EB2-FFF6843719E2}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/BinaryObjectScanner/BinaryObjectScanner.csproj b/BinaryObjectScanner/BinaryObjectScanner.csproj index a20e2851..8689b18c 100644 --- a/BinaryObjectScanner/BinaryObjectScanner.csproj +++ b/BinaryObjectScanner/BinaryObjectScanner.csproj @@ -9,14 +9,13 @@ Matt Nadareski - BinaryObjectScanner + Protection scanning library Copyright (c)2018-2023 Matt Nadareski https://github.com/SabreTools/ https://github.com/mnadareski/BurnOutSharp git + protection copy-protection scanning packer MIT - true - true @@ -33,6 +32,15 @@ + + + + Always + Always + true + + + @@ -41,6 +49,7 @@ + diff --git a/BurnOutSharp/CascLib.dll b/BinaryObjectScanner/CascLib.dll similarity index 100% rename from BurnOutSharp/CascLib.dll rename to BinaryObjectScanner/CascLib.dll diff --git a/BurnOutSharp/Handler.cs b/BinaryObjectScanner/Handler.cs similarity index 99% rename from BurnOutSharp/Handler.cs rename to BinaryObjectScanner/Handler.cs index 4e9eae91..4a9a81cc 100644 --- a/BurnOutSharp/Handler.cs +++ b/BinaryObjectScanner/Handler.cs @@ -9,7 +9,7 @@ using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Utilities; using static BinaryObjectScanner.Utilities.Dictionary; -namespace BurnOutSharp +namespace BinaryObjectScanner { internal static class Handler { diff --git a/BurnOutSharp/Scanner.cs b/BinaryObjectScanner/Scanner.cs similarity index 99% rename from BurnOutSharp/Scanner.cs rename to BinaryObjectScanner/Scanner.cs index 653f3689..3c2ae147 100644 --- a/BurnOutSharp/Scanner.cs +++ b/BinaryObjectScanner/Scanner.cs @@ -5,14 +5,13 @@ using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; -using BinaryObjectScanner; using BinaryObjectScanner.FileType; using BinaryObjectScanner.Interfaces; using BinaryObjectScanner.Utilities; using SabreTools.Serialization.Wrappers; using static BinaryObjectScanner.Utilities.Dictionary; -namespace BurnOutSharp +namespace BinaryObjectScanner { public class Scanner { diff --git a/BurnOutSharp/StormLib.dll b/BinaryObjectScanner/StormLib.dll similarity index 100% rename from BurnOutSharp/StormLib.dll rename to BinaryObjectScanner/StormLib.dll diff --git a/BurnOutSharp/BurnOutSharp.csproj b/BurnOutSharp/BurnOutSharp.csproj deleted file mode 100644 index 2402c73a..00000000 --- a/BurnOutSharp/BurnOutSharp.csproj +++ /dev/null @@ -1,47 +0,0 @@ - - - - - net48;net6.0;net7.0 - win-x86;win-x64;linux-x64;osx-x64 - 2.8 - true - - - Protection scanning library - Matt Nadareski;Gernot Knippen - BurnOutSharp - Copyright (c)2018-2023 Matt Nadareski - https://github.com/SabreTools/ - https://github.com/mnadareski/BurnOutSharp - git - MIT - true - true - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - Always - Always - true - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - diff --git a/Test/Program.cs b/Test/Program.cs index b146d2ac..e16274ec 100644 --- a/Test/Program.cs +++ b/Test/Program.cs @@ -1,7 +1,6 @@ using System; using System.Text; using BinaryObjectScanner; -using BurnOutSharp; namespace Test { @@ -47,10 +46,10 @@ namespace Test // Information printing if (options.EnableInformation) -#if NET6_0_OR_GREATER - Printer.PrintPathInfo(inputPath, options.Json, options.Debug); -#else +#if NET48 Printer.PrintPathInfo(inputPath, false, options.Debug); +#else + Printer.PrintPathInfo(inputPath, options.Json, options.Debug); #endif // Scanning diff --git a/Test/Test.csproj b/Test/Test.csproj index 81cffb9d..516d4b71 100644 --- a/Test/Test.csproj +++ b/Test/Test.csproj @@ -9,7 +9,6 @@ - diff --git a/appveyor.yml b/appveyor.yml index 7106d51b..1cb76143 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,28 +28,28 @@ build_script: - cmd: dotnet publish Test\Test.csproj --framework net7.0 --runtime win-x64 --self-contained true -p:PublishSingleFile=true - cmd: dotnet publish Test\Test.csproj --framework net7.0 --runtime linux-x64 --self-contained true -p:PublishSingleFile=true - cmd: dotnet publish Test\Test.csproj --framework net7.0 --runtime osx-x64 --self-contained true -p:PublishSingleFile=true - - cmd: dotnet pack BurnOutSharp\BurnOutSharp.csproj --output %APPVEYOR_BUILD_FOLDER% + - cmd: dotnet pack BinaryObjectScanner\BinaryObjectScanner.csproj --output %APPVEYOR_BUILD_FOLDER% # post-build script after_build: - cmd: cd %APPVEYOR_BUILD_FOLDER%\Test\bin\Debug\net48 - - cmd: 7z a -tzip %APPVEYOR_BUILD_FOLDER%\BurnOutSharp-%APPVEYOR_REPO_COMMIT%_net48.zip * + - cmd: 7z a -tzip %APPVEYOR_BUILD_FOLDER%\BinaryObjectScanner-%APPVEYOR_REPO_COMMIT%_net48.zip * - cmd: cd %APPVEYOR_BUILD_FOLDER%\Test\bin\Debug\net6.0\win-x86\publish\ - - cmd: 7z a -tzip %APPVEYOR_BUILD_FOLDER%\BurnOutSharp-%APPVEYOR_REPO_COMMIT%_net6.0_win-x86.zip * + - cmd: 7z a -tzip %APPVEYOR_BUILD_FOLDER%\BinaryObjectScanner-%APPVEYOR_REPO_COMMIT%_net6.0_win-x86.zip * - cmd: cd %APPVEYOR_BUILD_FOLDER%\Test\bin\Debug\net6.0\win-x64\publish\ - - cmd: 7z a -tzip %APPVEYOR_BUILD_FOLDER%\BurnOutSharp-%APPVEYOR_REPO_COMMIT%_net6.0_win-x64.zip * + - cmd: 7z a -tzip %APPVEYOR_BUILD_FOLDER%\BinaryObjectScanner-%APPVEYOR_REPO_COMMIT%_net6.0_win-x64.zip * - cmd: cd %APPVEYOR_BUILD_FOLDER%\Test\bin\Debug\net6.0\linux-x64\publish\ - - cmd: 7z a -tzip %APPVEYOR_BUILD_FOLDER%\BurnOutSharp-%APPVEYOR_REPO_COMMIT%_net6.0_linux-x64.zip * + - cmd: 7z a -tzip %APPVEYOR_BUILD_FOLDER%\BinaryObjectScanner-%APPVEYOR_REPO_COMMIT%_net6.0_linux-x64.zip * - cmd: cd %APPVEYOR_BUILD_FOLDER%\Test\bin\Debug\net6.0\osx-x64\publish\ - - cmd: 7z a -tzip %APPVEYOR_BUILD_FOLDER%\BurnOutSharp-%APPVEYOR_REPO_COMMIT%_net6.0_osx-x64.zip * + - cmd: 7z a -tzip %APPVEYOR_BUILD_FOLDER%\BinaryObjectScanner-%APPVEYOR_REPO_COMMIT%_net6.0_osx-x64.zip * - cmd: cd %APPVEYOR_BUILD_FOLDER%\Test\bin\Debug\net7.0\win-x86\publish\ - - cmd: 7z a -tzip %APPVEYOR_BUILD_FOLDER%\BurnOutSharp-%APPVEYOR_REPO_COMMIT%_net7.0_win-x86.zip * + - cmd: 7z a -tzip %APPVEYOR_BUILD_FOLDER%\BinaryObjectScanner-%APPVEYOR_REPO_COMMIT%_net7.0_win-x86.zip * - cmd: cd %APPVEYOR_BUILD_FOLDER%\Test\bin\Debug\net7.0\win-x64\publish\ - - cmd: 7z a -tzip %APPVEYOR_BUILD_FOLDER%\BurnOutSharp-%APPVEYOR_REPO_COMMIT%_net7.0_win-x64.zip * + - cmd: 7z a -tzip %APPVEYOR_BUILD_FOLDER%\BinaryObjectScanner-%APPVEYOR_REPO_COMMIT%_net7.0_win-x64.zip * - cmd: cd %APPVEYOR_BUILD_FOLDER%\Test\bin\Debug\net7.0\linux-x64\publish\ - - cmd: 7z a -tzip %APPVEYOR_BUILD_FOLDER%\BurnOutSharp-%APPVEYOR_REPO_COMMIT%_net7.0_linux-x64.zip * + - cmd: 7z a -tzip %APPVEYOR_BUILD_FOLDER%\BinaryObjectScanner-%APPVEYOR_REPO_COMMIT%_net7.0_linux-x64.zip * - cmd: cd %APPVEYOR_BUILD_FOLDER%\Test\bin\Debug\net7.0\osx-x64\publish\ - - cmd: 7z a -tzip %APPVEYOR_BUILD_FOLDER%\BurnOutSharp-%APPVEYOR_REPO_COMMIT%_net7.0_osx-x64.zip * + - cmd: 7z a -tzip %APPVEYOR_BUILD_FOLDER%\BinaryObjectScanner-%APPVEYOR_REPO_COMMIT%_net7.0_osx-x64.zip * # success/failure tracking on_success: @@ -61,23 +61,23 @@ on_failure: # artifact linking artifacts: -- path: BurnOutSharp-%APPVEYOR_REPO_COMMIT%_net48.zip - name: BurnOutSharp (.NET Framework 4.8) -- path: BurnOutSharp-%APPVEYOR_REPO_COMMIT%_net6.0_win-x86.zip - name: BurnOutSharp (.NET 6.0, Windows x86) -- path: BurnOutSharp-%APPVEYOR_REPO_COMMIT%_net6.0_win-x64.zip - name: BurnOutSharp (.NET 6.0, Windows x64) -- path: BurnOutSharp-%APPVEYOR_REPO_COMMIT%_net6.0_linux-x64.zip - name: BurnOutSharp (.NET 6.0, Linux x64) -- path: BurnOutSharp-%APPVEYOR_REPO_COMMIT%_net6.0_osx-x64.zip - name: BurnOutSharp (.NET 6.0, OSX x64) -- path: BurnOutSharp-%APPVEYOR_REPO_COMMIT%_net7.0_win-x86.zip - name: BurnOutSharp (.NET 7.0, Windows x86) -- path: BurnOutSharp-%APPVEYOR_REPO_COMMIT%_net7.0_win-x64.zip - name: BurnOutSharp (.NET 7.0, Windows x64) -- path: BurnOutSharp-%APPVEYOR_REPO_COMMIT%_net7.0_linux-x64.zip - name: BurnOutSharp (.NET 7.0, Linux x64) -- path: BurnOutSharp-%APPVEYOR_REPO_COMMIT%_net7.0_osx-x64.zip - name: BurnOutSharp (.NET 7.0, OSX x64) +- path: BinaryObjectScanner-%APPVEYOR_REPO_COMMIT%_net48.zip + name: BinaryObjectScanner (.NET Framework 4.8) +- path: BinaryObjectScanner-%APPVEYOR_REPO_COMMIT%_net6.0_win-x86.zip + name: BinaryObjectScanner (.NET 6.0, Windows x86) +- path: BinaryObjectScanner-%APPVEYOR_REPO_COMMIT%_net6.0_win-x64.zip + name: BinaryObjectScanner (.NET 6.0, Windows x64) +- path: BinaryObjectScanner-%APPVEYOR_REPO_COMMIT%_net6.0_linux-x64.zip + name: BinaryObjectScanner (.NET 6.0, Linux x64) +- path: BinaryObjectScanner-%APPVEYOR_REPO_COMMIT%_net6.0_osx-x64.zip + name: BinaryObjectScanner (.NET 6.0, OSX x64) +- path: BinaryObjectScanner-%APPVEYOR_REPO_COMMIT%_net7.0_win-x86.zip + name: BinaryObjectScanner (.NET 7.0, Windows x86) +- path: BinaryObjectScanner-%APPVEYOR_REPO_COMMIT%_net7.0_win-x64.zip + name: BinaryObjectScanner (.NET 7.0, Windows x64) +- path: BinaryObjectScanner-%APPVEYOR_REPO_COMMIT%_net7.0_linux-x64.zip + name: BinaryObjectScanner (.NET 7.0, Linux x64) +- path: BinaryObjectScanner-%APPVEYOR_REPO_COMMIT%_net7.0_osx-x64.zip + name: BinaryObjectScanner (.NET 7.0, OSX x64) - path: '*.nupkg' name: Nuget Packages