diff --git a/.gitignore b/.gitignore index c4d9393..d4b8f45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,7 @@ -*.swp -*.*~ -project.lock.json -.DS_Store -*.pyc -nupkg/ - -# Visual Studio Code -.vscode - -# Rider -.idea +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore # User-specific files *.suo @@ -17,6 +9,9 @@ nupkg/ *.userosscache *.sln.docstates +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + # Build results [Dd]ebug/ [Dd]ebugPublic/ @@ -24,15 +19,280 @@ nupkg/ [Rr]eleases/ x64/ x86/ -build/ bld/ [Bb]in/ [Oo]bj/ -[Oo]ut/ -msbuild.log -msbuild.err -msbuild.wrn +[Ll]og/ -# Visual Studio 2015 +# Visual Studio 2015 cache/options directory .vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ +**/Properties/launchSettings.json + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Typescript v1 declaration files +typings/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..1f3bfeb --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,15 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/psxt001z.sln", + ], + "problemMatcher": "$msCompile" + }, + ] +} \ No newline at end of file diff --git a/psxt001z.Library/Common.cs b/psxt001z.Library/Common.cs index cf5adc4..c106e74 100644 --- a/psxt001z.Library/Common.cs +++ b/psxt001z.Library/Common.cs @@ -19,12 +19,6 @@ namespace psxt001z /// public static byte IntegerToBinary(byte i) => (byte)(i / 10 * 16 + i % 10); - /// - /// Get a santized hex string from an input byte array - /// - public static string GetHexString(byte[] bytes) => - BitConverter.ToString(bytes).Replace("-", string.Empty); - /// /// Get a santized hex string from an input byte array /// diff --git a/psxt001z.Library/psxt001z.Library.csproj b/psxt001z.Library/psxt001z.Library.csproj index 6838f5f..6a2e504 100644 --- a/psxt001z.Library/psxt001z.Library.csproj +++ b/psxt001z.Library/psxt001z.Library.csproj @@ -2,10 +2,13 @@ - net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net9.0 + net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;netstandard2.0;netstandard2.1 + false + false true latest enable + true snupkg true 0.21-rc2 @@ -13,7 +16,7 @@ Kirill Korolyov, Matt Nadareski C# port of psxt001z as a library - Copyright (c)2013 Dremora, Copyright (c)2018-2024 Matt Nadareski + Copyright (c)2013 Dremora, Copyright (c)2018-2025 Matt Nadareski https://github.com/SabreTools/ README.md https://github.com/SabreTools/psxt001z @@ -26,13 +29,9 @@ - - - - - - + + \ No newline at end of file diff --git a/psxt001z/Program.cs b/psxt001z/Program.cs index 506b860..d967ff4 100644 --- a/psxt001z/Program.cs +++ b/psxt001z/Program.cs @@ -2,6 +2,7 @@ using System.IO; using System.Linq; using System.Security.Cryptography; +using SabreTools.IO.Extensions; using static psxt001z.LibCrypt; namespace psxt001z @@ -505,8 +506,8 @@ namespace psxt001z sha1.TransformFinalBlock(Message_Digest, 0, Message_Digest.Length); Console.WriteLine($"\rCRC-32: {crc.Hash:8x} \n"); - Console.WriteLine($"MD5: {GetHexString(md5.Hash!)}"); - Console.WriteLine($"SHA-1: {GetHexString(sha1.Hash!)}"); + Console.WriteLine($"MD5: {md5.Hash.ToHexString()}"); + Console.WriteLine($"SHA-1: {sha1.Hash.ToHexString()}"); Console.WriteLine(); return 1; } diff --git a/psxt001z/psxt001z.csproj b/psxt001z/psxt001z.csproj index c867967..c354ed1 100644 --- a/psxt001z/psxt001z.csproj +++ b/psxt001z/psxt001z.csproj @@ -1,4 +1,4 @@ - + @@ -7,6 +7,7 @@ latest enable false + true true 0.21-rc2 @@ -37,9 +38,9 @@ - - - + + + \ No newline at end of file