aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to .NET 8.0 RC1.

Browse Source
This commit is contained in:
Natalia Portillo
2023-09-24 21:49:01 +01:00
parent 8e405c7443
commit 98821a0798
28 changed files with 105 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Aaru.Archives/Aaru.Archives.csproj
View File

@@ -14,8 +14,8 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Archives</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>11</LangVersion>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>12</LangVersion>
<Description>Archive implementations used by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>

2
Aaru.Checksums

Submodule Aaru.Checksums updated: 544bc95fd0...4fa879da70

2
Aaru.CommonTypes

Submodule Aaru.CommonTypes updated: 1d4add3282...28df3fb207

6
Aaru.Compression/Aaru.Compression.csproj
View File

@@ -16,8 +16,8 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru Data Preservation Suite</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>11</LangVersion>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>12</LangVersion>
<Description>Compression algorithms used by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
@@ -80,7 +80,7 @@
<PackageReference Include="DotNetZip" Version="1.16.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="SharpCompress" Version="0.32.2" />
<PackageReference Include="System.Resources.Extensions" Version="7.0.0" />
<PackageReference Include="System.Resources.Extensions" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>

2
Aaru.Console

Submodule Aaru.Console updated: 383eab6147...ce95be40b5

4
Aaru.Core/Aaru.Core.csproj
View File

@@ -14,8 +14,8 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Core</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>11</LangVersion>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>12</LangVersion>
<Description>Contains core algorithms used by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>

4
Aaru.Core/Statistics.cs
View File

@@ -225,7 +225,7 @@ public static class Statistics
dto.Medias.Add(new MediaStats
{
real = true,
type = media,
MediaType = media,
Value = ctx.Medias.LongCount(c => !c.Synchronized && c.Type == media && c.Real)
});
@@ -233,7 +233,7 @@ public static class Statistics
dto.Medias.Add(new MediaStats
{
real = false,
type = media,
MediaType = media,
Value = ctx.Medias.LongCount(c => !c.Synchronized && c.Type == media && !c.Real)
});
}

12
Aaru.Database/Aaru.Database.csproj
View File

@@ -13,8 +13,8 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Database</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>11</LangVersion>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>12</LangVersion>
<Description>Database models used by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
@@ -47,14 +47,14 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="EntityFramework" Version="6.4.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.1">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-rc.1.23419.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.0-rc.1.23419.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.1.23419.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="2.0.0-preview1-final" />
<PackageReference Include="System.Text.Json" Version="7.0.1" />
<PackageReference Include="System.Text.Json" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>

2
Aaru.Decoders

Submodule Aaru.Decoders updated: e944d6b982...abbde2d4fe

2
Aaru.Decryption

Submodule Aaru.Decryption updated: d41607f900...4efd3a6891

6
Aaru.Devices/Aaru.Devices.csproj
View File

@@ -14,8 +14,8 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Devices</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>11</LangVersion>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>12</LangVersion>
<Description>Media device hardware interface implementation used by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
@@ -42,7 +42,7 @@
<NrtShowRevision>true</NrtShowRevision>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Management" Version="7.0.0"/>
<PackageReference Include="System.Management" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3" PrivateAssets="all"/>
</ItemGroup>
<ItemGroup>

2
Aaru.Dto

Submodule Aaru.Dto updated: aa1bfe6693...49b5e2c729

4
Aaru.Filesystems/Aaru.Filesystems.csproj
View File

@@ -14,9 +14,9 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Filesystems</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<NoWarn>CS0649</NoWarn>
<LangVersion>11</LangVersion>
<LangVersion>12</LangVersion>
<Description>Filesystem implementations used by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>

4
Aaru.Filters/Aaru.Filters.csproj
View File

@@ -14,8 +14,8 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Filters</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>11</LangVersion>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>12</LangVersion>
<Description>File filters used by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>

6
Aaru.Gui/Aaru.Gui.csproj
View File

