Upgrade to .NET 6.

2025-12-16 19:24:25 +00:00 · 2021-09-12 22:25:59 +01:00
parent 9f30ed44cb
commit ebd29840fe
36 changed files with 568 additions and 558 deletions
--- a/Aaru.Archives/Aaru.Archives.csproj
+++ b/Aaru.Archives/Aaru.Archives.csproj
@@ -17,8 +17,8 @@
    <Product>Aaru Data Preservation Suite</Product>
    <Title>Aaru.Archives</Title>
    <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>8</LangVersion>
+    <TargetFramework>net6</TargetFramework>
+    <LangVersion>10</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>
@@ -29,6 +29,7 @@
    <IncludeSymbols>true</IncludeSymbols>
    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
    <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
  </PropertyGroup>
  <PropertyGroup>
    <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>
--- a/Aaru.Checksums
+++ b/Aaru.Checksums
--- a/Aaru.CommonTypes
+++ b/Aaru.CommonTypes
--- a/Aaru.Compression/Aaru.Compression.csproj
+++ b/Aaru.Compression/Aaru.Compression.csproj
@@ -18,8 +18,8 @@
    <Product>Aaru Data Preservation Suite</Product>
    <Title>Aaru Data Preservation Suite</Title>
    <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>8</LangVersion>
+    <TargetFramework>net6</TargetFramework>
+    <LangVersion>10</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>
@@ -30,6 +30,7 @@
    <IncludeSymbols>true</IncludeSymbols>
    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
    <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
  </PropertyGroup>
  <PropertyGroup>
    <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>
--- a/Aaru.Console
+++ b/Aaru.Console
--- a/Aaru.Core/Aaru.Core.csproj
+++ b/Aaru.Core/Aaru.Core.csproj
@@ -17,8 +17,8 @@
    <Product>Aaru Data Preservation Suite</Product>
    <Title>Aaru.Core</Title>
    <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>8</LangVersion>
+    <TargetFramework>net6</TargetFramework>
+    <LangVersion>10</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>
@@ -29,6 +29,7 @@
    <IncludeSymbols>true</IncludeSymbols>
    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
    <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
  </PropertyGroup>
  <PropertyGroup>
    <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>
--- a/Aaru.Core/Sidecar/Files.cs
+++ b/Aaru.Core/Sidecar/Files.cs
@@ -52,8 +52,8 @@ namespace Aaru.Core
            if(ret != Errno.NoError)
                return null;

