Clean up based on .NET Core 3.1 reccomendations

This commit is contained in:
Matt Nadareski
2020-12-14 16:01:28 -08:00
parent 8870e9b287
commit ebd1044454
29 changed files with 130 additions and 222 deletions

View File

@@ -69,7 +69,7 @@ namespace SabreTools.DatFiles.Formats
Rom rom = new Rom
{
Name = svr.Line[1].Substring(fullname[0].Length + 1),
Name = svr.Line[1][(fullname[0].Length + 1)..],
Size = null, // No size provided, but we don't want the size being 0
CRC = svr.Line[4],
MD5 = svr.Line[3],

View File

@@ -222,7 +222,7 @@ namespace SabreTools.DatFiles.Formats
}
// Get the hash field and set final fields
string hash = string.Empty;
string hash;
switch (_hash)
{
case Hash.CRC:

View File

@@ -93,7 +93,7 @@ namespace SabreTools.DatFiles.Formats
logger.Warning($"Possibly malformed line: '{line}'");
string romname = split[0];
line = line.Substring(romname.Length);
line = line[romname.Length..];
// Next we separate the ROM into pieces
split = line.Split(new char[0], StringSplitOptions.RemoveEmptyEntries);

View File

@@ -398,8 +398,6 @@ namespace SabreTools.DatFiles.Formats
// Otherwise, add what is possible
reader.MoveToContent();
string key = string.Empty;
string temptype = reader.Name;
bool containsItems = false;
// Create a new machine
@@ -497,7 +495,7 @@ namespace SabreTools.DatFiles.Formats
archive.CopyMachineInformation(machine);
// Now process and add the archive
key = ParseAddHelper(archive);
ParseAddHelper(archive);
reader.Read();
break;
@@ -521,7 +519,7 @@ namespace SabreTools.DatFiles.Formats
biosSet.CopyMachineInformation(machine);
// Now process and add the biosSet
key = ParseAddHelper(biosSet);
ParseAddHelper(biosSet);
reader.Read();
break;
@@ -547,7 +545,7 @@ namespace SabreTools.DatFiles.Formats
disk.CopyMachineInformation(machine);
// Now process and add the disk
key = ParseAddHelper(disk);
ParseAddHelper(disk);
reader.Read();
break;
@@ -573,7 +571,7 @@ namespace SabreTools.DatFiles.Formats
media.CopyMachineInformation(machine);
// Now process and add the media
key = ParseAddHelper(media);
ParseAddHelper(media);
reader.Read();
break;
@@ -593,7 +591,7 @@ namespace SabreTools.DatFiles.Formats
release.CopyMachineInformation(machine);
// Now process and add the release
key = ParseAddHelper(release);
ParseAddHelper(release);
reader.Read();
break;
@@ -627,7 +625,7 @@ namespace SabreTools.DatFiles.Formats
rom.CopyMachineInformation(machine);
// Now process and add the rom
key = ParseAddHelper(rom);
ParseAddHelper(rom);
reader.Read();
break;
@@ -649,7 +647,7 @@ namespace SabreTools.DatFiles.Formats
sample.CopyMachineInformation(machine);
// Now process and add the sample
key = ParseAddHelper(sample);
ParseAddHelper(sample);
reader.Read();
break;

View File

@@ -536,7 +536,7 @@ namespace SabreTools.DatFiles.Formats
return base.CreateProperties(type, memberSerialization)
.OrderBy(p => BaseTypesAndSelf(p.DeclaringType).Count()).ToList();
IEnumerable<Type> BaseTypesAndSelf(Type t)
static IEnumerable<Type> BaseTypesAndSelf(Type t)
{
while (t != null)
{