@@ -10,9 +10,9 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru Data Preservation Suite</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<NoWarn>CS0649,CS0169</NoWarn>
<LangVersion>11</LangVersion>
<LangVersion>12</LangVersion>
<Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
@@ -35,7 +35,7 @@
<PackageReference Include="Claunia.Encoding" Version="1.9.2"/>
<PackageReference Include="MessageBox.Avalonia" Version="2.1.0"/>
<PackageReference Include="OxyPlot.Avalonia-alpha-2020-04-15" Version="1.0.0"/>
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0"/>
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

2
Aaru.Helpers

Submodule Aaru.Helpers updated: b03390c74b...88caaa77e7

6
Aaru.Images/Aaru.Images.csproj
View File

@@ -14,9 +14,9 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.DiscImages</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<NoWarn>CS0649</NoWarn>
<LangVersion>11</LangVersion>
<LangVersion>12</LangVersion>
<Description>Media image formats used by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
@@ -49,7 +49,7 @@
<PackageReference Include="DotNetZip" Version="1.16.0" />
<PackageReference Include="plist-cil" Version="2.2.0" />
<PackageReference Include="SharpCompress" Version="0.32.2" />
<PackageReference Include="System.Text.Json" Version="7.0.1" />
<PackageReference Include="System.Text.Json" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3" PrivateAssets="all" />
</ItemGroup>

72
Aaru.Images/AaruFormat/Write.cs
View File

