glm94/LibIRD
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Finalise old dotnet support

Browse Source
This commit is contained in:
Deterous
2024-03-12 19:08:42 +09:00
parent fed9d6ea57
commit f7879bf9e8
3 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRDKit/IRDKit.csproj
+5 -5
View File
@@ -5,13 +5,13 @@
<OutputType>Exe</OutputType>
<TargetName>irdkit</TargetName>
<AssemblyName>irdkit</AssemblyName>
<TargetFrameworks>net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<LangVersion>latest</LangVersion>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Version>0.7.0</Version>
<Version>0.7.1</Version>
<!-- Package Properties -->
<Authors>Deterous</Authors>
@@ -30,7 +30,7 @@
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="SabreTools.Hashing" Version="1.1.3" />
<PackageReference Include="SabreTools.Hashing" Version="1.1.4" />
<PackageReference Include="SabreTools.RedumpLib" Version="1.3.4" />
</ItemGroup>
LibIRD/IRD.cs
+30 -2
View File
@@ -413,7 +413,11 @@ namespace LibIRD
throw new ArgumentException("Disc Key must be a byte array of length 16", nameof(key));
// Setup AES decryption
#if NET35_OR_GREATER || NETCOREAPP
using Aes aes = Aes.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings");
#else
using Rijndael aes = Rijndael.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings"); ;
#endif
// Set AES settings
aes.Key = D1AesKey;
@@ -446,7 +450,11 @@ namespace LibIRD
throw new ArgumentException("Disc Key must be a byte array of length 16", nameof(d1));
// Setup AES decryption
#if NET35_OR_GREATER || NETCOREAPP
using Aes aes = Aes.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings");
#else
using Rijndael aes = Rijndael.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings"); ;
#endif
// Set AES settings
aes.Key = D1AesKey;
@@ -478,7 +486,11 @@ namespace LibIRD
if (d2.Length != 16) throw new ArgumentException("Disc ID must be a byte array of length 16", nameof(d2));
// Setup AES encryption
#if NET35_OR_GREATER || NETCOREAPP
using Aes aes = Aes.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings");
#else
using Rijndael aes = Rijndael.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings"); ;
#endif
// Set AES settings
aes.Key = D2AesKey;
@@ -511,7 +523,11 @@ namespace LibIRD
throw new ArgumentException("Disc ID must be a byte array of length 16", nameof(d2));
// Setup AES encryption
#if NET35_OR_GREATER || NETCOREAPP
using Aes aes = Aes.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings");
#else
using Rijndael aes = Rijndael.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings"); ;
#endif
// Set AES settings
aes.Key = D2AesKey;
@@ -737,7 +753,7 @@ namespace LibIRD
HashISO(fs, redump && UID == 0x00000000);
}
#endregion
#endregion
#region Reading ISO
@@ -989,7 +1005,12 @@ namespace LibIRD
throw new ArgumentException("Number of sectors must be within buffer");
// Setup AES decryption
#if NET35_OR_GREATER || NETCOREAPP
using Aes aes = Aes.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings");
#else
using Rijndael aes = Rijndael.Create() ?? throw new InvalidOperationException("AES not available. Change your system settings"); ;
#endif
// Set AES settings
aes.Key = DiscKey;
aes.Padding = PaddingMode.None;
@@ -1359,7 +1380,14 @@ namespace LibIRD
#endif
// Write entire gzipped IRD stream to file
stream.Position = 0;
#if NET40_OR_GREATER || NETCOREAPP
stream.CopyTo(gzStream);
#else
byte[] buffer = new byte[1024];
int numBytes;
while ((numBytes = stream.Read(buffer, 0, buffer.Length)) > 0)
gzStream.Write(buffer, 0, numBytes);
#endif
}
/// <summary>
@@ -1571,7 +1599,7 @@ namespace LibIRD
}
}
#endregion
#endregion
#region Helper Functions
LibIRD/LibIRD.csproj
+12 -5
View File
@@ -2,13 +2,12 @@
<PropertyGroup>
<!-- Assembly Properties -->
<TargetFrameworks>net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<LangVersion>latest</LangVersion>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Version>0.7.0</Version>
<Version>0.7.1</Version>
<PackageOutputPath>../nupkg</PackageOutputPath>
<!-- Package Properties -->
@@ -23,13 +22,21 @@
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
</PropertyGroup>
<PropertyGroup Condition="$(RuntimeIdentifier.StartsWith(`osx-arm`))">
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition="!$(RuntimeIdentifier.StartsWith(`osx-arm`))">
<TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<None Include="./README.md" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SabreTools.Hashing" Version="1.1.3" />
<PackageReference Include="SabreTools.Hashing" Version="1.1.4" />
</ItemGroup>
</Project>