claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Goodbye .NET Framework 4.8 and RIPEMD160

Browse Source
This commit is contained in:
Matt Nadareski
2020-12-14 15:22:14 -08:00
parent 2ae180fb53
commit 7f7c3ec314
52 changed files with 59 additions and 3033 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SabreTools.Skippers/SabreTools.Skippers.csproj
View File

@@ -1,16 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net48;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
<RuntimeIdentifiers>win10-x64;win7-x86</RuntimeIdentifiers>
<Configurations>Debug;Release</Configurations>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net48'">
<DefineConstants>NET_FRAMEWORK</DefineConstants>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\SabreTools.Logging\SabreTools.Logging.csproj" />
</ItemGroup>

28
SabreTools.Skippers/SkipperFile.cs
View File

@@ -336,29 +336,13 @@ namespace SabreTools.Skippers
if (xtr.GetAttribute("operator") != null)
{
string oper = xtr.GetAttribute("operator");
#if NET_FRAMEWORK
switch (oper.ToLowerInvariant())
test.Operator = oper.ToLowerInvariant() switch
{
case "less":
test.Operator = HeaderSkipTestFileOperator.Less;
break;
case "greater":
test.Operator = HeaderSkipTestFileOperator.Greater;
break;
case "equal":
default:
test.Operator = HeaderSkipTestFileOperator.Equal;
break;
}
#else
test.Operator = oper.ToLowerInvariant() switch
{
"less" => HeaderSkipTestFileOperator.Less,
"greater" => HeaderSkipTestFileOperator.Greater,
"equal" => HeaderSkipTestFileOperator.Equal,
_ => HeaderSkipTestFileOperator.Equal,
};
#endif
"less" => HeaderSkipTestFileOperator.Less,
"greater" => HeaderSkipTestFileOperator.Greater,
"equal" => HeaderSkipTestFileOperator.Equal,
_ => HeaderSkipTestFileOperator.Equal,
};
}
return test;

18
SabreTools.Skippers/SkipperTest.cs
View File

@@ -55,23 +55,6 @@ namespace SabreTools.Skippers
/// <remarks>The Stream is assumed to be in the proper position for a given test</remarks>
public bool Passes(Stream input)
{
#if NET_FRAMEWORK
switch (Type)
{
case HeaderSkipTest.And:
return CheckAnd(input);
case HeaderSkipTest.Data:
return CheckData(input);
case HeaderSkipTest.File:
return CheckFile(input);
case HeaderSkipTest.Or:
return CheckOr(input);
case HeaderSkipTest.Xor:
return CheckXor(input);
default:
return true;
}
#else
return Type switch
{
HeaderSkipTest.And => CheckAnd(input),
@@ -81,7 +64,6 @@ namespace SabreTools.Skippers
HeaderSkipTest.Xor => CheckXor(input),
_ => true,
};
#endif
}
#region Checking Helpers