@@ -1676,7 +1676,7 @@ public sealed partial class AaruFormat
};
_structureBytes = new byte[Marshal.SizeOf<DdtHeader>()];
MemoryMarshal.Write(_structureBytes, ref ddtHeader);
MemoryMarshal.Write(_structureBytes, in ddtHeader);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
_structureBytes = null;
@@ -1895,7 +1895,7 @@ public sealed partial class AaruFormat
});
_structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
MemoryMarshal.Write(_structureBytes, ref _currentBlockHeader);
MemoryMarshal.Write(_structureBytes, in _currentBlockHeader);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
_structureBytes = null;
@@ -2650,7 +2650,7 @@ public sealed partial class AaruFormat
});
_structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
MemoryMarshal.Write(_structureBytes, ref _currentBlockHeader);
MemoryMarshal.Write(_structureBytes, in _currentBlockHeader);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
_structureBytes = null;
@@ -2758,7 +2758,7 @@ public sealed partial class AaruFormat
}
_structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
MemoryMarshal.Write(_structureBytes, ref tagBlock);
MemoryMarshal.Write(_structureBytes, in tagBlock);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
if(tagBlock.compression == CompressionType.Lzma)
@@ -2785,7 +2785,7 @@ public sealed partial class AaruFormat
idxEntry.offset);
_structureBytes = new byte[Marshal.SizeOf<GeometryBlock>()];
MemoryMarshal.Write(_structureBytes, ref _geometryBlock);
MemoryMarshal.Write(_structureBytes, in _geometryBlock);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
_index.RemoveAll(t => t is { blockType: BlockType.GeometryBlock, dataType: DataType.NoData });
@@ -2847,7 +2847,7 @@ public sealed partial class AaruFormat
};
_structureBytes = new byte[Marshal.SizeOf<DumpHardwareEntry>()];
MemoryMarshal.Write(_structureBytes, ref dumpEntry);
MemoryMarshal.Write(_structureBytes, in dumpEntry);
dumpMs.Write(_structureBytes, 0, _structureBytes.Length);
if(dumpManufacturer != null)
@@ -2926,7 +2926,7 @@ public sealed partial class AaruFormat
};
_structureBytes = new byte[Marshal.SizeOf<DumpHardwareHeader>()];
MemoryMarshal.Write(_structureBytes, ref dumpBlock);
MemoryMarshal.Write(_structureBytes, in dumpBlock);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
_imageStream.Write(dumpMs.ToArray(), 0, (int)dumpMs.Length);
@@ -2962,7 +2962,7 @@ public sealed partial class AaruFormat
};
_structureBytes = new byte[Marshal.SizeOf<AaruMetadataJsonBlock>()];
MemoryMarshal.Write(_structureBytes, ref jsonBlock);
MemoryMarshal.Write(_structureBytes, in jsonBlock);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
_imageStream.Write(jsonMs.ToArray(), 0, (int)jsonMs.Length);
@@ -2997,7 +2997,7 @@ public sealed partial class AaruFormat
};
_structureBytes = new byte[Marshal.SizeOf<ChecksumEntry>()];
MemoryMarshal.Write(_structureBytes, ref md5Entry);
MemoryMarshal.Write(_structureBytes, in md5Entry);
chkMs.Write(_structureBytes, 0, _structureBytes.Length);
chkMs.Write(md5, 0, md5.Length);
chkHeader.entries++;
@@ -3014,7 +3014,7 @@ public sealed partial class AaruFormat
};
_structureBytes = new byte[Marshal.SizeOf<ChecksumEntry>()];
MemoryMarshal.Write(_structureBytes, ref sha1Entry);
MemoryMarshal.Write(_structureBytes, in sha1Entry);
chkMs.Write(_structureBytes, 0, _structureBytes.Length);
chkMs.Write(sha1, 0, sha1.Length);
chkHeader.entries++;
@@ -3031,7 +3031,7 @@ public sealed partial class AaruFormat
};
_structureBytes = new byte[Marshal.SizeOf<ChecksumEntry>()];
MemoryMarshal.Write(_structureBytes, ref sha256Entry);
MemoryMarshal.Write(_structureBytes, in sha256Entry);
chkMs.Write(_structureBytes, 0, _structureBytes.Length);
chkMs.Write(sha256, 0, sha256.Length);
chkHeader.entries++;
@@ -3048,7 +3048,7 @@ public sealed partial class AaruFormat
};
_structureBytes = new byte[Marshal.SizeOf<ChecksumEntry>()];
MemoryMarshal.Write(_structureBytes, ref spamsumEntry);
MemoryMarshal.Write(_structureBytes, in spamsumEntry);
chkMs.Write(_structureBytes, 0, _structureBytes.Length);
chkMs.Write(spamsum, 0, spamsum.Length);
chkHeader.entries++;
@@ -3069,7 +3069,7 @@ public sealed partial class AaruFormat
idxEntry.offset);
_structureBytes = new byte[Marshal.SizeOf<ChecksumHeader>()];
MemoryMarshal.Write(_structureBytes, ref chkHeader);
MemoryMarshal.Write(_structureBytes, in chkHeader);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
_imageStream.Write(chkMs.ToArray(), 0, (int)chkMs.Length);
@@ -3126,7 +3126,7 @@ public sealed partial class AaruFormat
tapePartitionHeader.crc64 = BitConverter.ToUInt64(_crc64.Final(), 0);
_structureBytes = new byte[Marshal.SizeOf<TapePartitionHeader>()];
MemoryMarshal.Write(_structureBytes, ref tapePartitionHeader);
MemoryMarshal.Write(_structureBytes, in tapePartitionHeader);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
_structureBytes = null;
_imageStream.Write(tapePartitionEntriesData, 0, tapePartitionEntriesData.Length);
@@ -3168,7 +3168,7 @@ public sealed partial class AaruFormat
tapeFileHeader.crc64 = BitConverter.ToUInt64(_crc64.Final(), 0);
_structureBytes = new byte[Marshal.SizeOf<TapeFileHeader>()];
MemoryMarshal.Write(_structureBytes, ref tapeFileHeader);
MemoryMarshal.Write(_structureBytes, in tapeFileHeader);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
_structureBytes = null;
_imageStream.Write(tapeFileEntriesData, 0, tapeFileEntriesData.Length);
@@ -3243,7 +3243,7 @@ public sealed partial class AaruFormat
ddtHeader.cmpCrc64 = BitConverter.ToUInt64(cmpCrc64Context.Final(), 0);
_structureBytes = new byte[Marshal.SizeOf<DdtHeader>()];
MemoryMarshal.Write(_structureBytes, ref ddtHeader);
MemoryMarshal.Write(_structureBytes, in ddtHeader);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
_structureBytes = null;
@@ -3347,7 +3347,7 @@ public sealed partial class AaruFormat
}
_structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
MemoryMarshal.Write(_structureBytes, ref prefixBlock);
MemoryMarshal.Write(_structureBytes, in prefixBlock);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
if(prefixBlock.compression == CompressionType.Lzma)
@@ -3436,7 +3436,7 @@ public sealed partial class AaruFormat
}
_structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
MemoryMarshal.Write(_structureBytes, ref prefixBlock);
MemoryMarshal.Write(_structureBytes, in prefixBlock);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
if(prefixBlock.compression == CompressionType.Lzma)
@@ -3599,7 +3599,7 @@ public sealed partial class AaruFormat
ddtHeader.cmpCrc64 = BitConverter.ToUInt64(cmpCrc64Context.Final(), 0);
_structureBytes = new byte[Marshal.SizeOf<DdtHeader>()];
MemoryMarshal.Write(_structureBytes, ref ddtHeader);
MemoryMarshal.Write(_structureBytes, in ddtHeader);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
_structureBytes = null;
@@ -3674,7 +3674,7 @@ public sealed partial class AaruFormat
ddtHeader.cmpCrc64 = BitConverter.ToUInt64(cmpCrc64Context.Final(), 0);
_structureBytes = new byte[Marshal.SizeOf<DdtHeader>()];
MemoryMarshal.Write(_structureBytes, ref ddtHeader);
MemoryMarshal.Write(_structureBytes, in ddtHeader);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
_structureBytes = null;
@@ -3769,7 +3769,7 @@ public sealed partial class AaruFormat
}
_structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
MemoryMarshal.Write(_structureBytes, ref prefixBlock);
MemoryMarshal.Write(_structureBytes, in prefixBlock);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
if(prefixBlock.compression == CompressionType.Lzma)
@@ -3863,7 +3863,7 @@ public sealed partial class AaruFormat
}
_structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
MemoryMarshal.Write(_structureBytes, ref suffixBlock);
MemoryMarshal.Write(_structureBytes, in suffixBlock);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
if(suffixBlock.compression == CompressionType.Lzma)
@@ -3962,7 +3962,7 @@ public sealed partial class AaruFormat
}
_structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
MemoryMarshal.Write(_structureBytes, ref subheaderBlock);
MemoryMarshal.Write(_structureBytes, in subheaderBlock);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
if(subheaderBlock.compression == CompressionType.Lzma)
@@ -4064,7 +4064,7 @@ public sealed partial class AaruFormat
}
_structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
MemoryMarshal.Write(_structureBytes, ref subchannelBlock);
MemoryMarshal.Write(_structureBytes, in subchannelBlock);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
if(subchannelBlock.compression is CompressionType.Lzma
@@ -4162,7 +4162,7 @@ public sealed partial class AaruFormat
}
_structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
MemoryMarshal.Write(_structureBytes, ref cprMaiBlock);
MemoryMarshal.Write(_structureBytes, in cprMaiBlock);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
if(cprMaiBlock.compression is CompressionType.Lzma
@@ -4257,7 +4257,7 @@ public sealed partial class AaruFormat
}
_structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
MemoryMarshal.Write(_structureBytes, ref idBlock);
MemoryMarshal.Write(_structureBytes, in idBlock);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
if(idBlock.compression is CompressionType.Lzma
@@ -4352,7 +4352,7 @@ public sealed partial class AaruFormat
}
_structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
MemoryMarshal.Write(_structureBytes, ref iedBlock);
MemoryMarshal.Write(_structureBytes, in iedBlock);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
if(iedBlock.compression is CompressionType.Lzma
@@ -4447,7 +4447,7 @@ public sealed partial class AaruFormat
}
_structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
MemoryMarshal.Write(_structureBytes, ref edcBlock);
MemoryMarshal.Write(_structureBytes, in edcBlock);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
if(edcBlock.compression is CompressionType.Lzma
@@ -4543,7 +4543,7 @@ public sealed partial class AaruFormat
}
_structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
MemoryMarshal.Write(_structureBytes, ref titleKeyBlock);
MemoryMarshal.Write(_structureBytes, in titleKeyBlock);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
if(titleKeyBlock.compression is CompressionType.Lzma
@@ -4649,7 +4649,7 @@ public sealed partial class AaruFormat
});
_structureBytes = new byte[Marshal.SizeOf<TracksHeader>()];
MemoryMarshal.Write(_structureBytes, ref trkHeader);
MemoryMarshal.Write(_structureBytes, in trkHeader);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
_imageStream.Write(blockStream.ToArray(), 0, (int)blockStream.Length);
blockStream.Close();
@@ -4703,7 +4703,7 @@ public sealed partial class AaruFormat
});
_structureBytes = new byte[Marshal.SizeOf<CompactDiscIndexesHeader>()];
MemoryMarshal.Write(_structureBytes, ref cdixHeader);
MemoryMarshal.Write(_structureBytes, in cdixHeader);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
_imageStream.Write(blockStream.ToArray(), 0, (int)blockStream.Length);
blockStream.Close();
@@ -4815,7 +4815,7 @@ public sealed partial class AaruFormat
}
_structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
MemoryMarshal.Write(_structureBytes, ref subchannelBlock);
MemoryMarshal.Write(_structureBytes, in subchannelBlock);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
if(subchannelBlock.compression == CompressionType.Lzma)
@@ -5022,7 +5022,7 @@ public sealed partial class AaruFormat
metadataBlock.blockSize = (uint)blockStream.Length;
_structureBytes = new byte[Marshal.SizeOf<MetadataBlock>()];
MemoryMarshal.Write(_structureBytes, ref metadataBlock);
MemoryMarshal.Write(_structureBytes, in metadataBlock);
blockStream.Position = 0;
blockStream.Write(_structureBytes, 0, _structureBytes.Length);
_index.RemoveAll(t => t is { blockType: BlockType.MetadataBlock, dataType: DataType.NoData });
@@ -5049,7 +5049,7 @@ public sealed partial class AaruFormat
{
_structureBytes = new byte[Marshal.SizeOf<IndexEntry>()];
IndexEntry indexEntry = entry;
MemoryMarshal.Write(_structureBytes, ref indexEntry);
MemoryMarshal.Write(_structureBytes, in indexEntry);
blockStream.Write(_structureBytes, 0, _structureBytes.Length);
}
@@ -5068,7 +5068,7 @@ public sealed partial class AaruFormat
// Write index header to disk
_structureBytes = new byte[Marshal.SizeOf<IndexHeader2>()];
MemoryMarshal.Write(_structureBytes, ref idxHeader);
MemoryMarshal.Write(_structureBytes, in idxHeader);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
}
else
@@ -5082,7 +5082,7 @@ public sealed partial class AaruFormat
// Write index header to disk
_structureBytes = new byte[Marshal.SizeOf<IndexHeader>()];
MemoryMarshal.Write(_structureBytes, ref idxHeader);
MemoryMarshal.Write(_structureBytes, in idxHeader);
_imageStream.Write(_structureBytes, 0, _structureBytes.Length);
}

