diff --git a/Aaru.Checksums b/Aaru.Checksums index b2612422a..293a9bc26 160000 --- a/Aaru.Checksums +++ b/Aaru.Checksums @@ -1 +1 @@ -Subproject commit b2612422abea422c4b07419b45fd032b5b11801f +Subproject commit 293a9bc264a614deb2dcb5e4b700c59c999a65d2 diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes index 1389baf6b..c84f5791c 160000 --- a/Aaru.CommonTypes +++ b/Aaru.CommonTypes @@ -1 +1 @@ -Subproject commit 1389baf6b2742edf9e90beb83905571185524817 +Subproject commit c84f5791c61efa244c59454b51e73edaa85f8cd4 diff --git a/Aaru.Compression/Aaru.Compression.csproj b/Aaru.Compression/Aaru.Compression.csproj index 859759591..9a675e1c2 100644 --- a/Aaru.Compression/Aaru.Compression.csproj +++ b/Aaru.Compression/Aaru.Compression.csproj @@ -12,7 +12,7 @@ $(Version) false true - 5.0.99.2991 + 5.1.0.3214 Claunia.com Copyright © 2011-2020 Natalia Portillo Aaru Data Preservation Suite diff --git a/Aaru.Console b/Aaru.Console index fa739c475..dbe94a0da 160000 --- a/Aaru.Console +++ b/Aaru.Console @@ -1 +1 @@ -Subproject commit fa739c475178569a06e666368a76a82ca0fab81c +Subproject commit dbe94a0da20bbe67ea96dbaa6fd0fbb9c4b0c774 diff --git a/Aaru.Core/Aaru.Core.csproj b/Aaru.Core/Aaru.Core.csproj index 4cd21df4d..e4fc78373 100644 --- a/Aaru.Core/Aaru.Core.csproj +++ b/Aaru.Core/Aaru.Core.csproj @@ -11,7 +11,7 @@ $(Version) false true - 5.0.99.2991 + 5.1.0.3214 Claunia.com Copyright © 2011-2020 Natalia Portillo Aaru Data Preservation Suite diff --git a/Aaru.Database/Aaru.Database.csproj b/Aaru.Database/Aaru.Database.csproj index ef718acc0..870ca782f 100644 --- a/Aaru.Database/Aaru.Database.csproj +++ b/Aaru.Database/Aaru.Database.csproj @@ -10,7 +10,7 @@ $(Version) false true - 5.0.99.2991 + 5.1.0.3214 Claunia.com Copyright © 2011-2020 Natalia Portillo Aaru Data Preservation Suite diff --git a/Aaru.Decoders b/Aaru.Decoders index b52d62376..21610ea7a 160000 --- a/Aaru.Decoders +++ b/Aaru.Decoders @@ -1 +1 @@ -Subproject commit b52d623764d463e4e0dd4142bc0b4bc51203e194 +Subproject commit 21610ea7a0e01b91e53dd5602e4a6f62e96830b3 diff --git a/Aaru.Devices/Aaru.Devices.csproj b/Aaru.Devices/Aaru.Devices.csproj index 7889ee7cc..346d38318 100644 --- a/Aaru.Devices/Aaru.Devices.csproj +++ b/Aaru.Devices/Aaru.Devices.csproj @@ -11,7 +11,7 @@ $(Version) false true - 5.0.99.2991 + 5.1.0.3214 Claunia.com Copyright © 2011-2020 Natalia Portillo Aaru Data Preservation Suite diff --git a/Aaru.Dto b/Aaru.Dto index ae5a792fe..9627e9283 160000 --- a/Aaru.Dto +++ b/Aaru.Dto @@ -1 +1 @@ -Subproject commit ae5a792feca2b9b9f6a9b02c3a95ac917616ff96 +Subproject commit 9627e9283bc9a296b0cfedea3f2a0a19c5546d7d diff --git a/Aaru.Filesystems/Aaru.Filesystems.csproj b/Aaru.Filesystems/Aaru.Filesystems.csproj index 1321b4ce5..003394ece 100644 --- a/Aaru.Filesystems/Aaru.Filesystems.csproj +++ b/Aaru.Filesystems/Aaru.Filesystems.csproj @@ -11,7 +11,7 @@ $(Version) false true - 5.0.99.2991 + 5.1.0.3214 Claunia.com Copyright © 2011-2020 Natalia Portillo Aaru Data Preservation Suite diff --git a/Aaru.Filters/Aaru.Filters.csproj b/Aaru.Filters/Aaru.Filters.csproj index f074cefee..3c77968c8 100644 --- a/Aaru.Filters/Aaru.Filters.csproj +++ b/Aaru.Filters/Aaru.Filters.csproj @@ -11,7 +11,7 @@ $(Version) false true - 5.0.99.2991 + 5.1.0.3214 Claunia.com Copyright © 2011-2020 Natalia Portillo Aaru Data Preservation Suite diff --git a/Aaru.Gui/Aaru.Gui.csproj b/Aaru.Gui/Aaru.Gui.csproj index 75e8aab53..6e7bc6b11 100644 --- a/Aaru.Gui/Aaru.Gui.csproj +++ b/Aaru.Gui/Aaru.Gui.csproj @@ -4,7 +4,7 @@ Aaru.Gui $(Version) true - 5.99.0.2990 + 5.99.0.3214 Claunia.com Copyright © 2011-2020 Natalia Portillo Aaru Data Preservation Suite diff --git a/Aaru.Helpers b/Aaru.Helpers index 430db71b3..48929629b 160000 --- a/Aaru.Helpers +++ b/Aaru.Helpers @@ -1 +1 @@ -Subproject commit 430db71b374e4e65cb74a2db5d3fcc92bf6276fe +Subproject commit 48929629bdddc02b493653177def673d5ddacc93 diff --git a/Aaru.Images/Aaru.Images.csproj b/Aaru.Images/Aaru.Images.csproj index 94cd402e7..101991c8d 100644 --- a/Aaru.Images/Aaru.Images.csproj +++ b/Aaru.Images/Aaru.Images.csproj @@ -11,7 +11,7 @@ $(Version) false true - 5.0.99.2991 + 5.1.0.3214 Claunia.com Copyright © 2011-2020 Natalia Portillo Aaru Data Preservation Suite diff --git a/Aaru.Partitions/Aaru.Partitions.csproj b/Aaru.Partitions/Aaru.Partitions.csproj index a4c35bb25..783f4a38b 100644 --- a/Aaru.Partitions/Aaru.Partitions.csproj +++ b/Aaru.Partitions/Aaru.Partitions.csproj @@ -11,7 +11,7 @@ $(Version) false true - 5.0.99.2991 + 5.1.0.3214 Claunia.com Copyright © 2011-2020 Natalia Portillo Aaru Data Preservation Suite diff --git a/Aaru.Settings/Aaru.Settings.csproj b/Aaru.Settings/Aaru.Settings.csproj index 013ee1d58..fd0f4f8b5 100644 --- a/Aaru.Settings/Aaru.Settings.csproj +++ b/Aaru.Settings/Aaru.Settings.csproj @@ -11,7 +11,7 @@ $(Version) false true - 5.0.99.2991 + 5.1.0.3214 Claunia.com Copyright © 2011-2020 Natalia Portillo Aaru Data Preservation Suite diff --git a/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj b/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj index f02cbd35a..6f006f6a6 100644 --- a/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj +++ b/Aaru.Tests.Devices/Aaru.Tests.Devices.csproj @@ -11,7 +11,7 @@ false netcoreapp3.1 true - 4.5.99.1693 + 5.1.0.3214 Claunia.com Copyright © 2011-2020 Natalia Portillo Aaru Data Preservation Suite diff --git a/Aaru/Aaru.csproj b/Aaru/Aaru.csproj index a12471f5d..5355f651d 100644 --- a/Aaru/Aaru.csproj +++ b/Aaru/Aaru.csproj @@ -12,7 +12,7 @@ false netcoreapp3.1 true - 5.0.99.2991 + 5.1.0.3214 Claunia.com Copyright © 2011-2020 Natalia Portillo Aaru Data Preservation Suite @@ -22,11 +22,13 @@ true 8 + True full @@ -201,7 +203,9 @@ Aaru.Checksums + {F8BDF57B-1571-4CD0-84B3-B422088D359A} Aaru.Helpers @@ -274,7 +278,9 @@ + @@ -300,7 +306,7 @@ - 5.0.99.2991-1 + 5.1.0.3214-1 aaru Natalia Portillo <claunia@claunia.com>
net
diff --git a/Aaru/Commands/Device/List.cs b/Aaru/Commands/Device/List.cs index ad1491b52..772aa3c31 100644 --- a/Aaru/Commands/Device/List.cs +++ b/Aaru/Commands/Device/List.cs @@ -37,7 +37,6 @@ using Aaru.CommonTypes.Enums; using Aaru.Console; using Aaru.Core; using Aaru.Devices; -using JetBrains.Annotations; namespace Aaru.Commands.Device { @@ -55,7 +54,7 @@ namespace Aaru.Commands.Device Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke))); } - public static int Invoke(bool debug, bool verbose, [CanBeNull] string aaruRemoteHost) + public static int Invoke(bool debug, bool verbose, string aaruRemoteHost) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Filesystem/ExtractFiles.cs b/Aaru/Commands/Filesystem/ExtractFiles.cs index 4afb19761..c5c0d9987 100644 --- a/Aaru/Commands/Filesystem/ExtractFiles.cs +++ b/Aaru/Commands/Filesystem/ExtractFiles.cs @@ -42,7 +42,6 @@ using Aaru.CommonTypes.Interfaces; using Aaru.CommonTypes.Structs; using Aaru.Console; using Aaru.Core; -using JetBrains.Annotations; using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes; namespace Aaru.Commands.Filesystem @@ -337,8 +336,8 @@ namespace Aaru.Commands.Filesystem return (int)ErrorNumber.NoError; } - static void ExtractFilesInDir(string path, [NotNull] IReadOnlyFilesystem fs, string volumeName, - string outputDir, bool doXattrs) + static void ExtractFilesInDir(string path, IReadOnlyFilesystem fs, string volumeName, string outputDir, + bool doXattrs) { if(path.StartsWith('/')) path = path.Substring(1); diff --git a/Aaru/Commands/Filesystem/Ls.cs b/Aaru/Commands/Filesystem/Ls.cs index 3617e1fc7..6a19c8f13 100644 --- a/Aaru/Commands/Filesystem/Ls.cs +++ b/Aaru/Commands/Filesystem/Ls.cs @@ -42,7 +42,6 @@ using Aaru.CommonTypes.Interfaces; using Aaru.CommonTypes.Structs; using Aaru.Console; using Aaru.Core; -using JetBrains.Annotations; namespace Aaru.Commands.Filesystem { @@ -310,7 +309,7 @@ namespace Aaru.Commands.Filesystem return (int)ErrorNumber.NoError; } - static void ListFilesInDir(string path, [NotNull] IReadOnlyFilesystem fs, bool longFormat) + static void ListFilesInDir(string path, IReadOnlyFilesystem fs, bool longFormat) { if(path.StartsWith('/')) path = path.Substring(1); diff --git a/Aaru/Commands/Filesystem/Options.cs b/Aaru/Commands/Filesystem/Options.cs index 580692eb4..6025ad19e 100644 --- a/Aaru/Commands/Filesystem/Options.cs +++ b/Aaru/Commands/Filesystem/Options.cs @@ -40,7 +40,6 @@ using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; using Aaru.Console; using Aaru.Core; -using JetBrains.Annotations; namespace Aaru.Commands.Filesystem { @@ -87,8 +86,7 @@ namespace Aaru.Commands.Filesystem return (int)ErrorNumber.NoError; } - [NotNull] - static string TypeToString([NotNull] Type type) + static string TypeToString(Type type) { if(type == typeof(bool)) return "boolean"; diff --git a/Aaru/Commands/Image/CreateSidecar.cs b/Aaru/Commands/Image/CreateSidecar.cs index 2cdb85b3c..6a85913f9 100644 --- a/Aaru/Commands/Image/CreateSidecar.cs +++ b/Aaru/Commands/Image/CreateSidecar.cs @@ -43,7 +43,6 @@ using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; using Aaru.Console; using Aaru.Core; -using JetBrains.Annotations; using Schemas; namespace Aaru.Commands.Image @@ -91,8 +90,8 @@ namespace Aaru.Commands.Image Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke))); } - public static int Invoke(bool debug, bool verbose, uint blockSize, [CanBeNull] string encodingName, - string imagePath, bool tape) + public static int Invoke(bool debug, bool verbose, uint blockSize, string encodingName, string imagePath, + bool tape) { MainClass.PrintCopyright(); diff --git a/Aaru/Commands/Image/Options.cs b/Aaru/Commands/Image/Options.cs index 1a826187a..bb78b8251 100644 --- a/Aaru/Commands/Image/Options.cs +++ b/Aaru/Commands/Image/Options.cs @@ -40,7 +40,6 @@ using Aaru.CommonTypes.Enums; using Aaru.CommonTypes.Interfaces; using Aaru.Console; using Aaru.Core; -using JetBrains.Annotations; namespace Aaru.Commands.Image { @@ -89,8 +88,7 @@ namespace Aaru.Commands.Image return (int)ErrorNumber.NoError; } - [NotNull] - static string TypeToString([NotNull] Type type) + static string TypeToString(Type type) { if(type == typeof(bool)) return "boolean"; diff --git a/Aaru/Info.plist b/Aaru/Info.plist index 45c843c09..b4a34bc06 100644 --- a/Aaru/Info.plist +++ b/Aaru/Info.plist @@ -15,7 +15,7 @@ CFBundleIdentifier app.aaru CFBundleShortVersionString - 5.99.0.2990-alpha2 + 5.99.0.3214-alpha3 CFBundleExecutable aaru LSExecutableArchitectures diff --git a/Aaru/Main.cs b/Aaru/Main.cs index 15797e4ef..cc5925bef 100644 --- a/Aaru/Main.cs +++ b/Aaru/Main.cs @@ -67,13 +67,13 @@ namespace Aaru as AssemblyInformationalVersionAttribute; _assemblyCopyright = ((AssemblyCopyrightAttribute)attributes[0]).Copyright; - +/* if(args.Length == 1 && args[0].ToLowerInvariant() == "gui") { return Gui.Main.Start(args); } - +*/ AaruConsole.WriteLineEvent += System.Console.WriteLine; AaruConsole.WriteEvent += System.Console.Write; AaruConsole.ErrorWriteLineEvent += System.Console.Error.WriteLine; diff --git a/Changelog.md b/Changelog.md index 539cd5650..6aaefbcc9 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,4 +1,4 @@ -# [5.1.0.xxxx] - 2020-07-xx +# [5.1.0.3214] - 2020-07-25 ## Added ### - Aaru Image Format - Save Compact Disc track indexes in. @@ -1355,6 +1355,7 @@ Aaru.Server (previously DiscImageChef.Server), aaruformat (previously dicformat) - Master Boot Record (aka MBR). - NeXT disklabels. +[5.1.0.3214]: https://github.com/aaru-dps/Aaru/releases/tag/v5.1.0.3214 [5.0.1.2884]: https://github.com/aaru-dps/Aaru/releases/tag/v5.0.1.2884 [5.0.0.2879]: https://github.com/aaru-dps/Aaru/releases/tag/v5.0.0.2879 [4.5.1.1692]: https://github.com/aaru-dps/Aaru/releases/tag/v4.5.1.1692 diff --git a/README.md b/README.md index f4372a3b5..a81b15d0b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Aaru Data Preservation Suite v5.0.99.2991 +Aaru Data Preservation Suite v5.1.0.3214 Aaru diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 index 2fc3e212d..78ef6bbf2 --- a/build.sh +++ b/build.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -AARU_VERSION=5.0.99.2991 +AARU_VERSION=5.1.0.3214 OS_NAME=`uname` mkdir -p build diff --git a/pkg/pacman/rolling/PKGBUILD b/pkg/pacman/rolling/PKGBUILD index 1246ad964..bcf7cdf89 100644 --- a/pkg/pacman/rolling/PKGBUILD +++ b/pkg/pacman/rolling/PKGBUILD @@ -5,7 +5,7 @@ _aarubase='Aaru' packager='Natalia Portillo ' pkgbase='aaru-git' pkgname=('aaru-git') -pkgver=v5.1.99.2967.r1190.g4decb6d4 +pkgver=v5.1.99.3214.r1190.g4decb6d4 pkgrel=1 pkgdesc='Disc image management and creation tool for disks, tapes, optical and solid state media' arch=('x86_64' 'armv7h' 'aarch64') @@ -39,18 +39,16 @@ prepare() { build() { cd "${srcdir}"/"${_aarubase}" - dotnet restore Aaru.sln - dotnet build -f ${_netcoretarget} -c Debug Aaru.sln - dotnet publish -f ${_netcoretarget} -c Debug --self-contained -r ${dotnet_rid} Aaru.sln + dotnet publish -f ${_netcoretarget} -c Debug --self-contained -r ${dotnet_rid} } package() { # Install MIME database file - cd "${srcdir}"/Aaru + cd "${srcdir}"/"${_aarubase}" install -d -m0755 -g 0 "${pkgdir}"/usr/share/mime/packages install -m0755 -g 0 -t "${pkgdir}"/usr/share/mime/packages aaruformat.xml - cd "${srcdir}"/"${_aarubase}"/Aaru/bin/Debug/${_netcoretarget}/${dotnet_rid}/publish + cd "${srcdir}"/"${_aarubase}"/bin/Debug/${_netcoretarget}/${dotnet_rid}/publish # Create destination directory install -d -m0755 -g 0 "${pkgdir}"/opt/Aaru @@ -62,7 +60,6 @@ package() { install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru *.so install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru *.a install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru createdump - install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru sosdocsunix.txt # Copy .NET dependencies install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru *.dll diff --git a/pkg/pacman/stable/PKGBUILD b/pkg/pacman/stable/PKGBUILD index 5e98ab63b..1904feef6 100644 --- a/pkg/pacman/stable/PKGBUILD +++ b/pkg/pacman/stable/PKGBUILD @@ -1,16 +1,17 @@ # Maintainer: Natalia Portillo packager='Natalia Portillo ' -_netcoretarget='netcoreapp2.1' +_netcoretarget='netcoreapp3.1' +_aarubase='Aaru' pkgname='aaru' -pkgver=5.0.0.2879 +pkgver=5.1.0.3214 pkgrel=1 pkgdesc='Disc image management and creation tool for disks, tapes, optical and solid state media' arch=('x86_64' 'armv7h' 'aarch64') url='http://www.aaru.app' license=('GPL') -source=('aaru-src-5.0.0.2879.tar.xz::local://aaru-src-5.0.0.2879.tar.xz' - 'aaru-src-5.0.0.2879.tar.xz.asc::local://aaru-src-5.0.0.2879.tar.xz.asc') -makedepends=('dotnet-sdk>=2.1.0') +source=('aaru-src-5.1.0.3214.tar.xz::local://aaru-src-5.1.0.3214.tar.xz' + 'aaru-src-5.1.0.3214.tar.xz.asc::local://aaru-src-5.1.0.3214.tar.xz.asc') +makedepends=('dotnet-sdk>=3.1.0') options=('staticlibs') validpgpkeys=('236F1E21B540FC0D40F7AD1751D20488C724CA9F') provides=('aaru') @@ -26,19 +27,17 @@ else fi build() { - cd "${srcdir}" - dotnet restore Aaru.sln - dotnet build -f ${_netcoretarget} -c Release Aaru.sln - dotnet publish -f ${_netcoretarget} -c Release --self-contained -r ${dotnet_rid} Aaru.sln + cd "${srcdir}"/"${_aarubase}" + dotnet publish -f ${_netcoretarget} -c Release --self-contained -r ${dotnet_rid} } package() { # Install MIME database file - cd "${srcdir}"/Aaru + cd "${srcdir}"/"${_aarubase}" install -d -m0755 -g 0 "${pkgdir}"/usr/share/mime/packages install -m0755 -g 0 -t "${pkgdir}"/usr/share/mime/packages aaruformat.xml - cd "${srcdir}"/Aaru/bin/Release/${_netcoretarget}/${dotnet_rid}/publish + cd "${srcdir}"/"${_aarubase}"/bin/Release/${_netcoretarget}/${dotnet_rid}/publish # Create destination directory install -d -m0755 -g 0 "${pkgdir}"/opt/Aaru @@ -50,7 +49,6 @@ package() { install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru *.so install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru *.a install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru createdump - install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru sosdocsunix.txt # Copy .NET dependencies install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru *.dll @@ -79,4 +77,4 @@ post_upgrade() { post_remove() { post_install "$1" -} \ No newline at end of file +}