From 8cb8f6a320e9078d40c99e01960628bfcb5bd5d1 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Thu, 9 Apr 2020 01:30:44 +0100
Subject: [PATCH] Move to .NET Core 3.0.

---
 .idea/.idea.Aaru/.idea/contentModel.xml  | 822 +++++++++++++++++------
 Aaru.Checksums                           |   2 +-
 Aaru.CommonTypes                         |   2 +-
 Aaru.Compression/Aaru.Compression.csproj |   2 +-
 Aaru.Console                             |   2 +-
 Aaru.Core/Aaru.Core.csproj               |   2 +-
 Aaru.Database/Aaru.Database.csproj       |   2 +-
 Aaru.Decoders                            |   2 +-
 Aaru.Devices/Aaru.Devices.csproj         |   2 +-
 Aaru.Dto                                 |   2 +-
 Aaru.Filesystems/Aaru.Filesystems.csproj |   2 +-
 Aaru.Filters/Aaru.Filters.csproj         |   2 +-
 Aaru.Gui/Aaru.Gui.csproj                 |   2 +-
 Aaru.Helpers                             |   2 +-
 Aaru.Images/Aaru.Images.csproj           |   2 +-
 Aaru.Partitions/Aaru.Partitions.csproj   |   2 +-
 Aaru.Settings/Aaru.Settings.csproj       |   2 +-
 Aaru/Aaru.csproj                         |   2 +-
 CICMMetadata                             |   2 +-
 build.sh                                 |   0
 20 files changed, 632 insertions(+), 226 deletions(-)
 mode change 100755 => 100644 build.sh

diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml
index 759018a09..6144ef440 100644
--- a/.idea/.idea.Aaru/.idea/contentModel.xml
+++ b/.idea/.idea.Aaru/.idea/contentModel.xml
@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ContentModelStore">
-    <e p="$APPLICATION_CONFIG_DIR$/consoles/db" t="IncludeRecursive" />
-    <e p="$APPLICATION_PLUGINS_DIR$/puppet/lib/stubs" t="IncludeRecursive" />
-    <e p="$USER_HOME$/.Rider2019.3/system/extResources" t="IncludeRecursive" />
-    <e p="$USER_HOME$/.Rider2019.3/system/resharper-host/local/Transient/ReSharperHost/v193/SolutionCaches/_Aaru.232757112.00" t="ExcludeRecursive" />
-    <e p="$PROJECT_DIR$" t="IncludeFlat">
-      <e p=".git/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/Aaru.Checksums/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/Aaru.CommonTypes/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/Aaru.Console/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/Aaru.Decoders/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/Aaru.Dto/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/Aaru.Helpers/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/CICMMetadata/info/exclude" t="IncludeRecursive" />
-      <e p=".git/modules/cuetoolsnet/info/exclude" t="IncludeRecursive" />
-      <e p=".github/CODE_OF_CONDUCT.md" t="Include" />
-      <e p=".github/ISSUE_TEMPLATE.md" t="Include" />
-      <e p=".github/PULL_REQUEST_TEMPLATE.md" t="Include" />
+    <e p="C:\Users\claunia\AppData\Local\JetBrains\Rider2020.1\extResources" t="IncludeRecursive" />
+    <e p="C:\Users\claunia\AppData\Local\JetBrains\Rider2020.1\resharper-host\Local\Transient\ReSharperHost\v201\SolutionCaches\_Aaru.795230756.00" t="ExcludeRecursive" />
+    <e p="C:\Users\claunia\AppData\Local\JetBrains\Toolbox\apps\Rider\ch-1\201.6668.91.plugins\puppet\lib\stubs" t="IncludeRecursive" />
+    <e p="C:\Users\claunia\Development\Aaru\Aaru" t="IncludeFlat">
+      <e p=".git\info\exclude" t="IncludeRecursive" />
+      <e p=".git\modules\Aaru.Checksums\info\exclude" t="IncludeRecursive" />
+      <e p=".git\modules\Aaru.CommonTypes\info\exclude" t="IncludeRecursive" />
+      <e p=".git\modules\Aaru.Console\info\exclude" t="IncludeRecursive" />
+      <e p=".git\modules\Aaru.Decoders\info\exclude" t="IncludeRecursive" />
+      <e p=".git\modules\Aaru.Dto\info\exclude" t="IncludeRecursive" />
+      <e p=".git\modules\Aaru.Helpers\info\exclude" t="IncludeRecursive" />
+      <e p=".git\modules\CICMMetadata\info\exclude" t="IncludeRecursive" />
+      <e p=".git\modules\cuetoolsnet\info\exclude" t="IncludeRecursive" />
+      <e p=".github\CODE_OF_CONDUCT.md" t="Include" />
+      <e p=".github\ISSUE_TEMPLATE.md" t="Include" />
+      <e p=".github\PULL_REQUEST_TEMPLATE.md" t="Include" />
       <e p=".travis.yml" t="Include" />
       <e p="Aaru" t="IncludeRecursive">
         <e p="Aaru.csproj" t="IncludeRecursive" />
+        <e p="aaruformat.xml" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="Commands" t="Include">
           <e p="Configure.cs" t="Include" />
           <e p="Database" t="Include">
@@ -69,26 +70,56 @@
         <e p="Info.plist" t="Include" />
         <e p="MacIcon.icns" t="Include" />
         <e p="Main.cs" t="Include" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
         <e p="Progress.cs" t="Include" />
         <e p="Properties" t="Include">
           <e p="launchSettings.json" t="Include" />
         </e>
         <e p="Settings.StyleCop" t="Include" />
-        <e p="aaruformat.xml" t="Include" />
+      </e>
+      <e p="Aaru.Avalon" t="IncludeRecursive">
+        <e p="Aaru.Avalon.csproj" t="IncludeRecursive" />
+        <e p="App.xaml" t="Include" />
+        <e p="App.xaml.cs" t="Include" />
+        <e p="Assets" t="Include">
+          <e p="avalonia-logo.ico" t="Include" />
+        </e>
         <e p="bin" t="ExcludeRecursive" />
+        <e p="Models" t="Include" />
+        <e p="nuget.config" t="Include" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
-              <e p="Aaru.AssemblyInfo.cs" t="Include" />
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.Avalon.AssemblyInfo.cs" t="Include" />
+              <e p="Avalonia" t="Include">
+                <e p="resources" t="Include" />
+              </e>
             </e>
           </e>
         </e>
+        <e p="Program.cs" t="Include" />
+        <e p="ViewLocator.cs" t="Include" />
+        <e p="ViewModels" t="Include">
+          <e p="MainWindowViewModel.cs" t="Include" />
+          <e p="ViewModelBase.cs" t="Include" />
+        </e>
+        <e p="Views" t="Include">
+          <e p="MainWindow.xaml" t="Include" />
+          <e p="MainWindow.xaml.cs" t="Include" />
+        </e>
       </e>
       <e p="Aaru.Checksums" t="IncludeRecursive">
         <e p=".editorconfig" t="Include" />
         <e p=".gitignore" t="Include" />
         <e p="Aaru.Checksums.csproj" t="IncludeRecursive" />
         <e p="Adler32Context.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="CDChecksums.cs" t="Include" />
         <e p="CRC16CCITTContext.cs" t="Include" />
         <e p="CRC16Context.cs" t="Include" />
@@ -97,6 +128,13 @@
         <e p="CRC64Context.cs" t="Include" />
         <e p="FletcherContext.cs" t="Include" />
         <e p="MD5Context.cs" t="Include" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.Checksums.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
         <e p="ReedSolomon.cs" t="Include" />
         <e p="Register.cs" t="Include" />
         <e p="SHA1Context.cs" t="Include" />
@@ -104,19 +142,12 @@
         <e p="SHA384Context.cs" t="Include" />
         <e p="SHA512Context.cs" t="Include" />
         <e p="SpamSumContext.cs" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
-              <e p="Aaru.Checksums.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
       </e>
       <e p="Aaru.CommonTypes" t="IncludeRecursive">
         <e p=".editorconfig" t="Include" />
         <e p=".gitignore" t="Include" />
         <e p="Aaru.CommonTypes.csproj" t="IncludeRecursive" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="Enums" t="Include">
           <e p="DeviceType.cs" t="Include" />
           <e p="ErrorNumber.cs" t="Include" />
@@ -175,6 +206,13 @@
           <e p="Statistics.cs" t="Include" />
           <e p="Version.cs" t="Include" />
         </e>
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.CommonTypes.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
         <e p="Partition.cs" t="Include" />
         <e p="PluginBase.cs" t="Include" />
         <e p="Structs" t="Include">
