From ebd29840fed4e1221cc39c85402b26d09c4fe6a0 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 12 Sep 2021 22:25:59 +0100 Subject: [PATCH] Upgrade to .NET 6. --- Aaru.Archives/Aaru.Archives.csproj | 5 +- Aaru.Checksums | 2 +- Aaru.CommonTypes | 2 +- Aaru.Compression/Aaru.Compression.csproj | 5 +- Aaru.Console | 2 +- Aaru.Core/Aaru.Core.csproj | 5 +- Aaru.Core/Sidecar/Files.cs | 10 +- Aaru.Database/Aaru.Database.csproj | 202 +++--- Aaru.Decoders | 2 +- Aaru.Decryption | 2 +- Aaru.Devices/Aaru.Devices.csproj | 139 ++--- Aaru.Dto | 2 +- Aaru.Filesystems/Aaru.Filesystems.csproj | 5 +- Aaru.Filesystems/AppleDOS/AppleDOS.cs | 4 +- Aaru.Filesystems/AppleMFS/AppleMFS.cs | 4 +- Aaru.Filesystems/CPM/CPM.cs | 4 +- Aaru.Filesystems/FAT/FAT.cs | 6 +- Aaru.Filesystems/FATX/FATX.cs | 4 +- Aaru.Filesystems/ISO9660/ISO9660.cs | 6 +- Aaru.Filesystems/ISO9660/Super.cs | 10 +- Aaru.Filesystems/LisaFS/Dir.cs | 4 +- Aaru.Filesystems/LisaFS/LisaFS.cs | 6 +- Aaru.Filesystems/Opera/Opera.cs | 4 +- Aaru.Filesystems/UCSDPascal/UCSDPascal.cs | 4 +- Aaru.Filters/Aaru.Filters.csproj | 5 +- Aaru.Gui/Aaru.Gui.csproj | 583 +++++++++--------- Aaru.Gui/ViewModels/Dialogs/AboutViewModel.cs | 37 +- Aaru.Helpers | 2 +- Aaru.Images/Aaru.Images.csproj | 5 +- Aaru.Partitions/Aaru.Partitions.csproj | 5 +- Aaru.Settings/Aaru.Settings.csproj | 25 +- Aaru.Tests.Devices/Aaru.Tests.Devices.csproj | 5 +- Aaru.Tests/Aaru.Tests.csproj | 7 +- Aaru/Aaru.csproj | 9 +- Aaru/Commands/Filesystem/Ls.cs | 2 +- README.md | 2 +- 36 files changed, 568 insertions(+), 558 deletions(-) diff --git a/Aaru.Archives/Aaru.Archives.csproj b/Aaru.Archives/Aaru.Archives.csproj index 92d895782..6ebe52b57 100644 --- a/Aaru.Archives/Aaru.Archives.csproj +++ b/Aaru.Archives/Aaru.Archives.csproj @@ -17,8 +17,8 @@ Aaru Data Preservation Suite Aaru.Archives $(Version) - netcoreapp3.1 - 8 + net6 + 10 Archive implementations used by the Aaru Data Preservation Suite. https://github.com/aaru-dps/ LGPL-2.1-only @@ -29,6 +29,7 @@ true snupkg Natalia Portillo <claunia@claunia.com> + true $(Version)+{chash:8} diff --git a/Aaru.Checksums b/Aaru.Checksums index 84bc41e28..786f6a5b6 160000 --- a/Aaru.Checksums +++ b/Aaru.Checksums @@ -1 +1 @@ -Subproject commit 84bc41e28a19500698112f1c1f3117adfc8ee410 +Subproject commit 786f6a5b6d9969b2ecee90ac0b6333b2f0914e7d diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes index fd95ca9a7..2fa72ccb3 160000 --- a/Aaru.CommonTypes +++ b/Aaru.CommonTypes @@ -1 +1 @@ -Subproject commit fd95ca9a7d942a8506dc50997ed0fdca4840ccaa +Subproject commit 2fa72ccb383767a84758951ef7ce5190cfdc4eee diff --git a/Aaru.Compression/Aaru.Compression.csproj b/Aaru.Compression/Aaru.Compression.csproj index 5e73c352b..2cebd7732 100644 --- a/Aaru.Compression/Aaru.Compression.csproj +++ b/Aaru.Compression/Aaru.Compression.csproj @@ -18,8 +18,8 @@ Aaru Data Preservation Suite Aaru Data Preservation Suite $(Version) - netcoreapp3.1 - 8 + net6 + 10 Compression algorithms used by the Aaru Data Preservation Suite. https://github.com/aaru-dps/ LGPL-2.1-only @@ -30,6 +30,7 @@ true snupkg Natalia Portillo <claunia@claunia.com> + true $(Version)+{chash:8} diff --git a/Aaru.Console b/Aaru.Console index 3ba151164..ce2ca83b4 160000 --- a/Aaru.Console +++ b/Aaru.Console @@ -1 +1 @@ -Subproject commit 3ba151164e1bb23c879c198b9433a2ceb06bfc5f +Subproject commit ce2ca83b494a2db3eb9a732c07ce5a4feb5626e4 diff --git a/Aaru.Core/Aaru.Core.csproj b/Aaru.Core/Aaru.Core.csproj index f38ed8599..57bf2e9c4 100644 --- a/Aaru.Core/Aaru.Core.csproj +++ b/Aaru.Core/Aaru.Core.csproj @@ -17,8 +17,8 @@ Aaru Data Preservation Suite Aaru.Core $(Version) - netcoreapp3.1 - 8 + net6 + 10 Contains core algorithms used by the Aaru Data Preservation Suite. https://github.com/aaru-dps/ GPL-3.0-or-later @@ -29,6 +29,7 @@ true snupkg Natalia Portillo <claunia@claunia.com> + true $(Version)+{chash:8} diff --git a/Aaru.Core/Sidecar/Files.cs b/Aaru.Core/Sidecar/Files.cs index 6b155d7cf..d842ee802 100644 --- 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 directories = new List(); - List files = new List(); + List directories = new(); + List files = new(); foreach(string dirent in dirents) { @@ -155,8 +155,8 @@ namespace Aaru.Core if(ret != Errno.NoError) return null; - List directories = new List(); - List files = new List(); + List directories = new(); + List files = new(); foreach(string dirent in dirents) { @@ -297,7 +297,7 @@ namespace Aaru.Core if(ret != Errno.NoError) return file; - List xattrTypes = new List(); + List xattrTypes = new(); foreach(string xattr in xattrs) { diff --git a/Aaru.Database/Aaru.Database.csproj b/Aaru.Database/Aaru.Database.csproj index 7417640ff..2e6d5c075 100644 --- a/Aaru.Database/Aaru.Database.csproj +++ b/Aaru.Database/Aaru.Database.csproj @@ -16,8 +16,8 @@ Aaru Data Preservation Suite Aaru.Database $(Version) - netcoreapp3.1 - 8 + net6 + 10 Database models used by the Aaru Data Preservation Suite. https://github.com/aaru-dps/ LGPL-2.1-only @@ -28,6 +28,7 @@ true snupkg Natalia Portillo <claunia@claunia.com> + true $(Version)+{chash:8} @@ -53,7 +54,7 @@ false - + @@ -61,111 +62,114 @@ - - - - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + diff --git a/Aaru.Decoders b/Aaru.Decoders index 4568b67cf..51c8224fc 160000 --- a/Aaru.Decoders +++ b/Aaru.Decoders @@ -1 +1 @@ -Subproject commit 4568b67cf3cf51062021699a1f96eeb93bb4d252 +Subproject commit 51c8224fce0019183bce1655e2091a3f85501d45 diff --git a/Aaru.Decryption b/Aaru.Decryption index 6b04c4eb0..98912c842 160000 --- a/Aaru.Decryption +++ b/Aaru.Decryption @@ -1 +1 @@ -Subproject commit 6b04c4eb0649f1bf4320ef45935ef55c52339d1d +Subproject commit 98912c8425c8877f245bfa269e6bc1dbda0c150c diff --git a/Aaru.Devices/Aaru.Devices.csproj b/Aaru.Devices/Aaru.Devices.csproj index c4a7a42d9..87ab1be2a 100644 --- a/Aaru.Devices/Aaru.Devices.csproj +++ b/Aaru.Devices/Aaru.Devices.csproj @@ -17,8 +17,8 @@ Aaru Data Preservation Suite Aaru.Devices $(Version) - netcoreapp3.1 - 8 + net6 + 10 Media device hardware interface implementation used by the Aaru Data Preservation Suite. https://github.com/aaru-dps/ LGPL-2.1-only @@ -29,6 +29,7 @@ true snupkg Natalia Portillo <claunia@claunia.com> + true $(Version)+{chash:8} @@ -55,87 +56,87 @@ false - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - + + + + - + {CCAA7AFE-C094-4D82-A66D-630DE8A3F545} Aaru.Console diff --git a/Aaru.Dto b/Aaru.Dto index ca6dc718e..53856c274 160000 --- a/Aaru.Dto +++ b/Aaru.Dto @@ -1 +1 @@ -Subproject commit ca6dc718e09ab849ffb503ee10ceb426cefd5596 +Subproject commit 53856c274a5aa7874e30f9415ea2dd93acc26bdf diff --git a/Aaru.Filesystems/Aaru.Filesystems.csproj b/Aaru.Filesystems/Aaru.Filesystems.csproj index 3f9105cac..322a37e29 100644 --- a/Aaru.Filesystems/Aaru.Filesystems.csproj +++ b/Aaru.Filesystems/Aaru.Filesystems.csproj @@ -17,9 +17,9 @@ Aaru Data Preservation Suite Aaru.Filesystems $(Version) - netcoreapp3.1 + net6 CS0649 - 8 + 10 Filesystem implementations used by the Aaru Data Preservation Suite. https://github.com/aaru-dps/ LGPL-2.1-only @@ -30,6 +30,7 @@ true snupkg Natalia Portillo <claunia@claunia.com> + true $(Version)+{chash:8} diff --git a/Aaru.Filesystems/AppleDOS/AppleDOS.cs b/Aaru.Filesystems/AppleDOS/AppleDOS.cs index 29a8f5eb3..9135a885b 100644 --- a/Aaru.Filesystems/AppleDOS/AppleDOS.cs +++ b/Aaru.Filesystems/AppleDOS/AppleDOS.cs @@ -60,7 +60,7 @@ namespace Aaru.Filesystems /// public string Name => "Apple DOS File System"; /// - public Guid Id => new Guid("8658A1E9-B2E7-4BCC-9638-157A31B0A700\n"); + public Guid Id => new("8658A1E9-B2E7-4BCC-9638-157A31B0A700\n"); /// public string Author => "Natalia Portillo"; @@ -72,7 +72,7 @@ namespace Aaru.Filesystems /// public Dictionary Namespaces => null; - static Dictionary GetDefaultOptions() => new Dictionary + static Dictionary GetDefaultOptions() => new() { { "debug", false.ToString() diff --git a/Aaru.Filesystems/AppleMFS/AppleMFS.cs b/Aaru.Filesystems/AppleMFS/AppleMFS.cs index c3e557c54..4ad5587bd 100644 --- a/Aaru.Filesystems/AppleMFS/AppleMFS.cs +++ b/Aaru.Filesystems/AppleMFS/AppleMFS.cs @@ -67,7 +67,7 @@ namespace Aaru.Filesystems /// public string Name => "Apple Macintosh File System"; /// - public Guid Id => new Guid("36405F8D-0D26-4066-6538-5DBF5D065C3A"); + public Guid Id => new("36405F8D-0D26-4066-6538-5DBF5D065C3A"); /// public Encoding Encoding { get; private set; } /// @@ -82,7 +82,7 @@ namespace Aaru.Filesystems /// public Dictionary Namespaces => null; - static Dictionary GetDefaultOptions() => new Dictionary + static Dictionary GetDefaultOptions() => new() { { "debug", false.ToString() diff --git a/Aaru.Filesystems/CPM/CPM.cs b/Aaru.Filesystems/CPM/CPM.cs index 2829c15c2..489ad146a 100644 --- a/Aaru.Filesystems/CPM/CPM.cs +++ b/Aaru.Filesystems/CPM/CPM.cs @@ -88,7 +88,7 @@ namespace Aaru.Filesystems /// public string Name => "CP/M File System"; /// - public Guid Id => new Guid("AA2B8585-41DF-4E3B-8A35-D1A935E2F8A1"); + public Guid Id => new("AA2B8585-41DF-4E3B-8A35-D1A935E2F8A1"); /// public string Author => "Natalia Portillo"; @@ -100,7 +100,7 @@ namespace Aaru.Filesystems /// public Dictionary Namespaces => null; - static Dictionary GetDefaultOptions() => new Dictionary + static Dictionary GetDefaultOptions() => new() { { "debug", false.ToString() diff --git a/Aaru.Filesystems/FAT/FAT.cs b/Aaru.Filesystems/FAT/FAT.cs index 9c765561d..a8ceebf32 100644 --- a/Aaru.Filesystems/FAT/FAT.cs +++ b/Aaru.Filesystems/FAT/FAT.cs @@ -74,7 +74,7 @@ namespace Aaru.Filesystems /// public string Name => "Microsoft File Allocation Table"; /// - public Guid Id => new Guid("33513B2C-0D26-0D2D-32C3-79D8611158E0"); + public Guid Id => new("33513B2C-0D26-0D2D-32C3-79D8611158E0"); /// public string Author => "Natalia Portillo"; @@ -84,7 +84,7 @@ namespace Aaru.Filesystems {}; /// - public Dictionary Namespaces => new Dictionary + public Dictionary Namespaces => new() { { "dos", "DOS (8.3 all uppercase)" @@ -103,7 +103,7 @@ namespace Aaru.Filesystems } }; - static Dictionary GetDefaultOptions() => new Dictionary + static Dictionary GetDefaultOptions() => new() { { "debug", false.ToString() diff --git a/Aaru.Filesystems/FATX/FATX.cs b/Aaru.Filesystems/FATX/FATX.cs index 8f7c8a961..cde5812d0 100644 --- a/Aaru.Filesystems/FATX/FATX.cs +++ b/Aaru.Filesystems/FATX/FATX.cs @@ -67,7 +67,7 @@ namespace Aaru.Filesystems /// public string Name => "FATX Filesystem Plugin"; /// - public Guid Id => new Guid("ED27A721-4A17-4649-89FD-33633B46E228"); + public Guid Id => new("ED27A721-4A17-4649-89FD-33633B46E228"); /// public string Author => "Natalia Portillo"; @@ -98,7 +98,7 @@ namespace Aaru.Filesystems /// public Dictionary Namespaces => null; - static Dictionary GetDefaultOptions() => new Dictionary + static Dictionary GetDefaultOptions() => new() { { "debug", false.ToString() diff --git a/Aaru.Filesystems/ISO9660/ISO9660.cs b/Aaru.Filesystems/ISO9660/ISO9660.cs index d9b81c5c0..4ab3be388 100644 --- a/Aaru.Filesystems/ISO9660/ISO9660.cs +++ b/Aaru.Filesystems/ISO9660/ISO9660.cs @@ -69,7 +69,7 @@ namespace Aaru.Filesystems /// public string Name => "ISO9660 Filesystem"; /// - public Guid Id => new Guid("d812f4d3-c357-400d-90fd-3b22ef786aa8"); + public Guid Id => new("d812f4d3-c357-400d-90fd-3b22ef786aa8"); /// public string Author => "Natalia Portillo"; @@ -84,7 +84,7 @@ namespace Aaru.Filesystems }; /// - public Dictionary Namespaces => new Dictionary + public Dictionary Namespaces => new() { { "normal", "Primary Volume Descriptor, ignoring ;1 suffixes" @@ -103,7 +103,7 @@ namespace Aaru.Filesystems } }; - static Dictionary GetDefaultOptions() => new Dictionary + static Dictionary GetDefaultOptions() => new() { { "debug", false.ToString() diff --git a/Aaru.Filesystems/ISO9660/Super.cs b/Aaru.Filesystems/ISO9660/Super.cs index 7b4cbfe76..429b72bbe 100644 --- a/Aaru.Filesystems/ISO9660/Super.cs +++ b/Aaru.Filesystems/ISO9660/Super.cs @@ -122,11 +122,11 @@ namespace Aaru.Filesystems hsOff = 8; _cdi = false; - List bvdSectors = new List(); - List pvdSectors = new List(); - List svdSectors = new List(); - List evdSectors = new List(); - List vpdSectors = new List(); + List bvdSectors = new(); + List pvdSectors = new(); + List svdSectors = new(); + List evdSectors = new(); + List vpdSectors = new(); while(true) { diff --git a/Aaru.Filesystems/LisaFS/Dir.cs b/Aaru.Filesystems/LisaFS/Dir.cs index f31499c61..07318aafc 100644 --- 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 catalogV2 = new List(); + List 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 catalogBlocks = new List + List catalogBlocks = new() { firstCatalogBlock }; diff --git a/Aaru.Filesystems/LisaFS/LisaFS.cs b/Aaru.Filesystems/LisaFS/LisaFS.cs index da22cabb7..a898c1e6b 100644 --- a/Aaru.Filesystems/LisaFS/LisaFS.cs +++ b/Aaru.Filesystems/LisaFS/LisaFS.cs @@ -55,7 +55,7 @@ namespace Aaru.Filesystems.LisaFS /// public string Name => "Apple Lisa File System"; /// - public Guid Id => new Guid("7E6034D1-D823-4248-A54D-239742B28391"); + public Guid Id => new("7E6034D1-D823-4248-A54D-239742B28391"); /// public Encoding Encoding { get; private set; } /// @@ -70,7 +70,7 @@ namespace Aaru.Filesystems.LisaFS {}; /// - public Dictionary Namespaces => new Dictionary + public Dictionary Namespaces => new() { { "workshop", "Filenames as shown by the Lisa Pascal Workshop (default)" @@ -80,7 +80,7 @@ namespace Aaru.Filesystems.LisaFS } }; - static Dictionary GetDefaultOptions() => new Dictionary + static Dictionary GetDefaultOptions() => new() { { "debug", false.ToString() diff --git a/Aaru.Filesystems/Opera/Opera.cs b/Aaru.Filesystems/Opera/Opera.cs index 6ef1a4b43..23177d550 100644 --- a/Aaru.Filesystems/Opera/Opera.cs +++ b/Aaru.Filesystems/Opera/Opera.cs @@ -58,7 +58,7 @@ namespace Aaru.Filesystems /// public string Name => "Opera Filesystem Plugin"; /// - public Guid Id => new Guid("0ec84ec7-eae6-4196-83fe-943b3fe46dbd"); + public Guid Id => new("0ec84ec7-eae6-4196-83fe-943b3fe46dbd"); /// public string Author => "Natalia Portillo"; @@ -89,7 +89,7 @@ namespace Aaru.Filesystems /// public Dictionary Namespaces => null; - static Dictionary GetDefaultOptions() => new Dictionary + static Dictionary GetDefaultOptions() => new() { { "debug", false.ToString() diff --git a/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs b/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs index 1f7f0521c..043996286 100644 --- a/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs +++ b/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs @@ -59,7 +59,7 @@ namespace Aaru.Filesystems.UCSDPascal /// public string Name => "U.C.S.D. Pascal filesystem"; /// - public Guid Id => new Guid("B0AC2CB5-72AA-473A-9200-270B5A2C2D53"); + public Guid Id => new("B0AC2CB5-72AA-473A-9200-270B5A2C2D53"); /// public Encoding Encoding { get; private set; } /// @@ -92,7 +92,7 @@ namespace Aaru.Filesystems.UCSDPascal /// public Dictionary Namespaces => null; - static Dictionary GetDefaultOptions() => new Dictionary + static Dictionary GetDefaultOptions() => new() { { "debug", false.ToString() diff --git a/Aaru.Filters/Aaru.Filters.csproj b/Aaru.Filters/Aaru.Filters.csproj index 6552a7fcf..c6b224865 100644 --- a/Aaru.Filters/Aaru.Filters.csproj +++ b/Aaru.Filters/Aaru.Filters.csproj @@ -17,8 +17,8 @@ Aaru Data Preservation Suite Aaru.Filters $(Version) - netcoreapp3.1 - 8 + net6 + 10 File filters used by the Aaru Data Preservation Suite. https://github.com/aaru-dps/ LGPL-2.1-only @@ -29,6 +29,7 @@ true snupkg Natalia Portillo <claunia@claunia.com> + true $(Version)+{chash:8} diff --git a/Aaru.Gui/Aaru.Gui.csproj b/Aaru.Gui/Aaru.Gui.csproj index 9933e3f89..6fbf00ab5 100644 --- a/Aaru.Gui/Aaru.Gui.csproj +++ b/Aaru.Gui/Aaru.Gui.csproj @@ -10,10 +10,11 @@ Aaru Data Preservation Suite Aaru Data Preservation Suite $(Version) - netcoreapp3.1 + net6 CS0649,CS0169 - 8 + 10 Natalia Portillo <claunia@claunia.com> + true $(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified} @@ -21,306 +22,306 @@ true - - - - - - - - - + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + %(Filename) Designer - + Designer @@ -416,7 +417,7 @@ - + diff --git a/Aaru.Gui/ViewModels/Dialogs/AboutViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/AboutViewModel.cs index 80007a913..4516efa53 100644 --- 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(); } diff --git a/Aaru.Helpers b/Aaru.Helpers index bbd634f68..c01b2bd3e 160000 --- a/Aaru.Helpers +++ b/Aaru.Helpers @@ -1 +1 @@ -Subproject commit bbd634f686da43f0c4968f04be056fc139b4daf1 +Subproject commit c01b2bd3e697c186fec0920a5bd163b29b56f955 diff --git a/Aaru.Images/Aaru.Images.csproj b/Aaru.Images/Aaru.Images.csproj index 7a2394001..1c36124cd 100644 --- a/Aaru.Images/Aaru.Images.csproj +++ b/Aaru.Images/Aaru.Images.csproj @@ -17,9 +17,9 @@ Aaru Data Preservation Suite Aaru.DiscImages $(Version) - netcoreapp3.1 + net6 CS0649 - 8 + 10 Media image formats used by the Aaru Data Preservation Suite. https://github.com/aaru-dps/ LGPL-2.1-only @@ -30,6 +30,7 @@ true snupkg Natalia Portillo <claunia@claunia.com> + true $(Version)+{chash:8} diff --git a/Aaru.Partitions/Aaru.Partitions.csproj b/Aaru.Partitions/Aaru.Partitions.csproj index 265eab9b9..4fb623807 100644 --- a/Aaru.Partitions/Aaru.Partitions.csproj +++ b/Aaru.Partitions/Aaru.Partitions.csproj @@ -17,9 +17,9 @@ Aaru Data Preservation Suite Aaru.Partitions $(Version) - netcoreapp3.1 + net6 CS0649 - 8 + 10 Partitioning schemes implemented by the Aaru Data Preservation Suite. https://github.com/aaru-dps/ LGPL-2.1-only @@ -30,6 +30,7 @@ true snupkg Natalia Portillo <claunia@claunia.com> + true $(Version)+{chash:8} diff --git a/Aaru.Settings/Aaru.Settings.csproj b/Aaru.Settings/Aaru.Settings.csproj index 8d0d62350..8dfc7fa28 100644 --- a/Aaru.Settings/Aaru.Settings.csproj +++ b/Aaru.Settings/Aaru.Settings.csproj @@ -17,8 +17,8 @@ Aaru Data Preservation Suite Aaru.Settings $(Version) - netcoreapp3.1 - 8 + net6 + 10 Settings interface used by the Aaru Data Preservation Suite. https://github.com/aaru-dps/ LGPL-2.1-only @@ -29,6 +29,7 @@ true snupkg Natalia Portillo <claunia@claunia.com> + true $(Version)+{chash:8} @@ -53,14 +54,14 @@ false - - + + ..\packages\plist-cil.1.16.0\lib\net40\plist-cil.dll - + @@ -68,20 +69,20 @@ - + - - - + + + - - - + + + diff --git a/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj b/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj index 29698bfdc..3a990c0f0 100644 --- a/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj +++ b/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj @@ -9,7 +9,7 @@ Aaru.Tests.Devices $(Version) false - netcoreapp3.1 + net6 true 6.0.0-alpha6 Claunia.com @@ -17,8 +17,9 @@ Aaru Data Preservation Suite Aaru.Tests.Devices $(Version) - 8 + 10 Natalia Portillo <claunia@claunia.com> + true $(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified} diff --git a/Aaru.Tests/Aaru.Tests.csproj b/Aaru.Tests/Aaru.Tests.csproj index 0c6228e5d..8cba931ca 100644 --- a/Aaru.Tests/Aaru.Tests.csproj +++ b/Aaru.Tests/Aaru.Tests.csproj @@ -1,12 +1,13 @@ - netcoreapp3.1 + net6 false - 8 + 10 Natalia Portillo <claunia@claunia.com> + true @@ -15,7 +16,7 @@ - + diff --git a/Aaru/Aaru.csproj b/Aaru/Aaru.csproj index 8c7021e07..da7504d84 100644 --- a/Aaru/Aaru.csproj +++ b/Aaru/Aaru.csproj @@ -10,7 +10,7 @@ aaru $(Version) false - netcoreapp3.1 + net6 true 6.0.0-alpha6 Claunia.com @@ -20,7 +20,8 @@ $(Version) 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 true - 8 + 10 + true $(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified} @@ -262,10 +263,10 @@ - + - + diff --git a/Aaru/Commands/Filesystem/Ls.cs b/Aaru/Commands/Filesystem/Ls.cs index ca13ce376..2826eaacd 100644 --- a/Aaru/Commands/Filesystem/Ls.cs +++ b/Aaru/Commands/Filesystem/Ls.cs @@ -325,7 +325,7 @@ namespace Aaru.Commands.Filesystem return; } - Dictionary stats = new Dictionary(); + Dictionary stats = new(); foreach(string entry in directory) { diff --git a/README.md b/README.md index 95479bf90..72d49ec29 100644 --- 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