2
Aaru.Images/Anex86/Write.cs
View File

@@ -227,7 +227,7 @@ public sealed partial class Anex86
}
byte[] hdr = new byte[Marshal.SizeOf<Header>()];
MemoryMarshal.Write(hdr, ref _header);
MemoryMarshal.Write(hdr, in _header);
_writingStream.Seek(0, SeekOrigin.Begin);
_writingStream.Write(hdr, 0, hdr.Length);

6
Aaru.Images/Apridisk/Write.cs
View File

@@ -199,7 +199,7 @@ public sealed partial class Apridisk
cylinder = c
};
MemoryMarshal.Write(hdr, ref record);
MemoryMarshal.Write(hdr, in record);
_writingStream.Write(hdr, 0, hdr.Length);
_writingStream.Write(_sectorsData[c][h][s], 0, _sectorsData[c][h][s].Length);
@@ -222,7 +222,7 @@ public sealed partial class Apridisk
cylinder = 0
};
MemoryMarshal.Write(hdr, ref creatorRecord);
MemoryMarshal.Write(hdr, in creatorRecord);
_writingStream.Write(hdr, 0, hdr.Length);
_writingStream.Write(creatorBytes, 0, creatorBytes.Length);
@@ -244,7 +244,7 @@ public sealed partial class Apridisk
cylinder = 0
};
MemoryMarshal.Write(hdr, ref commentRecord);
MemoryMarshal.Write(hdr, in commentRecord);
_writingStream.Write(hdr, 0, hdr.Length);
_writingStream.Write(commentBytes, 0, commentBytes.Length);