@@ -195,27 +233,19 @@
           <e p="TapeFile.cs" t="Include" />
           <e p="TapePartition.cs" t="Include" />
         </e>
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
-              <e p="Aaru.CommonTypes.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
       </e>
       <e p="Aaru.Compression" t="IncludeRecursive">
         <e p="Aaru.Compression.csproj" t="IncludeRecursive" />
         <e p="AppleRle.cs" t="Include" />
-        <e p="TeleDiskLzh.cs" t="Include" />
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
+            <e p="netcoreapp3.0" t="Include">
               <e p="Aaru.Compression.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
         </e>
+        <e p="TeleDiskLzh.cs" t="Include" />
       </e>
       <e p="Aaru.Console" t="IncludeRecursive">
         <e p=".editorconfig" t="Include" />
@@ -225,7 +255,7 @@
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
+            <e p="netcoreapp3.0" t="Include">
               <e p="Aaru.Console.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
@@ -233,6 +263,7 @@
       </e>
       <e p="Aaru.Core" t="IncludeRecursive">
         <e p="Aaru.Core.csproj" t="IncludeRecursive" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="Checksum.cs" t="Include" />
         <e p="DataFile.cs" t="Include" />
         <e p="Delegates.cs" t="Include" />
@@ -253,8 +284,8 @@
               <e p="Trim.cs" t="Include" />
             </e>
             <e p="Dump.cs" t="Include" />
-            <e p="MMC.cs" t="Include" />
             <e p="Metadata.cs" t="Include" />
+            <e p="MMC.cs" t="Include" />
             <e p="NVMe.cs" t="Include" />
             <e p="PlayStationPortable" t="Include">
               <e p="MemoryStick.cs" t="Include" />
@@ -264,11 +295,11 @@
             <e p="ResumeSupport.cs" t="Include" />
             <e p="SBC.cs" t="Include" />
             <e p="SCSI.cs" t="Include" />
-            <e p="SSC.cs" t="Include" />
             <e p="SecureDigital.cs" t="Include" />
+            <e p="SSC.cs" t="Include" />
             <e p="XGD.cs" t="Include" />
           </e>
-          <e p="Info" t="Include">
+          <e p="info" t="Include">
             <e p="DeviceInfo.cs" t="Include" />
             <e p="Plextor.cs" t="Include" />
             <e p="Properties.cs" t="Include" />
@@ -282,17 +313,17 @@
             <e p="FireWire.cs" t="Include" />
             <e p="MMC.cs" t="Include" />
             <e p="PCMCIA.cs" t="Include" />
-            <e p="SSC.cs" t="Include" />
-            <e p="Scsi.cs" t="Include" />
+            <e p="SCSI.cs" t="Include" />
             <e p="SecureDigital.cs" t="Include" />
+            <e p="SSC.cs" t="Include" />
             <e p="USB.cs" t="Include" />
           </e>
           <e p="Scanning" t="Include">
             <e p="ATA.cs" t="Include" />
             <e p="MediaScan.cs" t="Include" />
             <e p="NVMe.cs" t="Include" />
-            <e p="SCSI.cs" t="Include" />
             <e p="ScanResults.cs" t="Include" />
+            <e p="SCSI.cs" t="Include" />
             <e p="SecureDigital.cs" t="Include" />
           </e>
         </e>
@@ -312,12 +343,19 @@
           <e p="Detection" t="Include">
             <e p="MMC.cs" t="Include" />
           </e>
-          <e p="Info" t="Include">
+          <e p="info" t="Include">
             <e p="CompactDisc.cs" t="Include" />
             <e p="ScsiInfo.cs" t="Include" />
             <e p="XgdInfo.cs" t="Include" />
           </e>
         </e>
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.Core.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
         <e p="Options.cs" t="Include" />
         <e p="Partitions.cs" t="Include" />
         <e p="PrintScsiModePages.cs" t="Include" />
@@ -334,68 +372,61 @@
           <e p="Sidecar.cs" t="Include" />
         </e>
         <e p="Statistics.cs" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
-              <e p="Aaru.Core.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
       </e>
       <e p="Aaru.Database" t="IncludeRecursive">
         <e p="Aaru.Database.csproj" t="IncludeRecursive" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="Context.cs" t="Include" />
         <e p="ContextFactory.cs" t="Include" />
         <e p="Migrations" t="Include">
-          <e p="20181126222301_DeviceReportV2.Designer.cs" t="Include" />
           <e p="20181126222301_DeviceReportV2.cs" t="Include" />
-          <e p="20181127001622_AddDeviceBasicFields.Designer.cs" t="Include" />
+          <e p="20181126222301_DeviceReportV2.Designer.cs" t="Include" />
           <e p="20181127001622_AddDeviceBasicFields.cs" t="Include" />
-          <e p="20181127013131_CorrectReportsDbSet.Designer.cs" t="Include" />
+          <e p="20181127001622_AddDeviceBasicFields.Designer.cs" t="Include" />
           <e p="20181127013131_CorrectReportsDbSet.cs" t="Include" />
-          <e p="20181221015906_NameValueStatistics.Designer.cs" t="Include" />
+          <e p="20181127013131_CorrectReportsDbSet.Designer.cs" t="Include" />
           <e p="20181221015906_NameValueStatistics.cs" t="Include" />
-          <e p="20181221032605_MediaStatistics.Designer.cs" t="Include" />
+          <e p="20181221015906_NameValueStatistics.Designer.cs" t="Include" />
           <e p="20181221032605_MediaStatistics.cs" t="Include" />
-          <e p="20181221034941_SeenDevicesStatistics.Designer.cs" t="Include" />
+          <e p="20181221032605_MediaStatistics.Designer.cs" t="Include" />
           <e p="20181221034941_SeenDevicesStatistics.cs" t="Include" />
-          <e p="20181221040408_OperatingSystemStatistics.Designer.cs" t="Include" />
+          <e p="20181221034941_SeenDevicesStatistics.Designer.cs" t="Include" />
           <e p="20181221040408_OperatingSystemStatistics.cs" t="Include" />
-          <e p="20181221041242_VersionStatistics.Designer.cs" t="Include" />
+          <e p="20181221040408_OperatingSystemStatistics.Designer.cs" t="Include" />
           <e p="20181221041242_VersionStatistics.cs" t="Include" />
-          <e p="20181221125353_AddStatsCounters.Designer.cs" t="Include" />
+          <e p="20181221041242_VersionStatistics.Designer.cs" t="Include" />
           <e p="20181221125353_AddStatsCounters.cs" t="Include" />
-          <e p="20181223183913_FixUnsignedFields.Designer.cs" t="Include" />
+          <e p="20181221125353_AddStatsCounters.Designer.cs" t="Include" />
           <e p="20181223183913_FixUnsignedFields.cs" t="Include" />
-          <e p="20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.Designer.cs" t="Include" />
+          <e p="20181223183913_FixUnsignedFields.Designer.cs" t="Include" />
           <e p="20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.cs" t="Include" />
-          <e p="20181224044809_StoreUsbIdsInDatabase.Designer.cs" t="Include" />
+          <e p="20181223214411_UseBinaryDataForIdentifyInquiryAndModesInReports.Designer.cs" t="Include" />
           <e p="20181224044809_StoreUsbIdsInDatabase.cs" t="Include" />
-          <e p="20181224172147_FixUsbIdsAndIndexes.Designer.cs" t="Include" />
+          <e p="20181224044809_StoreUsbIdsInDatabase.Designer.cs" t="Include" />
           <e p="20181224172147_FixUsbIdsAndIndexes.cs" t="Include" />
-          <e p="20181225002740_AddCdOffsets.Designer.cs" t="Include" />
+          <e p="20181224172147_FixUsbIdsAndIndexes.Designer.cs" t="Include" />
           <e p="20181225002740_AddCdOffsets.cs" t="Include" />
-          <e p="20181225152947_StoreMmcGetConfigurationResponse.Designer.cs" t="Include" />
+          <e p="20181225002740_AddCdOffsets.Designer.cs" t="Include" />
           <e p="20181225152947_StoreMmcGetConfigurationResponse.cs" t="Include" />
-          <e p="20181225214500_StoreReadResultsInReportDatabase.Designer.cs" t="Include" />
+          <e p="20181225152947_StoreMmcGetConfigurationResponse.Designer.cs" t="Include" />
           <e p="20181225214500_StoreReadResultsInReportDatabase.cs" t="Include" />
-          <e p="20190102061236_AddMultisessionLeadTest.Designer.cs" t="Include" />
+          <e p="20181225214500_StoreReadResultsInReportDatabase.Designer.cs" t="Include" />
           <e p="20190102061236_AddMultisessionLeadTest.cs" t="Include" />
