Code style auto-adjustments

Library/DiscUtils.BootConfig/BcdObject.cs

@@ -135,8 +135,8 @@ public class BcdObject
 
     static BcdObject()
     {
-        _nameToGuid = new Dictionary<string, Guid>();
-        _guidToName = new Dictionary<Guid, string>();
+        _nameToGuid = [];
+        _guidToName = [];
 
         AddMapping("{emssettings}", EmsSettingsGroupId);
         AddMapping("{resumeloadersettings}", ResumeLoaderSettingsGroupId);

Library/DiscUtils.Btrfs/Context.cs

@@ -36,7 +36,7 @@ internal class Context : VfsContext
 {
     public Context(BtrfsFileSystemOptions options)
     {
-        FsTrees = new Dictionary<ulong, NodeHeader>();
+        FsTrees = [];
         Options = options;
     }
 

Library/DiscUtils.Core/Archives/TarFileBuilder.cs

@@ -39,7 +39,7 @@ public class TarFileBuilder : StreamBuilder
     /// </summary>
     public TarFileBuilder()
     {
-        _files = new List<UnixBuildFileRecord>();
+        _files = [];
     }
 
     public bool Exists(string name)

Library/DiscUtils.Core/Archives/UnixBuildFileRecord.cs

@@ -69,13 +69,13 @@ public UnixBuildFileRecord(string name, BuilderExtentSource fileSource, UnixFile
 
     public string Name => _name;
 
-    public UnixFilePermissions FileMode => this._fileMode;
+    public UnixFilePermissions FileMode => _fileMode;
 
-    public int OwnerId => this._ownerId;
+    public int OwnerId => _ownerId;
 
-    public int GroupId => this._groupId;
+    public int GroupId => _groupId;
 
-    public DateTime ModificationTime => this._modificationTime;
+    public DateTime ModificationTime => _modificationTime;
 
     public long Length => _source.Length;
 

Library/DiscUtils.Core/FileSystemManager.cs

@@ -45,7 +45,7 @@ public static class FileSystemManager
     /// </summary>
     static FileSystemManager()
     {
-        _factories = new List<VfsFileSystemFactory>();
+        _factories = [];
     }
 
     /// <summary>

Library/DiscUtils.Core/Internal/ObjectCache.cs

@@ -45,14 +45,14 @@ internal class ObjectCache<K, V> where V : class
 
     public ObjectCache()
     {
-        _entries = new Dictionary<K, WeakReference<V>>();
-        _recent = new List<KeyValuePair<K, V>>();
+        _entries = [];
+        _recent = [];
     }
 
     public ObjectCache(IEqualityComparer<K> comparer)
     {
         _entries = new Dictionary<K, WeakReference<V>>(comparer);
-        _recent = new List<KeyValuePair<K, V>>();
+        _recent = [];
     }
 
     public V this[K key]

Library/DiscUtils.Core/LogicalDiskManager/Database.cs

@@ -56,7 +56,7 @@ public Database(Stream stream)
 
             stream.ReadExactly(buffer, 0, bufferSize);
 
-            _records = new Dictionary<ulong, DatabaseRecord>();
+            _records = [];
             for (var i = 0; i < _vmdb.NumVBlks; ++i)
             {
                 var rec = DatabaseRecord.ReadFrom(buffer, (int)(i * _vmdb.BlockSize));

Library/DiscUtils.Core/LogicalDiskManager/DynamicDiskGroup.cs

@@ -37,7 +37,7 @@ internal class DynamicDiskGroup : IDiagnosticTraceable
 
     internal DynamicDiskGroup(VirtualDisk disk)
     {
-        _disks = new Dictionary<Guid, DynamicDisk>();
+        _disks = [];
 
         var dynDisk = new DynamicDisk(disk);
         _database = dynDisk.Database;

Library/DiscUtils.Core/LogicalDiskManager/DynamicDiskManager.cs

@@ -39,7 +39,7 @@ public class DynamicDiskManager : IDiagnosticTraceable
     /// <param name="disks">The initial set of disks to manage.</param>
     public DynamicDiskManager(params VirtualDisk[] disks)
     {
-        _groups = new Dictionary<string, DynamicDiskGroup>();
+        _groups = [];
 
         foreach (var disk in disks)
         {

Library/DiscUtils.Core/Partitions/BiosPartitionedDiskBuilder.cs

@@ -58,7 +58,7 @@ public BiosPartitionedDiskBuilder(long capacity, Geometry biosGeometry)
         _bootSectors.SetLength(capacity);
         PartitionTable = BiosPartitionTable.Initialize(_bootSectors, _biosGeometry);
 
-        _partitionContents = new Dictionary<int, BuilderExtent>();
+        _partitionContents = [];
     }
 
     /// <summary>
@@ -84,7 +84,7 @@ public BiosPartitionedDiskBuilder(long capacity, byte[] bootSectors, Geometry bi
         _bootSectors.Write(bootSectors, 0, bootSectors.Length);
         PartitionTable = new BiosPartitionTable(_bootSectors, biosGeometry);
 
-        _partitionContents = new Dictionary<int, BuilderExtent>();
+        _partitionContents = [];
     }
 
     /// <summary>
@@ -132,7 +132,7 @@ public BiosPartitionedDiskBuilder(VirtualDisk sourceDisk)
 
         PartitionTable = new BiosPartitionTable(_bootSectors, _biosGeometry);
 
-        _partitionContents = new Dictionary<int, BuilderExtent>();
+        _partitionContents = [];
     }
 
     /// <summary>

Library/DiscUtils.Core/Setup/SetupHelper.cs

@@ -13,7 +13,7 @@ public static class SetupHelper
 
     static SetupHelper()
     {
-        _alreadyLoaded = new HashSet<string>();
+        _alreadyLoaded = [];
 
         // Register the core DiscUtils lib
         RegisterAssembly(typeof(SetupHelper).Assembly);

Library/DiscUtils.Core/VirtualDiskParameters.cs

@@ -55,7 +55,7 @@ public sealed class VirtualDiskParameters
     /// <summary>
     /// Gets a dictionary of extended parameters, that varies by disk type.
     /// </summary>
-    public Dictionary<string, string> ExtendedParameters { get; } = new Dictionary<string, string>();
+    public Dictionary<string, string> ExtendedParameters { get; } = [];
 
     /// <summary>
     /// Gets or sets the physical (aka IDE) geometry of the disk.

Library/DiscUtils.Core/VolumeManager.cs

@@ -58,9 +58,9 @@ public sealed class VolumeManager
     /// </summary>
     public VolumeManager()
     {
-        _disks = new List<VirtualDisk>();
-        _physicalVolumes = new Dictionary<string, PhysicalVolumeInfo>();
-        _logicalVolumes = new Dictionary<string, LogicalVolumeInfo>();
+        _disks = [];
+        _physicalVolumes = [];
+        _logicalVolumes = [];
     }
 
     /// <summary>

Library/DiscUtils.Dmg/CompressedBlock.cs

@@ -52,7 +52,7 @@ public int ReadFrom(ReadOnlySpan<byte> buffer)
 
         CheckSum = EndianUtilities.ToStruct<UdifChecksum>(buffer.Slice(60));
 
-        Runs = new List<CompressedRun>();
+        Runs = [];
         var numRuns = EndianUtilities.ToInt32BigEndian(buffer.Slice(200));
         for (var i = 0; i < numRuns; ++i)
         {

Library/DiscUtils.Dmg/UdifBuffer.cs

@@ -48,7 +48,7 @@ public UdifBuffer(Stream stream, ResourceFork resources, long sectorCount)
         _resources = resources;
         _sectorCount = sectorCount;
 
-        Blocks = new List<CompressedBlock>();
+        Blocks = [];
 
         foreach (var resource in _resources.GetAllResources("blkx"))
         {

Library/DiscUtils.Dmg/UdifPartitionTable.cs

@@ -35,7 +35,7 @@ internal class UdifPartitionTable : PartitionTable
     public UdifPartitionTable(Disk disk, UdifBuffer buffer)
     {
         _buffer = buffer;
-        _partitions = new Collection<PartitionInfo>();
+        _partitions = [];
         _disk = disk;
 
         foreach (var block in _buffer.Blocks)

Library/DiscUtils.Ext/BlockGroup.cs

@@ -38,10 +38,10 @@ internal class BlockGroup64 : BlockGroup
 
     public BlockGroup64(int descriptorSize)
     {
-        this._descriptorSize = descriptorSize;
+        _descriptorSize = descriptorSize;
     }
 
-    public override int Size => this._descriptorSize;
+    public override int Size => _descriptorSize;
 
     public override int ReadFrom(ReadOnlySpan<byte> buffer)
     {
@@ -54,7 +54,7 @@ public override int ReadFrom(ReadOnlySpan<byte> buffer)
         FreeInodesCountHigh = EndianUtilities.ToUInt16LittleEndian(buffer.Slice(0x2E));
         UsedDirsCountHigh = EndianUtilities.ToUInt16LittleEndian(buffer.Slice(0x30));
 
-        return this._descriptorSize;
+        return _descriptorSize;
     }
 }
 

Library/DiscUtils.Fat/ClusterStream.cs

@@ -52,15 +52,7 @@ internal ClusterStream(FatFileSystem fileSystem, FileAccess access, uint firstCl
         _fat = fileSystem.Fat;
         _length = length;
 
-        _knownClusters = new List<uint>();
-        if (firstCluster != 0)
-        {
-            _knownClusters.Add(firstCluster);
-        }
-        else
-        {
-            _knownClusters.Add(FatBuffer.EndOfChain);
-        }
+        _knownClusters = [firstCluster != 0 ? firstCluster : FatBuffer.EndOfChain];
 
         if (_length == uint.MaxValue)
         {

Library/DiscUtils.Fat/Directory.cs

@@ -350,8 +350,8 @@ internal void UpdateEntry(long id, DirectoryEntry entry)
 
     private void LoadEntries()
     {
-        _entries = new Dictionary<long, DirectoryEntry>();
-        _freeEntries = new List<long>();
+        _entries = [];
+        _freeEntries = [];
 
         _selfEntryLocation = -1;
         _parentEntryLocation = -1;

Library/DiscUtils.Fat/FatBuffer.cs

@@ -68,7 +68,7 @@ public FatBuffer(FatType type, byte[] buffer)
     {
         _type = type;
         _buffer = buffer;
-        _dirtySectors = new Dictionary<uint, uint>();
+        _dirtySectors = [];
     }
 
     internal int NumEntries => _type switch

Library/DiscUtils.Fat/FatFileSystem.cs

@@ -41,7 +41,7 @@ public sealed class FatFileSystem : DiscFileSystem, IDosFileSystem, IClusterBase
     /// <summary>
     /// The Epoch for FAT file systems (1st Jan, 1980).
     /// </summary>
-    public static readonly DateTime Epoch = new DateTime(1980, 1, 1);
+    public static readonly DateTime Epoch = new(1980, 1, 1);
 
     private readonly Dictionary<uint, Directory> _dirCache;
     private readonly Ownership _ownsData;
@@ -87,7 +87,7 @@ static FatFileSystem()
     public FatFileSystem(Stream data)
         : base(new FatFileSystemOptions())
     {
-        _dirCache = new Dictionary<uint, Directory>();
+        _dirCache = [];
         _timeConverter = DefaultTimeConverter;
         Initialize(data);
     }
@@ -104,7 +104,7 @@ public FatFileSystem(Stream data)
     public FatFileSystem(Stream data, Ownership ownsData)
         : base(new FatFileSystemOptions())
     {
-        _dirCache = new Dictionary<uint, Directory>();
+        _dirCache = [];
         _timeConverter = DefaultTimeConverter;
         Initialize(data);
         _ownsData = ownsData;
@@ -118,7 +118,7 @@ public FatFileSystem(Stream data, Ownership ownsData)
     public FatFileSystem(Stream data, TimeConverter timeConverter)
         : base(new FatFileSystemOptions())
     {
-        _dirCache = new Dictionary<uint, Directory>();
+        _dirCache = [];
         _timeConverter = timeConverter;
         Initialize(data);
     }
@@ -133,7 +133,7 @@ public FatFileSystem(Stream data, TimeConverter timeConverter)
     public FatFileSystem(Stream data, Ownership ownsData, TimeConverter timeConverter)
         : base(new FatFileSystemOptions())
     {
-        _dirCache = new Dictionary<uint, Directory>();
+        _dirCache = [];
         _timeConverter = timeConverter;
         Initialize(data);
         _ownsData = ownsData;
@@ -149,7 +149,7 @@ public FatFileSystem(Stream data, Ownership ownsData, TimeConverter timeConverte
     public FatFileSystem(Stream data, Ownership ownsData, FileSystemParameters parameters)
         : base(new FatFileSystemOptions(parameters))
     {
-        _dirCache = new Dictionary<uint, Directory>();
+        _dirCache = [];
 
         if (parameters != null && parameters.TimeConverter != null)
         {

Library/DiscUtils.Iscsi/Connection.cs

@@ -64,7 +64,7 @@ public Connection(Session session, TargetAddress address, Authenticator[] authen
         MaxInitiatorTransmitDataSegmentLength = 131072;
         MaxTargetReceiveDataSegmentLength = 8192;
 
-        _negotiatedParameters = new Dictionary<string, string>();
+        _negotiatedParameters = [];
         NegotiateSecurity();
         NegotiateFeatures();
     }
@@ -352,7 +352,7 @@ public IEnumerable<TargetInfo> EnumerateTargets()
                 }
 
                 currentTarget = line.Value;
-                currentAddresses = new List<TargetAddress>();
+                currentAddresses = [];
             }
             else if (line.Key == TargetNameParameter)
             {

Library/DiscUtils.Iscsi/ScsiReportLunsResponse.cs

@@ -37,7 +37,7 @@ internal class ScsiReportLunsResponse : ScsiResponse
 
     public override void ReadFrom(byte[] buffer, int offset, int count)
     {
-        Luns = new List<ulong>();
+        Luns = [];
 
         if (count == 0)
         {

Library/DiscUtils.Iscsi/Session.cs

@@ -72,7 +72,7 @@ internal Session(SessionType type, string targetName, string userName, string pa
         DataPDUInOrder = true;
         DataSequenceInOrder = true;
 
-        _negotiatedParameters = new Dictionary<string, string>();
+        _negotiatedParameters = [];
 
         if (string.IsNullOrEmpty(userName))
         {

Library/DiscUtils.Iscsi/TextBuffer.cs

@@ -33,7 +33,7 @@ internal class TextBuffer
 
     public TextBuffer()
     {
-        _records = new List<KeyValuePair<string, string>>();
+        _records = [];
     }
 
     internal int Count => _records.Count;

Library/DiscUtils.Iso9660/CDBuilder.cs

@@ -61,8 +61,8 @@ public sealed class CDBuilder : StreamBuilder, IFileSystemBuilder
     /// </summary>
     public CDBuilder()
     {
-        _files = new List<BuildFileInfo>();
-        _dirs = new List<BuildDirectoryInfo>();
+        _files = [];
+        _dirs = [];
         _rootDirectory = new BuildDirectoryInfo("\0", null);
         _dirs.Add(_rootDirectory);
 

Library/DiscUtils.Iso9660/Susp/SuspRecords.cs

@@ -32,7 +32,7 @@ internal sealed class SuspRecords
 
     public SuspRecords(IsoContext context, ReadOnlySpan<byte> data)
     {
-        _records = new Dictionary<string, Dictionary<string, List<SystemUseEntry>>>();
+        _records = [];
 
         var contEntry = Parse(context, data.Slice(context.SuspSkipBytes));
         while (contEntry != null)
@@ -164,13 +164,13 @@ private void StoreEntry(SuspExtension extension, SystemUseEntry entry)
 
         if (!_records.TryGetValue(extensionId, out var extensionEntries))
         {
-            extensionEntries = new Dictionary<string, List<SystemUseEntry>>();
+            extensionEntries = [];
             _records.Add(extensionId, extensionEntries);
         }
 
         if (!extensionEntries.TryGetValue(entry.Name, out var entries))
         {
-            entries = new List<SystemUseEntry>();
+            entries = [];
             extensionEntries.Add(entry.Name, entries);
         }
 

Library/DiscUtils.Iso9660/VfsCDReader.cs

@@ -571,7 +571,7 @@ private static void InitializeSusp(IsoContext context, DirectoryRecord rootSelfR
         var extensions = new List<SuspExtension>();
         if (!SuspRecords.DetectSharingProtocol(rootSelfRecord.SystemUseData))
         {
-            context.SuspExtensions = new List<SuspExtension>();
+            context.SuspExtensions = [];
             context.SuspDetected = false;
             return;
         }

Library/DiscUtils.Lvm/LogicalVolumeManager.cs

@@ -38,8 +38,8 @@ public class LogicalVolumeManager
     /// <param name="disks">The initial set of disks to manage.</param>
     public LogicalVolumeManager(IEnumerable<VirtualDisk> disks)
     {
-        _devices = new List<PhysicalVolume>();
-        _volumeGroups = new List<MetadataVolumeGroupSection>();
+        _devices = [];
+        _volumeGroups = [];
         foreach (var disk in disks)
         {
             if (disk.IsPartitioned)