Make the leap to BinaryObjectScanner

This commit is contained in:
Matt Nadareski
2023-09-18 13:56:07 -04:00
parent 2085c306ab
commit a54b89d380
12 changed files with 49 additions and 96 deletions

View File

@@ -1,3 +1,3 @@
{
"dotnet.defaultSolution": "BurnOutSharp.sln"
"dotnet.defaultSolution": "BinaryObjectScanner.sln"
}

6
.vscode/tasks.json vendored
View File

@@ -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"
],

View File

@@ -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

View File

@@ -9,14 +9,13 @@
<!-- Package Properties -->
<Authors>Matt Nadareski</Authors>
<Product>BinaryObjectScanner</Product>
<Description>Protection scanning library</Description>
<Copyright>Copyright (c)2018-2023 Matt Nadareski</Copyright>
<PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
<RepositoryUrl>https://github.com/mnadareski/BurnOutSharp</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>protection copy-protection scanning packer</PackageTags>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<IncludeSource>true</IncludeSource>
<IncludeSymbols>true</IncludeSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'!='net48'">
@@ -33,6 +32,15 @@
</DefaultItemExcludes>
</PropertyGroup>
<!-- These are needed for dealing with native Windows DLLs -->
<ItemGroup>
<None Include="*.dll" Pack="true" Condition="'$(TargetFramework)' == 'net48'">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
<PackageCopyToOutput>true</PackageCopyToOutput>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="OpenMcdf" Version="2.2.1.12" />
<PackageReference Include="SabreTools.Compression" Version="0.1.0" />
@@ -41,6 +49,7 @@
<PackageReference Include="SabreTools.Serialization" Version="1.1.5" />
<PackageReference Include="SharpCompress" Version="0.32.2" />
<PackageReference Include="SharpZipLib" Version="1.4.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
<PackageReference Include="UnshieldSharp" Version="1.6.9" />
<PackageReference Include="WiseUnpacker" Version="1.0.4" />
</ItemGroup>

View File

@@ -9,7 +9,7 @@ using BinaryObjectScanner.Interfaces;
using BinaryObjectScanner.Utilities;
using static BinaryObjectScanner.Utilities.Dictionary;
namespace BurnOutSharp
namespace BinaryObjectScanner
{
internal static class Handler
{

View File

@@ -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
{

View File

@@ -1,47 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Assembly Properties -->
<TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
<RuntimeIdentifiers>win-x86;win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
<Version>2.8</Version>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!-- Package Properties -->
<Description>Protection scanning library</Description>
<Authors>Matt Nadareski;Gernot Knippen</Authors>
<Product>BurnOutSharp</Product>
<Copyright>Copyright (c)2018-2023 Matt Nadareski</Copyright>
<PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
<RepositoryUrl>https://github.com/mnadareski/BurnOutSharp</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<IncludeSource>true</IncludeSource>
<IncludeSymbols>true</IncludeSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="SabreTools.Serialization" Version="1.1.5" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
<PackageReference Include="Teronis.MSBuild.Packaging.ProjectBuildInPackage" Version="1.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<None Include="*.dll" Pack="true" Condition="'$(TargetFramework)' == 'net48'">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
<PackageCopyToOutput>true</PackageCopyToOutput>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BinaryObjectScanner\BinaryObjectScanner.csproj">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</ProjectReference>
</ItemGroup>
</Project>

View File

@@ -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

View File

@@ -9,7 +9,6 @@
<ItemGroup>
<ProjectReference Include="..\BinaryObjectScanner\BinaryObjectScanner.csproj" />
<ProjectReference Include="..\BurnOutSharp\BurnOutSharp.csproj" />
</ItemGroup>
<ItemGroup>

View File

@@ -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