-          <e p="20190102230036_AddOptimalReadMultipleCount.Designer.cs" t="Include" />
+          <e p="20190102061236_AddMultisessionLeadTest.Designer.cs" t="Include" />
           <e p="20190102230036_AddOptimalReadMultipleCount.cs" t="Include" />
-          <e p="20190108013456_AddChangeableScsiModes.Designer.cs" t="Include" />
+          <e p="20190102230036_AddOptimalReadMultipleCount.Designer.cs" t="Include" />
           <e p="20190108013456_AddChangeableScsiModes.cs" t="Include" />
-          <e p="20190525183723_IdForDensityCode.Designer.cs" t="Include" />
+          <e p="20190108013456_AddChangeableScsiModes.Designer.cs" t="Include" />
           <e p="20190525183723_IdForDensityCode.cs" t="Include" />
-          <e p="20191103000828_MakeFieldsUnsigned.Designer.cs" t="Include" />
+          <e p="20190525183723_IdForDensityCode.Designer.cs" t="Include" />
           <e p="20191103000828_MakeFieldsUnsigned.cs" t="Include" />
-          <e p="20191207175444_SyncWithServerChanges.Designer.cs" t="Include" />
+          <e p="20191103000828_MakeFieldsUnsigned.Designer.cs" t="Include" />
           <e p="20191207175444_SyncWithServerChanges.cs" t="Include" />
-          <e p="20191207183522_AddNameCountModel.Designer.cs" t="Include" />
+          <e p="20191207175444_SyncWithServerChanges.Designer.cs" t="Include" />
           <e p="20191207183522_AddNameCountModel.cs" t="Include" />
-          <e p="20191207184342_AddRemoteStats.Designer.cs" t="Include" />
+          <e p="20191207183522_AddNameCountModel.Designer.cs" t="Include" />
           <e p="20191207184342_AddRemoteStats.cs" t="Include" />
+          <e p="20191207184342_AddRemoteStats.Designer.cs" t="Include" />
           <e p="AaruContextModelSnapshot.cs" t="Include" />
         </e>
         <e p="Models" t="Include">
@@ -420,10 +451,9 @@
           <e p="UsbVendor.cs" t="Include" />
           <e p="Version.cs" t="Include" />
         </e>
-        <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
+            <e p="netcoreapp3.0" t="Include">
               <e p="Aaru.Database.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
@@ -432,11 +462,12 @@
       <e p="Aaru.Decoders" t="IncludeRecursive">
         <e p=".editorconfig" t="Include" />
         <e p=".gitignore" t="Include" />
+        <e p="Aaru.Decoders.csproj" t="IncludeRecursive" />
         <e p="ATA" t="Include">
           <e p="Identify.cs" t="Include" />
           <e p="Registers.cs" t="Include" />
         </e>
-        <e p="Aaru.Decoders.csproj" t="IncludeRecursive" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="Blu-ray" t="Include">
           <e p="BCA.cs" t="Include" />
           <e p="Cartridge.cs" t="Include" />
@@ -458,9 +489,9 @@
           <e p="AACS.cs" t="Include" />
           <e p="ADIP.cs" t="Include" />
           <e p="BCA.cs" t="Include" />
+          <e p="Cartridge.cs" t="Include" />
           <e p="CPRM.cs" t="Include" />
           <e p="CSS&amp;CPRM.cs" t="Include" />
-          <e p="Cartridge.cs" t="Include" />
           <e p="DDS.cs" t="Include" />
           <e p="DMI.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
@@ -490,6 +521,13 @@
           <e p="OCR.cs" t="Include" />
           <e p="VendorString.cs" t="Include" />
         </e>
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.Decoders.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
         <e p="PCMCIA" t="Include">
           <e p="CIS.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
@@ -553,11 +591,11 @@
             <e p="Mode6.cs" t="Include" />
             <e p="Structs.cs" t="Include" />
           </e>
+          <e p="Sense.cs" t="Include" />
           <e p="SSC" t="Include">
             <e p="BlockLimits.cs" t="Include" />
             <e p="DensitySupport.cs" t="Include" />
           </e>
-          <e p="Sense.cs" t="Include" />
           <e p="Types.cs" t="Include" />
           <e p="VendorString.cs" t="Include" />
         </e>
@@ -577,17 +615,10 @@
           <e p="DMI.cs" t="Include" />
           <e p="SS.cs" t="Include" />
         </e>
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
-              <e p="Aaru.Decoders.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
       </e>
       <e p="Aaru.Devices" t="IncludeRecursive">
         <e p="Aaru.Devices.csproj" t="IncludeRecursive" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="Command.cs" t="Include" />
         <e p="Device" t="Include">
           <e p="AtaCommands" t="Include">
@@ -644,6 +675,13 @@
           <e p="ListDevices.cs" t="Include" />
           <e p="Structs.cs" t="Include" />
         </e>
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.Devices.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
         <e p="Remote" t="Include">
           <e p="Consts.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
@@ -656,42 +694,34 @@
           <e p="Extern.cs" t="Include" />
           <e p="ListDevices.cs" t="Include" />
           <e p="Structs.cs" t="Include" />
-          <e p="Usb.cs" t="Include" />
+          <e p="USB.cs" t="Include" />
           <e p="UsbFunctions.cs" t="Include" />
         </e>
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
-              <e p="Aaru.Devices.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
       </e>
       <e p="Aaru.Dto" t="IncludeRecursive">
         <e p=".editorconfig" t="Include" />
         <e p=".gitignore" t="Include" />
         <e p="Aaru.Dto.csproj" t="IncludeRecursive" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="CdOffsetDto.cs" t="Include" />
         <e p="DeviceDto.cs" t="Include" />
-        <e p="SyncDto.cs" t="Include" />
-        <e p="UsbProductDto.cs" t="Include" />
-        <e p="UsbVendorDto.cs" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
+            <e p="netcoreapp3.0" t="Include">
               <e p="Aaru.Dto.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
         </e>
+        <e p="SyncDto.cs" t="Include" />
+        <e p="UsbProductDto.cs" t="Include" />
+        <e p="UsbVendorDto.cs" t="Include" />
       </e>
       <e p="Aaru.Filesystems" t="IncludeRecursive">
-        <e p="AODOS.cs" t="Include" />
-        <e p="APFS.cs" t="Include" />
         <e p="Aaru.Filesystems.csproj" t="IncludeRecursive" />
         <e p="Acorn.cs" t="Include" />
         <e p="AmigaDOS.cs" t="Include" />
+        <e p="AODOS.cs" t="Include" />
+        <e p="APFS.cs" t="Include" />
         <e p="AppleCommon" t="Include">
           <e p="Consts.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
@@ -727,11 +757,13 @@
         </e>
         <e p="AtheOS.cs" t="Include" />
         <e p="BFS.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="BTRFS.cs" t="Include" />
         <e p="CBM.cs" t="Include" />
         <e p="CPM" t="Include">
-          <e p="CPM.cs" t="Include" />
           <e p="Consts.cs" t="Include" />
+          <e p="CPM.cs" t="Include" />
+          <e p="cpmdefs.xml" t="Include" />
           <e p="Definitions.cs" t="Include" />
           <e p="Dir.cs" t="Include" />
           <e p="File.cs" t="Include" />
@@ -739,11 +771,14 @@
           <e p="Structs.cs" t="Include" />
           <e p="Super.cs" t="Include" />
           <e p="Xattr.cs" t="Include" />
-          <e p="cpmdefs.xml" t="Include" />
         </e>
         <e p="Cram.cs" t="Include" />
+        <e p="Dump.cs" t="Include" />
         <e p="ECMA67.cs" t="Include" />
         <e p="EFS.cs" t="Include" />
+        <e p="exFAT.cs" t="Include" />
+        <e p="ext2FS.cs" t="Include" />
+        <e p="extFS.cs" t="Include" />
         <e p="F2FS.cs" t="Include" />
         <e p="FAT" t="Include">
           <e p="BPB.cs" t="Include" />
@@ -783,8 +818,8 @@
             <e p="CDi.cs" t="Include" />
             <e p="ElTorito.cs" t="Include" />
             <e p="HighSierra.cs" t="Include" />
-            <e p="ISO.cs" t="Include" />
             <e p="Internal.cs" t="Include" />
+            <e p="ISO.cs" t="Include" />
             <e p="RRIP.cs" t="Include" />
             <e p="SUSP.cs" t="Include" />
             <e p="XA.cs" t="Include" />
@@ -793,8 +828,8 @@
           <e p="Date.cs" t="Include" />
           <e p="Dir.cs" t="Include" />
           <e p="File.cs" t="Include" />
-          <e p="ISO9660.cs" t="Include" />
           <e p="Info.cs" t="Include" />
