Upgrade to .NET 6.

This commit is contained in:
2021-09-12 22:25:59 +01:00
parent 9f30ed44cb
commit ebd29840fe
36 changed files with 568 additions and 558 deletions

View File

@@ -17,8 +17,8 @@
<Product>Aaru Data Preservation Suite</Product> <Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Archives</Title> <Title>Aaru.Archives</Title>
<ApplicationVersion>$(Version)</ApplicationVersion> <ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6</TargetFramework>
<LangVersion>8</LangVersion> <LangVersion>10</LangVersion>
<Description>Archive implementations used by the Aaru Data Preservation Suite.</Description> <Description>Archive implementations used by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl> <PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression> <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
@@ -29,6 +29,7 @@
<IncludeSymbols>true</IncludeSymbols> <IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat> <SymbolPackageFormat>snupkg</SymbolPackageFormat>
<Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors> <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat> <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>

View File

@@ -18,8 +18,8 @@
<Product>Aaru Data Preservation Suite</Product> <Product>Aaru Data Preservation Suite</Product>
<Title>Aaru Data Preservation Suite</Title> <Title>Aaru Data Preservation Suite</Title>
<ApplicationVersion>$(Version)</ApplicationVersion> <ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6</TargetFramework>
<LangVersion>8</LangVersion> <LangVersion>10</LangVersion>
<Description>Compression algorithms used by the Aaru Data Preservation Suite.</Description> <Description>Compression algorithms used by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl> <PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression> <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
@@ -30,6 +30,7 @@
<IncludeSymbols>true</IncludeSymbols> <IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat> <SymbolPackageFormat>snupkg</SymbolPackageFormat>
<Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors> <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat> <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>

View File

@@ -17,8 +17,8 @@
<Product>Aaru Data Preservation Suite</Product> <Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Core</Title> <Title>Aaru.Core</Title>
<ApplicationVersion>$(Version)</ApplicationVersion> <ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6</TargetFramework>
<LangVersion>8</LangVersion> <LangVersion>10</LangVersion>
<Description>Contains core algorithms used by the Aaru Data Preservation Suite.</Description> <Description>Contains core algorithms used by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl> <PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression> <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
@@ -29,6 +29,7 @@
<IncludeSymbols>true</IncludeSymbols> <IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat> <SymbolPackageFormat>snupkg</SymbolPackageFormat>
<Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors> <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat> <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>

View File