2
Aaru.Images/QED/Write.cs
View File

@@ -291,7 +291,7 @@ public sealed partial class Qed
}
byte[] hdr = new byte[Marshal.SizeOf<QedHeader>()];
MemoryMarshal.Write(hdr, ref _qHdr);
MemoryMarshal.Write(hdr, in _qHdr);
_writingStream.Seek(0, SeekOrigin.Begin);
_writingStream.Write(hdr, 0, hdr.Length);

4
Aaru.Localization/Aaru.Localization.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<OutputType>Library</OutputType>
@@ -15,7 +15,7 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Localization</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<LangVersion>11</LangVersion>
<LangVersion>12</LangVersion>
<Description>Language resources for the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>

4
Aaru.Partitions/Aaru.Partitions.csproj
View File

@@ -14,9 +14,9 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Partitions</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<NoWarn>CS0649</NoWarn>
<LangVersion>11</LangVersion>
<LangVersion>12</LangVersion>
<Description>Partitioning schemes implemented by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>

4
Aaru.Settings/Aaru.Settings.csproj
View File

@@ -14,8 +14,8 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Settings</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>11</LangVersion>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>12</LangVersion>
<Description>Settings interface used by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>

4
Aaru.Tests.Devices/Aaru.Tests.Devices.csproj
View File