+          <e p="ISO9660.cs" t="Include" />
           <e p="Mode2.cs" t="Include" />
           <e p="PathTable.cs" t="Include" />
           <e p="Structs" t="Include">
@@ -803,8 +838,8 @@
             <e p="CDi.cs" t="Include" />
             <e p="ElTorito.cs" t="Include" />
             <e p="HighSierra.cs" t="Include" />
-            <e p="ISO.cs" t="Include" />
             <e p="Internal.cs" t="Include" />
+            <e p="ISO.cs" t="Include" />
             <e p="Joliet.cs" t="Include" />
             <e p="RRIP.cs" t="Include" />
             <e p="SUSP.cs" t="Include" />
@@ -831,8 +866,15 @@
         <e p="MicroDOS.cs" t="Include" />
         <e p="MinixFS.cs" t="Include" />
         <e p="NILFS2.cs" t="Include" />
-        <e p="NTFS.cs" t="Include" />
         <e p="Nintendo.cs" t="Include" />
+        <e p="NTFS.cs" t="Include" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.Filesystems.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
         <e p="ODS.cs" t="Include" />
         <e p="Opera" t="Include">
           <e p="Consts.cs" t="Include" />
@@ -850,11 +892,11 @@
         <e p="QNX4.cs" t="Include" />
         <e p="QNX6.cs" t="Include" />
         <e p="RBF.cs" t="Include" />
-        <e p="RT11.cs" t="Include" />
         <e p="ReFS.cs" t="Include" />
         <e p="Register.cs" t="Include" />
         <e p="Reiser.cs" t="Include" />
         <e p="Reiser4.cs" t="Include" />
+        <e p="RT11.cs" t="Include" />
         <e p="SFS.cs" t="Include" />
         <e p="SolarFS.cs" t="Include" />
         <e p="Squash.cs" t="Include" />
@@ -877,40 +919,404 @@
         <e p="XFS.cs" t="Include" />
         <e p="Xia.cs" t="Include" />
         <e p="ZFS.cs" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="dump.cs" t="Include" />
-        <e p="exFAT.cs" t="Include" />
-        <e p="ext2FS.cs" t="Include" />
-        <e p="extFS.cs" t="Include" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
-              <e p="Aaru.Filesystems.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
       </e>
       <e p="Aaru.Filters" t="IncludeRecursive">
         <e p="Aaru.Filters.csproj" t="IncludeRecursive" />
         <e p="AppleDouble.cs" t="Include" />
         <e p="AppleSingle.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="BZip2.cs" t="Include" />
         <e p="ForcedSeekStream.cs" t="Include" />
         <e p="GZip.cs" t="Include" />
         <e p="LZip.cs" t="Include" />
         <e p="MacBinary.cs" t="Include" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.Filters.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
         <e p="OffsetStream.cs" t="Include" />
         <e p="PCExchange.cs" t="Include" />
         <e p="Register.cs" t="Include" />
         <e p="XZ.cs" t="Include" />
         <e p="ZZZNoFilter.cs" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
-              <e p="Aaru.Filters.AssemblyInfo.cs" t="Include" />
+      </e>
+      <e p="Aaru.Gui" t="IncludeRecursive">
+        <e p=".Aaru.Gui.csproj.kate-swp" t="Include" />
+        <e p="Aaru.Gui.csproj" t="IncludeRecursive" />
+        <e p="Assets" t="Include">
+          <e p="Icons" t="Include">
+            <e p="oxygen" t="Include">
+              <e p="32x32" t="Include">
+                <e p="computer.png" t="Include" />
+                <e p="drive-harddisk.png" t="Include" />
+                <e p="drive-optical.png" t="Include" />
+                <e p="drive-removable-media-usb.png" t="Include" />
+                <e p="drive-removable-media.png" t="Include" />
+                <e p="inode-directory.png" t="Include" />
+                <e p="media-eject.png" t="Include" />
+                <e p="media-flash-sd-mmc.png" t="Include" />
+                <e p="media-tape.png" t="Include" />
+              </e>
+              <e p="COPYING" t="Include" />
             </e>
           </e>