@@ -52,8 +52,8 @@ namespace Aaru.Core
if(ret != Errno.NoError) if(ret != Errno.NoError)
return null; return null;
List<DirectoryType> directories = new List<DirectoryType>(); List<DirectoryType> directories = new();
List<ContentsFileType> files = new List<ContentsFileType>(); List<ContentsFileType> files = new();
foreach(string dirent in dirents) foreach(string dirent in dirents)
{ {
@@ -155,8 +155,8 @@ namespace Aaru.Core
if(ret != Errno.NoError) if(ret != Errno.NoError)
return null; return null;
List<DirectoryType> directories = new List<DirectoryType>(); List<DirectoryType> directories = new();
List<ContentsFileType> files = new List<ContentsFileType>(); List<ContentsFileType> files = new();
foreach(string dirent in dirents) foreach(string dirent in dirents)
{ {
@@ -297,7 +297,7 @@ namespace Aaru.Core
if(ret != Errno.NoError) if(ret != Errno.NoError)
return file; return file;
List<ExtendedAttributeType> xattrTypes = new List<ExtendedAttributeType>(); List<ExtendedAttributeType> xattrTypes = new();
foreach(string xattr in xattrs) foreach(string xattr in xattrs)
{ {

View File

@@ -16,8 +16,8 @@
<Product>Aaru Data Preservation Suite</Product> <Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Database</Title> <Title>Aaru.Database</Title>
<ApplicationVersion>$(Version)</ApplicationVersion> <ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6</TargetFramework>
<LangVersion>8</LangVersion> <LangVersion>10</LangVersion>
<Description>Database models used by the Aaru Data Preservation Suite.</Description> <Description>Database models used by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl> <PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression> <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
@@ -28,6 +28,7 @@
<IncludeSymbols>true</IncludeSymbols> <IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat> <SymbolPackageFormat>snupkg</SymbolPackageFormat>
<Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors> <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat> <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>
@@ -62,10 +63,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EntityFramework" Version="6.4.4" /> <PackageReference Include="EntityFramework" Version="6.4.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.5"/> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0-preview.7.21378.4">
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.1.5"/> <PrivateAssets>all</PrivateAssets>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.5"/> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="1.1.6"/> </PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.0-preview.7.21378.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0-preview.7.21378.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="2.0.0-preview1-final" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all" /> <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@@ -17,8 +17,8 @@
<Product>Aaru Data Preservation Suite</Product> <Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Devices</Title> <Title>Aaru.Devices</Title>
<ApplicationVersion>$(Version)</ApplicationVersion> <ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6</TargetFramework>
<LangVersion>8</LangVersion> <LangVersion>10</LangVersion>
<Description>Media device hardware interface implementation used by the Aaru Data Preservation Suite.</Description> <Description>Media device hardware interface implementation used by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl> <PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression> <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
@@ -29,6 +29,7 @@
<IncludeSymbols>true</IncludeSymbols> <IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat> <SymbolPackageFormat>snupkg</SymbolPackageFormat>
<Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors> <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat> <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>
@@ -119,7 +120,7 @@
<Compile Include="Windows\UsbFunctions.cs" /> <Compile Include="Windows\UsbFunctions.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Management" Version="4.7.0"/> <PackageReference Include="System.Management" Version="6.0.0-preview.7.21377.19" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all" /> <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all" />
</ItemGroup> </ItemGroup>
<ProjectExtensions> <ProjectExtensions>

View File

@@ -17,9 +17,9 @@
<Product>Aaru Data Preservation Suite</Product> <Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Filesystems</Title> <Title>Aaru.Filesystems</Title>
<ApplicationVersion>$(Version)</ApplicationVersion> <ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6</TargetFramework>
<NoWarn>CS0649</NoWarn> <NoWarn>CS0649</NoWarn>
<LangVersion>8</LangVersion> <LangVersion>10</LangVersion>
<Description>Filesystem implementations used by the Aaru Data Preservation Suite.</Description> <Description>Filesystem implementations used by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl> <PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression> <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
@@ -30,6 +30,7 @@
<IncludeSymbols>true</IncludeSymbols> <IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat> <SymbolPackageFormat>snupkg</SymbolPackageFormat>
<Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors> <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat> <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>

View File

@@ -60,7 +60,7 @@ namespace Aaru.Filesystems
/// <inheritdoc /> /// <inheritdoc />
public string Name => "Apple DOS File System"; public string Name => "Apple DOS File System";
/// <inheritdoc /> /// <inheritdoc />
public Guid Id => new Guid("8658A1E9-B2E7-4BCC-9638-157A31B0A700\n"); public Guid Id => new("8658A1E9-B2E7-4BCC-9638-157A31B0A700\n");
/// <inheritdoc /> /// <inheritdoc />
public string Author => "Natalia Portillo"; public string Author => "Natalia Portillo";
@@ -72,7 +72,7 @@ namespace Aaru.Filesystems
/// <inheritdoc /> /// <inheritdoc />
public Dictionary<string, string> Namespaces => null; public Dictionary<string, string> Namespaces => null;
static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string> static Dictionary<string, string> GetDefaultOptions() => new()
{ {
{ {
"debug", false.ToString() "debug", false.ToString()

View File

@@ -67,7 +67,7 @@ namespace Aaru.Filesystems
/// <inheritdoc /> /// <inheritdoc />
public string Name => "Apple Macintosh File System"; public string Name => "Apple Macintosh File System";
/// <inheritdoc /> /// <inheritdoc />
public Guid Id => new Guid("36405F8D-0D26-4066-6538-5DBF5D065C3A"); public Guid Id => new("36405F8D-0D26-4066-6538-5DBF5D065C3A");
/// <inheritdoc /> /// <inheritdoc />
public Encoding Encoding { get; private set; } public Encoding Encoding { get; private set; }
/// <inheritdoc /> /// <inheritdoc />
@@ -82,7 +82,7 @@ namespace Aaru.Filesystems
/// <inheritdoc /> /// <inheritdoc />
public Dictionary<string, string> Namespaces => null; public Dictionary<string, string> Namespaces => null;
static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string> static Dictionary<string, string> GetDefaultOptions() => new()
{ {
{ {
"debug", false.ToString() "debug", false.ToString()

View File

@@ -88,7 +88,7 @@ namespace Aaru.Filesystems
/// <inheritdoc /> /// <inheritdoc />
public string Name => "CP/M File System"; public string Name => "CP/M File System";
/// <inheritdoc /> /// <inheritdoc />
public Guid Id => new Guid("AA2B8585-41DF-4E3B-8A35-D1A935E2F8A1"); public Guid Id => new("AA2B8585-41DF-4E3B-8A35-D1A935E2F8A1");
/// <inheritdoc /> /// <inheritdoc />
public string Author => "Natalia Portillo"; public string Author => "Natalia Portillo";
@@ -100,7 +100,7 @@ namespace Aaru.Filesystems
/// <inheritdoc /> /// <inheritdoc />
public Dictionary<string, string> Namespaces => null; public Dictionary<string, string> Namespaces => null;
static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string> static Dictionary<string, string> GetDefaultOptions() => new()
{ {
{ {
"debug", false.ToString() "debug", false.ToString()

View File

@@ -74,7 +74,7 @@ namespace Aaru.Filesystems
/// <inheritdoc /> /// <inheritdoc />
public string Name => "Microsoft File Allocation Table"; public string Name => "Microsoft File Allocation Table";
/// <inheritdoc /> /// <inheritdoc />
public Guid Id => new Guid("33513B2C-0D26-0D2D-32C3-79D8611158E0"); public Guid Id => new("33513B2C-0D26-0D2D-32C3-79D8611158E0");
/// <inheritdoc /> /// <inheritdoc />
public string Author => "Natalia Portillo"; public string Author => "Natalia Portillo";
@@ -84,7 +84,7 @@ namespace Aaru.Filesystems
{}; {};
/// <inheritdoc /> /// <inheritdoc />
public Dictionary<string, string> Namespaces => new Dictionary<string, string> public Dictionary<string, string> Namespaces => new()
{ {
{ {
"dos", "DOS (8.3 all uppercase)" "dos", "DOS (8.3 all uppercase)"
@@ -103,7 +103,7 @@ namespace Aaru.Filesystems
} }
}; };
static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string> static Dictionary<string, string> GetDefaultOptions() => new()
{ {
{ {
"debug", false.ToString() "debug", false.ToString()

View File

@@ -67,7 +67,7 @@ namespace Aaru.Filesystems
/// <inheritdoc /> /// <inheritdoc />
public string Name => "FATX Filesystem Plugin"; public string Name => "FATX Filesystem Plugin";
/// <inheritdoc /> /// <inheritdoc />
public Guid Id => new Guid("ED27A721-4A17-4649-89FD-33633B46E228"); public Guid Id => new("ED27A721-4A17-4649-89FD-33633B46E228");
/// <inheritdoc /> /// <inheritdoc />
public string Author => "Natalia Portillo"; public string Author => "Natalia Portillo";
@@ -98,7 +98,7 @@ namespace Aaru.Filesystems
/// <inheritdoc /> /// <inheritdoc />
public Dictionary<string, string> Namespaces => null; public Dictionary<string, string> Namespaces => null;
static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string> static Dictionary<string, string> GetDefaultOptions() => new()
{ {
{ {
"debug", false.ToString() "debug", false.ToString()

View File

@@ -69,7 +69,7 @@ namespace Aaru.Filesystems
/// <inheritdoc /> /// <inheritdoc />
public string Name => "ISO9660 Filesystem"; public string Name => "ISO9660 Filesystem";
/// <inheritdoc /> /// <inheritdoc />
public Guid Id => new Guid("d812f4d3-c357-400d-90fd-3b22ef786aa8"); public Guid Id => new("d812f4d3-c357-400d-90fd-3b22ef786aa8");
/// <inheritdoc /> /// <inheritdoc />
public string Author => "Natalia Portillo"; public string Author => "Natalia Portillo";
@@ -84,7 +84,7 @@ namespace Aaru.Filesystems
}; };
/// <inheritdoc /> /// <inheritdoc />
public Dictionary<string, string> Namespaces => new Dictionary<string, string> public Dictionary<string, string> Namespaces => new()
{ {
{ {
"normal", "Primary Volume Descriptor, ignoring ;1 suffixes" "normal", "Primary Volume Descriptor, ignoring ;1 suffixes"
@@ -103,7 +103,7 @@ namespace Aaru.Filesystems
} }
}; };
static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string> static Dictionary<string, string> GetDefaultOptions() => new()
{ {
{ {
"debug", false.ToString() "debug", false.ToString()

View File

@@ -122,11 +122,11 @@ namespace Aaru.Filesystems
hsOff = 8; hsOff = 8;
_cdi = false; _cdi = false;
List<ulong> bvdSectors = new List<ulong>(); List<ulong> bvdSectors = new();
List<ulong> pvdSectors = new List<ulong>(); List<ulong> pvdSectors = new();
List<ulong> svdSectors = new List<ulong>(); List<ulong> svdSectors = new();
List<ulong> evdSectors = new List<ulong>(); List<ulong> evdSectors = new();
List<ulong> vpdSectors = new List<ulong>(); List<ulong> vpdSectors = new();
while(true) while(true)
{ {

View File

@@ -112,7 +112,7 @@ namespace Aaru.Filesystems.LisaFS
return error; return error;
int offset = 0; int offset = 0;
List<CatalogEntryV2> catalogV2 = new List<CatalogEntryV2>(); List<CatalogEntryV2> catalogV2 = new();
// For each entry on the catalog // For each entry on the catalog
while(offset + 54 < buf.Length) while(offset + 54 < buf.Length)
@@ -206,7 +206,7 @@ namespace Aaru.Filesystems.LisaFS
ulong nextCatalogPointer = BigEndianBitConverter.ToUInt32(firstCatalogBlock, 0x7FA); ulong nextCatalogPointer = BigEndianBitConverter.ToUInt32(firstCatalogBlock, 0x7FA);
List<byte[]> catalogBlocks = new List<byte[]> List<byte[]> catalogBlocks = new()
{ {
firstCatalogBlock firstCatalogBlock
}; };

View File

@@ -55,7 +55,7 @@ namespace Aaru.Filesystems.LisaFS
/// <inheritdoc /> /// <inheritdoc />
public string Name => "Apple Lisa File System"; public string Name => "Apple Lisa File System";
/// <inheritdoc /> /// <inheritdoc />
public Guid Id => new Guid("7E6034D1-D823-4248-A54D-239742B28391"); public Guid Id => new("7E6034D1-D823-4248-A54D-239742B28391");
/// <inheritdoc /> /// <inheritdoc />
public Encoding Encoding { get; private set; } public Encoding Encoding { get; private set; }
/// <inheritdoc /> /// <inheritdoc />
@@ -70,7 +70,7 @@ namespace Aaru.Filesystems.LisaFS
{}; {};
/// <inheritdoc /> /// <inheritdoc />
public Dictionary<string, string> Namespaces => new Dictionary<string, string> public Dictionary<string, string> Namespaces => new()
{ {
{ {
"workshop", "Filenames as shown by the Lisa Pascal Workshop (default)" "workshop", "Filenames as shown by the Lisa Pascal Workshop (default)"
@@ -80,7 +80,7 @@ namespace Aaru.Filesystems.LisaFS
} }
}; };
static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string> static Dictionary<string, string> GetDefaultOptions() => new()
{ {
{ {
"debug", false.ToString() "debug", false.ToString()

View File

@@ -58,7 +58,7 @@ namespace Aaru.Filesystems
/// <inheritdoc /> /// <inheritdoc />
public string Name => "Opera Filesystem Plugin"; public string Name => "Opera Filesystem Plugin";
/// <inheritdoc /> /// <inheritdoc />
public Guid Id => new Guid("0ec84ec7-eae6-4196-83fe-943b3fe46dbd"); public Guid Id => new("0ec84ec7-eae6-4196-83fe-943b3fe46dbd");
/// <inheritdoc /> /// <inheritdoc />
public string Author => "Natalia Portillo"; public string Author => "Natalia Portillo";
@@ -89,7 +89,7 @@ namespace Aaru.Filesystems
/// <inheritdoc /> /// <inheritdoc />
public Dictionary<string, string> Namespaces => null; public Dictionary<string, string> Namespaces => null;
static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string> static Dictionary<string, string> GetDefaultOptions() => new()
{ {
{ {
"debug", false.ToString() "debug", false.ToString()

View File

@@ -59,7 +59,7 @@ namespace Aaru.Filesystems.UCSDPascal
/// <inheritdoc /> /// <inheritdoc />
public string Name => "U.C.S.D. Pascal filesystem"; public string Name => "U.C.S.D. Pascal filesystem";
/// <inheritdoc /> /// <inheritdoc />
public Guid Id => new Guid("B0AC2CB5-72AA-473A-9200-270B5A2C2D53"); public Guid Id => new("B0AC2CB5-72AA-473A-9200-270B5A2C2D53");
/// <inheritdoc /> /// <inheritdoc />
public Encoding Encoding { get; private set; } public Encoding Encoding { get; private set; }
/// <inheritdoc /> /// <inheritdoc />
@@ -92,7 +92,7 @@ namespace Aaru.Filesystems.UCSDPascal
/// <inheritdoc /> /// <inheritdoc />
public Dictionary<string, string> Namespaces => null; public Dictionary<string, string> Namespaces => null;
static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string> static Dictionary<string, string> GetDefaultOptions() => new()
{ {
{ {
"debug", false.ToString() "debug", false.ToString()

View File

@@ -17,8 +17,8 @@
<Product>Aaru Data Preservation Suite</Product> <Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Filters</Title> <Title>Aaru.Filters</Title>
<ApplicationVersion>$(Version)</ApplicationVersion> <ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6</TargetFramework>
<LangVersion>8</LangVersion> <LangVersion>10</LangVersion>
<Description>File filters used by the Aaru Data Preservation Suite.</Description> <Description>File filters used by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl> <PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression> <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
@@ -29,6 +29,7 @@
<IncludeSymbols>true</IncludeSymbols> <IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat> <SymbolPackageFormat>snupkg</SymbolPackageFormat>
<Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors> <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat> <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>

View File

@@ -10,10 +10,11 @@
<Product>Aaru Data Preservation Suite</Product> <Product>Aaru Data Preservation Suite</Product>
<Title>Aaru Data Preservation Suite</Title> <Title>Aaru Data Preservation Suite</Title>
<ApplicationVersion>$(Version)</ApplicationVersion> <ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6</TargetFramework>
<NoWarn>CS0649,CS0169</NoWarn> <NoWarn>CS0649,CS0169</NoWarn>
<LangVersion>8</LangVersion> <LangVersion>10</LangVersion>
<Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors> <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat> <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
@@ -25,7 +26,7 @@
<PackageReference Include="Claunia.Encoding" Version="1.9.1" /> <PackageReference Include="Claunia.Encoding" Version="1.9.1" />
<PackageReference Include="MessageBox.Avalonia" Version="0.9.6.1" /> <PackageReference Include="MessageBox.Avalonia" Version="0.9.6.1" />
<PackageReference Include="OxyPlot.Avalonia-alpha-2020-04-15" Version="1.0.0" /> <PackageReference Include="OxyPlot.Avalonia-alpha-2020-04-15" Version="1.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1"/> <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.7.21377.19" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" /> <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
<PackageReference Include="Avalonia" Version="0.9.10" /> <PackageReference Include="Avalonia" Version="0.9.10" />
<PackageReference Include="Avalonia.Desktop" Version="0.9.10" /> <PackageReference Include="Avalonia.Desktop" Version="0.9.10" />

View File

@@ -36,11 +36,11 @@ using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Reactive; using System.Reactive;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices;
using System.Threading.Tasks; using System.Threading.Tasks;
using Aaru.Gui.Models; using Aaru.Gui.Models;
using Aaru.Gui.Views.Dialogs; using Aaru.Gui.Views.Dialogs;
using JetBrains.Annotations; using JetBrains.Annotations;
using Microsoft.DotNet.PlatformAbstractions;
using ReactiveUI; using ReactiveUI;
namespace Aaru.Gui.ViewModels.Dialogs namespace Aaru.Gui.ViewModels.Dialogs
@@ -148,29 +148,22 @@ Logo and art:
} }
}; };
switch(RuntimeEnvironment.OperatingSystemPlatform) if(RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{ {
case Platform.Unknown: return;
case Platform.Windows:
process.StartInfo.FileName = "cmd"; process.StartInfo.FileName = "cmd";
process.StartInfo.Arguments = $"/c start {process.StartInfo.Arguments.Replace("&", "^&")}"; process.StartInfo.Arguments = $"/c start {process.StartInfo.Arguments.Replace("&", "^&")}";
break;
case Platform.FreeBSD:
case Platform.Linux:
process.StartInfo.FileName = "xdg-open";
break;
case Platform.Darwin:
process.StartInfo.FileName = "open";
break;
default:
if(Debugger.IsAttached)
throw new ArgumentOutOfRangeException();
return;
} }
else if(RuntimeInformation.IsOSPlatform(OSPlatform.FreeBSD) ||
RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
process.StartInfo.FileName = "xdg-open";
}
else if(RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
process.StartInfo.FileName = "open";
}
else
return;
process.Start(); process.Start();
} }

View File

@@ -17,9 +17,9 @@
<Product>Aaru Data Preservation Suite</Product> <Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.DiscImages</Title> <Title>Aaru.DiscImages</Title>
<ApplicationVersion>$(Version)</ApplicationVersion> <ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6</TargetFramework>
<NoWarn>CS0649</NoWarn> <NoWarn>CS0649</NoWarn>
<LangVersion>8</LangVersion> <LangVersion>10</LangVersion>
<Description>Media image formats used by the Aaru Data Preservation Suite.</Description> <Description>Media image formats used by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl> <PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression> <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
@@ -30,6 +30,7 @@
<IncludeSymbols>true</IncludeSymbols> <IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat> <SymbolPackageFormat>snupkg</SymbolPackageFormat>
<Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors> <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat> <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>

View File

@@ -17,9 +17,9 @@
<Product>Aaru Data Preservation Suite</Product> <Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Partitions</Title> <Title>Aaru.Partitions</Title>
<ApplicationVersion>$(Version)</ApplicationVersion> <ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6</TargetFramework>
<NoWarn>CS0649</NoWarn> <NoWarn>CS0649</NoWarn>
<LangVersion>8</LangVersion> <LangVersion>10</LangVersion>
<Description>Partitioning schemes implemented by the Aaru Data Preservation Suite.</Description> <Description>Partitioning schemes implemented by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl> <PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression> <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
@@ -30,6 +30,7 @@
<IncludeSymbols>true</IncludeSymbols> <IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat> <SymbolPackageFormat>snupkg</SymbolPackageFormat>
<Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors> <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat> <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>

View File

@@ -17,8 +17,8 @@
<Product>Aaru Data Preservation Suite</Product> <Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Settings</Title> <Title>Aaru.Settings</Title>
<ApplicationVersion>$(Version)</ApplicationVersion> <ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6</TargetFramework>
<LangVersion>8</LangVersion> <LangVersion>10</LangVersion>
<Description>Settings interface used by the Aaru Data Preservation Suite.</Description> <Description>Settings interface used by the Aaru Data Preservation Suite.</Description>
<PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl> <PackageProjectUrl>https://github.com/aaru-dps/</PackageProjectUrl>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression> <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
@@ -29,6 +29,7 @@
<IncludeSymbols>true</IncludeSymbols> <IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat> <SymbolPackageFormat>snupkg</SymbolPackageFormat>
<Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors> <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat> <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>
@@ -71,7 +72,7 @@
<ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj" /> <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0"/> <PackageReference Include="Microsoft.Win32.Registry" Version="6.0.0-preview.5.21301.5" />
<PackageReference Include="plist-cil" Version="2.2.0" /> <PackageReference Include="plist-cil" Version="2.2.0" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all" /> <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all" />
</ItemGroup> </ItemGroup>

View File

@@ -9,7 +9,7 @@
<AssemblyName>Aaru.Tests.Devices</AssemblyName> <AssemblyName>Aaru.Tests.Devices</AssemblyName>
<ReleaseVersion>$(Version)</ReleaseVersion> <ReleaseVersion>$(Version)</ReleaseVersion>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems> <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6</TargetFramework>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo> <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>6.0.0-alpha6</Version> <Version>6.0.0-alpha6</Version>
<Company>Claunia.com</Company> <Company>Claunia.com</Company>
@@ -17,8 +17,9 @@
<Product>Aaru Data Preservation Suite</Product> <Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Tests.Devices</Title> <Title>Aaru.Tests.Devices</Title>
<ApplicationVersion>$(Version)</ApplicationVersion> <ApplicationVersion>$(Version)</ApplicationVersion>
<LangVersion>8</LangVersion> <LangVersion>10</LangVersion>
<Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors> <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat> <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>

View File

@@ -1,12 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6</TargetFramework>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<LangVersion>8</LangVersion> <LangVersion>10</LangVersion>
<Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors> <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@@ -15,7 +16,7 @@
<PackageReference Include="nunit" Version="3.12.0" /> <PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" /> <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" /> <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.7.21377.19" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@@ -10,7 +10,7 @@
<AssemblyName>aaru</AssemblyName> <AssemblyName>aaru</AssemblyName>
<ReleaseVersion>$(Version)</ReleaseVersion> <ReleaseVersion>$(Version)</ReleaseVersion>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems> <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6</TargetFramework>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo> <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>6.0.0-alpha6</Version> <Version>6.0.0-alpha6</Version>
<Company>Claunia.com</Company> <Company>Claunia.com</Company>
@@ -20,7 +20,8 @@
<ApplicationVersion>$(Version)</ApplicationVersion> <ApplicationVersion>$(Version)</ApplicationVersion>
<RuntimeIdentifiers>alpine-x64;linux-arm64;linux-arm;linux-x64;osx-x64;win-arm64;win-arm;win-x64;win-x86;debian-arm;debian-arm64;debian-x64;rhel-arm64;rhel-x64;sles-x64</RuntimeIdentifiers> <RuntimeIdentifiers>alpine-x64;linux-arm64;linux-arm;linux-x64;osx-x64;win-arm64;win-arm;win-x64;win-x86;debian-arm;debian-arm64;debian-x64;rhel-arm64;rhel-x64;sles-x64</RuntimeIdentifiers>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<LangVersion>8</LangVersion> <LangVersion>10</LangVersion>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat> <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
@@ -262,10 +263,10 @@
<Content Include="..\.github\PULL_REQUEST_TEMPLATE.md" /> <Content Include="..\.github\PULL_REQUEST_TEMPLATE.md" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.5" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0-preview.7.21378.4" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20104.2" /> <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20104.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" /> <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.7.21377.19" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" /> <PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" /> <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
<PackageReference Include="System.Collections" Version="4.3.0" /> <PackageReference Include="System.Collections" Version="4.3.0" />

View File

@@ -325,7 +325,7 @@ namespace Aaru.Commands.Filesystem
return; return;
} }
Dictionary<string, FileEntryInfo> stats = new Dictionary<string, FileEntryInfo>(); Dictionary<string, FileEntryInfo> stats = new();
foreach(string entry in directory) foreach(string entry in directory)
{ {

View File

@@ -28,7 +28,7 @@ Stable releases in [Github](https://github.com/aaru-dps/Aaru/releases).
System requirements System requirements
=================== ===================
Aaru is created using .NET Core 3.1 and can be compiled with all the major IDEs. To run it you require to use one of the Aaru is created using .NET 6 and can be compiled with all the major IDEs. To run it you require to use one of the
stable releases, or build it yourself. stable releases, or build it yourself.
Usage Usage