-            List<DirectoryType>    directories = new List<DirectoryType>();
-            List<ContentsFileType> files       = new List<ContentsFileType>();
+            List<DirectoryType>    directories = new();
+            List<ContentsFileType> files       = new();

            foreach(string dirent in dirents)
            {
@@ -155,8 +155,8 @@ namespace Aaru.Core
            if(ret != Errno.NoError)
                return null;

-            List<DirectoryType>    directories = new List<DirectoryType>();
-            List<ContentsFileType> files       = new List<ContentsFileType>();
+            List<DirectoryType>    directories = new();
+            List<ContentsFileType> files       = new();

            foreach(string dirent in dirents)
            {
@@ -297,7 +297,7 @@ namespace Aaru.Core
            if(ret != Errno.NoError)
                return file;

-            List<ExtendedAttributeType> xattrTypes = new List<ExtendedAttributeType>();
+            List<ExtendedAttributeType> xattrTypes = new();

            foreach(string xattr in xattrs)
            {
--- a/Aaru.Database/Aaru.Database.csproj
+++ b/Aaru.Database/Aaru.Database.csproj
@@ -16,8 +16,8 @@
    <Product>Aaru Data Preservation Suite</Product>
    <Title>Aaru.Database</Title>
    <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>8</LangVersion>
+    <TargetFramework>net6</TargetFramework>
+    <LangVersion>10</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>
@@ -28,6 +28,7 @@
    <IncludeSymbols>true</IncludeSymbols>
    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
    <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
  </PropertyGroup>
  <PropertyGroup>
    <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>
@@ -53,7 +54,7 @@
    <ConsolePause>false</ConsolePause>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="System"/>
+    <Reference Include="System" />
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="..\LICENSE.LGPL">
@@ -61,111 +62,114 @@
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="EntityFramework" Version="6.4.4"/>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.5"/>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.1.5"/>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.5"/>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="1.1.6"/>
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all"/>
+    <PackageReference Include="EntityFramework" Version="6.4.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0-preview.7.21378.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </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" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="Context.cs"/>
-    <Compile Include="ContextFactory.cs"/>
-    <Compile Include="Migrations\20181126222301_DeviceReportV2.cs"/>
-    <Compile Include="Migrations\20181126222301_DeviceReportV2.Designer.cs"/>
-    <Compile Include="Migrations\20181127001622_AddDeviceBasicFields.cs"/>
-    <Compile Include="Migrations\20181127001622_AddDeviceBasicFields.Designer.cs"/>
-    <Compile Include="Migrations\20181127013131_CorrectReportsDbSet.cs"/>
-    <Compile Include="Migrations\20181127013131_CorrectReportsDbSet.Designer.cs"/>
-    <Compile Include="Migrations\20181221015906_NameValueStatistics.cs"/>
-    <Compile Include="Migrations\20181221015906_NameValueStatistics.Designer.cs"/>
-    <Compile Include="Migrations\20181221032605_MediaStatistics.cs"/>
-    <Compile Include="Migrations\20181221032605_MediaStatistics.Designer.cs"/>
-    <Compile Include="Migrations\20181221034941_SeenDevicesStatistics.cs"/>
-    <Compile Include="Migrations\20181221034941_SeenDevicesStatistics.Designer.cs"/>
-    <Compile Include="Migrations\20181221040408_OperatingSystemStatistics.cs"/>
-    <Compile Include="Migrations\20181221040408_OperatingSystemStatistics.Designer.cs"/>
-    <Compile Include="Migrations\20181221041242_VersionStatistics.cs"/>
-    <Compile Include="Migrations\20181221041242_VersionStatistics.Designer.cs"/>
-    <Compile Include="Migrations\20181221125353_AddStatsCounters.cs"/>
-    <Compile Include="Migrations\20181221125353_AddStatsCounters.Designer.cs"/>
-    <Compile Include="Migrations\20181223183913_FixUnsignedFields.cs"/>
-    <Compile Include="Migrations\20181223183913_FixUnsignedFields.Designer.cs"/>
-    <Compile Include="Migrations\20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.cs"/>
-    <Compile Include="Migrations\20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.Designer.cs"/>
-    <Compile Include="Migrations\20181224044809_StoreUsbIdsInDatabase.cs"/>
-    <Compile Include="Migrations\20181224044809_StoreUsbIdsInDatabase.Designer.cs"/>
-    <Compile Include="Migrations\20181224172147_FixUsbIdsAndIndexes.cs"/>
-    <Compile Include="Migrations\20181224172147_FixUsbIdsAndIndexes.Designer.cs"/>
-    <Compile Include="Migrations\20181225002740_AddCdOffsets.cs"/>
-    <Compile Include="Migrations\20181225002740_AddCdOffsets.Designer.cs"/>
-    <Compile Include="Migrations\20181225152947_StoreMmcGetConfigurationResponse.cs"/>
-    <Compile Include="Migrations\20181225152947_StoreMmcGetConfigurationResponse.Designer.cs"/>
-    <Compile Include="Migrations\20181225214500_StoreReadResultsInReportDatabase.cs"/>
-    <Compile Include="Migrations\20181225214500_StoreReadResultsInReportDatabase.Designer.cs"/>
-    <Compile Include="Migrations\20190102061236_AddMultisessionLeadTest.cs"/>
-    <Compile Include="Migrations\20190102061236_AddMultisessionLeadTest.Designer.cs"/>
-    <Compile Include="Migrations\20190102230036_AddOptimalReadMultipleCount.cs"/>
-    <Compile Include="Migrations\20190102230036_AddOptimalReadMultipleCount.Designer.cs"/>
-    <Compile Include="Migrations\20190108013456_AddChangeableScsiModes.cs"/>
-    <Compile Include="Migrations\20190108013456_AddChangeableScsiModes.Designer.cs"/>
-    <Compile Include="Migrations\20190525183723_IdForDensityCode.cs"/>
-    <Compile Include="Migrations\20190525183723_IdForDensityCode.Designer.cs"/>
-    <Compile Include="Migrations\20191103000828_MakeFieldsUnsigned.cs"/>
-    <Compile Include="Migrations\20191103000828_MakeFieldsUnsigned.Designer.cs"/>
-    <Compile Include="Migrations\20191207175444_SyncWithServerChanges.cs"/>
-    <Compile Include="Migrations\20191207175444_SyncWithServerChanges.Designer.cs"/>
-    <Compile Include="Migrations\20191207183522_AddNameCountModel.cs"/>
-    <Compile Include="Migrations\20191207183522_AddNameCountModel.Designer.cs"/>
-    <Compile Include="Migrations\20191207184342_AddRemoteStats.cs"/>
-    <Compile Include="Migrations\20191207184342_AddRemoteStats.Designer.cs"/>
-    <Compile Include="Migrations\20200710140320_FixIndexes.cs"/>
-    <Compile Include="Migrations\20200710140320_FixIndexes.Designer.cs"/>
-    <Compile Include="Migrations\20200710164101_AddCanReadGdRomUsingSwapDisc.cs"/>
-    <Compile Include="Migrations\20200710164101_AddCanReadGdRomUsingSwapDisc.Designer.cs"/>
-    <Compile Include="Migrations\20200710170129_AddGdRomSwapDiscCapabilities.cs"/>
-    <Compile Include="Migrations\20200710170129_AddGdRomSwapDiscCapabilities.Designer.cs"/>
-    <Compile Include="Migrations\20200710192426_MakeCanReadGdRomUsingSwapDiscNullable.cs"/>
-    <Compile Include="Migrations\20200710192426_MakeCanReadGdRomUsingSwapDiscNullable.Designer.cs"/>
-    <Compile Include="Migrations\20200710194507_AddAudioFieldsToGdromReadCapabilities.cs"/>
-    <Compile Include="Migrations\20200710194507_AddAudioFieldsToGdromReadCapabilities.Designer.cs"/>
-    <Compile Include="Migrations\20200711182425_AddFieldsForF1hCommand06hSubcommand.cs"/>
-    <Compile Include="Migrations\20200711182425_AddFieldsForF1hCommand06hSubcommand.Designer.cs"/>
-    <Compile Include="Migrations\20200711230202_FixGdRomCapabilitiesFieldName.cs"/>
-    <Compile Include="Migrations\20200711230202_FixGdRomCapabilitiesFieldName.Designer.cs"/>
-    <Compile Include="Migrations\AaruContextModelSnapshot.cs"/>
-    <Compile Include="Models\BaseModel.cs"/>
-    <Compile Include="Models\BaseOperatingSystem.cs"/>
-    <Compile Include="Models\CdOffset.cs"/>
-    <Compile Include="Models\Command.cs"/>
-    <Compile Include="Models\Device.cs"/>
-    <Compile Include="Models\DeviceStat.cs"/>
-    <Compile Include="Models\Filesystem.cs"/>
-    <Compile Include="Models\Filter.cs"/>
-    <Compile Include="Models\Media.cs"/>
-    <Compile Include="Models\MediaFormat.cs"/>
-    <Compile Include="Models\NameCountModel.cs"/>
-    <Compile Include="Models\OperatingSystem.cs"/>
-    <Compile Include="Models\Partition.cs"/>
-    <Compile Include="Models\RemoteApplication.cs"/>
-    <Compile Include="Models\RemoteArchitecture.cs"/>
-    <Compile Include="Models\RemoteOperatingSystem.cs"/>
-    <Compile Include="Models\Report.cs"/>
-    <Compile Include="Models\UsbProduct.cs"/>
-    <Compile Include="Models\UsbVendor.cs"/>
-    <Compile Include="Models\Version.cs"/>
+    <Compile Include="Context.cs" />
+    <Compile Include="ContextFactory.cs" />
+    <Compile Include="Migrations\20181126222301_DeviceReportV2.cs" />
+    <Compile Include="Migrations\20181126222301_DeviceReportV2.Designer.cs" />
+    <Compile Include="Migrations\20181127001622_AddDeviceBasicFields.cs" />
+    <Compile Include="Migrations\20181127001622_AddDeviceBasicFields.Designer.cs" />
+    <Compile Include="Migrations\20181127013131_CorrectReportsDbSet.cs" />
+    <Compile Include="Migrations\20181127013131_CorrectReportsDbSet.Designer.cs" />
+    <Compile Include="Migrations\20181221015906_NameValueStatistics.cs" />
+    <Compile Include="Migrations\20181221015906_NameValueStatistics.Designer.cs" />
+    <Compile Include="Migrations\20181221032605_MediaStatistics.cs" />
+    <Compile Include="Migrations\20181221032605_MediaStatistics.Designer.cs" />
+    <Compile Include="Migrations\20181221034941_SeenDevicesStatistics.cs" />
+    <Compile Include="Migrations\20181221034941_SeenDevicesStatistics.Designer.cs" />
+    <Compile Include="Migrations\20181221040408_OperatingSystemStatistics.cs" />
+    <Compile Include="Migrations\20181221040408_OperatingSystemStatistics.Designer.cs" />
+    <Compile Include="Migrations\20181221041242_VersionStatistics.cs" />
+    <Compile Include="Migrations\20181221041242_VersionStatistics.Designer.cs" />
+    <Compile Include="Migrations\20181221125353_AddStatsCounters.cs" />
+    <Compile Include="Migrations\20181221125353_AddStatsCounters.Designer.cs" />
+    <Compile Include="Migrations\20181223183913_FixUnsignedFields.cs" />
+    <Compile Include="Migrations\20181223183913_FixUnsignedFields.Designer.cs" />
+    <Compile Include="Migrations\20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.cs" />
+    <Compile Include="Migrations\20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.Designer.cs" />
+    <Compile Include="Migrations\20181224044809_StoreUsbIdsInDatabase.cs" />
+    <Compile Include="Migrations\20181224044809_StoreUsbIdsInDatabase.Designer.cs" />
+    <Compile Include="Migrations\20181224172147_FixUsbIdsAndIndexes.cs" />
+    <Compile Include="Migrations\20181224172147_FixUsbIdsAndIndexes.Designer.cs" />
+    <Compile Include="Migrations\20181225002740_AddCdOffsets.cs" />
+    <Compile Include="Migrations\20181225002740_AddCdOffsets.Designer.cs" />
+    <Compile Include="Migrations\20181225152947_StoreMmcGetConfigurationResponse.cs" />
+    <Compile Include="Migrations\20181225152947_StoreMmcGetConfigurationResponse.Designer.cs" />
+    <Compile Include="Migrations\20181225214500_StoreReadResultsInReportDatabase.cs" />
+    <Compile Include="Migrations\20181225214500_StoreReadResultsInReportDatabase.Designer.cs" />
+    <Compile Include="Migrations\20190102061236_AddMultisessionLeadTest.cs" />
+    <Compile Include="Migrations\20190102061236_AddMultisessionLeadTest.Designer.cs" />
+    <Compile Include="Migrations\20190102230036_AddOptimalReadMultipleCount.cs" />
+    <Compile Include="Migrations\20190102230036_AddOptimalReadMultipleCount.Designer.cs" />
+    <Compile Include="Migrations\20190108013456_AddChangeableScsiModes.cs" />
+    <Compile Include="Migrations\20190108013456_AddChangeableScsiModes.Designer.cs" />
+    <Compile Include="Migrations\20190525183723_IdForDensityCode.cs" />
+    <Compile Include="Migrations\20190525183723_IdForDensityCode.Designer.cs" />
+    <Compile Include="Migrations\20191103000828_MakeFieldsUnsigned.cs" />
+    <Compile Include="Migrations\20191103000828_MakeFieldsUnsigned.Designer.cs" />
+    <Compile Include="Migrations\20191207175444_SyncWithServerChanges.cs" />
+    <Compile Include="Migrations\20191207175444_SyncWithServerChanges.Designer.cs" />
+    <Compile Include="Migrations\20191207183522_AddNameCountModel.cs" />
+    <Compile Include="Migrations\20191207183522_AddNameCountModel.Designer.cs" />
+    <Compile Include="Migrations\20191207184342_AddRemoteStats.cs" />
+    <Compile Include="Migrations\20191207184342_AddRemoteStats.Designer.cs" />
+    <Compile Include="Migrations\20200710140320_FixIndexes.cs" />
+    <Compile Include="Migrations\20200710140320_FixIndexes.Designer.cs" />
+    <Compile Include="Migrations\20200710164101_AddCanReadGdRomUsingSwapDisc.cs" />
+    <Compile Include="Migrations\20200710164101_AddCanReadGdRomUsingSwapDisc.Designer.cs" />
+    <Compile Include="Migrations\20200710170129_AddGdRomSwapDiscCapabilities.cs" />
+    <Compile Include="Migrations\20200710170129_AddGdRomSwapDiscCapabilities.Designer.cs" />
+    <Compile Include="Migrations\20200710192426_MakeCanReadGdRomUsingSwapDiscNullable.cs" />
+    <Compile Include="Migrations\20200710192426_MakeCanReadGdRomUsingSwapDiscNullable.Designer.cs" />
+    <Compile Include="Migrations\20200710194507_AddAudioFieldsToGdromReadCapabilities.cs" />
+    <Compile Include="Migrations\20200710194507_AddAudioFieldsToGdromReadCapabilities.Designer.cs" />
+    <Compile Include="Migrations\20200711182425_AddFieldsForF1hCommand06hSubcommand.cs" />
+    <Compile Include="Migrations\20200711182425_AddFieldsForF1hCommand06hSubcommand.Designer.cs" />
+    <Compile Include="Migrations\20200711230202_FixGdRomCapabilitiesFieldName.cs" />
+    <Compile Include="Migrations\20200711230202_FixGdRomCapabilitiesFieldName.Designer.cs" />
+    <Compile Include="Migrations\AaruContextModelSnapshot.cs" />
+    <Compile Include="Models\BaseModel.cs" />
+    <Compile Include="Models\BaseOperatingSystem.cs" />
+    <Compile Include="Models\CdOffset.cs" />
+    <Compile Include="Models\Command.cs" />
+    <Compile Include="Models\Device.cs" />
+    <Compile Include="Models\DeviceStat.cs" />
+    <Compile Include="Models\Filesystem.cs" />
+    <Compile Include="Models\Filter.cs" />
+    <Compile Include="Models\Media.cs" />
+    <Compile Include="Models\MediaFormat.cs" />
+    <Compile Include="Models\NameCountModel.cs" />
+    <Compile Include="Models\OperatingSystem.cs" />
+    <Compile Include="Models\Partition.cs" />
+    <Compile Include="Models\RemoteApplication.cs" />
+    <Compile Include="Models\RemoteArchitecture.cs" />
+    <Compile Include="Models\RemoteOperatingSystem.cs" />
+    <Compile Include="Models\Report.cs" />
+    <Compile Include="Models\UsbProduct.cs" />
+    <Compile Include="Models\UsbVendor.cs" />
+    <Compile Include="Models\Version.cs" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj"/>
-    <ProjectReference Include="..\Aaru.Decoders\Aaru.Decoders.csproj"/>
+    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj" />
+    <ProjectReference Include="..\Aaru.Decoders\Aaru.Decoders.csproj" />
  </ItemGroup>
  <ProjectExtensions>
    <MonoDevelop>
      <Properties>
        <Policies>
-          <StandardHeader IncludeInNewFiles="True" Text="/***************************************************************************&#xA;Aaru Data Preservation Suite&#xA;----------------------------------------------------------------------------&#xA; &#xA;Filename       : ${FileName}&#xA;Author(s)      : ${AuthorName} &lt;${AuthorEmail}&gt;&#xA;&#xA;Component      : Component&#xA; &#xA;--[ Description ] ----------------------------------------------------------&#xA; &#xA;    Description&#xA; &#xA;--[ License ] --------------------------------------------------------------&#xA; &#xA;    This library is free software; you can redistribute it and/or modify&#xA;    it under the terms of the GNU Lesser General Public License as&#xA;    published by the Free Software Foundation; either version 2.1 of the&#xA;    License, or (at your option) any later version.&#xA;&#xA;    This library is distributed in the hope that it will be useful, but&#xA;    WITHOUT ANY WARRANTY; without even the implied warranty of&#xA;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#xA;    Lesser General Public License for more details.&#xA;&#xA;    You should have received a copy of the GNU Lesser General Public&#xA;    License along with this library; if not, see &lt;http://www.gnu.org/licenses/&gt;.&#xA;&#xA;----------------------------------------------------------------------------&#xA;Copyright © 2011-${Year} ${CopyrightHolder}&#xA;****************************************************************************/"/>
-          <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp"/>
-          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" NewLineForMembersInObjectInit="True" NewLineForMembersInAnonymousTypes="True" NewLineForClausesInQuery="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp"/>
+          <StandardHeader IncludeInNewFiles="True" Text="/***************************************************************************&#xA;Aaru Data Preservation Suite&#xA;----------------------------------------------------------------------------&#xA; &#xA;Filename       : ${FileName}&#xA;Author(s)      : ${AuthorName} &lt;${AuthorEmail}&gt;&#xA;&#xA;Component      : Component&#xA; &#xA;--[ Description ] ----------------------------------------------------------&#xA; &#xA;    Description&#xA; &#xA;--[ License ] --------------------------------------------------------------&#xA; &#xA;    This library is free software; you can redistribute it and/or modify&#xA;    it under the terms of the GNU Lesser General Public License as&#xA;    published by the Free Software Foundation; either version 2.1 of the&#xA;    License, or (at your option) any later version.&#xA;&#xA;    This library is distributed in the hope that it will be useful, but&#xA;    WITHOUT ANY WARRANTY; without even the implied warranty of&#xA;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#xA;    Lesser General Public License for more details.&#xA;&#xA;    You should have received a copy of the GNU Lesser General Public&#xA;    License along with this library; if not, see &lt;http://www.gnu.org/licenses/&gt;.&#xA;&#xA;----------------------------------------------------------------------------&#xA;Copyright © 2011-${Year} ${CopyrightHolder}&#xA;****************************************************************************/" />
+          <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp" />
+          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" NewLineForMembersInObjectInit="True" NewLineForMembersInAnonymousTypes="True" NewLineForClausesInQuery="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp" />
        </Policies>
      </Properties>
    </MonoDevelop>
--- a/Aaru.Decoders
+++ b/Aaru.Decoders
--- a/Aaru.Decryption
+++ b/Aaru.Decryption
--- a/Aaru.Devices/Aaru.Devices.csproj
+++ b/Aaru.Devices/Aaru.Devices.csproj
@@ -17,8 +17,8 @@
    <Product>Aaru Data Preservation Suite</Product>
    <Title>Aaru.Devices</Title>
    <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>8</LangVersion>
+    <TargetFramework>net6</TargetFramework>
+    <LangVersion>10</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>
@@ -29,6 +29,7 @@
    <IncludeSymbols>true</IncludeSymbols>
    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
    <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
  </PropertyGroup>
  <PropertyGroup>
    <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>
@@ -55,87 +56,87 @@
    <ConsolePause>false</ConsolePause>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="System"/>
-    <Reference Include="System.Management"/>
+    <Reference Include="System" />
+    <Reference Include="System.Management" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="Device\DeviceException.cs"/>
-    <Compile Include="Device\ScsiCommands\MediaTek.cs"/>
-    <Compile Include="Device\ScsiCommands\MiniDisc.cs"/>
-    <Compile Include="Device\ScsiCommands\Optical.cs"/>
-    <Compile Include="FreeBSD\ListDevices.cs"/>
-    <Compile Include="Linux\Extern.cs"/>
-    <Compile Include="Linux\Structs.cs"/>
-    <Compile Include="Linux\Enums.cs"/>
-    <Compile Include="Enums.cs"/>
-    <Compile Include="Remote\Consts.cs"/>
-    <Compile Include="Remote\Enums.cs"/>
-    <Compile Include="Remote\Remote.cs"/>
-    <Compile Include="Remote\Structs.cs"/>
-    <Compile Include="Windows\Extern.cs"/>
-    <Compile Include="Windows\ListDevices.cs"/>
-    <Compile Include="Windows\Structs.cs"/>
-    <Compile Include="Windows\Enums.cs"/>
-    <Compile Include="Windows\Command.cs"/>
-    <Compile Include="Linux\Command.cs"/>
-    <Compile Include="Command.cs"/>
-    <Compile Include="Device\Constructor.cs"/>
-    <Compile Include="Device\Variables.cs"/>
-    <Compile Include="Device\Destructor.cs"/>
-    <Compile Include="Device\Commands.cs"/>
-    <Compile Include="Device\ScsiCommands\MMC.cs"/>
-    <Compile Include="Device\ScsiCommands\SPC.cs"/>
-    <Compile Include="Device\ScsiCommands\SBC.cs"/>
-    <Compile Include="Device\ScsiCommands\Pioneer.cs"/>
-    <Compile Include="Device\ScsiCommands\Plextor.cs"/>
-    <Compile Include="Device\ScsiCommands\NEC.cs"/>
-    <Compile Include="Device\ScsiCommands\HL-DT-ST.cs"/>
-    <Compile Include="Device\ScsiCommands\SSC.cs"/>
-    <Compile Include="Device\ScsiCommands\SMC.cs"/>
-    <Compile Include="Device\ScsiCommands\Adaptec.cs"/>
-    <Compile Include="Device\ScsiCommands\ArchiveCorp.cs"/>
-    <Compile Include="Device\ScsiCommands\Certance.cs"/>
-    <Compile Include="Device\ScsiCommands\Fujitsu.cs"/>
-    <Compile Include="Device\ScsiCommands\HP.cs"/>
-    <Compile Include="Device\ScsiCommands\Plasmon.cs"/>
-    <Compile Include="Device\ScsiCommands\SyQuest.cs"/>
-    <Compile Include="Device\AtaCommands\AtaCHS.cs"/>
-    <Compile Include="Device\AtaCommands\Atapi.cs"/>
-    <Compile Include="Device\AtaCommands\Ata28.cs"/>
-    <Compile Include="Device\AtaCommands\Ata48.cs"/>
-    <Compile Include="Device\AtaCommands\Smart.cs"/>
-    <Compile Include="Device\AtaCommands\Cfa.cs"/>
-    <Compile Include="Device\AtaCommands\MCPT.cs"/>
-    <Compile Include="FreeBSD\Command.cs"/>
-    <Compile Include="FreeBSD\Enums.cs"/>
-    <Compile Include="FreeBSD\Extern.cs"/>
-    <Compile Include="FreeBSD\Structs.cs"/>
-    <Compile Include="Device\MmcCommands\MMC.cs"/>
-    <Compile Include="Device\MmcCommands\SecureDigital.cs"/>
-    <Compile Include="Device\ScsiCommands\Kreon.cs"/>
-    <Compile Include="Device\List.cs"/>
-    <Compile Include="Linux\ListDevices.cs"/>
-    <Compile Include="Windows\Usb.cs"/>
-    <Compile Include="Windows\UsbFunctions.cs"/>
+    <Compile Include="Device\DeviceException.cs" />
+    <Compile Include="Device\ScsiCommands\MediaTek.cs" />
+    <Compile Include="Device\ScsiCommands\MiniDisc.cs" />
+    <Compile Include="Device\ScsiCommands\Optical.cs" />
+    <Compile Include="FreeBSD\ListDevices.cs" />
+    <Compile Include="Linux\Extern.cs" />
+    <Compile Include="Linux\Structs.cs" />
+    <Compile Include="Linux\Enums.cs" />
+    <Compile Include="Enums.cs" />
+    <Compile Include="Remote\Consts.cs" />
+    <Compile Include="Remote\Enums.cs" />
+    <Compile Include="Remote\Remote.cs" />
+    <Compile Include="Remote\Structs.cs" />
+    <Compile Include="Windows\Extern.cs" />
+    <Compile Include="Windows\ListDevices.cs" />
+    <Compile Include="Windows\Structs.cs" />
+    <Compile Include="Windows\Enums.cs" />
+    <Compile Include="Windows\Command.cs" />
+    <Compile Include="Linux\Command.cs" />
+    <Compile Include="Command.cs" />
+    <Compile Include="Device\Constructor.cs" />
+    <Compile Include="Device\Variables.cs" />
+    <Compile Include="Device\Destructor.cs" />
+    <Compile Include="Device\Commands.cs" />
+    <Compile Include="Device\ScsiCommands\MMC.cs" />
+    <Compile Include="Device\ScsiCommands\SPC.cs" />
+    <Compile Include="Device\ScsiCommands\SBC.cs" />
+    <Compile Include="Device\ScsiCommands\Pioneer.cs" />
+    <Compile Include="Device\ScsiCommands\Plextor.cs" />
+    <Compile Include="Device\ScsiCommands\NEC.cs" />
+    <Compile Include="Device\ScsiCommands\HL-DT-ST.cs" />
+    <Compile Include="Device\ScsiCommands\SSC.cs" />
+    <Compile Include="Device\ScsiCommands\SMC.cs" />
+    <Compile Include="Device\ScsiCommands\Adaptec.cs" />
+    <Compile Include="Device\ScsiCommands\ArchiveCorp.cs" />
+    <Compile Include="Device\ScsiCommands\Certance.cs" />
+    <Compile Include="Device\ScsiCommands\Fujitsu.cs" />
+    <Compile Include="Device\ScsiCommands\HP.cs" />
+    <Compile Include="Device\ScsiCommands\Plasmon.cs" />
+    <Compile Include="Device\ScsiCommands\SyQuest.cs" />
+    <Compile Include="Device\AtaCommands\AtaCHS.cs" />
+    <Compile Include="Device\AtaCommands\Atapi.cs" />
+    <Compile Include="Device\AtaCommands\Ata28.cs" />
+    <Compile Include="Device\AtaCommands\Ata48.cs" />
+    <Compile Include="Device\AtaCommands\Smart.cs" />
+    <Compile Include="Device\AtaCommands\Cfa.cs" />
+    <Compile Include="Device\AtaCommands\MCPT.cs" />
+    <Compile Include="FreeBSD\Command.cs" />
+    <Compile Include="FreeBSD\Enums.cs" />
+    <Compile Include="FreeBSD\Extern.cs" />
+    <Compile Include="FreeBSD\Structs.cs" />
+    <Compile Include="Device\MmcCommands\MMC.cs" />
+    <Compile Include="Device\MmcCommands\SecureDigital.cs" />
+    <Compile Include="Device\ScsiCommands\Kreon.cs" />
+    <Compile Include="Device\List.cs" />
+    <Compile Include="Linux\ListDevices.cs" />
+    <Compile Include="Windows\Usb.cs" />
+    <Compile Include="Windows\UsbFunctions.cs" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="System.Management" Version="4.7.0"/>
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all"/>
+    <PackageReference Include="System.Management" Version="6.0.0-preview.7.21377.19" />
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all" />
  </ItemGroup>
  <ProjectExtensions>
    <MonoDevelop>
      <Properties>
        <Policies>
-          <DotNetNamingPolicy DirectoryNamespaceAssociation="PrefixedHierarchical" ResourceNamePolicy="MSBuild"/>
-          <StandardHeader IncludeInNewFiles="True" Text="/***************************************************************************&#xA;Aaru Data Preservation Suite&#xA;----------------------------------------------------------------------------&#xA; &#xA;Filename       : ${FileName}&#xA;Author(s)      : ${AuthorName} &lt;${AuthorEmail}&gt;&#xA;&#xA;Component      : Component&#xA; &#xA;--[ Description ] ----------------------------------------------------------&#xA; &#xA;    Description&#xA; &#xA;--[ License ] --------------------------------------------------------------&#xA; &#xA;    This library is free software; you can redistribute it and/or modify&#xA;    it under the terms of the GNU Lesser General Public License as&#xA;    published by the Free Software Foundation; either version 2.1 of the&#xA;    License, or (at your option) any later version.&#xA;&#xA;    This library is distributed in the hope that it will be useful, but&#xA;    WITHOUT ANY WARRANTY; without even the implied warranty of&#xA;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#xA;    Lesser General Public License for more details.&#xA;&#xA;    You should have received a copy of the GNU Lesser General Public&#xA;    License along with this library; if not, see &lt;http://www.gnu.org/licenses/&gt;.&#xA;&#xA;----------------------------------------------------------------------------&#xA;Copyright © 2011-${Year} ${CopyrightHolder}&#xA;****************************************************************************/"/>
-          <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp"/>
-          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" NewLineForMembersInObjectInit="True" NewLineForMembersInAnonymousTypes="True" NewLineForClausesInQuery="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp"/>
+          <DotNetNamingPolicy DirectoryNamespaceAssociation="PrefixedHierarchical" ResourceNamePolicy="MSBuild" />
+          <StandardHeader IncludeInNewFiles="True" Text="/***************************************************************************&#xA;Aaru Data Preservation Suite&#xA;----------------------------------------------------------------------------&#xA; &#xA;Filename       : ${FileName}&#xA;Author(s)      : ${AuthorName} &lt;${AuthorEmail}&gt;&#xA;&#xA;Component      : Component&#xA; &#xA;--[ Description ] ----------------------------------------------------------&#xA; &#xA;    Description&#xA; &#xA;--[ License ] --------------------------------------------------------------&#xA; &#xA;    This library is free software; you can redistribute it and/or modify&#xA;    it under the terms of the GNU Lesser General Public License as&#xA;    published by the Free Software Foundation; either version 2.1 of the&#xA;    License, or (at your option) any later version.&#xA;&#xA;    This library is distributed in the hope that it will be useful, but&#xA;    WITHOUT ANY WARRANTY; without even the implied warranty of&#xA;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#xA;    Lesser General Public License for more details.&#xA;&#xA;    You should have received a copy of the GNU Lesser General Public&#xA;    License along with this library; if not, see &lt;http://www.gnu.org/licenses/&gt;.&#xA;&#xA;----------------------------------------------------------------------------&#xA;Copyright © 2011-${Year} ${CopyrightHolder}&#xA;****************************************************************************/" />
+          <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp" />
+          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" NewLineForMembersInObjectInit="True" NewLineForMembersInAnonymousTypes="True" NewLineForClausesInQuery="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp" />
        </Policies>
      </Properties>
    </MonoDevelop>
  </ProjectExtensions>
  <ItemGroup>
-    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj"/>
+    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj" />
    <ProjectReference Include="..\Aaru.Console\Aaru.Console.csproj">
      <Project>{CCAA7AFE-C094-4D82-A66D-630DE8A3F545}</Project>
      <Name>Aaru.Console</Name>
--- a/Aaru.Dto
+++ b/Aaru.Dto
--- a/Aaru.Filesystems/Aaru.Filesystems.csproj
+++ b/Aaru.Filesystems/Aaru.Filesystems.csproj
@@ -17,9 +17,9 @@
    <Product>Aaru Data Preservation Suite</Product>
    <Title>Aaru.Filesystems</Title>
    <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
    <NoWarn>CS0649</NoWarn>
-    <LangVersion>8</LangVersion>
+    <LangVersion>10</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>
@@ -30,6 +30,7 @@
    <IncludeSymbols>true</IncludeSymbols>
    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
    <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
  </PropertyGroup>
  <PropertyGroup>
    <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>
--- a/Aaru.Filesystems/AppleDOS/AppleDOS.cs
+++ b/Aaru.Filesystems/AppleDOS/AppleDOS.cs
@@ -60,7 +60,7 @@ namespace Aaru.Filesystems
        /// <inheritdoc />
        public string Name => "Apple DOS File System";
        /// <inheritdoc />
-        public Guid Id => new Guid("8658A1E9-B2E7-4BCC-9638-157A31B0A700\n");
+        public Guid Id => new("8658A1E9-B2E7-4BCC-9638-157A31B0A700\n");
        /// <inheritdoc />
        public string Author => "Natalia Portillo";

@@ -72,7 +72,7 @@ namespace Aaru.Filesystems
        /// <inheritdoc />
        public Dictionary<string, string> Namespaces => null;

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

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

@@ -100,7 +100,7 @@ namespace Aaru.Filesystems
        /// <inheritdoc />
        public Dictionary<string, string> Namespaces => null;

-        static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string>
+        static Dictionary<string, string> GetDefaultOptions() => new()
        {
            {
                "debug", false.ToString()
--- a/Aaru.Filesystems/FAT/FAT.cs
+++ b/Aaru.Filesystems/FAT/FAT.cs
@@ -74,7 +74,7 @@ namespace Aaru.Filesystems
        /// <inheritdoc />
        public string Name => "Microsoft File Allocation Table";
        /// <inheritdoc />
-        public Guid Id => new Guid("33513B2C-0D26-0D2D-32C3-79D8611158E0");
+        public Guid Id => new("33513B2C-0D26-0D2D-32C3-79D8611158E0");
        /// <inheritdoc />
        public string Author => "Natalia Portillo";

@@ -84,7 +84,7 @@ namespace Aaru.Filesystems
                {};

        /// <inheritdoc />
-        public Dictionary<string, string> Namespaces => new Dictionary<string, string>
+        public Dictionary<string, string> Namespaces => new()
        {
            {
                "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()
--- a/Aaru.Filesystems/FATX/FATX.cs
+++ b/Aaru.Filesystems/FATX/FATX.cs
@@ -67,7 +67,7 @@ namespace Aaru.Filesystems
        /// <inheritdoc />
        public string Name => "FATX Filesystem Plugin";
        /// <inheritdoc />
-        public Guid Id => new Guid("ED27A721-4A17-4649-89FD-33633B46E228");
+        public Guid Id => new("ED27A721-4A17-4649-89FD-33633B46E228");
        /// <inheritdoc />
        public string Author => "Natalia Portillo";

@@ -98,7 +98,7 @@ namespace Aaru.Filesystems
        /// <inheritdoc />
        public Dictionary<string, string> Namespaces => null;

-        static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string>
+        static Dictionary<string, string> GetDefaultOptions() => new()
        {
            {
                "debug", false.ToString()
--- a/Aaru.Filesystems/ISO9660/ISO9660.cs
+++ b/Aaru.Filesystems/ISO9660/ISO9660.cs
@@ -69,7 +69,7 @@ namespace Aaru.Filesystems
        /// <inheritdoc />
        public string Name => "ISO9660 Filesystem";
        /// <inheritdoc />
-        public Guid Id => new Guid("d812f4d3-c357-400d-90fd-3b22ef786aa8");
+        public Guid Id => new("d812f4d3-c357-400d-90fd-3b22ef786aa8");
        /// <inheritdoc />
        public string Author => "Natalia Portillo";

@@ -84,7 +84,7 @@ namespace Aaru.Filesystems
            };

        /// <inheritdoc />
-        public Dictionary<string, string> Namespaces => new Dictionary<string, string>
+        public Dictionary<string, string> Namespaces => new()
        {
            {
                "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()
--- a/Aaru.Filesystems/ISO9660/Super.cs
+++ b/Aaru.Filesystems/ISO9660/Super.cs
@@ -122,11 +122,11 @@ namespace Aaru.Filesystems
                hsOff = 8;

            _cdi = false;
-            List<ulong> bvdSectors = new List<ulong>();
-            List<ulong> pvdSectors = new List<ulong>();
-            List<ulong> svdSectors = new List<ulong>();
-            List<ulong> evdSectors = new List<ulong>();
-            List<ulong> vpdSectors = new List<ulong>();
+            List<ulong> bvdSectors = new();
+            List<ulong> pvdSectors = new();
+            List<ulong> svdSectors = new();
+            List<ulong> evdSectors = new();
+            List<ulong> vpdSectors = new();

            while(true)
            {
--- a/Aaru.Filesystems/LisaFS/Dir.cs
+++ b/Aaru.Filesystems/LisaFS/Dir.cs
@@ -112,7 +112,7 @@ namespace Aaru.Filesystems.LisaFS
                    return error;

                int                  offset    = 0;
-                List<CatalogEntryV2> catalogV2 = new List<CatalogEntryV2>();
+                List<CatalogEntryV2> catalogV2 = new();

                // For each entry on the catalog
                while(offset + 54 < buf.Length)
@@ -206,7 +206,7 @@ namespace Aaru.Filesystems.LisaFS

            ulong nextCatalogPointer = BigEndianBitConverter.ToUInt32(firstCatalogBlock, 0x7FA);

-            List<byte[]> catalogBlocks = new List<byte[]>
+            List<byte[]> catalogBlocks = new()
            {
                firstCatalogBlock
            };
--- a/Aaru.Filesystems/LisaFS/LisaFS.cs
+++ b/Aaru.Filesystems/LisaFS/LisaFS.cs
@@ -55,7 +55,7 @@ namespace Aaru.Filesystems.LisaFS
        /// <inheritdoc />
        public string Name => "Apple Lisa File System";
        /// <inheritdoc />
-        public Guid Id => new Guid("7E6034D1-D823-4248-A54D-239742B28391");
+        public Guid Id => new("7E6034D1-D823-4248-A54D-239742B28391");
        /// <inheritdoc />
        public Encoding Encoding { get; private set; }
        /// <inheritdoc />
@@ -70,7 +70,7 @@ namespace Aaru.Filesystems.LisaFS
                {};

        /// <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)"
@@ -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()
--- a/Aaru.Filesystems/Opera/Opera.cs
+++ b/Aaru.Filesystems/Opera/Opera.cs
@@ -58,7 +58,7 @@ namespace Aaru.Filesystems
        /// <inheritdoc />
        public string Name => "Opera Filesystem Plugin";
        /// <inheritdoc />
-        public Guid Id => new Guid("0ec84ec7-eae6-4196-83fe-943b3fe46dbd");
+        public Guid Id => new("0ec84ec7-eae6-4196-83fe-943b3fe46dbd");
        /// <inheritdoc />
        public string Author => "Natalia Portillo";

@@ -89,7 +89,7 @@ namespace Aaru.Filesystems
        /// <inheritdoc />
        public Dictionary<string, string> Namespaces => null;

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

-        static Dictionary<string, string> GetDefaultOptions() => new Dictionary<string, string>
+        static Dictionary<string, string> GetDefaultOptions() => new()
        {
            {
                "debug", false.ToString()
--- a/Aaru.Filters/Aaru.Filters.csproj
+++ b/Aaru.Filters/Aaru.Filters.csproj
@@ -17,8 +17,8 @@
    <Product>Aaru Data Preservation Suite</Product>
    <Title>Aaru.Filters</Title>
    <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>8</LangVersion>
+    <TargetFramework>net6</TargetFramework>
+    <LangVersion>10</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>
@@ -29,6 +29,7 @@
    <IncludeSymbols>true</IncludeSymbols>
    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
    <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
  </PropertyGroup>
  <PropertyGroup>
    <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>
--- a/Aaru.Gui/Aaru.Gui.csproj
+++ b/Aaru.Gui/Aaru.Gui.csproj
@@ -10,10 +10,11 @@
    <Product>Aaru Data Preservation Suite</Product>
    <Title>Aaru Data Preservation Suite</Title>
    <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
    <NoWarn>CS0649,CS0169</NoWarn>
-    <LangVersion>8</LangVersion>
+    <LangVersion>10</LangVersion>
    <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
  </PropertyGroup>
  <PropertyGroup>
    <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
@@ -21,306 +22,306 @@
    <NrtShowRevision>true</NrtShowRevision>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.9.10"/>
-    <PackageReference Include="Claunia.Encoding" Version="1.9.1"/>
-    <PackageReference Include="MessageBox.Avalonia" Version="0.9.6.1"/>
-    <PackageReference Include="OxyPlot.Avalonia-alpha-2020-04-15" Version="1.0.0"/>
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1"/>
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0"/>
-    <PackageReference Include="Avalonia" Version="0.9.10"/>
-    <PackageReference Include="Avalonia.Desktop" Version="0.9.10"/>
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.10"/>
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.9.10" />
+    <PackageReference Include="Claunia.Encoding" Version="1.9.1" />
+    <PackageReference Include="MessageBox.Avalonia" Version="0.9.6.1" />
+    <PackageReference Include="OxyPlot.Avalonia-alpha-2020-04-15" Version="1.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.7.21377.19" />
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
+    <PackageReference Include="Avalonia" Version="0.9.10" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.9.10" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.10" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\Aaru.Core\Aaru.Core.csproj"/>
-    <ProjectReference Include="..\Aaru.Devices\Aaru.Devices.csproj"/>
-    <ProjectReference Include="..\Aaru.Checksums\Aaru.Checksums.csproj"/>
+    <ProjectReference Include="..\Aaru.Core\Aaru.Core.csproj" />
+    <ProjectReference Include="..\Aaru.Devices\Aaru.Devices.csproj" />
+    <ProjectReference Include="..\Aaru.Checksums\Aaru.Checksums.csproj" />
  </ItemGroup>
  <ItemGroup>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT1.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT1.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT1Turbo.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT1Turbo.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT2Turbo.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT2Turbo.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT3Ex.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT3Ex.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT3.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT3.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT3Turbo.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT3Turbo.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT4.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT4.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT5.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AIT5.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AITETurbo.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\AITETurbo.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDRE.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDRE.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDREXL.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDREXL.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDROM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDROM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDR.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDR.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDRXL.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\BDRXL.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CD32.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CD32.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDDA.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDDA.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDEG.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDEG.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDG.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDI.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDIREADY.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDIREADY.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDI.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDMIDI.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDMIDI.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDPLUS.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDPLUS.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDROM2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDROM2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDROM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDROM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDR.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDR.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDRW.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDRW.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDTV.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDTV.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDV.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CDV.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CompactCassette.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\CompactCassette.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DAT160.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DAT160.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DAT320.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DAT320.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DAT72.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DAT72.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DDS1.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DDS1.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DDS2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DDS2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DDS3.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DDS3.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DDS4.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DDS4.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DigitalAudioTape.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DigitalAudioTape.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DittoMax.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DittoMax.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Ditto.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Ditto.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIII.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIII.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIIIxt.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIIIxt.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIV.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIV.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeS4.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeS4.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDDownload.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDDownload.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDPRDL.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDPRDL.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDPR.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDPR.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDPRW.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDPRW.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDRAM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDRAM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDROM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDROM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDR.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDR.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDRW.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\DVDRW.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ExpressCard34.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ExpressCard34.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ExpressCard54.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ExpressCard54.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\GDROM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\GDROM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\GDR.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\GDR.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\GOD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\GOD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRAM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRAM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRDL.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRDL.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDROM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDROM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDR.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDR.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRWDL.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRWDL.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRW.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRW.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\JaguarCD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\JaguarCD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Jaz2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Jaz2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Jaz.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Jaz.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LDROM2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LDROM2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LDROM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LDROM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO3.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO3.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO3WORM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO3WORM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO4.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO4.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO4WORM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO4WORM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO5.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO5.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO5WORM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO5WORM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO6.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO6.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO6WORM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO6WORM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO7.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO7.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO7WORM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO7WORM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LTO.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LVROM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\LVROM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MDData2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MDData2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MDData.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MDData.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MEGACD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MEGACD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MegaLD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MegaLD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickDuo.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickDuo.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickMicro.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickMicro.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStick.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickProDuo.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickProDuo.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickPro.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickPro.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\MemoryStick.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\miniSD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\miniSD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\NeoGeoCD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\NeoGeoCD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Nintendo3DSGameCard.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Nintendo3DSGameCard.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Nintendo_64_Logo.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Nuon.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Nuon.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PCD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PCD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PCFX.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PCFX.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PD650.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PD650.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PD650_WORM.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PD650_WORM.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Pippin.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Pippin.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Playdia.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\Playdia.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PlayStationMemoryCard2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PlayStationMemoryCard2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PlayStationMemoryCard.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PlayStationMemoryCard.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PlayStationVitaGameCard.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PlayStationVitaGameCard.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PocketZip.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PocketZip.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS1CD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS1CD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS2CD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS2CD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS2DVD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS2DVD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS3BD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS3BD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS3DVD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS3DVD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS4BD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\PS4BD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SACD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SACD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SAIT1.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SAIT1.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SAIT2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SAIT2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SATURNCD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SATURNCD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SecureDigital.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SecureDigital.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SmartMedia.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SmartMedia.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SuperCDROM2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SuperCDROM2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SVCD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SVCD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SwitchGameCard.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\SwitchGameCard.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ThreeDO.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ThreeDO.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\VCD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\VCD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\WOD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\WOD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\WUOD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\WUOD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\XGD2.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\XGD2.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\XGD3.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\XGD3.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\XGD4.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\XGD4.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\XGD.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\XGD.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ZIP100.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ZIP100.svg"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ZIP250.png"/>
-    <EmbeddedResource Include="Assets\Logos\Media\ZIP250.svg"/>
-    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\computer.png"/>
-    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\drive-harddisk.png"/>
-    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\drive-optical.png"/>
-    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\drive-removable-media-usb.png"/>
-    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\drive-removable-media.png"/>
-    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\inode-directory.png"/>
-    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\media-eject.png"/>
-    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\media-flash-sd-mmc.png"/>
-    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\media-tape.png"/>
+    <EmbeddedResource Include="Assets\Logos\Media\AIT1.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT1.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT1Turbo.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT1Turbo.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT2Turbo.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT2Turbo.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT3Ex.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT3Ex.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT3.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT3.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT3Turbo.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT3Turbo.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT4.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT4.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT5.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AIT5.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\AITETurbo.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\AITETurbo.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDRE.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDRE.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDREXL.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDREXL.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDROM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDROM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDR.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDR.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDRXL.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\BDRXL.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CD32.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CD32.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDDA.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDDA.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDEG.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDEG.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDG.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDI.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDIREADY.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDIREADY.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDI.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDMIDI.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDMIDI.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDPLUS.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDPLUS.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDROM2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDROM2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDROM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDROM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDR.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDR.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDRW.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDRW.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDTV.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDTV.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDV.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CDV.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\CompactCassette.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\CompactCassette.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DAT160.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DAT160.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DAT320.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DAT320.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DAT72.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DAT72.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DDS1.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DDS1.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DDS2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DDS2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DDS3.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DDS3.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DDS4.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DDS4.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DigitalAudioTape.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DigitalAudioTape.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DittoMax.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DittoMax.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\Ditto.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\Ditto.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIII.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIII.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIIIxt.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIIIxt.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIV.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeIV.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeS4.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DLTtapeS4.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDDownload.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDDownload.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDPRDL.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDPRDL.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDPR.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDPR.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDPRW.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDPRW.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDRAM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDRAM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDROM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDROM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDR.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDR.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDRW.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\DVDRW.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\ExpressCard34.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\ExpressCard34.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\ExpressCard54.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\ExpressCard54.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\GDROM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\GDROM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\GDR.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\GDR.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\GOD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\GOD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRAM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRAM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRDL.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRDL.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDROM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDROM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDR.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDR.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRWDL.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRWDL.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRW.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\HDDVDRW.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\JaguarCD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\JaguarCD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\Jaz2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\Jaz2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\Jaz.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\Jaz.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LDROM2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LDROM2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LDROM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LDROM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO3.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO3.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO3WORM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO3WORM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO4.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO4.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO4WORM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO4WORM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO5.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO5.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO5WORM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO5WORM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO6.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO6.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO6WORM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO6WORM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO7.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO7.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO7WORM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO7WORM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LTO.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\LVROM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\LVROM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MDData2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MDData2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MDData.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MDData.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MEGACD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MEGACD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MegaLD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MegaLD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickDuo.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickDuo.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickMicro.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickMicro.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStick.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickProDuo.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickProDuo.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickPro.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStickPro.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\MemoryStick.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\miniSD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\miniSD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\NeoGeoCD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\NeoGeoCD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\Nintendo3DSGameCard.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\Nintendo3DSGameCard.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\Nintendo_64_Logo.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\Nuon.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\Nuon.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PCD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PCD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PCFX.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PCFX.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PD650.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PD650.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PD650_WORM.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PD650_WORM.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\Pippin.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\Pippin.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\Playdia.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\Playdia.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PlayStationMemoryCard2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PlayStationMemoryCard2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PlayStationMemoryCard.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PlayStationMemoryCard.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PlayStationVitaGameCard.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PlayStationVitaGameCard.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PocketZip.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PocketZip.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS1CD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS1CD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS2CD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS2CD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS2DVD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS2DVD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS3BD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS3BD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS3DVD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS3DVD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS4BD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\PS4BD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\SACD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\SACD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\SAIT1.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\SAIT1.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\SAIT2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\SAIT2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\SATURNCD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\SATURNCD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\SecureDigital.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\SecureDigital.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\SmartMedia.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\SmartMedia.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\SuperCDROM2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\SuperCDROM2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\SVCD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\SVCD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\SwitchGameCard.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\SwitchGameCard.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\ThreeDO.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\ThreeDO.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\VCD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\VCD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\WOD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\WOD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\WUOD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\WUOD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\XGD2.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\XGD2.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\XGD3.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\XGD3.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\XGD4.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\XGD4.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\XGD.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\XGD.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\ZIP100.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\ZIP100.svg" />
+    <EmbeddedResource Include="Assets\Logos\Media\ZIP250.png" />
+    <EmbeddedResource Include="Assets\Logos\Media\ZIP250.svg" />
+    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\computer.png" />
+    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\drive-harddisk.png" />
+    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\drive-optical.png" />
+    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\drive-removable-media-usb.png" />
+    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\drive-removable-media.png" />
+    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\inode-directory.png" />
+    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\media-eject.png" />
+    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\media-flash-sd-mmc.png" />
+    <EmbeddedResource Include="Assets\Icons\oxygen\32x32\media-tape.png" />
  </ItemGroup>
  <ItemGroup>
-    <Folder Include="Assets"/>
-    <Folder Include="Models\"/>
+    <Folder Include="Assets" />
+    <Folder Include="Models\" />
    <Compile Update="**\*.xaml.cs">
      <DependentUpon>%(Filename)</DependentUpon>
    </Compile>
    <AvaloniaResource Include="**\*.xaml">
      <SubType>Designer</SubType>
    </AvaloniaResource>
-    <AvaloniaResource Include="Assets\**"/>
+    <AvaloniaResource Include="Assets\**" />
    <AvaloniaResource Update="Views\SplashWindow.xaml">
      <SubType>Designer</SubType>
    </AvaloniaResource>
@@ -416,7 +417,7 @@
    </Compile>
  </ItemGroup>
  <ItemGroup>
-    <UpToDateCheckInput Remove="Views\MainWindow.xaml"/>
+    <UpToDateCheckInput Remove="Views\MainWindow.xaml" />
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="..\LICENSE">
--- a/Aaru.Gui/ViewModels/Dialogs/AboutViewModel.cs
+++ b/Aaru.Gui/ViewModels/Dialogs/AboutViewModel.cs
@@ -36,11 +36,11 @@ using System.Diagnostics;
 using System.Linq;
 using System.Reactive;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Aaru.Gui.Models;
 using Aaru.Gui.Views.Dialogs;
 using JetBrains.Annotations;
-using Microsoft.DotNet.PlatformAbstractions;
 using ReactiveUI;

 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.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;
+                process.StartInfo.FileName  = "cmd";
+                process.StartInfo.Arguments = $"/c start {process.StartInfo.Arguments.Replace("&", "^&")}";
            }
+            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();
        }
--- a/Aaru.Helpers
+++ b/Aaru.Helpers
--- a/Aaru.Images/Aaru.Images.csproj
+++ b/Aaru.Images/Aaru.Images.csproj
@@ -17,9 +17,9 @@
    <Product>Aaru Data Preservation Suite</Product>
    <Title>Aaru.DiscImages</Title>
    <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
    <NoWarn>CS0649</NoWarn>
-    <LangVersion>8</LangVersion>
+    <LangVersion>10</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>
@@ -30,6 +30,7 @@
    <IncludeSymbols>true</IncludeSymbols>
    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
    <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
  </PropertyGroup>
  <PropertyGroup>
    <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>
--- a/Aaru.Partitions/Aaru.Partitions.csproj
+++ b/Aaru.Partitions/Aaru.Partitions.csproj
@@ -17,9 +17,9 @@
    <Product>Aaru Data Preservation Suite</Product>
    <Title>Aaru.Partitions</Title>
    <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
    <NoWarn>CS0649</NoWarn>
-    <LangVersion>8</LangVersion>
+    <LangVersion>10</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>
@@ -30,6 +30,7 @@
    <IncludeSymbols>true</IncludeSymbols>
    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
    <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
  </PropertyGroup>
  <PropertyGroup>
    <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>
--- a/Aaru.Settings/Aaru.Settings.csproj
+++ b/Aaru.Settings/Aaru.Settings.csproj
@@ -17,8 +17,8 @@
    <Product>Aaru Data Preservation Suite</Product>
    <Title>Aaru.Settings</Title>
    <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>8</LangVersion>
+    <TargetFramework>net6</TargetFramework>
+    <LangVersion>10</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>
@@ -29,6 +29,7 @@
    <IncludeSymbols>true</IncludeSymbols>
    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
    <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
  </PropertyGroup>
  <PropertyGroup>
    <NrtRevisionFormat>$(Version)+{chash:8}</NrtRevisionFormat>
@@ -53,14 +54,14 @@
    <ConsolePause>false</ConsolePause>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="System"/>
-    <Reference Include="System.Xml"/>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
    <Reference Include="plist-cil">
      <HintPath>..\packages\plist-cil.1.16.0\lib\net40\plist-cil.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="Settings.cs"/>
+    <Compile Include="Settings.cs" />
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="..\LICENSE.LGPL">
@@ -68,20 +69,20 @@
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj"/>
+    <ProjectReference Include="..\Aaru.CommonTypes\Aaru.CommonTypes.csproj" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0"/>
-    <PackageReference Include="plist-cil" Version="2.2.0"/>
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all"/>
+    <PackageReference Include="Microsoft.Win32.Registry" Version="6.0.0-preview.5.21301.5" />
+    <PackageReference Include="plist-cil" Version="2.2.0" />
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" PrivateAssets="all" />
  </ItemGroup>
  <ProjectExtensions>
    <MonoDevelop>
      <Properties>
        <Policies>
-          <StandardHeader IncludeInNewFiles="True" Text="/***************************************************************************&#xA;Aaru Data Preservation Suite&#xA;----------------------------------------------------------------------------&#xA; &#xA;Filename       : ${FileName}&#xA;Author(s)      : ${AuthorName} &lt;${AuthorEmail}&gt;&#xA;&#xA;Component      : Component&#xA; &#xA;--[ Description ] ----------------------------------------------------------&#xA; &#xA;    Description&#xA; &#xA;--[ License ] --------------------------------------------------------------&#xA; &#xA;    This library is free software; you can redistribute it and/or modify&#xA;    it under the terms of the GNU Lesser General Public License as&#xA;    published by the Free Software Foundation; either version 2.1 of the&#xA;    License, or (at your option) any later version.&#xA;&#xA;    This library is distributed in the hope that it will be useful, but&#xA;    WITHOUT ANY WARRANTY; without even the implied warranty of&#xA;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#xA;    Lesser General Public License for more details.&#xA;&#xA;    You should have received a copy of the GNU Lesser General Public&#xA;    License along with this library; if not, see &lt;http://www.gnu.org/licenses/&gt;.&#xA;&#xA;----------------------------------------------------------------------------&#xA;Copyright © 2011-${Year} ${CopyrightHolder}&#xA;****************************************************************************/"/>
-          <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp"/>
-          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" NewLineForMembersInObjectInit="True" NewLineForMembersInAnonymousTypes="True" NewLineForClausesInQuery="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp"/>
+          <StandardHeader IncludeInNewFiles="True" Text="/***************************************************************************&#xA;Aaru Data Preservation Suite&#xA;----------------------------------------------------------------------------&#xA; &#xA;Filename       : ${FileName}&#xA;Author(s)      : ${AuthorName} &lt;${AuthorEmail}&gt;&#xA;&#xA;Component      : Component&#xA; &#xA;--[ Description ] ----------------------------------------------------------&#xA; &#xA;    Description&#xA; &#xA;--[ License ] --------------------------------------------------------------&#xA; &#xA;    This library is free software; you can redistribute it and/or modify&#xA;    it under the terms of the GNU Lesser General Public License as&#xA;    published by the Free Software Foundation; either version 2.1 of the&#xA;    License, or (at your option) any later version.&#xA;&#xA;    This library is distributed in the hope that it will be useful, but&#xA;    WITHOUT ANY WARRANTY; without even the implied warranty of&#xA;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU&#xA;    Lesser General Public License for more details.&#xA;&#xA;    You should have received a copy of the GNU Lesser General Public&#xA;    License along with this library; if not, see &lt;http://www.gnu.org/licenses/&gt;.&#xA;&#xA;----------------------------------------------------------------------------&#xA;Copyright © 2011-${Year} ${CopyrightHolder}&#xA;****************************************************************************/" />
+          <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" TabsToSpaces="True" scope="text/x-csharp" />
+          <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="True" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" NewLinesForBracesInProperties="True" NewLinesForBracesInAccessors="True" NewLinesForBracesInAnonymousMethods="True" NewLinesForBracesInControlBlocks="True" NewLinesForBracesInAnonymousTypes="True" NewLinesForBracesInObjectCollectionArrayInitializers="True" NewLinesForBracesInLambdaExpressionBody="True" NewLineForElse="True" NewLineForCatch="True" NewLineForFinally="True" NewLineForMembersInObjectInit="True" NewLineForMembersInAnonymousTypes="True" NewLineForClausesInQuery="True" SpacingAfterMethodDeclarationName="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceAfterMethodCallName="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBeforeOpenSquareBracket="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeColonInBaseTypeDeclaration="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" SpaceAfterControlFlowStatementKeyword="False" scope="text/x-csharp" />
        </Policies>
      </Properties>
    </MonoDevelop>
--- a/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj
+++ b/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj
@@ -9,7 +9,7 @@
    <AssemblyName>Aaru.Tests.Devices</AssemblyName>
    <ReleaseVersion>$(Version)</ReleaseVersion>
    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
    <Version>6.0.0-alpha6</Version>
    <Company>Claunia.com</Company>
@@ -17,8 +17,9 @@
    <Product>Aaru Data Preservation Suite</Product>
    <Title>Aaru.Tests.Devices</Title>
    <ApplicationVersion>$(Version)</ApplicationVersion>
-    <LangVersion>8</LangVersion>
+    <LangVersion>10</LangVersion>
    <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
  </PropertyGroup>
  <PropertyGroup>
    <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
--- a/Aaru.Tests/Aaru.Tests.csproj
+++ b/Aaru.Tests/Aaru.Tests.csproj
@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6</TargetFramework>

    <IsPackable>false</IsPackable>

-    <LangVersion>8</LangVersion>
+    <LangVersion>10</LangVersion>
    <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
  </PropertyGroup>

  <ItemGroup>
@@ -15,7 +16,7 @@
    <PackageReference Include="nunit" Version="3.12.0" />
    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
    <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>
--- a/Aaru/Aaru.csproj
+++ b/Aaru/Aaru.csproj
@@ -10,7 +10,7 @@
    <AssemblyName>aaru</AssemblyName>
    <ReleaseVersion>$(Version)</ReleaseVersion>
    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
    <Version>6.0.0-alpha6</Version>
    <Company>Claunia.com</Company>
@@ -20,7 +20,8 @@
    <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>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <LangVersion>8</LangVersion>
+    <LangVersion>10</LangVersion>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
  </PropertyGroup>
  <PropertyGroup>
    <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
@@ -262,10 +263,10 @@
    <Content Include="..\.github\PULL_REQUEST_TEMPLATE.md" />
  </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="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="Unclassified.NetRevisionTask" Version="0.3.0" />
    <PackageReference Include="System.Collections" Version="4.3.0" />
--- a/Aaru/Commands/Filesystem/Ls.cs
+++ b/Aaru/Commands/Filesystem/Ls.cs
@@ -325,7 +325,7 @@ namespace Aaru.Commands.Filesystem
                return;
            }

-            Dictionary<string, FileEntryInfo> stats = new Dictionary<string, FileEntryInfo>();
+            Dictionary<string, FileEntryInfo> stats = new();

            foreach(string entry in directory)
            {
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Stable releases in [Github](https://github.com/aaru-dps/Aaru/releases).

 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.

 Usage