+          <e p="Logos" t="Include">
+            <e p="Media" t="Include">
+              <e p="AIT1.png" t="Include" />
+              <e p="AIT1.svg" t="Include" />
+              <e p="AIT1Turbo.png" t="Include" />
+              <e p="AIT1Turbo.svg" t="Include" />
+              <e p="AIT2.png" t="Include" />
+              <e p="AIT2.svg" t="Include" />
+              <e p="AIT2Turbo.png" t="Include" />
+              <e p="AIT2Turbo.svg" t="Include" />
+              <e p="AIT3.png" t="Include" />
+              <e p="AIT3.svg" t="Include" />
+              <e p="AIT3Ex.png" t="Include" />
+              <e p="AIT3Ex.svg" t="Include" />
+              <e p="AIT3Turbo.png" t="Include" />
+              <e p="AIT3Turbo.svg" t="Include" />
+              <e p="AIT4.png" t="Include" />
+              <e p="AIT4.svg" t="Include" />
+              <e p="AIT5.png" t="Include" />
+              <e p="AIT5.svg" t="Include" />
+              <e p="AITETurbo.png" t="Include" />
+              <e p="AITETurbo.svg" t="Include" />
+              <e p="BDR.png" t="Include" />
+              <e p="BDR.svg" t="Include" />
+              <e p="BDRE.png" t="Include" />
+              <e p="BDRE.svg" t="Include" />
+              <e p="BDREXL.png" t="Include" />
+              <e p="BDREXL.svg" t="Include" />
+              <e p="BDROM.png" t="Include" />
+              <e p="BDROM.svg" t="Include" />
+              <e p="BDRXL.png" t="Include" />
+              <e p="BDRXL.svg" t="Include" />
+              <e p="CD.png" t="Include" />
+              <e p="CD.svg" t="Include" />
+              <e p="CD32.png" t="Include" />
+              <e p="CD32.svg" t="Include" />
+              <e p="CDDA.png" t="Include" />
+              <e p="CDDA.svg" t="Include" />
+              <e p="CDEG.png" t="Include" />
+              <e p="CDEG.svg" t="Include" />
+              <e p="CDG.svg" t="Include" />
+              <e p="CDI.png" t="Include" />
+              <e p="CDI.svg" t="Include" />
+              <e p="CDIREADY.png" t="Include" />
+              <e p="CDIREADY.svg" t="Include" />
+              <e p="CDMIDI.png" t="Include" />
+              <e p="CDMIDI.svg" t="Include" />
+              <e p="CDPLUS.png" t="Include" />
+              <e p="CDPLUS.svg" t="Include" />
+              <e p="CDR.png" t="Include" />
+              <e p="CDR.svg" t="Include" />
+              <e p="CDROM.png" t="Include" />
+              <e p="CDROM.svg" t="Include" />
+              <e p="CDROM2.png" t="Include" />
+              <e p="CDROM2.svg" t="Include" />
+              <e p="CDRW.png" t="Include" />
+              <e p="CDRW.svg" t="Include" />
+              <e p="CDTV.png" t="Include" />
+              <e p="CDTV.svg" t="Include" />
+              <e p="CDV.png" t="Include" />
+              <e p="CDV.svg" t="Include" />
+              <e p="CompactCassette.png" t="Include" />
+              <e p="CompactCassette.svg" t="Include" />
+              <e p="DAT160.png" t="Include" />
+              <e p="DAT160.svg" t="Include" />
+              <e p="DAT320.png" t="Include" />
+              <e p="DAT320.svg" t="Include" />
+              <e p="DAT72.png" t="Include" />
+              <e p="DAT72.svg" t="Include" />
+              <e p="DDS1.png" t="Include" />
+              <e p="DDS1.svg" t="Include" />
+              <e p="DDS2.png" t="Include" />
+              <e p="DDS2.svg" t="Include" />
+              <e p="DDS3.png" t="Include" />
+              <e p="DDS3.svg" t="Include" />
+              <e p="DDS4.png" t="Include" />
+              <e p="DDS4.svg" t="Include" />
+              <e p="DigitalAudioTape.png" t="Include" />
+              <e p="DigitalAudioTape.svg" t="Include" />
+              <e p="Ditto.png" t="Include" />
+              <e p="Ditto.svg" t="Include" />
+              <e p="DittoMax.png" t="Include" />
+              <e p="DittoMax.svg" t="Include" />
+              <e p="DLTtapeIII.png" t="Include" />
+              <e p="DLTtapeIII.svg" t="Include" />
+              <e p="DLTtapeIIIxt.png" t="Include" />
+              <e p="DLTtapeIIIxt.svg" t="Include" />
+              <e p="DLTtapeIV.png" t="Include" />
+              <e p="DLTtapeIV.svg" t="Include" />
+              <e p="DLTtapeS4.png" t="Include" />
+              <e p="DLTtapeS4.svg" t="Include" />
+              <e p="DVDDownload.png" t="Include" />
+              <e p="DVDDownload.svg" t="Include" />
+              <e p="DVDPR.png" t="Include" />
+              <e p="DVDPR.svg" t="Include" />
+              <e p="DVDPRDL.png" t="Include" />
+              <e p="DVDPRDL.svg" t="Include" />
+              <e p="DVDPRW.png" t="Include" />
+              <e p="DVDPRW.svg" t="Include" />
+              <e p="DVDR.png" t="Include" />
+              <e p="DVDR.svg" t="Include" />
+              <e p="DVDRAM.png" t="Include" />
+              <e p="DVDRAM.svg" t="Include" />
+              <e p="DVDROM.png" t="Include" />
+              <e p="DVDROM.svg" t="Include" />
+              <e p="DVDRW.png" t="Include" />
+              <e p="DVDRW.svg" t="Include" />
+              <e p="ExpressCard34.png" t="Include" />
+              <e p="ExpressCard34.svg" t="Include" />
+              <e p="ExpressCard54.png" t="Include" />
+              <e p="ExpressCard54.svg" t="Include" />
+              <e p="GDR.png" t="Include" />
+              <e p="GDR.svg" t="Include" />
+              <e p="GDROM.png" t="Include" />
+              <e p="GDROM.svg" t="Include" />
+              <e p="GOD.png" t="Include" />
+              <e p="GOD.svg" t="Include" />
+              <e p="HDDVDR.png" t="Include" />
+              <e p="HDDVDR.svg" t="Include" />
+              <e p="HDDVDRAM.png" t="Include" />
+              <e p="HDDVDRAM.svg" t="Include" />
+              <e p="HDDVDRDL.png" t="Include" />
+              <e p="HDDVDRDL.svg" t="Include" />
+              <e p="HDDVDROM.png" t="Include" />
+              <e p="HDDVDROM.svg" t="Include" />
+              <e p="HDDVDRW.png" t="Include" />
+              <e p="HDDVDRW.svg" t="Include" />
+              <e p="HDDVDRWDL.png" t="Include" />
+              <e p="HDDVDRWDL.svg" t="Include" />
+              <e p="JaguarCD.png" t="Include" />
+              <e p="JaguarCD.svg" t="Include" />
+              <e p="Jaz.png" t="Include" />
+              <e p="Jaz.svg" t="Include" />
+              <e p="Jaz2.png" t="Include" />
+              <e p="Jaz2.svg" t="Include" />
+              <e p="LD.png" t="Include" />
+              <e p="LD.svg" t="Include" />
+              <e p="LDROM.png" t="Include" />
+              <e p="LDROM.svg" t="Include" />
+              <e p="LDROM2.png" t="Include" />
+              <e p="LDROM2.svg" t="Include" />
+              <e p="LTO.png" t="Include" />
+              <e p="LTO.svg" t="Include" />
+              <e p="LTO2.png" t="Include" />
+              <e p="LTO2.svg" t="Include" />
+              <e p="LTO3.png" t="Include" />
+              <e p="LTO3.svg" t="Include" />
+              <e p="LTO3WORM.png" t="Include" />
+              <e p="LTO3WORM.svg" t="Include" />
+              <e p="LTO4.png" t="Include" />
+              <e p="LTO4.svg" t="Include" />
+              <e p="LTO4WORM.png" t="Include" />
+              <e p="LTO4WORM.svg" t="Include" />
+              <e p="LTO5.png" t="Include" />
+              <e p="LTO5.svg" t="Include" />
+              <e p="LTO5WORM.png" t="Include" />
+              <e p="LTO5WORM.svg" t="Include" />
+              <e p="LTO6.png" t="Include" />
+              <e p="LTO6.svg" t="Include" />
+              <e p="LTO6WORM.png" t="Include" />
+              <e p="LTO6WORM.svg" t="Include" />
+              <e p="LTO7.png" t="Include" />
+              <e p="LTO7.svg" t="Include" />
+              <e p="LTO7WORM.png" t="Include" />
+              <e p="LTO7WORM.svg" t="Include" />
+              <e p="LVROM.png" t="Include" />
+              <e p="LVROM.svg" t="Include" />
+              <e p="MD.png" t="Include" />
+              <e p="MD.svg" t="Include" />
+              <e p="MDData.png" t="Include" />
+              <e p="MDData.svg" t="Include" />
+              <e p="MDData2.png" t="Include" />
+              <e p="MDData2.svg" t="Include" />
+              <e p="MEGACD.png" t="Include" />
+              <e p="MEGACD.svg" t="Include" />
+              <e p="MegaLD.png" t="Include" />
+              <e p="MegaLD.svg" t="Include" />
+              <e p="MemoryStick.png" t="Include" />
+              <e p="MemoryStick.svg" t="Include" />
+              <e p="MemoryStickDuo.png" t="Include" />
+              <e p="MemoryStickDuo.svg" t="Include" />
+              <e p="MemoryStickMicro.png" t="Include" />
+              <e p="MemoryStickMicro.svg" t="Include" />
+              <e p="MemoryStickPro.png" t="Include" />
+              <e p="MemoryStickPro.svg" t="Include" />
+              <e p="MemoryStickProDuo.png" t="Include" />
+              <e p="MemoryStickProDuo.svg" t="Include" />
+              <e p="MilCD.png" t="Include" />
+              <e p="MilCD.svg" t="Include" />
+              <e p="miniSD.png" t="Include" />
+              <e p="miniSD.svg" t="Include" />
+              <e p="NeoGeoCD.png" t="Include" />
+              <e p="NeoGeoCD.svg" t="Include" />
+              <e p="Nintendo3DSGameCard.png" t="Include" />
+              <e p="Nintendo3DSGameCard.svg" t="Include" />
+              <e p="Nintendo_64_Logo.svg" t="Include" />
+              <e p="Nuon.png" t="Include" />
+              <e p="Nuon.svg" t="Include" />
+              <e p="PCD.png" t="Include" />
+              <e p="PCD.svg" t="Include" />
+              <e p="PCFX.png" t="Include" />
+              <e p="PCFX.svg" t="Include" />
+              <e p="PD650.png" t="Include" />
+              <e p="PD650.svg" t="Include" />
+              <e p="PD650_WORM.png" t="Include" />
+              <e p="PD650_WORM.svg" t="Include" />
+              <e p="Pippin.png" t="Include" />
+              <e p="Pippin.svg" t="Include" />
+              <e p="Playdia.png" t="Include" />
+              <e p="Playdia.svg" t="Include" />
+              <e p="PlayStationMemoryCard.png" t="Include" />
+              <e p="PlayStationMemoryCard.svg" t="Include" />
+              <e p="PlayStationMemoryCard2.png" t="Include" />
+              <e p="PlayStationMemoryCard2.svg" t="Include" />
+              <e p="PlayStationVitaGameCard.png" t="Include" />
+              <e p="PlayStationVitaGameCard.svg" t="Include" />
+              <e p="PocketZip.png" t="Include" />
+              <e p="PocketZip.svg" t="Include" />
+              <e p="PS1CD.png" t="Include" />
+              <e p="PS1CD.svg" t="Include" />
+              <e p="PS2CD.png" t="Include" />
+              <e p="PS2CD.svg" t="Include" />
+              <e p="PS2DVD.png" t="Include" />
+              <e p="PS2DVD.svg" t="Include" />
+              <e p="PS3BD.png" t="Include" />
+              <e p="PS3BD.svg" t="Include" />
+              <e p="PS3DVD.png" t="Include" />
+              <e p="PS3DVD.svg" t="Include" />
+              <e p="PS4BD.png" t="Include" />
+              <e p="PS4BD.svg" t="Include" />
+              <e p="SACD.png" t="Include" />
+              <e p="SACD.svg" t="Include" />
+              <e p="SAIT1.png" t="Include" />
+              <e p="SAIT1.svg" t="Include" />
+              <e p="SAIT2.png" t="Include" />
+              <e p="SAIT2.svg" t="Include" />
+              <e p="SATURNCD.png" t="Include" />
+              <e p="SATURNCD.svg" t="Include" />
+              <e p="SecureDigital.png" t="Include" />
+              <e p="SecureDigital.svg" t="Include" />
+              <e p="SmartMedia.png" t="Include" />
+              <e p="SmartMedia.svg" t="Include" />
+              <e p="SuperCDROM2.png" t="Include" />
+              <e p="SuperCDROM2.svg" t="Include" />
+              <e p="SVCD.png" t="Include" />
+              <e p="SVCD.svg" t="Include" />
+              <e p="SwitchGameCard.png" t="Include" />
+              <e p="SwitchGameCard.svg" t="Include" />
+              <e p="ThreeDO.png" t="Include" />
+              <e p="ThreeDO.svg" t="Include" />
+              <e p="VCD.png" t="Include" />
+              <e p="VCD.svg" t="Include" />
+              <e p="WOD.png" t="Include" />
+              <e p="WOD.svg" t="Include" />
+              <e p="WUOD.png" t="Include" />
+              <e p="WUOD.svg" t="Include" />
+              <e p="XGD.png" t="Include" />
+              <e p="XGD.svg" t="Include" />
+              <e p="XGD2.png" t="Include" />
+              <e p="XGD2.svg" t="Include" />
+              <e p="XGD3.png" t="Include" />
+              <e p="XGD3.svg" t="Include" />
+              <e p="XGD4.png" t="Include" />
+              <e p="XGD4.svg" t="Include" />
+              <e p="ZIP100.png" t="Include" />
+              <e p="ZIP100.svg" t="Include" />
+              <e p="ZIP250.png" t="Include" />
+              <e p="ZIP250.svg" t="Include" />
+            </e>
+          </e>
+        </e>
+        <e p="bin" t="ExcludeRecursive" />
+        <e p="ConsoleHandler.cs" t="Include" />
+        <e p="Controls" t="Include">
+          <e p="BlockMap.cs" t="Include" />
+          <e p="ColoredGrid.cs" t="Include" />
+          <e p="LineChart.cs" t="Include" />
+          <e p="SvgImageView.cs" t="Include" />
+        </e>
+        <e p="Dialogs" t="Include">
+          <e p="dlgEncodings.xeto" t="Include" />
+          <e p="dlgEncodings.xeto.cs" t="Include" />
+          <e p="dlgPlugins.xeto" t="Include" />
+          <e p="dlgPlugins.xeto.cs" t="Include" />
+          <e p="dlgSettings.xeto" t="Include" />
+          <e p="dlgSettings.xeto.cs" t="Include" />
+          <e p="dlgStatistics.xeto" t="Include" />
+          <e p="dlgStatistics.xeto.cs" t="Include" />
+        </e>
+        <e p="Forms" t="Include">
+          <e p="frmConsole.xeto" t="Include" />
+          <e p="frmConsole.xeto.cs" t="Include" />
+          <e p="frmDecodeMediaTags.xeto" t="Include" />
+          <e p="frmDecodeMediaTags.xeto.cs" t="Include" />
+          <e p="frmDump.xeto" t="Include" />
+          <e p="frmDump.xeto.cs" t="Include" />
+          <e p="frmImageChecksum.xeto" t="Include" />
+          <e p="frmImageChecksum.xeto.cs" t="Include" />
+          <e p="frmImageConvert.xeto" t="Include" />
+          <e p="frmImageConvert.xeto.cs" t="Include" />
+          <e p="frmImageEntropy.xeto" t="Include" />
+          <e p="frmImageEntropy.xeto.cs" t="Include" />
+          <e p="frmImageSidecar.xeto" t="Include" />
+          <e p="frmImageSidecar.xeto.cs" t="Include" />
+          <e p="frmImageVerify.xeto" t="Include" />
+          <e p="frmImageVerify.xeto.cs" t="Include" />
+          <e p="frmMain.xeto" t="Include" />
+          <e p="frmMain.xeto.cs" t="Include" />
+          <e p="frmMediaScan.xeto" t="Include" />
+          <e p="frmMediaScan.xeto.cs" t="Include" />
+          <e p="frmPrintHex.xeto" t="Include" />
+          <e p="frmPrintHex.xeto.cs" t="Include" />
+        </e>
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.Gui.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
+        <e p="Panels" t="Include">
+          <e p="pnlDeviceInfo.xeto" t="Include" />
+          <e p="pnlDeviceInfo.xeto.cs" t="Include" />
+          <e p="pnlFilesystem.xeto" t="Include" />
+          <e p="pnlFilesystem.xeto.cs" t="Include" />
+          <e p="pnlImageInfo.xeto" t="Include" />
+          <e p="pnlImageInfo.xeto.cs" t="Include" />
+          <e p="pnlListFiles.xeto" t="Include" />
+          <e p="pnlListFiles.xeto.cs" t="Include" />
+          <e p="pnlPartition.xeto" t="Include" />
+          <e p="pnlPartition.xeto.cs" t="Include" />
+          <e p="pnlScsiInfo.xeto" t="Include" />
+          <e p="pnlScsiInfo.xeto.cs" t="Include" />
+        </e>
+        <e p="ResourceHandler.cs" t="Include" />
+        <e p="Tabs" t="Include">
+          <e p="tabAtaInfo.xeto" t="Include" />
+          <e p="tabAtaInfo.xeto.cs" t="Include" />
+          <e p="tabBlurayInfo.xeto" t="Include" />
+          <e p="tabBlurayInfo.xeto.cs" t="Include" />
+          <e p="tabCompactDiscInfo.xeto" t="Include" />
+          <e p="tabCompactDiscInfo.xeto.cs" t="Include" />
+          <e p="tabDvdInfo.xeto" t="Include" />
+          <e p="tabDvdInfo.xeto.cs" t="Include" />
+          <e p="tabDvdWritableInfo.xeto" t="Include" />
+          <e p="tabDvdWritableInfo.xeto.cs" t="Include" />
+          <e p="tabPcmciaInfo.xeto" t="Include" />
+          <e p="tabPcmciaInfo.xeto.cs" t="Include" />
+          <e p="tabScsiInfo.xeto" t="Include" />
+          <e p="tabScsiInfo.xeto.cs" t="Include" />
+          <e p="tabSdMmcInfo.xeto" t="Include" />
+          <e p="tabSdMmcInfo.xeto.cs" t="Include" />
+          <e p="tabXboxInfo.xeto" t="Include" />
+          <e p="tabXboxInfo.xeto.cs" t="Include" />
         </e>
       </e>
       <e p="Aaru.Helpers" t="IncludeRecursive">