@@ -6,7 +6,7 @@
<RootNamespace>Aaru.Tests.Devices</RootNamespace>
<AssemblyName>Aaru.Tests.Devices</AssemblyName>
<ReleaseVersion>$(Version)</ReleaseVersion>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>6.0.0-alpha9</Version>
<Company>Claunia.com</Company>
@@ -14,7 +14,7 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Tests.Devices</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<LangVersion>11</LangVersion>
<LangVersion>12</LangVersion>
<Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup>

6
Aaru.Tests/Aaru.Tests.csproj
View File

@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<LangVersion>11</LangVersion>
<LangVersion>12</LangVersion>
<Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
<ReleaseVersion>$(Version)</ReleaseVersion>
@@ -21,7 +21,7 @@
<PackageReference Include="nunit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0-rc.1.23419.4" />
</ItemGroup>
<ItemGroup>

4
Aaru.sln.DotSettings
View File

@@ -96,6 +96,7 @@
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=LambdaExpressionCanBeMadeStatic/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=LambdaExpressionMustBeStatic/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=LoopCanBeConvertedToQuery/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeFileLocal/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeMadeStatic_002EGlobal/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeMadeStatic_002ELocal/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBePrivate_002EGlobal/@EntryIndexedValue">WARNING</s:String>
@@ -137,6 +138,7 @@
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PropertyCanBeMadeInitOnly_002EGlobal/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PropertyCanBeMadeInitOnly_002ELocal/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PublicConstructorInAbstractClass/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RawStringCanBeSimplified/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAccessorBody/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAlwaysMatchSubpattern/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArrayCreationExpression/@EntryIndexedValue">WARNING</s:String>
@@ -290,9 +292,11 @@
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseNullPropagation/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseObjectOrCollectionInitializer/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UsePatternMatching/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseRawString/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseStringInterpolation/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseSwitchCasePatternVariable/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseUnsignedRightShiftOperator/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseUtf8StringLiteral/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseVerbatimString/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseWithExpressionToCopyAnonymousObject/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseWithExpressionToCopyRecord/@EntryIndexedValue">WARNING</s:String>

