diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 3c75ff14..464a8905 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -9,17 +9,17 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 0 - name: Setup .NET - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: dotnet-version: | - 6.0.x 8.0.x 9.0.x + 10.0.x - name: Run tests run: dotnet test @@ -36,7 +36,7 @@ jobs: git push origin rolling --force - name: Upload to rolling - uses: ncipollo/release-action@v1.14.0 + uses: ncipollo/release-action@v1.20.0 with: allowUpdates: True artifacts: "*.nupkg,*.snupkg,*.zip" diff --git a/.github/workflows/check_pr.yml b/.github/workflows/check_pr.yml index c9e23ecd..cc84d184 100644 --- a/.github/workflows/check_pr.yml +++ b/.github/workflows/check_pr.yml @@ -6,15 +6,15 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Setup .NET - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: dotnet-version: | - 6.0.x 8.0.x 9.0.x + 10.0.x - name: Build run: dotnet build diff --git a/.vscode/launch.json b/.vscode/launch.json index d9c5e544..5e917fdf 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,7 +10,7 @@ "request": "launch", "preLaunchTask": "build", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/ExtractionTool/bin/Debug/net9.0/ExtractionTool.dll", + "program": "${workspaceFolder}/ExtractionTool/bin/Debug/net10.0/ExtractionTool.dll", "args": [], "cwd": "${workspaceFolder}", // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console @@ -24,7 +24,7 @@ "request": "launch", "preLaunchTask": "build", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/InfoPrint/bin/Debug/net9.0/InfoPrint.dll", + "program": "${workspaceFolder}/InfoPrint/bin/Debug/net10.0/InfoPrint.dll", "args": [], "cwd": "${workspaceFolder}", // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console diff --git a/ExtractionTool/ExtractionTool.csproj b/ExtractionTool/ExtractionTool.csproj index 51296e00..8d95bc90 100644 --- a/ExtractionTool/ExtractionTool.csproj +++ b/ExtractionTool/ExtractionTool.csproj @@ -1,7 +1,7 @@ - net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0 + net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0 Exe false true @@ -20,11 +20,11 @@ win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64 - + win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64 - net6.0;net7.0;net8.0;net9.0 + net6.0;net7.0;net8.0;net9.0;net10.0 @@ -48,9 +48,9 @@ - - - + + + \ No newline at end of file diff --git a/ExtractionTool/Features/MainFeature.cs b/ExtractionTool/Features/MainFeature.cs index 0694eebb..e6213f9b 100644 --- a/ExtractionTool/Features/MainFeature.cs +++ b/ExtractionTool/Features/MainFeature.cs @@ -294,7 +294,7 @@ namespace ExtractionTool.Features case XZP xzp: xzp.Extract(OutputPath, Debug); break; - + // ZSTD case ZSTD zstd: zstd.Extract(OutputPath, Debug); diff --git a/InfoPrint/InfoPrint.csproj b/InfoPrint/InfoPrint.csproj index 4190f7db..90a67a59 100644 --- a/InfoPrint/InfoPrint.csproj +++ b/InfoPrint/InfoPrint.csproj @@ -1,7 +1,7 @@ - net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0 + net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0 Exe false true @@ -20,11 +20,11 @@ win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64 - + win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64 - net6.0;net7.0;net8.0;net9.0 + net6.0;net7.0;net8.0;net9.0;net10.0 @@ -32,9 +32,9 @@ - - - + + + \ No newline at end of file diff --git a/SabreTools.Serialization.Test/CrossModel/ArchiveDotOrgTests.cs b/SabreTools.Serialization.Test/CrossModel/ArchiveDotOrgTests.cs index a3fe4eae..da749544 100644 --- a/SabreTools.Serialization.Test/CrossModel/ArchiveDotOrgTests.cs +++ b/SabreTools.Serialization.Test/CrossModel/ArchiveDotOrgTests.cs @@ -171,4 +171,4 @@ namespace SabreTools.Serialization.Test.CrossModel Assert.Equal("XXXXXX", file.Width); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/CrossModel/AttractModeTests.cs b/SabreTools.Serialization.Test/CrossModel/AttractModeTests.cs index 1254aca2..5a4abd76 100644 --- a/SabreTools.Serialization.Test/CrossModel/AttractModeTests.cs +++ b/SabreTools.Serialization.Test/CrossModel/AttractModeTests.cs @@ -109,4 +109,4 @@ namespace SabreTools.Serialization.Test.CrossModel Assert.Equal("XXXXXX", row.FileIsAvailable); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/CrossModel/ClrMameProTests.cs b/SabreTools.Serialization.Test/CrossModel/ClrMameProTests.cs index d01dac97..eeca3343 100644 --- a/SabreTools.Serialization.Test/CrossModel/ClrMameProTests.cs +++ b/SabreTools.Serialization.Test/CrossModel/ClrMameProTests.cs @@ -498,4 +498,4 @@ namespace SabreTools.Serialization.Test.CrossModel Assert.Equal("XXXXXX", driver.Blit); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/CrossModel/DosCenterTests.cs b/SabreTools.Serialization.Test/CrossModel/DosCenterTests.cs index 85210485..2361883f 100644 --- a/SabreTools.Serialization.Test/CrossModel/DosCenterTests.cs +++ b/SabreTools.Serialization.Test/CrossModel/DosCenterTests.cs @@ -108,4 +108,4 @@ namespace SabreTools.Serialization.Test.CrossModel Assert.Equal("XXXXXX", rom.Date); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/CrossModel/EverdriveSMDBTests.cs b/SabreTools.Serialization.Test/CrossModel/EverdriveSMDBTests.cs index c8a1b260..bdfbb0f6 100644 --- a/SabreTools.Serialization.Test/CrossModel/EverdriveSMDBTests.cs +++ b/SabreTools.Serialization.Test/CrossModel/EverdriveSMDBTests.cs @@ -63,4 +63,4 @@ namespace SabreTools.Serialization.Test.CrossModel Assert.Equal("XXXXXX", row.Size); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/CrossModel/HashfileTests.cs b/SabreTools.Serialization.Test/CrossModel/HashfileTests.cs index f2d8644b..e5a8d532 100644 --- a/SabreTools.Serialization.Test/CrossModel/HashfileTests.cs +++ b/SabreTools.Serialization.Test/CrossModel/HashfileTests.cs @@ -1,6 +1,6 @@ -using SabreTools.Serialization.CrossModel; using System; using SabreTools.Hashing; +using SabreTools.Serialization.CrossModel; using Xunit; namespace SabreTools.Serialization.Test.CrossModel @@ -324,4 +324,4 @@ namespace SabreTools.Serialization.Test.CrossModel Assert.Equal("XXXXXX", spamsum.File); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/CrossModel/ListromTests.cs b/SabreTools.Serialization.Test/CrossModel/ListromTests.cs index dfee332f..57b51c6c 100644 --- a/SabreTools.Serialization.Test/CrossModel/ListromTests.cs +++ b/SabreTools.Serialization.Test/CrossModel/ListromTests.cs @@ -125,4 +125,4 @@ namespace SabreTools.Serialization.Test.CrossModel Assert.True(row.NoGoodDumpKnown); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/CrossModel/ListxmlTests.cs b/SabreTools.Serialization.Test/CrossModel/ListxmlTests.cs index 67f9be09..08a9b281 100644 --- a/SabreTools.Serialization.Test/CrossModel/ListxmlTests.cs +++ b/SabreTools.Serialization.Test/CrossModel/ListxmlTests.cs @@ -876,4 +876,4 @@ namespace SabreTools.Serialization.Test.CrossModel Assert.Equal("XXXXXX", ramoption.Content); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/CrossModel/LogiqxTests.cs b/SabreTools.Serialization.Test/CrossModel/LogiqxTests.cs index 22f01495..22b35e17 100644 --- a/SabreTools.Serialization.Test/CrossModel/LogiqxTests.cs +++ b/SabreTools.Serialization.Test/CrossModel/LogiqxTests.cs @@ -568,4 +568,4 @@ namespace SabreTools.Serialization.Test.CrossModel Assert.Equal("XXXXXX", softwarelist.Filter); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/CrossModel/M1Tests.cs b/SabreTools.Serialization.Test/CrossModel/M1Tests.cs index 8cdd4a87..b8513ace 100644 --- a/SabreTools.Serialization.Test/CrossModel/M1Tests.cs +++ b/SabreTools.Serialization.Test/CrossModel/M1Tests.cs @@ -870,4 +870,4 @@ namespace SabreTools.Serialization.Test.CrossModel Assert.Equal("XXXXXX", ramoption.Content); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/CrossModel/MessTests.cs b/SabreTools.Serialization.Test/CrossModel/MessTests.cs index 7a1878d9..00cf5052 100644 --- a/SabreTools.Serialization.Test/CrossModel/MessTests.cs +++ b/SabreTools.Serialization.Test/CrossModel/MessTests.cs @@ -870,4 +870,4 @@ namespace SabreTools.Serialization.Test.CrossModel Assert.Equal("XXXXXX", ramoption.Content); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/CrossModel/OfflineListTests.cs b/SabreTools.Serialization.Test/CrossModel/OfflineListTests.cs index c16db2eb..cb3d05d0 100644 --- a/SabreTools.Serialization.Test/CrossModel/OfflineListTests.cs +++ b/SabreTools.Serialization.Test/CrossModel/OfflineListTests.cs @@ -448,4 +448,4 @@ namespace SabreTools.Serialization.Test.CrossModel Assert.Equal("XXXXXX", image.Height); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/CrossModel/OpenMSXTests.cs b/SabreTools.Serialization.Test/CrossModel/OpenMSXTests.cs index 35384fcd..88fc4b4f 100644 --- a/SabreTools.Serialization.Test/CrossModel/OpenMSXTests.cs +++ b/SabreTools.Serialization.Test/CrossModel/OpenMSXTests.cs @@ -82,7 +82,7 @@ namespace SabreTools.Serialization.Test.CrossModel Original = original, Rom = sccpluscart, }; - + var software = new Data.Models.OpenMSX.Software { Title = "XXXXXX", @@ -154,4 +154,4 @@ namespace SabreTools.Serialization.Test.CrossModel Assert.Equal("XXXXXX", rombase.Remark); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/CrossModel/RomCenterTests.cs b/SabreTools.Serialization.Test/CrossModel/RomCenterTests.cs index c71d821a..00f615b3 100644 --- a/SabreTools.Serialization.Test/CrossModel/RomCenterTests.cs +++ b/SabreTools.Serialization.Test/CrossModel/RomCenterTests.cs @@ -151,4 +151,4 @@ namespace SabreTools.Serialization.Test.CrossModel Assert.Equal("XXXXXX", rom.MergeName); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/CrossModel/SeparatedValueTests.cs b/SabreTools.Serialization.Test/CrossModel/SeparatedValueTests.cs index b96270b9..107fc33f 100644 --- a/SabreTools.Serialization.Test/CrossModel/SeparatedValueTests.cs +++ b/SabreTools.Serialization.Test/CrossModel/SeparatedValueTests.cs @@ -180,4 +180,4 @@ namespace SabreTools.Serialization.Test.CrossModel Assert.Equal("XXXXXX", row.Status); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/CrossModel/SoftwareListTests.cs b/SabreTools.Serialization.Test/CrossModel/SoftwareListTests.cs index e30fe2bc..02746548 100644 --- a/SabreTools.Serialization.Test/CrossModel/SoftwareListTests.cs +++ b/SabreTools.Serialization.Test/CrossModel/SoftwareListTests.cs @@ -308,4 +308,4 @@ namespace SabreTools.Serialization.Test.CrossModel Assert.Equal("XXXXXX", dipvalue.Default); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Extensions/TypeLengthValueTests.cs b/SabreTools.Serialization.Test/Extensions/TypeLengthValueTests.cs index 8f3936b2..01683a6d 100644 --- a/SabreTools.Serialization.Test/Extensions/TypeLengthValueTests.cs +++ b/SabreTools.Serialization.Test/Extensions/TypeLengthValueTests.cs @@ -210,4 +210,4 @@ namespace SabreTools.Serialization.Test.Extensions #endregion } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/ObjectIdentifier/ParserTests.cs b/SabreTools.Serialization.Test/ObjectIdentifier/ParserTests.cs index 676cff23..ce4beb70 100644 --- a/SabreTools.Serialization.Test/ObjectIdentifier/ParserTests.cs +++ b/SabreTools.Serialization.Test/ObjectIdentifier/ParserTests.cs @@ -15,7 +15,7 @@ namespace SabreTools.Serialization.Test.ObjectIdentifier public void ASN1Notation_AlwaysNull() { ulong[]? values = null; - string? actual = Parser.ParseOIDToASN1Notation(values); + string? actual = Parser.ParseOIDToASN1Notation(values); Assert.Null(actual); } @@ -27,7 +27,7 @@ namespace SabreTools.Serialization.Test.ObjectIdentifier public void DotNotation_NullValues_Null() { ulong[]? values = null; - string? actual = Parser.ParseOIDToDotNotation(values); + string? actual = Parser.ParseOIDToDotNotation(values); Assert.Null(actual); } @@ -35,7 +35,7 @@ namespace SabreTools.Serialization.Test.ObjectIdentifier public void DotNotation_EmptyValues_Null() { ulong[]? values = []; - string? actual = Parser.ParseOIDToDotNotation(values); + string? actual = Parser.ParseOIDToDotNotation(values); Assert.Null(actual); } @@ -44,7 +44,7 @@ namespace SabreTools.Serialization.Test.ObjectIdentifier { string expected = "0.1.2.3"; ulong[]? values = [0, 1, 2, 3]; - string? actual = Parser.ParseOIDToDotNotation(values); + string? actual = Parser.ParseOIDToDotNotation(values); Assert.Equal(expected, actual); } @@ -56,7 +56,7 @@ namespace SabreTools.Serialization.Test.ObjectIdentifier public void ModifiedOIDIRI_NullValues_Null() { ulong[]? values = null; - string? actual = Parser.ParseOIDToModifiedOIDIRI(values); + string? actual = Parser.ParseOIDToModifiedOIDIRI(values); Assert.Null(actual); } @@ -64,7 +64,7 @@ namespace SabreTools.Serialization.Test.ObjectIdentifier public void ModifiedOIDIRI_EmptyValues_Null() { ulong[]? values = []; - string? actual = Parser.ParseOIDToModifiedOIDIRI(values); + string? actual = Parser.ParseOIDToModifiedOIDIRI(values); Assert.Null(actual); } @@ -73,7 +73,7 @@ namespace SabreTools.Serialization.Test.ObjectIdentifier { string expected = "/ITU-T/[question]/2/3"; ulong[]? values = [0, 1, 2, 3]; - string? actual = Parser.ParseOIDToModifiedOIDIRI(values); + string? actual = Parser.ParseOIDToModifiedOIDIRI(values); Assert.Equal(expected, actual); } @@ -85,7 +85,7 @@ namespace SabreTools.Serialization.Test.ObjectIdentifier public void OIDIRI_NullValues_Null() { ulong[]? values = null; - string? actual = Parser.ParseOIDToOIDIRINotation(values); + string? actual = Parser.ParseOIDToOIDIRINotation(values); Assert.Null(actual); } @@ -93,7 +93,7 @@ namespace SabreTools.Serialization.Test.ObjectIdentifier public void OIDIRI_EmptyValues_Null() { ulong[]? values = []; - string? actual = Parser.ParseOIDToOIDIRINotation(values); + string? actual = Parser.ParseOIDToOIDIRINotation(values); Assert.Null(actual); } @@ -102,10 +102,10 @@ namespace SabreTools.Serialization.Test.ObjectIdentifier { string expected = "/ITU-T/1/2/3"; ulong[]? values = [0, 1, 2, 3]; - string? actual = Parser.ParseOIDToOIDIRINotation(values); + string? actual = Parser.ParseOIDToOIDIRINotation(values); Assert.Equal(expected, actual); } #endregion } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/AACSTests.cs b/SabreTools.Serialization.Test/Readers/AACSTests.cs index 5698285b..086a1052 100644 --- a/SabreTools.Serialization.Test/Readers/AACSTests.cs +++ b/SabreTools.Serialization.Test/Readers/AACSTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/AbstractSyntaxNotationOneTests.cs b/SabreTools.Serialization.Test/Readers/AbstractSyntaxNotationOneTests.cs index 9b25719b..8735864b 100644 --- a/SabreTools.Serialization.Test/Readers/AbstractSyntaxNotationOneTests.cs +++ b/SabreTools.Serialization.Test/Readers/AbstractSyntaxNotationOneTests.cs @@ -149,4 +149,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/AdvancedInstallerTests.cs b/SabreTools.Serialization.Test/Readers/AdvancedInstallerTests.cs index 7d755eae..7295de83 100644 --- a/SabreTools.Serialization.Test/Readers/AdvancedInstallerTests.cs +++ b/SabreTools.Serialization.Test/Readers/AdvancedInstallerTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/AppPkgHeaderTests.cs b/SabreTools.Serialization.Test/Readers/AppPkgHeaderTests.cs index 968abba8..83464d60 100644 --- a/SabreTools.Serialization.Test/Readers/AppPkgHeaderTests.cs +++ b/SabreTools.Serialization.Test/Readers/AppPkgHeaderTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/ArchiveDotOrgTests.cs b/SabreTools.Serialization.Test/Readers/ArchiveDotOrgTests.cs index 2de2c47f..07b466b3 100644 --- a/SabreTools.Serialization.Test/Readers/ArchiveDotOrgTests.cs +++ b/SabreTools.Serialization.Test/Readers/ArchiveDotOrgTests.cs @@ -237,4 +237,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Equal("XXXXXX", file.Width); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/AttractModeTests.cs b/SabreTools.Serialization.Test/Readers/AttractModeTests.cs index 9a0efe51..894aaa87 100644 --- a/SabreTools.Serialization.Test/Readers/AttractModeTests.cs +++ b/SabreTools.Serialization.Test/Readers/AttractModeTests.cs @@ -214,4 +214,4 @@ namespace SabreTools.Serialization.Test.Readers } } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/BDPlusTests.cs b/SabreTools.Serialization.Test/Readers/BDPlusTests.cs index 9b30360f..a917344b 100644 --- a/SabreTools.Serialization.Test/Readers/BDPlusTests.cs +++ b/SabreTools.Serialization.Test/Readers/BDPlusTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/BFPKTests.cs b/SabreTools.Serialization.Test/Readers/BFPKTests.cs index 8dfac7ae..1d71cf76 100644 --- a/SabreTools.Serialization.Test/Readers/BFPKTests.cs +++ b/SabreTools.Serialization.Test/Readers/BFPKTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/BSPTests.cs b/SabreTools.Serialization.Test/Readers/BSPTests.cs index fba758a3..37a4b2ad 100644 --- a/SabreTools.Serialization.Test/Readers/BSPTests.cs +++ b/SabreTools.Serialization.Test/Readers/BSPTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/CFBTests.cs b/SabreTools.Serialization.Test/Readers/CFBTests.cs index 9aa30a2b..bb51b2ee 100644 --- a/SabreTools.Serialization.Test/Readers/CFBTests.cs +++ b/SabreTools.Serialization.Test/Readers/CFBTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/CHDTests.cs b/SabreTools.Serialization.Test/Readers/CHDTests.cs index cce9885d..9e5882dd 100644 --- a/SabreTools.Serialization.Test/Readers/CHDTests.cs +++ b/SabreTools.Serialization.Test/Readers/CHDTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/CIATests.cs b/SabreTools.Serialization.Test/Readers/CIATests.cs index d8644ba0..fa9f3de5 100644 --- a/SabreTools.Serialization.Test/Readers/CIATests.cs +++ b/SabreTools.Serialization.Test/Readers/CIATests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/CatalogTests.cs b/SabreTools.Serialization.Test/Readers/CatalogTests.cs index 5423e24c..ac5ac747 100644 --- a/SabreTools.Serialization.Test/Readers/CatalogTests.cs +++ b/SabreTools.Serialization.Test/Readers/CatalogTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/ClrMameProTests.cs b/SabreTools.Serialization.Test/Readers/ClrMameProTests.cs index 91466e57..44c70898 100644 --- a/SabreTools.Serialization.Test/Readers/ClrMameProTests.cs +++ b/SabreTools.Serialization.Test/Readers/ClrMameProTests.cs @@ -615,4 +615,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Equal("XXXXXX", driver.Blit); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/CueSheetTests.cs b/SabreTools.Serialization.Test/Readers/CueSheetTests.cs index b66fc833..ceca85eb 100644 --- a/SabreTools.Serialization.Test/Readers/CueSheetTests.cs +++ b/SabreTools.Serialization.Test/Readers/CueSheetTests.cs @@ -115,4 +115,4 @@ namespace SabreTools.Serialization.Test.Readers #endregion } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/DosCenterTests.cs b/SabreTools.Serialization.Test/Readers/DosCenterTests.cs index 1ddce291..a4a15044 100644 --- a/SabreTools.Serialization.Test/Readers/DosCenterTests.cs +++ b/SabreTools.Serialization.Test/Readers/DosCenterTests.cs @@ -174,4 +174,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Equal("XXXXXX XXXXXX", rom.Date); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/EverdriveSMDBTests.cs b/SabreTools.Serialization.Test/Readers/EverdriveSMDBTests.cs index 66115606..6910eff0 100644 --- a/SabreTools.Serialization.Test/Readers/EverdriveSMDBTests.cs +++ b/SabreTools.Serialization.Test/Readers/EverdriveSMDBTests.cs @@ -129,4 +129,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Equal("XXXXXX", row.Size); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/GCFTests.cs b/SabreTools.Serialization.Test/Readers/GCFTests.cs index 614fc660..aa99e1d1 100644 --- a/SabreTools.Serialization.Test/Readers/GCFTests.cs +++ b/SabreTools.Serialization.Test/Readers/GCFTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/GZipTests.cs b/SabreTools.Serialization.Test/Readers/GZipTests.cs index 60c813fd..ff69bfda 100644 --- a/SabreTools.Serialization.Test/Readers/GZipTests.cs +++ b/SabreTools.Serialization.Test/Readers/GZipTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/HashfileTests.cs b/SabreTools.Serialization.Test/Readers/HashfileTests.cs index 43c147a8..efe50a8f 100644 --- a/SabreTools.Serialization.Test/Readers/HashfileTests.cs +++ b/SabreTools.Serialization.Test/Readers/HashfileTests.cs @@ -398,4 +398,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Equal("XXXXXX", spamsum.File); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/IRDTests.cs b/SabreTools.Serialization.Test/Readers/IRDTests.cs index 4c86500c..04bbca5c 100644 --- a/SabreTools.Serialization.Test/Readers/IRDTests.cs +++ b/SabreTools.Serialization.Test/Readers/IRDTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/InstallShieldArchiveV3Tests.cs b/SabreTools.Serialization.Test/Readers/InstallShieldArchiveV3Tests.cs index d9bf0eb4..b3934172 100644 --- a/SabreTools.Serialization.Test/Readers/InstallShieldArchiveV3Tests.cs +++ b/SabreTools.Serialization.Test/Readers/InstallShieldArchiveV3Tests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/InstallShieldCabinetTests.cs b/SabreTools.Serialization.Test/Readers/InstallShieldCabinetTests.cs index 21f204dc..8a3f25b7 100644 --- a/SabreTools.Serialization.Test/Readers/InstallShieldCabinetTests.cs +++ b/SabreTools.Serialization.Test/Readers/InstallShieldCabinetTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/LZKWAJTests.cs b/SabreTools.Serialization.Test/Readers/LZKWAJTests.cs index 7390a503..c4332869 100644 --- a/SabreTools.Serialization.Test/Readers/LZKWAJTests.cs +++ b/SabreTools.Serialization.Test/Readers/LZKWAJTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/LZQBasicTests.cs b/SabreTools.Serialization.Test/Readers/LZQBasicTests.cs index 68bc5adb..42590aa5 100644 --- a/SabreTools.Serialization.Test/Readers/LZQBasicTests.cs +++ b/SabreTools.Serialization.Test/Readers/LZQBasicTests.cs @@ -6,7 +6,7 @@ using Xunit; namespace SabreTools.Serialization.Test.Readers { public class LZQBasicTests - + { [Fact] public void NullArray_Null() @@ -71,4 +71,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/LZSZDDTests.cs b/SabreTools.Serialization.Test/Readers/LZSZDDTests.cs index 3f384fa5..7e06913a 100644 --- a/SabreTools.Serialization.Test/Readers/LZSZDDTests.cs +++ b/SabreTools.Serialization.Test/Readers/LZSZDDTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/LinearExecutableTests.cs b/SabreTools.Serialization.Test/Readers/LinearExecutableTests.cs index 6f0b4c99..03bf46b8 100644 --- a/SabreTools.Serialization.Test/Readers/LinearExecutableTests.cs +++ b/SabreTools.Serialization.Test/Readers/LinearExecutableTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/ListromTests.cs b/SabreTools.Serialization.Test/Readers/ListromTests.cs index d5f56014..7a958154 100644 --- a/SabreTools.Serialization.Test/Readers/ListromTests.cs +++ b/SabreTools.Serialization.Test/Readers/ListromTests.cs @@ -264,4 +264,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.True(row.NoGoodDumpKnown); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/ListxmlTests.cs b/SabreTools.Serialization.Test/Readers/ListxmlTests.cs index ab6aa94f..44fd312c 100644 --- a/SabreTools.Serialization.Test/Readers/ListxmlTests.cs +++ b/SabreTools.Serialization.Test/Readers/ListxmlTests.cs @@ -943,4 +943,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Equal("XXXXXX", ramoption.Content); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/LogiqxTests.cs b/SabreTools.Serialization.Test/Readers/LogiqxTests.cs index 76a2fdfa..5b1e09b6 100644 --- a/SabreTools.Serialization.Test/Readers/LogiqxTests.cs +++ b/SabreTools.Serialization.Test/Readers/LogiqxTests.cs @@ -618,4 +618,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Equal("XXXXXX", softwarelist.Filter); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/M1Tests.cs b/SabreTools.Serialization.Test/Readers/M1Tests.cs index eca19f68..44f32f78 100644 --- a/SabreTools.Serialization.Test/Readers/M1Tests.cs +++ b/SabreTools.Serialization.Test/Readers/M1Tests.cs @@ -937,4 +937,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Equal("XXXXXX", ramoption.Content); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/MSDOSTests.cs b/SabreTools.Serialization.Test/Readers/MSDOSTests.cs index d2723887..42fa3cb4 100644 --- a/SabreTools.Serialization.Test/Readers/MSDOSTests.cs +++ b/SabreTools.Serialization.Test/Readers/MSDOSTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/MessTests.cs b/SabreTools.Serialization.Test/Readers/MessTests.cs index 8dcaf74c..8b8fe65c 100644 --- a/SabreTools.Serialization.Test/Readers/MessTests.cs +++ b/SabreTools.Serialization.Test/Readers/MessTests.cs @@ -937,4 +937,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Equal("XXXXXX", ramoption.Content); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/MicrosoftCabinetTests.cs b/SabreTools.Serialization.Test/Readers/MicrosoftCabinetTests.cs index a0f4fbb2..b31412d7 100644 --- a/SabreTools.Serialization.Test/Readers/MicrosoftCabinetTests.cs +++ b/SabreTools.Serialization.Test/Readers/MicrosoftCabinetTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/MoPaQTests.cs b/SabreTools.Serialization.Test/Readers/MoPaQTests.cs index 89e935bf..98f87401 100644 --- a/SabreTools.Serialization.Test/Readers/MoPaQTests.cs +++ b/SabreTools.Serialization.Test/Readers/MoPaQTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/N3DSTests.cs b/SabreTools.Serialization.Test/Readers/N3DSTests.cs index 0f7a370c..e87789f8 100644 --- a/SabreTools.Serialization.Test/Readers/N3DSTests.cs +++ b/SabreTools.Serialization.Test/Readers/N3DSTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/NCFTests.cs b/SabreTools.Serialization.Test/Readers/NCFTests.cs index 203e383f..a454963c 100644 --- a/SabreTools.Serialization.Test/Readers/NCFTests.cs +++ b/SabreTools.Serialization.Test/Readers/NCFTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/NewExecutableTests.cs b/SabreTools.Serialization.Test/Readers/NewExecutableTests.cs index 72504003..3c71d3fb 100644 --- a/SabreTools.Serialization.Test/Readers/NewExecutableTests.cs +++ b/SabreTools.Serialization.Test/Readers/NewExecutableTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/NitroTests.cs b/SabreTools.Serialization.Test/Readers/NitroTests.cs index b5f57a7d..68b798b4 100644 --- a/SabreTools.Serialization.Test/Readers/NitroTests.cs +++ b/SabreTools.Serialization.Test/Readers/NitroTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/OfflineListTests.cs b/SabreTools.Serialization.Test/Readers/OfflineListTests.cs index 147964a8..eb37e2bf 100644 --- a/SabreTools.Serialization.Test/Readers/OfflineListTests.cs +++ b/SabreTools.Serialization.Test/Readers/OfflineListTests.cs @@ -514,4 +514,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Equal("XXXXXX", image.Height); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/OpenMSXTests.cs b/SabreTools.Serialization.Test/Readers/OpenMSXTests.cs index 54a0b18f..1e140b12 100644 --- a/SabreTools.Serialization.Test/Readers/OpenMSXTests.cs +++ b/SabreTools.Serialization.Test/Readers/OpenMSXTests.cs @@ -220,4 +220,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Equal("XXXXXX", rombase.Remark); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/PAKTests.cs b/SabreTools.Serialization.Test/Readers/PAKTests.cs index 6f44ee97..eceae803 100644 --- a/SabreTools.Serialization.Test/Readers/PAKTests.cs +++ b/SabreTools.Serialization.Test/Readers/PAKTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/PFFTests.cs b/SabreTools.Serialization.Test/Readers/PFFTests.cs index 1d5011b3..a2ac77f7 100644 --- a/SabreTools.Serialization.Test/Readers/PFFTests.cs +++ b/SabreTools.Serialization.Test/Readers/PFFTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/PICTests.cs b/SabreTools.Serialization.Test/Readers/PICTests.cs index ad232a16..a8d7b350 100644 --- a/SabreTools.Serialization.Test/Readers/PICTests.cs +++ b/SabreTools.Serialization.Test/Readers/PICTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/PKZIPTests.cs b/SabreTools.Serialization.Test/Readers/PKZIPTests.cs index 34105e47..48c1fac3 100644 --- a/SabreTools.Serialization.Test/Readers/PKZIPTests.cs +++ b/SabreTools.Serialization.Test/Readers/PKZIPTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/PlayJAudioTests.cs b/SabreTools.Serialization.Test/Readers/PlayJAudioTests.cs index 40ce648e..2aa26141 100644 --- a/SabreTools.Serialization.Test/Readers/PlayJAudioTests.cs +++ b/SabreTools.Serialization.Test/Readers/PlayJAudioTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/PlayJPlaylistTests.cs b/SabreTools.Serialization.Test/Readers/PlayJPlaylistTests.cs index e950947f..c312822f 100644 --- a/SabreTools.Serialization.Test/Readers/PlayJPlaylistTests.cs +++ b/SabreTools.Serialization.Test/Readers/PlayJPlaylistTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/PortableExecutableTests.cs b/SabreTools.Serialization.Test/Readers/PortableExecutableTests.cs index f5e97ac9..ca1e8f7a 100644 --- a/SabreTools.Serialization.Test/Readers/PortableExecutableTests.cs +++ b/SabreTools.Serialization.Test/Readers/PortableExecutableTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/QuantumTests.cs b/SabreTools.Serialization.Test/Readers/QuantumTests.cs index c47ff243..edef770b 100644 --- a/SabreTools.Serialization.Test/Readers/QuantumTests.cs +++ b/SabreTools.Serialization.Test/Readers/QuantumTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/RomCenterTests.cs b/SabreTools.Serialization.Test/Readers/RomCenterTests.cs index e849c997..e59b3d7d 100644 --- a/SabreTools.Serialization.Test/Readers/RomCenterTests.cs +++ b/SabreTools.Serialization.Test/Readers/RomCenterTests.cs @@ -217,4 +217,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Equal("XXXXXX", rom.MergeName); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/SFBTests.cs b/SabreTools.Serialization.Test/Readers/SFBTests.cs index 700113d2..89bc2260 100644 --- a/SabreTools.Serialization.Test/Readers/SFBTests.cs +++ b/SabreTools.Serialization.Test/Readers/SFBTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/SFOTests.cs b/SabreTools.Serialization.Test/Readers/SFOTests.cs index d43b2411..e9916a05 100644 --- a/SabreTools.Serialization.Test/Readers/SFOTests.cs +++ b/SabreTools.Serialization.Test/Readers/SFOTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/SGATests.cs b/SabreTools.Serialization.Test/Readers/SGATests.cs index a7938b27..2e7c2931 100644 --- a/SabreTools.Serialization.Test/Readers/SGATests.cs +++ b/SabreTools.Serialization.Test/Readers/SGATests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/SeparatedValueTests.cs b/SabreTools.Serialization.Test/Readers/SeparatedValueTests.cs index daa109ba..499dcded 100644 --- a/SabreTools.Serialization.Test/Readers/SeparatedValueTests.cs +++ b/SabreTools.Serialization.Test/Readers/SeparatedValueTests.cs @@ -305,4 +305,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Equal("XXXXXX", row.Status); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/SoftwareListTests.cs b/SabreTools.Serialization.Test/Readers/SoftwareListTests.cs index d45bd33e..3ac2a21d 100644 --- a/SabreTools.Serialization.Test/Readers/SoftwareListTests.cs +++ b/SabreTools.Serialization.Test/Readers/SoftwareListTests.cs @@ -374,4 +374,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Equal("XXXXXX", dipvalue.Default); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/TapeArchiveTests.cs b/SabreTools.Serialization.Test/Readers/TapeArchiveTests.cs index 2176e1bb..803d61b5 100644 --- a/SabreTools.Serialization.Test/Readers/TapeArchiveTests.cs +++ b/SabreTools.Serialization.Test/Readers/TapeArchiveTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/VBSPTests.cs b/SabreTools.Serialization.Test/Readers/VBSPTests.cs index 02b4c01e..219491ab 100644 --- a/SabreTools.Serialization.Test/Readers/VBSPTests.cs +++ b/SabreTools.Serialization.Test/Readers/VBSPTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/VPKTests.cs b/SabreTools.Serialization.Test/Readers/VPKTests.cs index 7378b12d..59f73381 100644 --- a/SabreTools.Serialization.Test/Readers/VPKTests.cs +++ b/SabreTools.Serialization.Test/Readers/VPKTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/WAD3Tests.cs b/SabreTools.Serialization.Test/Readers/WAD3Tests.cs index 3d7d7dd4..e1987360 100644 --- a/SabreTools.Serialization.Test/Readers/WAD3Tests.cs +++ b/SabreTools.Serialization.Test/Readers/WAD3Tests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/WiseOverlayHeaderTests.cs b/SabreTools.Serialization.Test/Readers/WiseOverlayHeaderTests.cs index e45fd392..fc0aa695 100644 --- a/SabreTools.Serialization.Test/Readers/WiseOverlayHeaderTests.cs +++ b/SabreTools.Serialization.Test/Readers/WiseOverlayHeaderTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/WiseScriptTests.cs b/SabreTools.Serialization.Test/Readers/WiseScriptTests.cs index ff9a209d..7c08c32e 100644 --- a/SabreTools.Serialization.Test/Readers/WiseScriptTests.cs +++ b/SabreTools.Serialization.Test/Readers/WiseScriptTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/WiseSectionHeaderTests.cs b/SabreTools.Serialization.Test/Readers/WiseSectionHeaderTests.cs index d8b45e06..0e74b77a 100644 --- a/SabreTools.Serialization.Test/Readers/WiseSectionHeaderTests.cs +++ b/SabreTools.Serialization.Test/Readers/WiseSectionHeaderTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/XMIDTests.cs b/SabreTools.Serialization.Test/Readers/XMIDTests.cs index c5d9f319..20e26fcb 100644 --- a/SabreTools.Serialization.Test/Readers/XMIDTests.cs +++ b/SabreTools.Serialization.Test/Readers/XMIDTests.cs @@ -36,4 +36,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/XZPTests.cs b/SabreTools.Serialization.Test/Readers/XZPTests.cs index 53148f47..c7718d35 100644 --- a/SabreTools.Serialization.Test/Readers/XZPTests.cs +++ b/SabreTools.Serialization.Test/Readers/XZPTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/XZTests.cs b/SabreTools.Serialization.Test/Readers/XZTests.cs index 2969f606..a73ba872 100644 --- a/SabreTools.Serialization.Test/Readers/XZTests.cs +++ b/SabreTools.Serialization.Test/Readers/XZTests.cs @@ -70,4 +70,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Readers/XeMIDTests.cs b/SabreTools.Serialization.Test/Readers/XeMIDTests.cs index 5cdf1ed4..c96d3cf9 100644 --- a/SabreTools.Serialization.Test/Readers/XeMIDTests.cs +++ b/SabreTools.Serialization.Test/Readers/XeMIDTests.cs @@ -35,4 +35,4 @@ namespace SabreTools.Serialization.Test.Readers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/SabreTools.Serialization.Test.csproj b/SabreTools.Serialization.Test/SabreTools.Serialization.Test.csproj index e97a2e79..88200d35 100644 --- a/SabreTools.Serialization.Test/SabreTools.Serialization.Test.csproj +++ b/SabreTools.Serialization.Test/SabreTools.Serialization.Test.csproj @@ -1,7 +1,7 @@ - net8.0;net9.0 + net8.0;net9.0;net10.0 false latest enable @@ -26,8 +26,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/SabreTools.Serialization.Test/Wrappers/AACSMediaKeyBlockTests.cs b/SabreTools.Serialization.Test/Wrappers/AACSMediaKeyBlockTests.cs index cab58a99..7966b472 100644 --- a/SabreTools.Serialization.Test/Wrappers/AACSMediaKeyBlockTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/AACSMediaKeyBlockTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/BDPlusSVMTests.cs b/SabreTools.Serialization.Test/Wrappers/BDPlusSVMTests.cs index 6123a6d4..f47707dc 100644 --- a/SabreTools.Serialization.Test/Wrappers/BDPlusSVMTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/BDPlusSVMTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/BFPKTests.cs b/SabreTools.Serialization.Test/Wrappers/BFPKTests.cs index 5de9e80b..f160b3c3 100644 --- a/SabreTools.Serialization.Test/Wrappers/BFPKTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/BFPKTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/BSPTests.cs b/SabreTools.Serialization.Test/Wrappers/BSPTests.cs index 6894b9ba..d6dc384f 100644 --- a/SabreTools.Serialization.Test/Wrappers/BSPTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/BSPTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/BZip2Tests.cs b/SabreTools.Serialization.Test/Wrappers/BZip2Tests.cs index 02ba853c..40a22a64 100644 --- a/SabreTools.Serialization.Test/Wrappers/BZip2Tests.cs +++ b/SabreTools.Serialization.Test/Wrappers/BZip2Tests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/CFBTests.cs b/SabreTools.Serialization.Test/Wrappers/CFBTests.cs index 3d7ce84b..ccbf79ac 100644 --- a/SabreTools.Serialization.Test/Wrappers/CFBTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/CFBTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/CHDTests.cs b/SabreTools.Serialization.Test/Wrappers/CHDTests.cs index 120ad1d7..012126bf 100644 --- a/SabreTools.Serialization.Test/Wrappers/CHDTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/CHDTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/CIATests.cs b/SabreTools.Serialization.Test/Wrappers/CIATests.cs index 5d58df82..662e8541 100644 --- a/SabreTools.Serialization.Test/Wrappers/CIATests.cs +++ b/SabreTools.Serialization.Test/Wrappers/CIATests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/GCFTests.cs b/SabreTools.Serialization.Test/Wrappers/GCFTests.cs index bf59f63b..c2b1cb19 100644 --- a/SabreTools.Serialization.Test/Wrappers/GCFTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/GCFTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/GZipTests.cs b/SabreTools.Serialization.Test/Wrappers/GZipTests.cs index 3e0843a1..bdc49e99 100644 --- a/SabreTools.Serialization.Test/Wrappers/GZipTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/GZipTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/IRDTests.cs b/SabreTools.Serialization.Test/Wrappers/IRDTests.cs index 9954d075..f9c4cb11 100644 --- a/SabreTools.Serialization.Test/Wrappers/IRDTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/IRDTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/InstallShieldArchiveV3Tests.cs b/SabreTools.Serialization.Test/Wrappers/InstallShieldArchiveV3Tests.cs index 22b3b440..5dbac1c2 100644 --- a/SabreTools.Serialization.Test/Wrappers/InstallShieldArchiveV3Tests.cs +++ b/SabreTools.Serialization.Test/Wrappers/InstallShieldArchiveV3Tests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/InstallShieldCabinetTests.cs b/SabreTools.Serialization.Test/Wrappers/InstallShieldCabinetTests.cs index 2c97ca90..fbea0c5f 100644 --- a/SabreTools.Serialization.Test/Wrappers/InstallShieldCabinetTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/InstallShieldCabinetTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/LDSCRYPTTests.cs b/SabreTools.Serialization.Test/Wrappers/LDSCRYPTTests.cs index 3699a142..54bc8188 100644 --- a/SabreTools.Serialization.Test/Wrappers/LDSCRYPTTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/LDSCRYPTTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/LZKWAJTests.cs b/SabreTools.Serialization.Test/Wrappers/LZKWAJTests.cs index 750f15b5..b988a5c4 100644 --- a/SabreTools.Serialization.Test/Wrappers/LZKWAJTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/LZKWAJTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/LZQBasicTests.cs b/SabreTools.Serialization.Test/Wrappers/LZQBasicTests.cs index 98afa9f9..7db2804c 100644 --- a/SabreTools.Serialization.Test/Wrappers/LZQBasicTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/LZQBasicTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/LZSZDDTests.cs b/SabreTools.Serialization.Test/Wrappers/LZSZDDTests.cs index ec20728e..50bba211 100644 --- a/SabreTools.Serialization.Test/Wrappers/LZSZDDTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/LZSZDDTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/LinearExecutableTests.cs b/SabreTools.Serialization.Test/Wrappers/LinearExecutableTests.cs index 94143eb6..6872046a 100644 --- a/SabreTools.Serialization.Test/Wrappers/LinearExecutableTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/LinearExecutableTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/MSDOSTests.cs b/SabreTools.Serialization.Test/Wrappers/MSDOSTests.cs index 141dc159..cc342cae 100644 --- a/SabreTools.Serialization.Test/Wrappers/MSDOSTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/MSDOSTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/MicrosoftCabinetTests.cs b/SabreTools.Serialization.Test/Wrappers/MicrosoftCabinetTests.cs index 2c69db59..d25dace2 100644 --- a/SabreTools.Serialization.Test/Wrappers/MicrosoftCabinetTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/MicrosoftCabinetTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/MoPaQTests.cs b/SabreTools.Serialization.Test/Wrappers/MoPaQTests.cs index 15e7a000..22fc9263 100644 --- a/SabreTools.Serialization.Test/Wrappers/MoPaQTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/MoPaQTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/N3DSTests.cs b/SabreTools.Serialization.Test/Wrappers/N3DSTests.cs index 56a8b709..63444f24 100644 --- a/SabreTools.Serialization.Test/Wrappers/N3DSTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/N3DSTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/NCFTests.cs b/SabreTools.Serialization.Test/Wrappers/NCFTests.cs index 91e1b057..0b51335c 100644 --- a/SabreTools.Serialization.Test/Wrappers/NCFTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/NCFTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/NewExecutableTests.cs b/SabreTools.Serialization.Test/Wrappers/NewExecutableTests.cs index 7b40b7ab..9911205a 100644 --- a/SabreTools.Serialization.Test/Wrappers/NewExecutableTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/NewExecutableTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/NitroTests.cs b/SabreTools.Serialization.Test/Wrappers/NitroTests.cs index 91acb92e..afb471a5 100644 --- a/SabreTools.Serialization.Test/Wrappers/NitroTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/NitroTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/PAKTests.cs b/SabreTools.Serialization.Test/Wrappers/PAKTests.cs index ba8baa2f..448ede79 100644 --- a/SabreTools.Serialization.Test/Wrappers/PAKTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/PAKTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/PFFTests.cs b/SabreTools.Serialization.Test/Wrappers/PFFTests.cs index a9cf2def..0175ee2e 100644 --- a/SabreTools.Serialization.Test/Wrappers/PFFTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/PFFTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/PICTests.cs b/SabreTools.Serialization.Test/Wrappers/PICTests.cs index 8332e9e3..7372ee7f 100644 --- a/SabreTools.Serialization.Test/Wrappers/PICTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/PICTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/PKZIPTests.cs b/SabreTools.Serialization.Test/Wrappers/PKZIPTests.cs index c9fd75bc..0f588963 100644 --- a/SabreTools.Serialization.Test/Wrappers/PKZIPTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/PKZIPTests.cs @@ -76,4 +76,4 @@ namespace SabreTools.Serialization.Test.Wrappers #endregion } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/PlayJAudioFileTests.cs b/SabreTools.Serialization.Test/Wrappers/PlayJAudioFileTests.cs index 433d53c0..f417ef7a 100644 --- a/SabreTools.Serialization.Test/Wrappers/PlayJAudioFileTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/PlayJAudioFileTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/PlayJPlaylistTests.cs b/SabreTools.Serialization.Test/Wrappers/PlayJPlaylistTests.cs index b70e1d52..459010c9 100644 --- a/SabreTools.Serialization.Test/Wrappers/PlayJPlaylistTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/PlayJPlaylistTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/PortableExecutableTests.cs b/SabreTools.Serialization.Test/Wrappers/PortableExecutableTests.cs index 077e9e96..e56645b2 100644 --- a/SabreTools.Serialization.Test/Wrappers/PortableExecutableTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/PortableExecutableTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/QuantumTests.cs b/SabreTools.Serialization.Test/Wrappers/QuantumTests.cs index 254da7fc..2503e14d 100644 --- a/SabreTools.Serialization.Test/Wrappers/QuantumTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/QuantumTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/RARTests.cs b/SabreTools.Serialization.Test/Wrappers/RARTests.cs index 05ff4a04..1f190561 100644 --- a/SabreTools.Serialization.Test/Wrappers/RARTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/RARTests.cs @@ -75,4 +75,4 @@ namespace SabreTools.Serialization.Test.Wrappers #endregion } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/RealArcadeInstallerTests.cs b/SabreTools.Serialization.Test/Wrappers/RealArcadeInstallerTests.cs index c1da4cec..44cd1610 100644 --- a/SabreTools.Serialization.Test/Wrappers/RealArcadeInstallerTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/RealArcadeInstallerTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/RealArcadeMezzanineTests.cs b/SabreTools.Serialization.Test/Wrappers/RealArcadeMezzanineTests.cs index 9939154f..e2d6adb2 100644 --- a/SabreTools.Serialization.Test/Wrappers/RealArcadeMezzanineTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/RealArcadeMezzanineTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/SGATests.cs b/SabreTools.Serialization.Test/Wrappers/SGATests.cs index 4d348f4f..9e19bf9d 100644 --- a/SabreTools.Serialization.Test/Wrappers/SGATests.cs +++ b/SabreTools.Serialization.Test/Wrappers/SGATests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/SevenZipTests.cs b/SabreTools.Serialization.Test/Wrappers/SevenZipTests.cs index 1ca7e0b0..99c8ef9e 100644 --- a/SabreTools.Serialization.Test/Wrappers/SevenZipTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/SevenZipTests.cs @@ -73,4 +73,4 @@ namespace SabreTools.Serialization.Test.Wrappers #endregion } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/TapeArchiveTests.cs b/SabreTools.Serialization.Test/Wrappers/TapeArchiveTests.cs index 84468b46..5196e282 100644 --- a/SabreTools.Serialization.Test/Wrappers/TapeArchiveTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/TapeArchiveTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/VBSPTests.cs b/SabreTools.Serialization.Test/Wrappers/VBSPTests.cs index 4e1edd72..f9f6d926 100644 --- a/SabreTools.Serialization.Test/Wrappers/VBSPTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/VBSPTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/VPKTests.cs b/SabreTools.Serialization.Test/Wrappers/VPKTests.cs index 5c1e902e..4d6d49ff 100644 --- a/SabreTools.Serialization.Test/Wrappers/VPKTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/VPKTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/WAD3Tests.cs b/SabreTools.Serialization.Test/Wrappers/WAD3Tests.cs index d103efee..3e2fefd9 100644 --- a/SabreTools.Serialization.Test/Wrappers/WAD3Tests.cs +++ b/SabreTools.Serialization.Test/Wrappers/WAD3Tests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/WiseOverlayHeaderTests.cs b/SabreTools.Serialization.Test/Wrappers/WiseOverlayHeaderTests.cs index f06e3375..8f7d05e8 100644 --- a/SabreTools.Serialization.Test/Wrappers/WiseOverlayHeaderTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/WiseOverlayHeaderTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/WiseScriptTests.cs b/SabreTools.Serialization.Test/Wrappers/WiseScriptTests.cs index 7fbe9269..0efa596b 100644 --- a/SabreTools.Serialization.Test/Wrappers/WiseScriptTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/WiseScriptTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/WiseSectionHeaderTests.cs b/SabreTools.Serialization.Test/Wrappers/WiseSectionHeaderTests.cs index 3c6814c4..d6c292d1 100644 --- a/SabreTools.Serialization.Test/Wrappers/WiseSectionHeaderTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/WiseSectionHeaderTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/XMIDTests.cs b/SabreTools.Serialization.Test/Wrappers/XMIDTests.cs index 3f2d884f..c1e0ccb7 100644 --- a/SabreTools.Serialization.Test/Wrappers/XMIDTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/XMIDTests.cs @@ -30,4 +30,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/XZPTests.cs b/SabreTools.Serialization.Test/Wrappers/XZPTests.cs index 6a49f4f4..8336b7d7 100644 --- a/SabreTools.Serialization.Test/Wrappers/XZPTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/XZPTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/XZTests.cs b/SabreTools.Serialization.Test/Wrappers/XZTests.cs index dc49cd9d..da05f889 100644 --- a/SabreTools.Serialization.Test/Wrappers/XZTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/XZTests.cs @@ -58,4 +58,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Wrappers/XeMIDTests.cs b/SabreTools.Serialization.Test/Wrappers/XeMIDTests.cs index 5639602b..a06ea897 100644 --- a/SabreTools.Serialization.Test/Wrappers/XeMIDTests.cs +++ b/SabreTools.Serialization.Test/Wrappers/XeMIDTests.cs @@ -29,4 +29,4 @@ namespace SabreTools.Serialization.Test.Wrappers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/ArchiveDotOrgTests.cs b/SabreTools.Serialization.Test/Writers/ArchiveDotOrgTests.cs index 4efc2d7f..3d197ae0 100644 --- a/SabreTools.Serialization.Test/Writers/ArchiveDotOrgTests.cs +++ b/SabreTools.Serialization.Test/Writers/ArchiveDotOrgTests.cs @@ -22,4 +22,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/AttractModeTests.cs b/SabreTools.Serialization.Test/Writers/AttractModeTests.cs index 523dad96..52712fe2 100644 --- a/SabreTools.Serialization.Test/Writers/AttractModeTests.cs +++ b/SabreTools.Serialization.Test/Writers/AttractModeTests.cs @@ -22,4 +22,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/CatalogTests.cs b/SabreTools.Serialization.Test/Writers/CatalogTests.cs index c055e3be..d2395d8f 100644 --- a/SabreTools.Serialization.Test/Writers/CatalogTests.cs +++ b/SabreTools.Serialization.Test/Writers/CatalogTests.cs @@ -22,4 +22,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/ClrMameProTests.cs b/SabreTools.Serialization.Test/Writers/ClrMameProTests.cs index bee256b2..e9100b98 100644 --- a/SabreTools.Serialization.Test/Writers/ClrMameProTests.cs +++ b/SabreTools.Serialization.Test/Writers/ClrMameProTests.cs @@ -22,4 +22,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/CueSheetTests.cs b/SabreTools.Serialization.Test/Writers/CueSheetTests.cs index 5c8f74d5..7cca9250 100644 --- a/SabreTools.Serialization.Test/Writers/CueSheetTests.cs +++ b/SabreTools.Serialization.Test/Writers/CueSheetTests.cs @@ -22,4 +22,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/DosCenterTests.cs b/SabreTools.Serialization.Test/Writers/DosCenterTests.cs index d759c39d..e2a157a5 100644 --- a/SabreTools.Serialization.Test/Writers/DosCenterTests.cs +++ b/SabreTools.Serialization.Test/Writers/DosCenterTests.cs @@ -22,4 +22,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/EverdriveSMDBTests.cs b/SabreTools.Serialization.Test/Writers/EverdriveSMDBTests.cs index 1a4858ef..7a5e9d01 100644 --- a/SabreTools.Serialization.Test/Writers/EverdriveSMDBTests.cs +++ b/SabreTools.Serialization.Test/Writers/EverdriveSMDBTests.cs @@ -22,4 +22,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/HashfileTests.cs b/SabreTools.Serialization.Test/Writers/HashfileTests.cs index 65b43a2e..fea5e7f1 100644 --- a/SabreTools.Serialization.Test/Writers/HashfileTests.cs +++ b/SabreTools.Serialization.Test/Writers/HashfileTests.cs @@ -22,4 +22,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/IRDTests.cs b/SabreTools.Serialization.Test/Writers/IRDTests.cs index 733c080e..b71fe2df 100644 --- a/SabreTools.Serialization.Test/Writers/IRDTests.cs +++ b/SabreTools.Serialization.Test/Writers/IRDTests.cs @@ -22,4 +22,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/ListromTests.cs b/SabreTools.Serialization.Test/Writers/ListromTests.cs index d6ed1b73..e28aace5 100644 --- a/SabreTools.Serialization.Test/Writers/ListromTests.cs +++ b/SabreTools.Serialization.Test/Writers/ListromTests.cs @@ -22,4 +22,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/ListxmlTests.cs b/SabreTools.Serialization.Test/Writers/ListxmlTests.cs index 65b249be..f9c8a61e 100644 --- a/SabreTools.Serialization.Test/Writers/ListxmlTests.cs +++ b/SabreTools.Serialization.Test/Writers/ListxmlTests.cs @@ -22,4 +22,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/LogiqxTests.cs b/SabreTools.Serialization.Test/Writers/LogiqxTests.cs index b58fe855..eda2989c 100644 --- a/SabreTools.Serialization.Test/Writers/LogiqxTests.cs +++ b/SabreTools.Serialization.Test/Writers/LogiqxTests.cs @@ -22,4 +22,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/M1Tests.cs b/SabreTools.Serialization.Test/Writers/M1Tests.cs index dc52dd5d..d70aa78d 100644 --- a/SabreTools.Serialization.Test/Writers/M1Tests.cs +++ b/SabreTools.Serialization.Test/Writers/M1Tests.cs @@ -22,4 +22,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/MessTests.cs b/SabreTools.Serialization.Test/Writers/MessTests.cs index 9e472c06..4938150c 100644 --- a/SabreTools.Serialization.Test/Writers/MessTests.cs +++ b/SabreTools.Serialization.Test/Writers/MessTests.cs @@ -22,4 +22,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/OfflineListTests.cs b/SabreTools.Serialization.Test/Writers/OfflineListTests.cs index 3bdad545..4fa8468a 100644 --- a/SabreTools.Serialization.Test/Writers/OfflineListTests.cs +++ b/SabreTools.Serialization.Test/Writers/OfflineListTests.cs @@ -22,4 +22,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/OpenMSXTests.cs b/SabreTools.Serialization.Test/Writers/OpenMSXTests.cs index 1a68cd95..619145bc 100644 --- a/SabreTools.Serialization.Test/Writers/OpenMSXTests.cs +++ b/SabreTools.Serialization.Test/Writers/OpenMSXTests.cs @@ -22,4 +22,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/RomCenterTests.cs b/SabreTools.Serialization.Test/Writers/RomCenterTests.cs index e978f3c6..e527e883 100644 --- a/SabreTools.Serialization.Test/Writers/RomCenterTests.cs +++ b/SabreTools.Serialization.Test/Writers/RomCenterTests.cs @@ -22,4 +22,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/SeparatedValueTests.cs b/SabreTools.Serialization.Test/Writers/SeparatedValueTests.cs index 2442d8bf..c19259df 100644 --- a/SabreTools.Serialization.Test/Writers/SeparatedValueTests.cs +++ b/SabreTools.Serialization.Test/Writers/SeparatedValueTests.cs @@ -22,4 +22,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/SoftwareListTests.cs b/SabreTools.Serialization.Test/Writers/SoftwareListTests.cs index b4e46bea..9ea3eb50 100644 --- a/SabreTools.Serialization.Test/Writers/SoftwareListTests.cs +++ b/SabreTools.Serialization.Test/Writers/SoftwareListTests.cs @@ -22,4 +22,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/XMIDTests.cs b/SabreTools.Serialization.Test/Writers/XMIDTests.cs index e276174c..4968d94c 100644 --- a/SabreTools.Serialization.Test/Writers/XMIDTests.cs +++ b/SabreTools.Serialization.Test/Writers/XMIDTests.cs @@ -13,4 +13,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization.Test/Writers/XeMIDTests.cs b/SabreTools.Serialization.Test/Writers/XeMIDTests.cs index bf242da5..ac6aab7d 100644 --- a/SabreTools.Serialization.Test/Writers/XeMIDTests.cs +++ b/SabreTools.Serialization.Test/Writers/XeMIDTests.cs @@ -13,4 +13,4 @@ namespace SabreTools.Serialization.Test.Writers Assert.Null(actual); } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Attributes/NoFilterAttribute.cs b/SabreTools.Serialization/Attributes/NoFilterAttribute.cs index 1c84d558..d4ff7050 100644 --- a/SabreTools.Serialization/Attributes/NoFilterAttribute.cs +++ b/SabreTools.Serialization/Attributes/NoFilterAttribute.cs @@ -5,4 +5,4 @@ namespace SabreTools.Data.Attributes /// [System.AttributeUsage(System.AttributeTargets.Field)] public class NoFilterAttribute : System.Attribute { } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Attributes/RequiredAttribute.cs b/SabreTools.Serialization/Attributes/RequiredAttribute.cs index 2ea965af..08e71603 100644 --- a/SabreTools.Serialization/Attributes/RequiredAttribute.cs +++ b/SabreTools.Serialization/Attributes/RequiredAttribute.cs @@ -6,4 +6,4 @@ namespace SabreTools.Data.Attributes /// TODO: Use reflection to determine required fields on write [System.AttributeUsage(System.AttributeTargets.Property)] public class RequiredAttribute : System.Attribute { } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/CrossModel/ArchiveDotOrg.Serializer.cs b/SabreTools.Serialization/CrossModel/ArchiveDotOrg.Serializer.cs index 3b496082..64499609 100644 --- a/SabreTools.Serialization/CrossModel/ArchiveDotOrg.Serializer.cs +++ b/SabreTools.Serialization/CrossModel/ArchiveDotOrg.Serializer.cs @@ -13,7 +13,7 @@ namespace SabreTools.Serialization.CrossModel var metadataFile = new Data.Models.Metadata.MetadataFile { - [Data.Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(item), + [Data.Models.Metadata.MetadataFile.HeaderKey] = ConvertHeaderToInternalModel(), }; if (item?.File != null && item.File.Length > 0) @@ -28,7 +28,7 @@ namespace SabreTools.Serialization.CrossModel /// /// Convert from to /// - private static Data.Models.Metadata.Header ConvertHeaderToInternalModel(Files item) + private static Data.Models.Metadata.Header ConvertHeaderToInternalModel() { var header = new Data.Models.Metadata.Header { diff --git a/SabreTools.Serialization/CrossModel/AttractMode.Serializer.cs b/SabreTools.Serialization/CrossModel/AttractMode.Serializer.cs index 7b9e0d0e..72fd4f39 100644 --- a/SabreTools.Serialization/CrossModel/AttractMode.Serializer.cs +++ b/SabreTools.Serialization/CrossModel/AttractMode.Serializer.cs @@ -65,7 +65,6 @@ namespace SabreTools.Serialization.CrossModel [Data.Models.Metadata.Machine.TagsKey] = item.Tags, [Data.Models.Metadata.Machine.PlayedCountKey] = item.PlayedCount, [Data.Models.Metadata.Machine.PlayedTimeKey] = item.PlayedTime, - [Data.Models.Metadata.Machine.PlayedTimeKey] = item.PlayedTime, [Data.Models.Metadata.Machine.RomKey] = new Data.Models.Metadata.Rom[] { ConvertToInternalModel(item) }, }; return machine; diff --git a/SabreTools.Serialization/CrossModel/BaseMetadataSerializer.cs b/SabreTools.Serialization/CrossModel/BaseMetadataSerializer.cs index 43a80264..5ccac2c8 100644 --- a/SabreTools.Serialization/CrossModel/BaseMetadataSerializer.cs +++ b/SabreTools.Serialization/CrossModel/BaseMetadataSerializer.cs @@ -1,15 +1,18 @@ using SabreTools.Data.Models.Metadata; using SabreTools.Serialization.Interfaces; -/// -/// Base class for cross-model serializers -/// -/// Model convertable to -public abstract class BaseMetadataSerializer : ICrossModel +namespace SabreTools.Serialization.CrossModel { - /// - public abstract TModel? Deserialize(MetadataFile? obj); + /// + /// Base class for cross-model serializers + /// + /// Model convertable to + public abstract class BaseMetadataSerializer : ICrossModel + { + /// + public abstract TModel? Deserialize(MetadataFile? obj); - /// - public abstract MetadataFile? Serialize(TModel? obj); + /// + public abstract MetadataFile? Serialize(TModel? obj); + } } diff --git a/SabreTools.Serialization/CrossModel/Logiqx.Serializer.cs b/SabreTools.Serialization/CrossModel/Logiqx.Serializer.cs index 79bbc20d..79c07f09 100644 --- a/SabreTools.Serialization/CrossModel/Logiqx.Serializer.cs +++ b/SabreTools.Serialization/CrossModel/Logiqx.Serializer.cs @@ -37,7 +37,7 @@ namespace SabreTools.Serialization.CrossModel /// private static Data.Models.Metadata.Header ConvertHeaderToInternalModel(Datafile item) { - var header = item.Header != null ? ConvertHeaderToInternalModel(item.Header) : new Data.Models.Metadata.Header(); + var header = item.Header != null ? ConvertHeaderToInternalModel(item.Header) : []; header[Data.Models.Metadata.Header.BuildKey] = item.Build; header[Data.Models.Metadata.Header.DebugKey] = item.Debug; diff --git a/SabreTools.Serialization/CrossModel/SeparatedValue.Deserializer.cs b/SabreTools.Serialization/CrossModel/SeparatedValue.Deserializer.cs index 34dcaba0..02318123 100644 --- a/SabreTools.Serialization/CrossModel/SeparatedValue.Deserializer.cs +++ b/SabreTools.Serialization/CrossModel/SeparatedValue.Deserializer.cs @@ -66,7 +66,7 @@ namespace SabreTools.Serialization.CrossModel Array.ConvertAll(media, m => ConvertFromInternalModel(m, item, header))); } - return rowItems.ToArray(); + return [.. rowItems]; } /// diff --git a/SabreTools.Serialization/Extensions/CFB.cs b/SabreTools.Serialization/Extensions/CFB.cs index d6c69f31..81608ee0 100644 --- a/SabreTools.Serialization/Extensions/CFB.cs +++ b/SabreTools.Serialization/Extensions/CFB.cs @@ -28,7 +28,7 @@ namespace SabreTools.Data.Extensions byte ch = input[p]; if ((ch == 0xe3 && input[p + 1] >= 0xa0) || (ch == 0xe4 && input[p + 1] < 0xa0)) { - // UTF-8 encoding of 0x3800..0x47ff. + // UTF-8 encoding of 0x3800..0x47ff. output[q++] = (byte)Mime2Utf(input[p + 2] & 0x7f); output[q++] = (byte)Mime2Utf(input[p + 1] ^ 0xa0); p += 3; @@ -96,4 +96,4 @@ namespace SabreTools.Data.Extensions }; } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Extensions/ISO9660.cs b/SabreTools.Serialization/Extensions/ISO9660.cs index 6de9f7d0..90d61dae 100644 --- a/SabreTools.Serialization/Extensions/ISO9660.cs +++ b/SabreTools.Serialization/Extensions/ISO9660.cs @@ -1,4 +1,3 @@ -using System; using SabreTools.Data.Models.ISO9660; using SabreTools.Numerics; @@ -51,12 +50,5 @@ namespace SabreTools.Data.Extensions /// True if the block length is valid, false otherwise private static bool BlockSizeValid(short blockSize, short sectorLength) => blockSize >= 512 && blockSize <= sectorLength && (blockSize & (blockSize - 1)) == 0; - - /// - /// Indicates if an array contains all ASCII numeric digits - /// - /// TODO: Remove when IO is updated - public static bool IsNumericArray(this byte[] arr) - => Array.TrueForAll(arr, b => b >= 0x30 && b <= 0x39); } } diff --git a/SabreTools.Serialization/Extensions/InstallShieldCabinet.cs b/SabreTools.Serialization/Extensions/InstallShieldCabinet.cs index 0ddbc3d9..4aeb002b 100644 --- a/SabreTools.Serialization/Extensions/InstallShieldCabinet.cs +++ b/SabreTools.Serialization/Extensions/InstallShieldCabinet.cs @@ -124,4 +124,4 @@ namespace SabreTools.Data.Extensions #endregion } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/Extensions/PortableExecutable.cs b/SabreTools.Serialization/Extensions/PortableExecutable.cs index b9551b0d..608444de 100644 --- a/SabreTools.Serialization/Extensions/PortableExecutable.cs +++ b/SabreTools.Serialization/Extensions/PortableExecutable.cs @@ -6,7 +6,6 @@ using System.Xml.Serialization; using SabreTools.Data.Models.COFF; using SabreTools.Data.Models.PortableExecutable; using SabreTools.Data.Models.PortableExecutable.Resource.Entries; -using SabreTools.Data.Models.SecuROM; using SabreTools.IO.Extensions; namespace SabreTools.Data.Extensions @@ -110,9 +109,9 @@ namespace SabreTools.Data.Extensions /// Data to parse /// Offset into the byte array /// A filled NB10ProgramDatabase on success, null on error - public static Data.Models.PortableExecutable.DebugData.NB10ProgramDatabase? ParseNB10ProgramDatabase(this byte[] data, ref int offset) + public static Models.PortableExecutable.DebugData.NB10ProgramDatabase? ParseNB10ProgramDatabase(this byte[] data, ref int offset) { - var obj = new Data.Models.PortableExecutable.DebugData.NB10ProgramDatabase(); + var obj = new Models.PortableExecutable.DebugData.NB10ProgramDatabase(); obj.Signature = data.ReadUInt32LittleEndian(ref offset); if (obj.Signature != 0x3031424E) @@ -132,9 +131,9 @@ namespace SabreTools.Data.Extensions /// Data to parse /// Offset into the byte array /// A filled RSDSProgramDatabase on success, null on error - public static Data.Models.PortableExecutable.DebugData.RSDSProgramDatabase? ParseRSDSProgramDatabase(this byte[] data, ref int offset) + public static Models.PortableExecutable.DebugData.RSDSProgramDatabase? ParseRSDSProgramDatabase(this byte[] data, ref int offset) { - var obj = new Data.Models.PortableExecutable.DebugData.RSDSProgramDatabase(); + var obj = new Models.PortableExecutable.DebugData.RSDSProgramDatabase(); obj.Signature = data.ReadUInt32LittleEndian(ref offset); if (obj.Signature != 0x53445352) @@ -157,7 +156,7 @@ namespace SabreTools.Data.Extensions /// /// Resource data entry to parse into an accelerator table resource /// A filled accelerator table resource on success, null on error - public static AcceleratorTableEntry[]? AsAcceleratorTableResource(this Data.Models.PortableExecutable.Resource.DataEntry? entry) + public static AcceleratorTableEntry[]? AsAcceleratorTableResource(this Models.PortableExecutable.Resource.DataEntry? entry) { // If we have data that's invalid for this resource type, we can't do anything if (entry?.Data == null || entry.Data.Length % 8 != 0) @@ -186,7 +185,7 @@ namespace SabreTools.Data.Extensions /// /// Resource data entry to parse into a side-by-side assembly manifest /// A filled side-by-side assembly manifest on success, null on error - public static AssemblyManifest? AsAssemblyManifest(this Data.Models.PortableExecutable.Resource.DataEntry? entry) + public static AssemblyManifest? AsAssemblyManifest(this Models.PortableExecutable.Resource.DataEntry? entry) { // If we have an invalid entry, just skip if (entry?.Data == null) @@ -208,7 +207,7 @@ namespace SabreTools.Data.Extensions /// /// Resource data entry to parse into a dialog box /// A filled dialog box on success, null on error - public static DialogBoxResource? AsDialogBox(this Data.Models.PortableExecutable.Resource.DataEntry? entry) + public static DialogBoxResource? AsDialogBox(this Models.PortableExecutable.Resource.DataEntry? entry) { // If we have an invalid entry, just skip if (entry?.Data == null) @@ -685,7 +684,7 @@ namespace SabreTools.Data.Extensions /// /// Resource data entry to parse into a font group /// A filled font group on success, null on error - public static FontGroupHeader? AsFontGroup(this Data.Models.PortableExecutable.Resource.DataEntry? entry) + public static FontGroupHeader? AsFontGroup(this Models.PortableExecutable.Resource.DataEntry? entry) { // If we have an invalid entry, just skip if (entry?.Data == null) @@ -754,7 +753,7 @@ namespace SabreTools.Data.Extensions /// /// Resource data entry to parse into a menu /// A filled menu on success, null on error - public static MenuResource? AsMenu(this Data.Models.PortableExecutable.Resource.DataEntry? entry) + public static MenuResource? AsMenu(this Models.PortableExecutable.Resource.DataEntry? entry) { // If we have an invalid entry, just skip if (entry?.Data == null) @@ -850,7 +849,7 @@ namespace SabreTools.Data.Extensions /// /// Resource data entry to parse into a message table resource /// A filled message table resource on success, null on error - public static MessageResourceData? AsMessageResourceData(this Data.Models.PortableExecutable.Resource.DataEntry? entry) + public static MessageResourceData? AsMessageResourceData(this Models.PortableExecutable.Resource.DataEntry? entry) { // If we have an invalid entry, just skip if (entry?.Data == null) @@ -937,10 +936,10 @@ namespace SabreTools.Data.Extensions // Align to the DWORD boundary if we're not at the end data.AlignToBoundary(ref offset, 4); - var stringFileInfoChildren = new List(); + var stringFileInfoChildren = new List(); while ((offset - currentOffset) < stringFileInfo.Length) { - var stringTable = new Data.Models.PortableExecutable.Resource.Entries.StringTable(); + var stringTable = new Models.PortableExecutable.Resource.Entries.StringTable(); stringTable.Length = data.ReadUInt16LittleEndian(ref offset); stringTable.ValueLength = data.ReadUInt16LittleEndian(ref offset); @@ -994,7 +993,7 @@ namespace SabreTools.Data.Extensions /// /// Resource data entry to parse into a string table resource /// A filled string table resource on success, null on error - public static Dictionary? AsStringTable(this Data.Models.PortableExecutable.Resource.DataEntry? entry) + public static Dictionary? AsStringTable(this Models.PortableExecutable.Resource.DataEntry? entry) { // If we have an invalid entry, just skip if (entry?.Data == null) @@ -1086,7 +1085,7 @@ namespace SabreTools.Data.Extensions /// /// Resource data entry to parse into a version info resource /// A filled version info resource on success, null on error - public static VersionInfo? AsVersionInfo(this Data.Models.PortableExecutable.Resource.DataEntry? entry) + public static VersionInfo? AsVersionInfo(this Models.PortableExecutable.Resource.DataEntry? entry) { // If we have an invalid entry, just skip if (entry?.Data == null) diff --git a/SabreTools.Serialization/Extensions/WiseScript.cs b/SabreTools.Serialization/Extensions/WiseScript.cs index 9add012d..4d64bd9e 100644 --- a/SabreTools.Serialization/Extensions/WiseScript.cs +++ b/SabreTools.Serialization/Extensions/WiseScript.cs @@ -61,4 +61,4 @@ namespace SabreTools.Data.Extensions }; } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/ObjectIdentifier/Parser.ModifiedOIDIRI.cs b/SabreTools.Serialization/ObjectIdentifier/Parser.ModifiedOIDIRI.cs index 8266770c..34d7d9f4 100644 --- a/SabreTools.Serialization/ObjectIdentifier/Parser.ModifiedOIDIRI.cs +++ b/SabreTools.Serialization/ObjectIdentifier/Parser.ModifiedOIDIRI.cs @@ -47,7 +47,11 @@ namespace SabreTools.Data.ObjectIdentifier return nameBuilder.ToString(); // Add trailing items as just values +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + nameBuilder.Append('/'); +#else nameBuilder.Append("/"); +#endif // Get the remaining values in a new array var remainingValues = new ulong[values.Length - index]; @@ -3436,7 +3440,7 @@ namespace SabreTools.Data.ObjectIdentifier #endregion - // 249 + // 249 #region 0.0.8.249.* oid_0_0_8_249: @@ -3454,7 +3458,7 @@ namespace SabreTools.Data.ObjectIdentifier #endregion - // 261 + // 261 #region 0.0.8.261.* oid_0_0_8_261: @@ -3467,7 +3471,7 @@ namespace SabreTools.Data.ObjectIdentifier default: return $"{oidPath}/{values[index - 1]}"; } - // generic-capabilities + // generic-capabilities #region 0.0.8.261.1.* oid_0_0_8_261_1: diff --git a/SabreTools.Serialization/ObjectIdentifier/Parser.OIDIRI.cs b/SabreTools.Serialization/ObjectIdentifier/Parser.OIDIRI.cs index 452d18d8..e2fe8fe9 100644 --- a/SabreTools.Serialization/ObjectIdentifier/Parser.OIDIRI.cs +++ b/SabreTools.Serialization/ObjectIdentifier/Parser.OIDIRI.cs @@ -40,7 +40,11 @@ namespace SabreTools.Data.ObjectIdentifier return nameBuilder.ToString(); // Add trailing items as just values +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + nameBuilder.Append('/'); +#else nameBuilder.Append("/"); +#endif // Get the remaining values in a new array var remainingValues = new ulong[values.Length - index]; diff --git a/SabreTools.Serialization/Readers/BSP.cs b/SabreTools.Serialization/Readers/BSP.cs index a2488ee2..67c631bc 100644 --- a/SabreTools.Serialization/Readers/BSP.cs +++ b/SabreTools.Serialization/Readers/BSP.cs @@ -400,7 +400,6 @@ namespace SabreTools.Serialization.Readers // Break the text by ending curly braces string[] lumpSections = lumpText.Split('}'); - Array.ForEach(lumpSections, s => s.Trim('{', '}')); // Loop through all sections for (int i = 0; i < lumpSections.Length; i++) @@ -409,9 +408,8 @@ namespace SabreTools.Serialization.Readers var attributes = new List>(); // Split the section by newlines - string section = lumpSections[i]; + string section = lumpSections[i].Trim('{', '}'); string[] lines = section.Split('\n'); - Array.ForEach(lines, l => l.Trim()); // Convert each line into a key-value pair and add for (int j = 0; j < lines.Length; j++) diff --git a/SabreTools.Serialization/Readers/CFB.cs b/SabreTools.Serialization/Readers/CFB.cs index 5fddb2fa..aaffe807 100644 --- a/SabreTools.Serialization/Readers/CFB.cs +++ b/SabreTools.Serialization/Readers/CFB.cs @@ -86,7 +86,11 @@ namespace SabreTools.Serialization.Readers } // Get the next sector from the final sector number +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + currentSector = sectorNumbers[^1]; +#else currentSector = sectorNumbers[sectorNumbers.Length - 1]; +#endif } // Assign the DIFAT sectors table diff --git a/SabreTools.Serialization/Readers/Hashfile.cs b/SabreTools.Serialization/Readers/Hashfile.cs index 597e3042..ea20ebe0 100644 --- a/SabreTools.Serialization/Readers/Hashfile.cs +++ b/SabreTools.Serialization/Readers/Hashfile.cs @@ -111,7 +111,11 @@ namespace SabreTools.Serialization.Readers var sfv = new SFV { File = string.Join(" ", lineParts, 0, lineParts.Length - 1), +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + Hash = lineParts[^1], +#else Hash = lineParts[lineParts.Length - 1], +#endif }; sfvList.Add(sfv); } diff --git a/SabreTools.Serialization/Readers/InstallShieldCabinet.cs b/SabreTools.Serialization/Readers/InstallShieldCabinet.cs index fa0fb731..96a9a6c8 100644 --- a/SabreTools.Serialization/Readers/InstallShieldCabinet.cs +++ b/SabreTools.Serialization/Readers/InstallShieldCabinet.cs @@ -159,7 +159,7 @@ namespace SabreTools.Serialization.Readers #region File Group Offsets // Create and fill the file group offsets - cabinet.FileGroupOffsets = new Dictionary(); + cabinet.FileGroupOffsets = []; for (int i = 0; i < (cabinet.Descriptor.FileGroupOffsets?.Length ?? 0); i++) { // Get the file group offset @@ -236,7 +236,7 @@ namespace SabreTools.Serialization.Readers #region Component Offsets // Create and fill the component offsets - cabinet.ComponentOffsets = new Dictionary(); + cabinet.ComponentOffsets = []; for (int i = 0; i < (cabinet.Descriptor.ComponentOffsets?.Length ?? 0); i++) { // Get the component offset diff --git a/SabreTools.Serialization/Readers/Listrom.cs b/SabreTools.Serialization/Readers/Listrom.cs index 17f80575..dd4ee5cc 100644 --- a/SabreTools.Serialization/Readers/Listrom.cs +++ b/SabreTools.Serialization/Readers/Listrom.cs @@ -46,25 +46,41 @@ namespace SabreTools.Serialization.Readers // Set lines are unique if (line.StartsWith("ROMs required for driver")) { +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + string driver = line["ROMs required for driver".Length..].Trim('"', ' ', '.'); +#else string driver = line.Substring("ROMs required for driver".Length).Trim('"', ' ', '.'); +#endif set = new Set { Driver = driver }; continue; } else if (line.StartsWith("No ROMs required for driver")) { +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + string driver = line["No ROMs required for driver".Length..].Trim('"', ' ', '.'); +#else string driver = line.Substring("No ROMs required for driver".Length).Trim('"', ' ', '.'); +#endif set = new Set { Driver = driver }; continue; } else if (line.StartsWith("ROMs required for device")) { +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + string device = line["ROMs required for device".Length..].Trim('"', ' ', '.'); +#else string device = line.Substring("ROMs required for device".Length).Trim('"', ' ', '.'); +#endif set = new Set { Device = device }; continue; } else if (line.StartsWith("No ROMs required for device")) { +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + string device = line["No ROMs required for device".Length..].Trim('"', ' ', '.'); +#else string device = line.Substring("No ROMs required for device".Length).Trim('"', ' ', '.'); +#endif set = new Set { Device = device }; continue; } @@ -113,20 +129,40 @@ namespace SabreTools.Serialization.Readers case 1: row.Name = name; if (line.Contains("MD5(")) +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + row.MD5 = lineParts[0]["MD5".Length..].Trim('(', ')'); +#else row.MD5 = lineParts[0].Substring("MD5".Length).Trim('(', ')'); +#endif else +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + row.SHA1 = lineParts[0]["SHA1".Length..].Trim('(', ')'); +#else row.SHA1 = lineParts[0].Substring("SHA1".Length).Trim('(', ')'); +#endif break; // Normal ROM (Name, Size, CRC, MD5/SHA1) case 3 when line.Contains("CRC"): row.Name = name; row.Size = lineParts[0]; +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + row.CRC = lineParts[1]["CRC".Length..].Trim('(', ')'); +#else row.CRC = lineParts[1].Substring("CRC".Length).Trim('(', ')'); +#endif if (line.Contains("MD5(")) +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + row.MD5 = lineParts[2]["MD5".Length..].Trim('(', ')'); +#else row.MD5 = lineParts[2].Substring("MD5".Length).Trim('(', ')'); +#endif else +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + row.SHA1 = lineParts[2]["SHA1".Length..].Trim('(', ')'); +#else row.SHA1 = lineParts[2].Substring("SHA1".Length).Trim('(', ')'); +#endif break; // Bad CHD (Name, BAD, SHA1, BAD_DUMP) @@ -134,9 +170,17 @@ namespace SabreTools.Serialization.Readers row.Name = name; row.Bad = true; if (line.Contains("MD5(")) +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + row.MD5 = lineParts[1]["MD5".Length..].Trim('(', ')'); +#else row.MD5 = lineParts[1].Substring("MD5".Length).Trim('(', ')'); +#endif else +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + row.SHA1 = lineParts[1]["SHA1".Length..].Trim('(', ')'); +#else row.SHA1 = lineParts[1].Substring("SHA1".Length).Trim('(', ')'); +#endif break; // Nodump CHD (Name, NO GOOD DUMP KNOWN) @@ -150,11 +194,23 @@ namespace SabreTools.Serialization.Readers row.Name = name; row.Size = lineParts[0]; row.Bad = true; +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + row.CRC = lineParts[2]["CRC".Length..].Trim('(', ')'); +#else row.CRC = lineParts[2].Substring("CRC".Length).Trim('(', ')'); +#endif if (line.Contains("MD5(")) +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + row.MD5 = lineParts[3]["MD5".Length..].Trim('(', ')'); +#else row.MD5 = lineParts[3].Substring("MD5".Length).Trim('(', ')'); +#endif else +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + row.SHA1 = lineParts[3]["SHA1".Length..].Trim('(', ')'); +#else row.SHA1 = lineParts[3].Substring("SHA1".Length).Trim('(', ')'); +#endif break; // Nodump ROM (Name, Size, NO GOOD DUMP KNOWN) diff --git a/SabreTools.Serialization/Readers/NCF.cs b/SabreTools.Serialization/Readers/NCF.cs index 9539742b..0d0b031f 100644 --- a/SabreTools.Serialization/Readers/NCF.cs +++ b/SabreTools.Serialization/Readers/NCF.cs @@ -78,7 +78,7 @@ namespace SabreTools.Serialization.Readers long directoryNamesEnd = data.Position + directoryHeader.NameSize; // Create the string dictionary - file.DirectoryNames = new Dictionary(); + file.DirectoryNames = []; // Loop and read the null-terminated strings while (data.Position < directoryNamesEnd) diff --git a/SabreTools.Serialization/Readers/PKZIP.cs b/SabreTools.Serialization/Readers/PKZIP.cs index cba86597..1ec2f679 100644 --- a/SabreTools.Serialization/Readers/PKZIP.cs +++ b/SabreTools.Serialization/Readers/PKZIP.cs @@ -770,7 +770,7 @@ namespace SabreTools.Serialization.Readers obj.HeaderID = (HeaderID)data.ReadUInt16LittleEndian(ref offset); obj.DataSize = data.ReadUInt16LittleEndian(ref offset); - if (obj.DataSize > 0) + if (obj.DataSize > 0) obj.Data = data.ReadBytes(ref offset, obj.DataSize); return obj; @@ -793,28 +793,28 @@ namespace SabreTools.Serialization.Readers obj.DataSize = data.ReadUInt16LittleEndian(ref offset); int bytesRemaining = obj.DataSize; - if (header.UncompressedSize == uint.MaxValue) + if (header.UncompressedSize == uint.MaxValue && bytesRemaining >= 8) { obj.OriginalSize = data.ReadUInt64LittleEndian(ref offset); bytesRemaining -= 8; } - if (header.CompressedSize == uint.MaxValue) + if (header.CompressedSize == uint.MaxValue && bytesRemaining >= 8) { obj.CompressedSize = data.ReadUInt64LittleEndian(ref offset); bytesRemaining -= 8; } - if (header.RelativeOffsetOfLocalHeader == uint.MaxValue) + if (header.RelativeOffsetOfLocalHeader == uint.MaxValue && bytesRemaining >= 8) { obj.RelativeHeaderOffset = data.ReadUInt64LittleEndian(ref offset); bytesRemaining -= 8; } - if (header.DiskNumberStart == ushort.MaxValue) + if (header.DiskNumberStart == ushort.MaxValue && bytesRemaining >= 4) { obj.DiskStartNumber = data.ReadUInt32LittleEndian(ref offset); - bytesRemaining -= 4; + //bytesRemaining -= 4; } return obj; diff --git a/SabreTools.Serialization/Readers/PlayJAudio.cs b/SabreTools.Serialization/Readers/PlayJAudio.cs index d906de68..a1aca991 100644 --- a/SabreTools.Serialization/Readers/PlayJAudio.cs +++ b/SabreTools.Serialization/Readers/PlayJAudio.cs @@ -186,7 +186,7 @@ namespace SabreTools.Serialization.Readers { // Version 1 case 0x00000000: - AudioHeaderV1 v1 = new AudioHeaderV1(); + var v1 = new AudioHeaderV1(); v1.Signature = signature; v1.Version = version; @@ -207,7 +207,7 @@ namespace SabreTools.Serialization.Readers // Version 2 case 0x0000000A: - AudioHeaderV2 v2 = new AudioHeaderV2(); + var v2 = new AudioHeaderV2(); v2.Signature = signature; v2.Version = version; diff --git a/SabreTools.Serialization/Readers/VBSP.cs b/SabreTools.Serialization/Readers/VBSP.cs index 7eefc16e..77b77fbb 100644 --- a/SabreTools.Serialization/Readers/VBSP.cs +++ b/SabreTools.Serialization/Readers/VBSP.cs @@ -321,7 +321,6 @@ namespace SabreTools.Serialization.Readers // Break the text by ending curly braces string[] lumpSections = lumpText.Split('}'); - Array.ForEach(lumpSections, s => s.Trim('{', '}')); // Loop through all sections for (int i = 0; i < lumpSections.Length; i++) @@ -330,9 +329,8 @@ namespace SabreTools.Serialization.Readers var attributes = new List>(); // Split the section by newlines - string section = lumpSections[i]; + string section = lumpSections[i].Trim('{', '}'); string[] lines = section.Split('\n'); - Array.ForEach(lines, l => l.Trim()); // Convert each line into a key-value pair and add for (int j = 0; j < lines.Length; j++) diff --git a/SabreTools.Serialization/Readers/WiseSectionHeader.cs b/SabreTools.Serialization/Readers/WiseSectionHeader.cs index 71e416eb..1c12f91f 100644 --- a/SabreTools.Serialization/Readers/WiseSectionHeader.cs +++ b/SabreTools.Serialization/Readers/WiseSectionHeader.cs @@ -178,10 +178,17 @@ namespace SabreTools.Serialization.Readers // TODO: better way to figure out how far it's needed to advance? int versionSize; +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + if (header.Version[^1] == 0x02) + versionSize = header.Version[^3]; + else + versionSize = header.Version[^2]; +#else if (header.Version[header.Version.Length - 1] == 0x02) versionSize = header.Version[header.Version.Length - 3]; else versionSize = header.Version[header.Version.Length - 2]; +#endif // Third byte seems to indicate size of NonWiseVer if (versionSize > 1) diff --git a/SabreTools.Serialization/Readers/XMID.cs b/SabreTools.Serialization/Readers/XMID.cs index 2306b6b5..05628fd5 100644 --- a/SabreTools.Serialization/Readers/XMID.cs +++ b/SabreTools.Serialization/Readers/XMID.cs @@ -36,7 +36,11 @@ namespace SabreTools.Serialization.Readers var xmid = new Data.Models.Xbox.XMID(); +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + xmid.PublisherIdentifier = xmidString[..2]; +#else xmid.PublisherIdentifier = xmidString.Substring(0, 2); +#endif xmid.GameID = xmidString.Substring(2, 3); xmid.VersionNumber = xmidString.Substring(5, 2); xmid.RegionIdentifier = xmidString[7]; diff --git a/SabreTools.Serialization/Readers/XeMID.cs b/SabreTools.Serialization/Readers/XeMID.cs index 836b621e..b3388fa8 100644 --- a/SabreTools.Serialization/Readers/XeMID.cs +++ b/SabreTools.Serialization/Readers/XeMID.cs @@ -38,7 +38,11 @@ namespace SabreTools.Serialization.Readers var xemid = new Data.Models.Xbox.XeMID(); +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + xemid.PublisherIdentifier = xemidString[..2]; +#else xemid.PublisherIdentifier = xemidString.Substring(0, 2); +#endif xemid.PlatformIdentifier = xemidString[2]; if (xemid.PlatformIdentifier != '2') return null; @@ -61,9 +65,17 @@ namespace SabreTools.Serialization.Readers } if (xemidString.Length == 21) +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + xemid.CertificationSubmissionIdentifier = xemidString[13..]; +#else xemid.CertificationSubmissionIdentifier = xemidString.Substring(13); +#endif else if (xemidString.Length == 22) +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + xemid.CertificationSubmissionIdentifier = xemidString[14..]; +#else xemid.CertificationSubmissionIdentifier = xemidString.Substring(14); +#endif return xemid; } diff --git a/SabreTools.Serialization/Readers/ZSTD.cs b/SabreTools.Serialization/Readers/ZSTD.cs index b4baef4f..18be9782 100644 --- a/SabreTools.Serialization/Readers/ZSTD.cs +++ b/SabreTools.Serialization/Readers/ZSTD.cs @@ -20,17 +20,17 @@ namespace SabreTools.Serialization.Readers long initialOffset = data.Position; #region Header - + var header = ParseHeader(data); if (header == null) return null; - + // Valid versions are 0x1E and 0x22-0x28. // According to RFC-8878, the current version is still 0x28, and it should stay that way now that // it's a stable format. if ((header.VersionByte < 0x22 || header.VersionByte > 0x28) && header.VersionByte != 0x1E) return null; - + #endregion return header; @@ -50,13 +50,13 @@ namespace SabreTools.Serialization.Readers public static Header? ParseHeader(Stream data) { var obj = new Header(); - - obj.VersionByte = data.ReadByteValue(); + + obj.VersionByte = data.ReadByteValue(); obj.Magic = data.ReadBytes(3); if (!obj.Magic.EqualsExactly(SignatureBytes)) return null; - + return obj; } } -} \ No newline at end of file +} diff --git a/SabreTools.Serialization/SabreTools.Serialization.csproj b/SabreTools.Serialization/SabreTools.Serialization.csproj index c6b1aff0..5cfdc21c 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.csproj +++ b/SabreTools.Serialization/SabreTools.Serialization.csproj @@ -2,7 +2,7 @@ - net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;netstandard2.0;netstandard2.1 + net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0;netstandard2.0;netstandard2.1 true false false @@ -27,20 +27,6 @@ MIT - - - win-x86;win-x64 - - - win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64 - - - win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64 - - - net6.0;net7.0;net8.0;net9.0 - - @@ -61,8 +47,8 @@ - - + + \ No newline at end of file diff --git a/SabreTools.Serialization/Wrappers/BFPK.Extraction.cs b/SabreTools.Serialization/Wrappers/BFPK.Extraction.cs index 60ed8aaa..d4c26511 100644 --- a/SabreTools.Serialization/Wrappers/BFPK.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/BFPK.Extraction.cs @@ -92,8 +92,8 @@ namespace SabreTools.Serialization.Wrappers } else { - using MemoryStream ms = new MemoryStream(data); - using ZlibStream zs = new ZlibStream(ms, CompressionMode.Decompress); + using var ms = new MemoryStream(data); + using var zs = new ZlibStream(ms, CompressionMode.Decompress); zs.CopyTo(fs); fs.Flush(); } diff --git a/SabreTools.Serialization/Wrappers/CHD.cs b/SabreTools.Serialization/Wrappers/CHD.cs index 854ad394..ad85edc8 100644 --- a/SabreTools.Serialization/Wrappers/CHD.cs +++ b/SabreTools.Serialization/Wrappers/CHD.cs @@ -26,8 +26,8 @@ namespace SabreTools.Serialization.Wrappers HeaderV1 v1 => v1.MD5, HeaderV2 v2 => v2.MD5, HeaderV3 v3 => v3.MD5, - HeaderV4 v4 => null, - HeaderV5 v5 => null, + //HeaderV4 v4 => null, + //HeaderV5 v5 => null, _ => null, }; } @@ -42,8 +42,8 @@ namespace SabreTools.Serialization.Wrappers { return Model switch { - HeaderV1 v1 => null, - HeaderV2 v2 => null, + //HeaderV1 v1 => null, + //HeaderV2 v2 => null, HeaderV3 v3 => v3.SHA1, HeaderV4 v4 => v4.SHA1, HeaderV5 v5 => v5.SHA1, diff --git a/SabreTools.Serialization/Wrappers/ConcreteAbstractSerializer.cs b/SabreTools.Serialization/Wrappers/ConcreteAbstractSerializer.cs index d8e6234b..06f4be44 100644 --- a/SabreTools.Serialization/Wrappers/ConcreteAbstractSerializer.cs +++ b/SabreTools.Serialization/Wrappers/ConcreteAbstractSerializer.cs @@ -37,10 +37,10 @@ namespace SabreTools.Serialization.Wrappers public override JsonConverter CreateConverter(Type type, JsonSerializerOptions options) => (JsonConverter)Activator.CreateInstance( - typeof(ConcreteAbstractSerializerOfType<>).MakeGenericType(new Type[] { type }), + typeof(ConcreteAbstractSerializerOfType<>).MakeGenericType([type]), BindingFlags.Instance | BindingFlags.Public, binder: null, - args: Array.Empty(), + args: [], culture: null).ThrowOnNull(); } } diff --git a/SabreTools.Serialization/Wrappers/ConcreteInterfaceSerializer.cs b/SabreTools.Serialization/Wrappers/ConcreteInterfaceSerializer.cs index 2cfdc45c..e8d22215 100644 --- a/SabreTools.Serialization/Wrappers/ConcreteInterfaceSerializer.cs +++ b/SabreTools.Serialization/Wrappers/ConcreteInterfaceSerializer.cs @@ -31,16 +31,16 @@ namespace SabreTools.Serialization.Wrappers throw new NotImplementedException(); #endif - public override void Write(System.Text.Json.Utf8JsonWriter writer, TInterface value, JsonSerializerOptions options) => + public override void Write(Utf8JsonWriter writer, TInterface value, JsonSerializerOptions options) => JsonSerializer.Serialize(writer, value!, options); } public override JsonConverter CreateConverter(Type type, JsonSerializerOptions options) => (JsonConverter)Activator.CreateInstance( - typeof(ConcreteInterfaceSerializerOfType<>).MakeGenericType(new Type[] { type }), + typeof(ConcreteInterfaceSerializerOfType<>).MakeGenericType([type]), BindingFlags.Instance | BindingFlags.Public, binder: null, - args: Array.Empty(), + args: [], culture: null).ThrowOnNull(); } } diff --git a/SabreTools.Serialization/Wrappers/ISO9660.Extraction.cs b/SabreTools.Serialization/Wrappers/ISO9660.Extraction.cs index 9b3297c2..964110e0 100644 --- a/SabreTools.Serialization/Wrappers/ISO9660.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/ISO9660.Extraction.cs @@ -152,7 +152,11 @@ namespace SabreTools.Serialization.Wrappers string filename = encoding.GetString(dr.FileIdentifier); int index = filename.LastIndexOf(';'); if (index > 0) +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + filename = filename[..index]; +#else filename = filename.Substring(0, index); +#endif // Ensure the full output directory exists var filepath = Path.Combine(outputDirectory, filename); diff --git a/SabreTools.Serialization/Wrappers/ISO9660.Printing.cs b/SabreTools.Serialization/Wrappers/ISO9660.Printing.cs index 375e79ae..3cc0de5c 100644 --- a/SabreTools.Serialization/Wrappers/ISO9660.Printing.cs +++ b/SabreTools.Serialization/Wrappers/ISO9660.Printing.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Text; using SabreTools.Data.Extensions; using SabreTools.Data.Models.ISO9660; +using SabreTools.IO.Extensions; namespace SabreTools.Serialization.Wrappers { @@ -26,7 +27,7 @@ namespace SabreTools.Serialization.Wrappers // TODO: Parse the volume descriptors to print the Path Table Groups and Directory Descriptors with proper encoding Encoding encoding = Encoding.UTF8; - Print(builder, Model.PathTableGroups, encoding); + Print(builder, Model.PathTableGroups); Print(builder, Model.DirectoryDescriptors, encoding); } @@ -164,7 +165,7 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(vd.OptionalPathTableLocationM, " Optional Type-M Path Table Location"); builder.AppendLine(" Root Directory Record:"); - Print(builder, vd.RootDirectoryRecord, encoding); + Print(builder, vd.RootDirectoryRecord); builder.AppendLine(encoding.GetString(vd.VolumeSetIdentifier), " Volume Set Identifier"); builder.AppendLine(encoding.GetString(vd.PublisherIdentifier), " Publisher Identifier"); @@ -254,7 +255,7 @@ namespace SabreTools.Serialization.Wrappers #region Path Tables - protected static void Print(StringBuilder builder, PathTableGroup[] ptgs, Encoding encoding) + protected static void Print(StringBuilder builder, PathTableGroup[] ptgs) { builder.AppendLine(" Path Table Group(s):"); builder.AppendLine(" -------------------------"); @@ -271,7 +272,7 @@ namespace SabreTools.Serialization.Wrappers { builder.AppendLine($" Type-L Path Table {tableNum}:"); builder.AppendLine(" -------------------------"); - Print(builder, ptgs[tableNum].PathTableL, encoding); + Print(builder, ptgs[tableNum].PathTableL); } else { @@ -282,7 +283,7 @@ namespace SabreTools.Serialization.Wrappers { builder.AppendLine($" Optional Type-L Path Table {tableNum}:"); builder.AppendLine(" -------------------------"); - Print(builder, ptgs[tableNum].OptionalPathTableL, encoding); + Print(builder, ptgs[tableNum].OptionalPathTableL); } else { @@ -293,7 +294,7 @@ namespace SabreTools.Serialization.Wrappers { builder.AppendLine($" Type-M Path Table {tableNum}:"); builder.AppendLine(" -------------------------"); - Print(builder, ptgs[tableNum].PathTableM, encoding); + Print(builder, ptgs[tableNum].PathTableM); } else { @@ -304,7 +305,7 @@ namespace SabreTools.Serialization.Wrappers { builder.AppendLine($" Optional Type-M Path Table {tableNum}:"); builder.AppendLine(" -------------------------"); - Print(builder, ptgs[tableNum].OptionalPathTableM, encoding); + Print(builder, ptgs[tableNum].OptionalPathTableM); } else { @@ -316,7 +317,7 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(); } - private static void Print(StringBuilder builder, PathTableRecord[]? records, Encoding encoding) + private static void Print(StringBuilder builder, PathTableRecord[]? records) { if (records == null || records.Length == 0) { @@ -378,7 +379,7 @@ namespace SabreTools.Serialization.Wrappers { builder.AppendLine($" Directory Record {recordNum}:"); builder.AppendLine(" -------------------------"); - Print(builder, dir.DirectoryRecords[recordNum], encoding); + Print(builder, dir.DirectoryRecords[recordNum]); builder.AppendLine(); } } @@ -391,7 +392,7 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(); } - private static void Print(StringBuilder builder, DirectoryRecord dr, Encoding encoding) + private static void Print(StringBuilder builder, DirectoryRecord dr) { builder.AppendLine(dr.DirectoryRecordLength, " Directory Record Length"); builder.AppendLine(dr.ExtendedAttributeRecordLength, " Extended Attribute Record Length"); @@ -438,7 +439,7 @@ namespace SabreTools.Serialization.Wrappers builder.AppendLine(drdt.Hour, " Hour"); builder.AppendLine(drdt.Minute, " Minute"); builder.AppendLine(drdt.Second, " Second"); - string tz = $"{((drdt.TimezoneOffset - 48) * 15 / 60):+0;-0}:{((drdt.TimezoneOffset - 48) * 15 % 60 + 60) % 60:00} (0x{drdt.TimezoneOffset.ToString("X2")})"; + string tz = $"{((drdt.TimezoneOffset - 48) * 15 / 60):+0;-0}:{((drdt.TimezoneOffset - 48) * 15 % 60 + 60) % 60:00} (0x{drdt.TimezoneOffset:X2})"; builder.AppendLine(tz, " Timezone Offset"); } diff --git a/SabreTools.Serialization/Wrappers/InstallShieldCabinet.Extraction.cs b/SabreTools.Serialization/Wrappers/InstallShieldCabinet.Extraction.cs index d7806875..152d3934 100644 --- a/SabreTools.Serialization/Wrappers/InstallShieldCabinet.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/InstallShieldCabinet.Extraction.cs @@ -104,8 +104,7 @@ namespace SabreTools.Serialization.Wrappers } // Set the pattern, if possible - if (set != null) - set.FilenamePattern = pattern; + set?.FilenamePattern = pattern; return set; } diff --git a/SabreTools.Serialization/Wrappers/LZSZDD.Extraction.cs b/SabreTools.Serialization/Wrappers/LZSZDD.Extraction.cs index f16a9dae..a1d22636 100644 --- a/SabreTools.Serialization/Wrappers/LZSZDD.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/LZSZDD.Extraction.cs @@ -94,7 +94,11 @@ namespace SabreTools.Serialization.Wrappers // Handle replacing characters char c = (char.IsUpper(input[0]) ? char.ToLower(LastChar) : char.ToUpper(LastChar)); +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + string text2 = extension[..^1] + c; +#else string text2 = extension.Substring(0, extension.Length - 1) + c; +#endif return Path.GetFileNameWithoutExtension(input) + "." + text2; } } diff --git a/SabreTools.Serialization/Wrappers/LinearExecutable.cs b/SabreTools.Serialization/Wrappers/LinearExecutable.cs index c8fff0f8..770ebcc0 100644 --- a/SabreTools.Serialization/Wrappers/LinearExecutable.cs +++ b/SabreTools.Serialization/Wrappers/LinearExecutable.cs @@ -311,7 +311,7 @@ namespace SabreTools.Serialization.Wrappers /// The start of where to read data from, -1 means start of source /// How many bytes to read, -1 means read until end /// Byte array representing the range, null on error - [Obsolete] + [Obsolete("Passthrough method that should not be used")] public byte[]? ReadArbitraryRange(int rangeStart = -1, long length = -1) { // If we have an unset range start, read from the start of the source diff --git a/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs b/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs index db1f1166..41841d4a 100644 --- a/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs +++ b/SabreTools.Serialization/Wrappers/MicrosoftCabinet.cs @@ -253,7 +253,7 @@ namespace SabreTools.Serialization.Wrappers /// Block data to be used for decompression /// True to include debug data, false otherwise /// Byte array representing the decompressed data, empty on error - private byte[] DecompressMSZIPBlock(int folderIndex, Decompressor mszip, int blockIndex, CFDATA block, byte[] blockData, bool includeDebug) + private static byte[] DecompressMSZIPBlock(int folderIndex, Decompressor mszip, int blockIndex, CFDATA block, byte[] blockData, bool includeDebug) { try { diff --git a/SabreTools.Serialization/Wrappers/NewExecutable.cs b/SabreTools.Serialization/Wrappers/NewExecutable.cs index 7043d48f..ad1b887e 100644 --- a/SabreTools.Serialization/Wrappers/NewExecutable.cs +++ b/SabreTools.Serialization/Wrappers/NewExecutable.cs @@ -647,7 +647,7 @@ namespace SabreTools.Serialization.Wrappers /// The start of where to read data from, -1 means start of source /// How many bytes to read, -1 means read until end /// Byte array representing the range, null on error - [Obsolete] + [Obsolete("Passthrough method that should not be used")] public byte[]? ReadArbitraryRange(int rangeStart = -1, long length = -1) { // If we have an unset range start, read from the start of the source diff --git a/SabreTools.Serialization/Wrappers/Nitro.Encryption.cs b/SabreTools.Serialization/Wrappers/Nitro.Encryption.cs index f7ae2fac..9493ccd6 100644 --- a/SabreTools.Serialization/Wrappers/Nitro.Encryption.cs +++ b/SabreTools.Serialization/Wrappers/Nitro.Encryption.cs @@ -8,7 +8,7 @@ namespace SabreTools.Serialization.Wrappers { #region Encryption process variables - private uint[] _cardHash = new uint[0x412]; + private readonly uint[] _cardHash = new uint[0x412]; private uint[] _arg2 = new uint[3]; #endregion diff --git a/SabreTools.Serialization/Wrappers/ObjectExtensions.cs b/SabreTools.Serialization/Wrappers/ObjectExtensions.cs index 084d611c..ec91a195 100644 --- a/SabreTools.Serialization/Wrappers/ObjectExtensions.cs +++ b/SabreTools.Serialization/Wrappers/ObjectExtensions.cs @@ -11,7 +11,7 @@ namespace SabreTools.Serialization.Wrappers internal static class ObjectExtensions { public static TClass ThrowOnNull(this TClass? value) where TClass : class - => value ?? throw new ArgumentNullException(); + => value ?? throw new ArgumentNullException(nameof(value)); } } diff --git a/SabreTools.Serialization/Wrappers/RAR.Extraction.cs b/SabreTools.Serialization/Wrappers/RAR.Extraction.cs index 22754898..594c6498 100644 --- a/SabreTools.Serialization/Wrappers/RAR.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/RAR.Extraction.cs @@ -48,9 +48,9 @@ namespace SabreTools.Serialization.Wrappers else if (rarFile.Entries.Count == 0) rarFile = RarArchive.Open(parts, readerOptions); } - - // Explained in https://github.com/adamhathcock/sharpcompress/pull/661. in order to determine whether - // a RAR or 7Z archive is solid or not, you must check the second file in the archive, as the first + + // Explained in https://github.com/adamhathcock/sharpcompress/pull/661. in order to determine whether + // a RAR or 7Z archive is solid or not, you must check the second file in the archive, as the first // file is always marked non-solid even for solid archives. This iteration is necessary since things // like directories aren't marked solid either. // This is only temporary, as solid detection has been fixed in upstream SolidCompress, but they likely @@ -147,10 +147,17 @@ namespace SabreTools.Serialization.Wrappers match = Regex.Match(filename, rarOldPattern, RegexOptions.IgnoreCase); nextPartFunc = (i) => { +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + return string.Concat( + match.Groups[1].Value, + (char)(match.Groups[2].Value[0] + ((i - 1) / 100)) + + (i - 1).ToString("D4")[2..]); +#else return string.Concat( match.Groups[1].Value, (char)(match.Groups[2].Value[0] + ((i - 1) / 100)) + (i - 1).ToString("D4").Substring(2)); +#endif }; } else if (Regex.IsMatch(filename, genericPattern, RegexOptions.IgnoreCase)) @@ -188,7 +195,7 @@ namespace SabreTools.Serialization.Wrappers #if NET462_OR_GREATER || NETCOREAPP /// - /// Extraction method for non-solid archives. This iterates over each entry in the archive to extract every + /// Extraction method for non-solid archives. This iterates over each entry in the archive to extract every /// file individually, in order to extract all valid files from the archive. /// private static bool ExtractNonSolid(RarArchive rarFile, string outDir, bool includeDebug) diff --git a/SabreTools.Serialization/Wrappers/SevenZip.Extraction.cs b/SabreTools.Serialization/Wrappers/SevenZip.Extraction.cs index 345b7023..48d2e240 100644 --- a/SabreTools.Serialization/Wrappers/SevenZip.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/SevenZip.Extraction.cs @@ -38,7 +38,7 @@ namespace SabreTools.Serialization.Wrappers { // Find all file parts FileInfo[] parts = [.. ArchiveFactory.GetFileParts(new FileInfo(Filename))]; - + // If there are multiple parts if (parts.Length > 1) sevenZip = SevenZipArchive.Open(parts, readerOptions); @@ -48,8 +48,8 @@ namespace SabreTools.Serialization.Wrappers sevenZip = SevenZipArchive.Open(parts, readerOptions); } - // Explained in https://github.com/adamhathcock/sharpcompress/pull/661. in order to determine whether - // a RAR or 7Z archive is solid or not, you must check the second file in the archive, as the first + // Explained in https://github.com/adamhathcock/sharpcompress/pull/661. in order to determine whether + // a RAR or 7Z archive is solid or not, you must check the second file in the archive, as the first // file is always marked non-solid even for solid archives. This iteration is necessary since things // like directories aren't marked solid either. // This is only temporary, as solid detection has been fixed in upstream SolidCompress, but they likely @@ -85,7 +85,7 @@ namespace SabreTools.Serialization.Wrappers if (includeDebug) Console.WriteLine(ex); } } - + // Still check SharpCompress's archive-level isSolid flag. Based on the way the check works on their // end, it's possible that a multi-block solid archive might have the second (or more files) file not // solid? It doesn't hurt to check either way. @@ -163,7 +163,7 @@ namespace SabreTools.Serialization.Wrappers #if NET462_OR_GREATER || NETCOREAPP /// - /// Extraction method for non-solid archives. This iterates over each entry in the archive to extract every + /// Extraction method for non-solid archives. This iterates over each entry in the archive to extract every /// file individually, in order to extract all valid files from the archive. /// private static bool ExtractNonSolid(SevenZipArchive sevenZip, string outputDirectory, bool includeDebug) diff --git a/SabreTools.Serialization/Wrappers/Skeleton.Printing.cs b/SabreTools.Serialization/Wrappers/Skeleton.Printing.cs index 8fc19490..2cb850ea 100644 --- a/SabreTools.Serialization/Wrappers/Skeleton.Printing.cs +++ b/SabreTools.Serialization/Wrappers/Skeleton.Printing.cs @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Wrappers // TODO: Parse the volume descriptors to print the Path Table Groups and Directory Descriptors with proper encoding Encoding encoding = Encoding.UTF8; - Print(builder, Model.PathTableGroups, encoding); + Print(builder, Model.PathTableGroups); Print(builder, Model.DirectoryDescriptors, encoding); } } diff --git a/SabreTools.Serialization/Wrappers/VBSP.Printing.cs b/SabreTools.Serialization/Wrappers/VBSP.Printing.cs index e965da81..f66faa22 100644 --- a/SabreTools.Serialization/Wrappers/VBSP.Printing.cs +++ b/SabreTools.Serialization/Wrappers/VBSP.Printing.cs @@ -374,7 +374,7 @@ namespace SabreTools.Serialization.Wrappers for (int i = 0; i < lump.Entities.Length; i++) { // TODO: Implement entity printing - var entity = lump.Entities[i]; + //var entity = lump.Entities[i]; builder.AppendLine($" Entity {i}: Not printed yet"); } diff --git a/SabreTools.Serialization/Wrappers/VPK.cs b/SabreTools.Serialization/Wrappers/VPK.cs index 919267aa..3641bcf2 100644 --- a/SabreTools.Serialization/Wrappers/VPK.cs +++ b/SabreTools.Serialization/Wrappers/VPK.cs @@ -39,7 +39,11 @@ namespace SabreTools.Serialization.Wrappers if (fileName.Length < 3) return null; +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + else if (fileName[^3..] != "dir") +#else else if (fileName.Substring(fileName.Length - 3) != "dir") +#endif return null; // Get the archive count @@ -59,7 +63,11 @@ namespace SabreTools.Serialization.Wrappers for (int i = 0; i < archiveCount; i++) { // We need 5 digits to print a short, but we already have 3 for dir. +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + string archiveFileName = $"{fileName[..^3]}{i.ToString().PadLeft(3, '0')}.{extension}"; +#else string archiveFileName = $"{fileName.Substring(0, fileName.Length - 3)}{i.ToString().PadLeft(3, '0')}.{extension}"; +#endif _archiveFilenames[i] = archiveFileName; } diff --git a/SabreTools.Serialization/Wrappers/WiseScript.cs b/SabreTools.Serialization/Wrappers/WiseScript.cs index 71b8ae7e..c7c08ceb 100644 --- a/SabreTools.Serialization/Wrappers/WiseScript.cs +++ b/SabreTools.Serialization/Wrappers/WiseScript.cs @@ -222,7 +222,11 @@ namespace SabreTools.Serialization.Wrappers // Remove wildcards from end of the path if (newDirectoryName.EndsWith("*.*")) +#if NETCOREAPP || NETSTANDARD2_1_OR_GREATER + newDirectoryName = newDirectoryName[..^4]; +#else newDirectoryName = newDirectoryName.Substring(0, newDirectoryName.Length - 4); +#endif Directory.CreateDirectory(newDirectoryName); } diff --git a/SabreTools.Serialization/Wrappers/WrapperType.cs b/SabreTools.Serialization/Wrappers/WrapperType.cs index bbf470fa..aff782b0 100644 --- a/SabreTools.Serialization/Wrappers/WrapperType.cs +++ b/SabreTools.Serialization/Wrappers/WrapperType.cs @@ -262,7 +262,7 @@ namespace SabreTools.Serialization.Wrappers /// Xbox Package File /// XZP, - + /// /// ZStandard compressed file /// diff --git a/SabreTools.Serialization/Wrappers/XZ.Extraction.cs b/SabreTools.Serialization/Wrappers/XZ.Extraction.cs index 47088fa0..0c31911e 100644 --- a/SabreTools.Serialization/Wrappers/XZ.Extraction.cs +++ b/SabreTools.Serialization/Wrappers/XZ.Extraction.cs @@ -1,8 +1,6 @@ using System; #if NET462_OR_GREATER || NETCOREAPP using System.IO; -#endif -#if NET462_OR_GREATER || NETCOREAPP using SharpCompress.Compressors.Xz; #endif diff --git a/SabreTools.Serialization/Wrappers/ZSTD.cs b/SabreTools.Serialization/Wrappers/ZSTD.cs index b39a6b3c..d9cb6d00 100644 --- a/SabreTools.Serialization/Wrappers/ZSTD.cs +++ b/SabreTools.Serialization/Wrappers/ZSTD.cs @@ -25,22 +25,22 @@ namespace SabreTools.Serialization.Wrappers #region Constructors /// - public ZSTD(Data.Models.ZSTD.Header model, byte[] data) : base(model, data) { } + public ZSTD(Header model, byte[] data) : base(model, data) { } /// - public ZSTD(Data.Models.ZSTD.Header model, byte[] data, int offset) : base(model, data, offset) { } + public ZSTD(Header model, byte[] data, int offset) : base(model, data, offset) { } /// - public ZSTD(Data.Models.ZSTD.Header model, byte[] data, int offset, int length) : base(model, data, offset, length) { } + public ZSTD(Header model, byte[] data, int offset, int length) : base(model, data, offset, length) { } /// - public ZSTD(Data.Models.ZSTD.Header model, Stream data) : base(model, data) { } + public ZSTD(Header model, Stream data) : base(model, data) { } /// - public ZSTD(Data.Models.ZSTD.Header model, Stream data, long offset) : base(model, data, offset) { } + public ZSTD(Header model, Stream data, long offset) : base(model, data, offset) { } /// - public ZSTD(Data.Models.ZSTD.Header model, Stream data, long offset, long length) : base(model, data, offset, length) { } + public ZSTD(Header model, Stream data, long offset, long length) : base(model, data, offset, length) { } #endregion diff --git a/SabreTools.Serialization/Writers/BaseBinarySerializer.cs b/SabreTools.Serialization/Writers/BaseBinarySerializer.cs index 7f41e789..70a0871b 100644 --- a/SabreTools.Serialization/Writers/BaseBinarySerializer.cs +++ b/SabreTools.Serialization/Writers/BaseBinarySerializer.cs @@ -9,7 +9,7 @@ namespace SabreTools.Serialization.Writers /// Type of the model to serialize /// /// This class allows all inheriting types to only implement - /// and still implicitly implement and + /// and still implicitly implement and /// public abstract class BaseBinaryWriter : IByteWriter, diff --git a/SabreTools.Serialization/Writers/CueSheet.cs b/SabreTools.Serialization/Writers/CueSheet.cs index 4f7fdbc6..9a4c39a7 100644 --- a/SabreTools.Serialization/Writers/CueSheet.cs +++ b/SabreTools.Serialization/Writers/CueSheet.cs @@ -17,7 +17,7 @@ namespace SabreTools.Serialization.Writers // If we don't have any files, it's invalid if (obj?.Files == null) - throw new ArgumentNullException(nameof(obj.Files)); + throw new InvalidDataException(nameof(obj.Files)); else if (obj.Files.Length == 0) throw new ArgumentException("No files provided to write"); @@ -46,7 +46,7 @@ namespace SabreTools.Serialization.Writers { // If we don't have any files, it's invalid if (cueSheet.Files == null) - throw new ArgumentNullException(nameof(cueSheet.Files)); + throw new InvalidDataException(nameof(cueSheet.Files)); else if (cueSheet.Files.Length == 0) throw new ArgumentException("No files provided to write"); @@ -80,7 +80,7 @@ namespace SabreTools.Serialization.Writers { // If we don't have any tracks, it's invalid if (cueFile?.Tracks == null) - throw new ArgumentNullException(nameof(cueFile.Tracks)); + throw new InvalidDataException(nameof(cueFile.Tracks)); else if (cueFile.Tracks.Length == 0) throw new ArgumentException("No tracks provided to write"); @@ -101,7 +101,7 @@ namespace SabreTools.Serialization.Writers { // If we don't have any indices, it's invalid if (cueTrack?.Indices == null) - throw new ArgumentNullException(nameof(cueTrack.Indices)); + throw new InvalidDataException(nameof(cueTrack.Indices)); else if (cueTrack.Indices.Length == 0) throw new ArgumentException("No indices provided to write"); diff --git a/publish-nix.sh b/publish-nix.sh index 33999bb5..ecb8f98f 100755 --- a/publish-nix.sh +++ b/publish-nix.sh @@ -1,7 +1,7 @@ #!/bin/bash # This batch file assumes the following: -# - .NET 9.0 (or newer) SDK is installed and in PATH +# - .NET 10.0 (or newer) SDK is installed and in PATH # - zip is installed and in PATH # - Git is installed and in PATH # @@ -49,18 +49,18 @@ echo " No archive (-a) $NO_ARCHIVE" echo " " # Create the build matrix arrays -FRAMEWORKS=("net9.0") +FRAMEWORKS=("net10.0") RUNTIMES=("win-x86" "win-x64" "win-arm64" "linux-x64" "linux-arm64" "osx-x64" "osx-arm64") # Use expanded lists, if requested if [ $USE_ALL = true ]; then - FRAMEWORKS=("net20" "net35" "net40" "net452" "net462" "net472" "net48" "netcoreapp3.1" "net5.0" "net6.0" "net7.0" "net8.0" "net9.0") + FRAMEWORKS=("net20" "net35" "net40" "net452" "net462" "net472" "net48" "netcoreapp3.1" "net5.0" "net6.0" "net7.0" "net8.0" "net9.0" "net10.0") fi # Create the filter arrays -SINGLE_FILE_CAPABLE=("net5.0" "net6.0" "net7.0" "net8.0" "net9.0") -VALID_APPLE_FRAMEWORKS=("net6.0" "net7.0" "net8.0" "net9.0") -VALID_CROSS_PLATFORM_FRAMEWORKS=("netcoreapp3.1" "net5.0" "net6.0" "net7.0" "net8.0" "net9.0") +SINGLE_FILE_CAPABLE=("net5.0" "net6.0" "net7.0" "net8.0" "net9.0" "net10.0") +VALID_APPLE_FRAMEWORKS=("net6.0" "net7.0" "net8.0" "net9.0" "net10.0") +VALID_CROSS_PLATFORM_FRAMEWORKS=("netcoreapp3.1" "net5.0" "net6.0" "net7.0" "net8.0" "net9.0" "net10.0") VALID_CROSS_PLATFORM_RUNTIMES=("win-arm64" "linux-x64" "linux-arm64" "osx-x64" "osx-arm64") # Only build if requested diff --git a/publish-win.ps1 b/publish-win.ps1 index 71e1ee3d..89e82f99 100644 --- a/publish-win.ps1 +++ b/publish-win.ps1 @@ -1,5 +1,5 @@ # This batch file assumes the following: -# - .NET 9.0 (or newer) SDK is installed and in PATH +# - .NET 10.0 (or newer) SDK is installed and in PATH # - 7-zip commandline (7z.exe) is installed and in PATH # - Git for Windows is installed and in PATH # @@ -40,18 +40,18 @@ Write-Host " No archive (-NoArchive) $NO_ARCHIVE" Write-Host " " # Create the build matrix arrays -$FRAMEWORKS = @('net9.0') +$FRAMEWORKS = @('net10.0') $RUNTIMES = @('win-x86', 'win-x64', 'win-arm64', 'linux-x64', 'linux-arm64', 'osx-x64', 'osx-arm64') # Use expanded lists, if requested if ($USE_ALL.IsPresent) { - $FRAMEWORKS = @('net20', 'net35', 'net40', 'net452', 'net462', 'net472', 'net48', 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0') + $FRAMEWORKS = @('net20', 'net35', 'net40', 'net452', 'net462', 'net472', 'net48', 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0', 'net10.0') } # Create the filter arrays -$SINGLE_FILE_CAPABLE = @('net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0') -$VALID_APPLE_FRAMEWORKS = @('net6.0', 'net7.0', 'net8.0', 'net9.0') -$VALID_CROSS_PLATFORM_FRAMEWORKS = @('netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0') +$SINGLE_FILE_CAPABLE = @('net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0', 'net10.0') +$VALID_APPLE_FRAMEWORKS = @('net6.0', 'net7.0', 'net8.0', 'net9.0', 'net10.0') +$VALID_CROSS_PLATFORM_FRAMEWORKS = @('netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0', 'net10.0') $VALID_CROSS_PLATFORM_RUNTIMES = @('win-arm64', 'linux-x64', 'linux-arm64', 'osx-x64', 'osx-arm64') # Only build if requested