@@ -920,6 +1326,7 @@
         <e p="ArrayFill.cs" t="Include" />
         <e p="ArrayIsEmpty.cs" t="Include" />
         <e p="BigEndianBitConverter.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="BitEndian.cs" t="Include" />
         <e p="CHS.cs" t="Include" />
         <e p="CompareBytes.cs" t="Include" />
@@ -927,17 +1334,16 @@
         <e p="DateHandlers.cs" t="Include" />
         <e p="Marshal.cs" t="Include" />
         <e p="MarshallingPropertiesAttribute.cs" t="Include" />
-        <e p="PrintHex.cs" t="Include" />
-        <e p="StringHandlers.cs" t="Include" />
-        <e p="Swapping.cs" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
+            <e p="netcoreapp3.0" t="Include">
               <e p="Aaru.Helpers.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
         </e>
+        <e p="PrintHex.cs" t="Include" />
+        <e p="StringHandlers.cs" t="Include" />
+        <e p="Swapping.cs" t="Include" />
       </e>
       <e p="Aaru.Images" t="IncludeRecursive">
         <e p="Aaru.Images.csproj" t="IncludeRecursive" />
@@ -1020,16 +1426,7 @@
           <e p="Unsupported.cs" t="Include" />
           <e p="Write.cs" t="Include" />
         </e>
-        <e p="BLU" t="Include">
-          <e p="BLU.cs" t="Include" />
-          <e p="Constants.cs" t="Include" />
-          <e p="Identify.cs" t="Include" />
-          <e p="Properties.cs" t="Include" />
-          <e p="Read.cs" t="Include" />
-          <e p="Unsupported.cs" t="Include" />
-          <e p="Verify.cs" t="Include" />
-          <e p="Write.cs" t="Include" />
-        </e>
+        <e p="bin" t="ExcludeRecursive" />
         <e p="BlindWrite4" t="Include">
           <e p="BlindWrite4.cs" t="Include" />
           <e p="Constants.cs" t="Include" />
@@ -1051,6 +1448,16 @@
           <e p="Structs.cs" t="Include" />
           <e p="Verify.cs" t="Include" />
         </e>
+        <e p="BLU" t="Include">
+          <e p="BLU.cs" t="Include" />
+          <e p="Constants.cs" t="Include" />
+          <e p="Identify.cs" t="Include" />
+          <e p="Properties.cs" t="Include" />
+          <e p="Read.cs" t="Include" />
+          <e p="Unsupported.cs" t="Include" />
+          <e p="Verify.cs" t="Include" />
+          <e p="Write.cs" t="Include" />
+        </e>
         <e p="CDRDAO" t="Include">
           <e p="CDRDAO.cs" t="Include" />
           <e p="Constants.cs" t="Include" />