22
Aaru/Aaru.csproj
View File

@@ -7,7 +7,7 @@
<RootNamespace>Aaru</RootNamespace>
<AssemblyName>aaru</AssemblyName>
<ReleaseVersion>$(Version)</ReleaseVersion>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>6.0.0~alpha9</Version>
<Company>Claunia.com</Company>
@@ -15,11 +15,13 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<RuntimeIdentifiers>alpine-x64;linux-arm64;linux-arm;linux-x64;osx-x64;osx-arm64;win-arm64;win-arm;win-x64;win-x86;debian-arm;debian-arm64;debian-x64;rhel-arm64;rhel-x64;sles-x64</RuntimeIdentifiers>
<!-- TODO win-arm doesn't seem to work in RC1, try again in final -->
<RuntimeIdentifiers>linux-musl-arm;linux-musl-arm64;linux-musl-x64;linux-arm64;linux-arm;linux-x64;osx-x64;osx-arm64;win-arm64;win-x64;win-x86</RuntimeIdentifiers>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<LangVersion>11</LangVersion>
<LangVersion>12</LangVersion>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
<IsPackable>false</IsPackable>
</PropertyGroup>
<PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>
@@ -92,7 +94,7 @@
<Content Include="..\.github\PULL_REQUEST_TEMPLATE.md" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.1.23419.6" />
<PackageReference Include="Spectre.Console" Version="0.45.0" />
<PackageReference Include="Spectre.Console.Analyzer" Version="0.45.0">
<PrivateAssets>all</PrivateAssets>
@@ -100,8 +102,8 @@
</PackageReference>
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
<PackageReference Include="System.Text.Json" Version="7.0.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="System.Text.Json" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3">
<PrivateAssets>all</PrivateAssets>
@@ -133,15 +135,15 @@
</Content>
</ItemGroup>
<PropertyGroup Condition="'$(RuntimeIdentifier)' == 'alpine-arm64'">
<PropertyGroup Condition="'$(RuntimeIdentifier)' == 'linux-musl-arm64'">
<PackageName>$(PackagePrefix)-$(PackageVersion)_alpine_aarch64$(DebugPackage)</PackageName>
</PropertyGroup>
<PropertyGroup Condition="'$(RuntimeIdentifier)' == 'alpine-arm'">
<PropertyGroup Condition="'$(RuntimeIdentifier)' == 'linux-musl-arm'">
<PackageName>$(PackagePrefix)-$(PackageVersion)_alpine_armhf$(DebugPackage)</PackageName>
</PropertyGroup>
<PropertyGroup Condition="'$(RuntimeIdentifier)' == 'alpine-x64'">
<PropertyGroup Condition="'$(RuntimeIdentifier)' == 'linux-musl-x64'">
<PackageName>$(PackagePrefix)-$(PackageVersion)_alpine_x86_64$(DebugPackage)</PackageName>
</PropertyGroup>
@@ -180,6 +182,7 @@
<PackageName>$(PackagePrefix)-$(PackageVersion)_windows_x86$(DebugPackage)</PackageName>
</PropertyGroup>
<!-- TODO: Distribution specific RIDs where removed in .NET 8.0. We need to detect packaging in another way
<PropertyGroup Condition="'$(RuntimeIdentifier)' == 'debian-arm64'">
<PackageName>$(PackagePrefix)_$(PackageVersion)_arm64$(DebugPackage)</PackageName>
</PropertyGroup>
@@ -203,4 +206,5 @@
<PropertyGroup Condition="'$(RuntimeIdentifier)' == 'sles-x64'">
<PackageName>$(PackagePrefix)-$(PackageVersion).sles.x86_64$(DebugPackage)</PackageName>
</PropertyGroup>
-->
</Project>