From 738f2325bc45addd89e3ce623b961d621ee4bdd2 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Tue, 9 Nov 2021 01:46:07 +0000
Subject: [PATCH] Update .NET 6 dependencies to RTM.

---
 Aaru.Compression/Aaru.Compression.csproj |   2 +-
 Aaru.Database/Aaru.Database.csproj       |   6 +-
 Aaru.Devices/Aaru.Devices.csproj         | 124 +++++++++++------------
 Aaru.Gui/Aaru.Gui.csproj                 |   2 +-
 Aaru.Tests/Aaru.Tests.csproj             |   2 +-
 Aaru/Aaru.csproj                         |   4 +-
 6 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/Aaru.Compression/Aaru.Compression.csproj b/Aaru.Compression/Aaru.Compression.csproj
index d92622dfd..3d3db52a3 100644
--- a/Aaru.Compression/Aaru.Compression.csproj
+++ b/Aaru.Compression/Aaru.Compression.csproj
@@ -99,7 +99,7 @@
     <PackageReference Include="DotNetZip" Version="1.15.0" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
     <PackageReference Include="SharpCompress" Version="0.29.0" />
-    <PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
+    <PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1" PrivateAssets="all" />
   </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/Aaru.Database/Aaru.Database.csproj b/Aaru.Database/Aaru.Database.csproj
index 708e1b7d5..8181b7eec 100644
--- a/Aaru.Database/Aaru.Database.csproj
+++ b/Aaru.Database/Aaru.Database.csproj
@@ -63,12 +63,12 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="EntityFramework" Version="6.4.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0-preview.7.21378.4">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
       <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.Proxies" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="2.0.0-preview1-final" />
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1" PrivateAssets="all" />
   </ItemGroup>
diff --git a/Aaru.Devices/Aaru.Devices.csproj b/Aaru.Devices/Aaru.Devices.csproj
index 4a2a0a571..a0cb9ebe9 100644
--- a/Aaru.Devices/Aaru.Devices.csproj
+++ b/Aaru.Devices/Aaru.Devices.csproj
@@ -56,82 +56,82 @@
     <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="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="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="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="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="6.0.0-preview.7.21377.19"/>
-    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1" PrivateAssets="all"/>
+    <PackageReference Include="System.Management" Version="6.0.0" />
+    <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1" 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>
diff --git a/Aaru.Gui/Aaru.Gui.csproj b/Aaru.Gui/Aaru.Gui.csproj
index c482c1846..bde737e5b 100644
--- a/Aaru.Gui/Aaru.Gui.csproj
+++ b/Aaru.Gui/Aaru.Gui.csproj
@@ -27,7 +27,7 @@
     <PackageReference Include="Claunia.Encoding" Version="1.9.1" />
     <PackageReference Include="MessageBox.Avalonia" Version="1.5.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="System.Text.Encoding.CodePages" Version="6.0.0" />
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Aaru.Tests/Aaru.Tests.csproj b/Aaru.Tests/Aaru.Tests.csproj
index 3f32ec281..1f016e7fa 100644
--- a/Aaru.Tests/Aaru.Tests.csproj
+++ b/Aaru.Tests/Aaru.Tests.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="nunit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.7.21377.19" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Aaru/Aaru.csproj b/Aaru/Aaru.csproj
index 2e5ae1707..c69350f67 100644
--- a/Aaru/Aaru.csproj
+++ b/Aaru/Aaru.csproj
@@ -262,12 +262,12 @@
     <Content Include="..\.github\PULL_REQUEST_TEMPLATE.md" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0-preview.7.21378.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Spectre.Console" Version="0.41.0" />
     <PackageReference Include="Spectre.Console.Analyzer" Version="0.41.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20104.2" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-preview.7.21377.19" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1">
       <PrivateAssets>all</PrivateAssets>