@@ -1084,16 +1491,6 @@
           <e p="Structs.cs" t="Include" />
           <e p="Verify.cs" t="Include" />
         </e>
-        <e p="CPCDSK" t="Include">
-          <e p="CPCDSK.cs" t="Include" />
-          <e p="Constants.cs" t="Include" />
-          <e p="Helpers.cs" t="Include" />
-          <e p="Identify.cs" t="Include" />
-          <e p="Properties.cs" t="Include" />
-          <e p="Read.cs" t="Include" />
-          <e p="Structs.cs" t="Include" />
-          <e p="Unsupported.cs" t="Include" />
-        </e>
         <e p="CisCopy" t="Include">
           <e p="CisCopy.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
@@ -1131,6 +1528,16 @@
           <e p="Unsupported.cs" t="Include" />
           <e p="Write.cs" t="Include" />
         </e>
+        <e p="CPCDSK" t="Include">
+          <e p="Constants.cs" t="Include" />
+          <e p="CPCDSK.cs" t="Include" />
+          <e p="Helpers.cs" t="Include" />
+          <e p="Identify.cs" t="Include" />
+          <e p="Properties.cs" t="Include" />
+          <e p="Read.cs" t="Include" />
+          <e p="Structs.cs" t="Include" />
+          <e p="Unsupported.cs" t="Include" />
+        </e>
         <e p="D88" t="Include">
           <e p="Constants.cs" t="Include" />
           <e p="D88.cs" t="Include" />
@@ -1221,8 +1628,8 @@
         <e p="IMD" t="Include">
           <e p="Constants.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
-          <e p="IMD.cs" t="Include" />
           <e p="Identify.cs" t="Include" />
+          <e p="IMD.cs" t="Include" />
           <e p="Properties.cs" t="Include" />
           <e p="Read.cs" t="Include" />
           <e p="Unsupported.cs" t="Include" />
@@ -1256,16 +1663,6 @@
           <e p="Structs.cs" t="Include" />
           <e p="Unsupported.cs" t="Include" />
         </e>
-        <e p="NHDr0" t="Include">
-          <e p="Constants.cs" t="Include" />
-          <e p="Identify.cs" t="Include" />
-          <e p="NHDr0.cs" t="Include" />
-          <e p="Properties.cs" t="Include" />
-          <e p="Read.cs" t="Include" />
-          <e p="Structs.cs" t="Include" />
-          <e p="Unsupported.cs" t="Include" />
-          <e p="Write.cs" t="Include" />
-        </e>
         <e p="Nero" t="Include">
           <e p="Constants.cs" t="Include" />
           <e p="Enums.cs" t="Include" />
@@ -1277,6 +1674,23 @@
           <e p="Structs.cs" t="Include" />
           <e p="Verify.cs" t="Include" />
         </e>
+        <e p="NHDr0" t="Include">
+          <e p="Constants.cs" t="Include" />
+          <e p="Identify.cs" t="Include" />
+          <e p="NHDr0.cs" t="Include" />
+          <e p="Properties.cs" t="Include" />
+          <e p="Read.cs" t="Include" />
+          <e p="Structs.cs" t="Include" />
+          <e p="Unsupported.cs" t="Include" />
+          <e p="Write.cs" t="Include" />
+        </e>
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.Images.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
         <e p="Parallels" t="Include">
           <e p="Constants.cs" t="Include" />
           <e p="Identify.cs" t="Include" />
@@ -1459,16 +1873,6 @@
           <e p="Unsupported.cs" t="Include" />
           <e p="VHDX.cs" t="Include" />
         </e>
-        <e p="VMware" t="Include">
-          <e p="Constants.cs" t="Include" />
-          <e p="Identify.cs" t="Include" />
-          <e p="Properties.cs" t="Include" />
-          <e p="Read.cs" t="Include" />
-          <e p="Structs.cs" t="Include" />
-          <e p="Unsupported.cs" t="Include" />
-          <e p="VMware.cs" t="Include" />
-          <e p="Write.cs" t="Include" />
-        </e>
         <e p="Virtual98" t="Include">
           <e p="Constants.cs" t="Include" />
           <e p="Identify.cs" t="Include" />
@@ -1479,6 +1883,16 @@
           <e p="Virtual98.cs" t="Include" />
           <e p="Write.cs" t="Include" />
         </e>
+        <e p="VMware" t="Include">
+          <e p="Constants.cs" t="Include" />
+          <e p="Identify.cs" t="Include" />
+          <e p="Properties.cs" t="Include" />
+          <e p="Read.cs" t="Include" />
+          <e p="Structs.cs" t="Include" />
+          <e p="Unsupported.cs" t="Include" />
+          <e p="VMware.cs" t="Include" />
+          <e p="Write.cs" t="Include" />
+        </e>
         <e p="WCDiskImage" t="Include">
           <e p="Identify.cs" t="Include" />
           <e p="Properties.cs" t="Include" />
@@ -1497,14 +1911,6 @@
           <e p="Write.cs" t="Include" />
           <e p="ZZZRawImage.cs" t="Include" />
         </e>
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
-              <e p="Aaru.Images.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
       </e>
       <e p="Aaru.Partitions" t="IncludeRecursive">
         <e p="Aaru.Partitions.csproj" t="IncludeRecursive" />
@@ -1512,6 +1918,7 @@
         <e p="AppleMap.cs" t="Include" />
         <e p="Apricot.cs" t="Include" />
         <e p="Atari.cs" t="Include" />
+        <e p="bin" t="ExcludeRecursive" />
         <e p="BSD.cs" t="Include" />
         <e p="DEC.cs" t="Include" />
         <e p="DragonFlyBSD.cs" t="Include" />
@@ -1519,6 +1926,13 @@
         <e p="Human68k.cs" t="Include" />
         <e p="MBR.cs" t="Include" />
         <e p="NeXT.cs" t="Include" />
+        <e p="obj" t="ExcludeRecursive">
+          <e p="Debug" t="Include">
+            <e p="netcoreapp3.0" t="Include">
+              <e p="Aaru.Partitions.AssemblyInfo.cs" t="Include" />
+            </e>
+          </e>
+        </e>
         <e p="PC98.cs" t="Include" />
         <e p="Plan9.cs" t="Include" />
         <e p="RDB.cs" t="Include" />
@@ -1528,41 +1942,26 @@
         <e p="Sun.cs" t="Include" />
         <e p="UNIX.cs" t="Include" />
         <e p="VTOC.cs" t="Include" />
-        <e p="XENIX.cs" t="Include" />
         <e p="Xbox.cs" t="Include" />
-        <e p="bin" t="ExcludeRecursive" />
-        <e p="obj" t="ExcludeRecursive">
-          <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
-              <e p="Aaru.Partitions.AssemblyInfo.cs" t="Include" />
-            </e>
-          </e>
-        </e>
+        <e p="XENIX.cs" t="Include" />
       </e>
       <e p="Aaru.Settings" t="IncludeRecursive">
         <e p="Aaru.Settings.csproj" t="IncludeRecursive" />
-        <e p="Settings.cs" t="Include" />
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp2.1" t="Include">
+            <e p="netcoreapp3.0" t="Include">
               <e p="Aaru.Settings.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
         </e>
+        <e p="Settings.cs" t="Include" />
       </e>
       <e p="Aaru.sln" t="IncludeFlat" />
-      <e p="CICMMetadata/dotnet/cicm.cs" t="Include" />
-      <e p="CONTRIBUTING.md" t="Include" />
       <e p="Changelog.md" t="Include" />
-      <e p="LICENSE" t="Include" />
-      <e p="LICENSE.LGPL" t="Include" />
-      <e p="LICENSE.MIT" t="Include" />
-      <e p="NEEDED.md" t="Include" />
-      <e p="NEEDINFO.md" t="Include" />
-      <e p="README.md" t="Include" />
-      <e p="TODO.md" t="Include" />
-      <e p="cuetoolsnet/CUETools.Codecs" t="Include">
+      <e p="CICMMetadata\dotnet\cicm.cs" t="Include" />
+      <e p="CONTRIBUTING.md" t="Include" />
+      <e p="cuetoolsnet\CUETools.Codecs" t="Include">
         <e p="AudioBuffer.cs" t="Include" />
         <e p="AudioDecoderClass.cs" t="Include" />
         <e p="AudioEncoderClass.cs" t="Include" />
@@ -1596,8 +1995,8 @@
         <e p="LpcContext.cs" t="Include" />
         <e p="NullStream.cs" t="Include" />
         <e p="PlaybackState.cs" t="Include" />
-        <e p="SRDescriptionAttribute.cs" t="Include" />
         <e p="SilenceGenerator.cs" t="Include" />
+        <e p="SRDescriptionAttribute.cs" t="Include" />
         <e p="UserDefinedEncoderSettings.cs" t="Include" />
         <e p="UserDefinedReader.cs" t="Include" />
         <e p="UserDefinedWriter.cs" t="Include" />
@@ -1605,7 +2004,7 @@
         <e p="WAVWriter.cs" t="Include" />
         <e p="WAVWriterSettings.cs" t="Include" />
       </e>
-      <e p="cuetoolsnet/CUETools.Codecs.FLAKE" t="Include">
+      <e p="cuetoolsnet\CUETools.Codecs.FLAKE" t="Include">
         <e p="ChannelMode.cs" t="Include" />
         <e p="FlacFrame.cs" t="Include" />
         <e p="FlacSubframe.cs" t="Include" />
@@ -1628,7 +2027,14 @@
         <e p="WindowFunction.cs" t="Include" />
         <e p="WindowMethod.cs" t="Include" />
       </e>
+      <e p="LICENSE" t="Include" />
+      <e p="LICENSE.LGPL" t="Include" />
+      <e p="LICENSE.MIT" t="Include" />
+      <e p="NEEDED.md" t="Include" />
+      <e p="NEEDINFO.md" t="Include" />
       <e p="packages" t="ExcludeRecursive" />
+      <e p="README.md" t="Include" />
+      <e p="TODO.md" t="Include" />
     </e>
   </component>
 </project>
\ No newline at end of file
diff --git a/Aaru.Checksums b/Aaru.Checksums
index da70be0ac..3c84cc53e 160000
--- a/Aaru.Checksums
+++ b/Aaru.Checksums
@@ -1 +1 @@
-Subproject commit da70be0ac0495acdc770b98bdd41360d913da28f
+Subproject commit 3c84cc53ed28db1eaded56313d02989d597f3ef2
diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
index 6e696eb3b..931b89da2 160000
--- a/Aaru.CommonTypes
+++ b/Aaru.CommonTypes
@@ -1 +1 @@
-Subproject commit 6e696eb3ba48ef0d11db45dd7d433b279810f74e
+Subproject commit 931b89da2e3976eec4bf8f64cfb9d27a183681a4
diff --git a/Aaru.Compression/Aaru.Compression.csproj b/Aaru.Compression/Aaru.Compression.csproj
index 5734d5176..372088033 100644
--- a/Aaru.Compression/Aaru.Compression.csproj
+++ b/Aaru.Compression/Aaru.Compression.csproj
@@ -18,7 +18,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru Data Preservation Suite</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
diff --git a/Aaru.Console b/Aaru.Console
index f73e29fd3..40d55b246 160000
--- a/Aaru.Console
+++ b/Aaru.Console
@@ -1 +1 @@
-Subproject commit f73e29fd34ae28e6db60352643e4a747e8fa75c8
+Subproject commit 40d55b2460bc095a88be7c0daa2e878b6352ce1c
diff --git a/Aaru.Core/Aaru.Core.csproj b/Aaru.Core/Aaru.Core.csproj
index 925d2a515..4f09cba31 100644
--- a/Aaru.Core/Aaru.Core.csproj
+++ b/Aaru.Core/Aaru.Core.csproj
@@ -17,7 +17,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru.Core</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/Aaru.Database/Aaru.Database.csproj b/Aaru.Database/Aaru.Database.csproj
index e95d017af..d9e58db62 100644
--- a/Aaru.Database/Aaru.Database.csproj
+++ b/Aaru.Database/Aaru.Database.csproj
@@ -16,7 +16,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru.Database</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
diff --git a/Aaru.Decoders b/Aaru.Decoders
index cb36d0d52..02866c29e 160000
--- a/Aaru.Decoders
+++ b/Aaru.Decoders
@@ -1 +1 @@
-Subproject commit cb36d0d527c30528e92bdbe32579d52f6ec358da
+Subproject commit 02866c29e294b683c787f6041587d73d4ffcf180
diff --git a/Aaru.Devices/Aaru.Devices.csproj b/Aaru.Devices/Aaru.Devices.csproj
index c7c428c96..565d5ce1c 100644
--- a/Aaru.Devices/Aaru.Devices.csproj
+++ b/Aaru.Devices/Aaru.Devices.csproj
@@ -17,7 +17,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru.Devices</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
diff --git a/Aaru.Dto b/Aaru.Dto
index 4b5afe2ca..c5416bbaf 160000
--- a/Aaru.Dto
+++ b/Aaru.Dto
@@ -1 +1 @@
-Subproject commit 4b5afe2ca4d4f77c43e169f9c4e40976b807d2d5
+Subproject commit c5416bbaf7fe21e0d32ade2eeec78f9e6301b828
diff --git a/Aaru.Filesystems/Aaru.Filesystems.csproj b/Aaru.Filesystems/Aaru.Filesystems.csproj
index 220d3092d..77c0175be 100644
--- a/Aaru.Filesystems/Aaru.Filesystems.csproj
+++ b/Aaru.Filesystems/Aaru.Filesystems.csproj
@@ -17,7 +17,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru.Filesystems</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <NoWarn>CS0649</NoWarn>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
diff --git a/Aaru.Filters/Aaru.Filters.csproj b/Aaru.Filters/Aaru.Filters.csproj
index 3945a8bb8..ae6b518eb 100644
--- a/Aaru.Filters/Aaru.Filters.csproj
+++ b/Aaru.Filters/Aaru.Filters.csproj
@@ -17,7 +17,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru.Filters</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
diff --git a/Aaru.Gui/Aaru.Gui.csproj b/Aaru.Gui/Aaru.Gui.csproj
index 7549ed644..bce6f3847 100644
--- a/Aaru.Gui/Aaru.Gui.csproj
+++ b/Aaru.Gui/Aaru.Gui.csproj
@@ -10,7 +10,7 @@
         <Product>Aaru Data Preservation Suite</Product>
         <Title>Aaru Data Preservation Suite</Title>
         <ApplicationVersion>$(Version)</ApplicationVersion>
-        <TargetFramework>netcoreapp2.1</TargetFramework>
+        <TargetFramework>netcoreapp3.0</TargetFramework>
         <NoWarn>CS0649,CS0169</NoWarn>
     </PropertyGroup>
     <PropertyGroup>
diff --git a/Aaru.Helpers b/Aaru.Helpers
index 97d450220..c3ab7ac75 160000
--- a/Aaru.Helpers
+++ b/Aaru.Helpers
@@ -1 +1 @@
-Subproject commit 97d450220a8208be0f782c6105811e82172fff2d
+Subproject commit c3ab7ac7526c6821ff1856c7b5d3d9704230e24f
diff --git a/Aaru.Images/Aaru.Images.csproj b/Aaru.Images/Aaru.Images.csproj
index 5fc71fb78..1dab050a5 100644
--- a/Aaru.Images/Aaru.Images.csproj
+++ b/Aaru.Images/Aaru.Images.csproj
@@ -17,7 +17,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru.DiscImages</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <NoWarn>CS0649</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/Aaru.Partitions/Aaru.Partitions.csproj b/Aaru.Partitions/Aaru.Partitions.csproj
index b83a35a5a..ae0a249e6 100644
--- a/Aaru.Partitions/Aaru.Partitions.csproj
+++ b/Aaru.Partitions/Aaru.Partitions.csproj
@@ -17,7 +17,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru.Partitions</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <NoWarn>CS0649</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/Aaru.Settings/Aaru.Settings.csproj b/Aaru.Settings/Aaru.Settings.csproj
index a3d27990d..cf97c791f 100644
--- a/Aaru.Settings/Aaru.Settings.csproj
+++ b/Aaru.Settings/Aaru.Settings.csproj
@@ -17,7 +17,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru.Settings</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
diff --git a/Aaru/Aaru.csproj b/Aaru/Aaru.csproj
index 587385cea..c35df66f6 100644
--- a/Aaru/Aaru.csproj
+++ b/Aaru/Aaru.csproj
@@ -10,7 +10,7 @@
     <AssemblyName>aaru</AssemblyName>
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <Version>5.1.99.2880</Version>
     <Company>Claunia.com</Company>
diff --git a/CICMMetadata b/CICMMetadata
index 5debf2c35..c3a8be244 160000
--- a/CICMMetadata
+++ b/CICMMetadata
@@ -1 +1 @@
-Subproject commit 5debf2c35979da8d11f82df4c8f31734714f7f4c
+Subproject commit c3a8be24478245e5f9604df12d082917ef1e66f6
diff --git a/build.sh b/build.sh
old mode 100755
new mode 100644