Bump version and fix Arch Linux package building scripts.

Aaru.Compression/Aaru.Compression.csproj

@@ -12,7 +12,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.99.2991</Version>
+    <Version>5.1.0.3214</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>

Aaru.Core/Aaru.Core.csproj

@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.99.2991</Version>
+    <Version>5.1.0.3214</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>

Aaru.Database/Aaru.Database.csproj

@@ -10,7 +10,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.99.2991</Version>
+    <Version>5.1.0.3214</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>

Aaru.Devices/Aaru.Devices.csproj

@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.99.2991</Version>
+    <Version>5.1.0.3214</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>

Aaru.Filesystems/Aaru.Filesystems.csproj

@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.99.2991</Version>
+    <Version>5.1.0.3214</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>

Aaru.Filters/Aaru.Filters.csproj

@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.99.2991</Version>
+    <Version>5.1.0.3214</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>

Aaru.Gui/Aaru.Gui.csproj

@@ -4,7 +4,7 @@
     <AssemblyName>Aaru.Gui</AssemblyName>
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.99.0.2990</Version>
+    <Version>5.99.0.3214</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>

Aaru.Images/Aaru.Images.csproj

@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.99.2991</Version>
+    <Version>5.1.0.3214</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>

Aaru.Partitions/Aaru.Partitions.csproj

@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.99.2991</Version>
+    <Version>5.1.0.3214</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>

Aaru.Settings/Aaru.Settings.csproj

@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.99.2991</Version>
+    <Version>5.1.0.3214</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>

Aaru.Tests.Devices/Aaru.Tests.Devices.csproj

@@ -11,7 +11,7 @@
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>4.5.99.1693</Version>
+    <Version>5.1.0.3214</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>

Aaru/Aaru.csproj

@@ -12,7 +12,7 @@
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.0.99.2991</Version>
+    <Version>5.1.0.3214</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
@@ -22,11 +22,13 @@
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <LangVersion>8</LangVersion>
   </PropertyGroup>
+  <!--
   <PropertyGroup>
     <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>
+  -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>True</DebugSymbols>
     <DebugType>full</DebugType>
@@ -201,7 +203,9 @@
       <Name>Aaru.Checksums</Name>
     </ProjectReference>
     <ProjectReference Include="..\Aaru.Database\Aaru.Database.csproj" />
+<!--
     <ProjectReference Include="..\Aaru.Gui\Aaru.Gui.csproj" />
+-->
     <ProjectReference Include="..\Aaru.Helpers\Aaru.Helpers.csproj">
       <Project>{F8BDF57B-1571-4CD0-84B3-B422088D359A}</Project>
       <Name>Aaru.Helpers</Name>
@@ -274,7 +278,9 @@
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20104.2" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+<!--
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
+-->
     <PackageReference Include="System.Collections" Version="4.3.0" />
     <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
     <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
@@ -300,7 +306,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <PackageVersion>5.0.99.2991-1</PackageVersion>
+    <PackageVersion>5.1.0.3214-1</PackageVersion>
     <PackagePrefix>aaru</PackagePrefix>
     <Authors>Natalia Portillo &lt;claunia@claunia.com&gt;</Authors>
     <Section>net</Section>

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();
 

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,
+        static void ExtractFilesInDir(string path, IReadOnlyFilesystem fs, string volumeName, string outputDir,
-                                      string outputDir, bool doXattrs)
+                                      bool doXattrs)
         {
             if(path.StartsWith('/'))
                 path = path.Substring(1);

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);

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(Type type)
-        static string TypeToString([NotNull] Type type)
         {
             if(type == typeof(bool))
                 return "boolean";

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,
+        public static int Invoke(bool debug, bool verbose, uint blockSize, string encodingName, string imagePath,
-                                 string imagePath, bool tape)
+                                 bool tape)
         {
             MainClass.PrintCopyright();
 

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(Type type)
-        static string TypeToString([NotNull] Type type)
         {
             if(type == typeof(bool))
                 return "boolean";

Aaru/Info.plist

@@ -15,7 +15,7 @@
         <key>CFBundleIdentifier</key>
         <string>app.aaru</string>
         <key>CFBundleShortVersionString</key>
-        <string>5.99.0.2990-alpha2</string>
+        <string>5.99.0.3214-alpha3</string>
         <key>CFBundleExecutable</key>
         <string>aaru</string>
         <key>LSExecutableArchitectures</key>

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;

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

README.md

@@ -1,4 +1,4 @@
-Aaru Data Preservation Suite v5.0.99.2991
+Aaru Data Preservation Suite v5.1.0.3214
 
 Aaru
 

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

pkg/pacman/rolling/PKGBUILD

@@ -5,7 +5,7 @@ _aarubase='Aaru'
 packager='Natalia Portillo <claunia@claunia.com>'
 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 publish -f ${_netcoretarget} -c Debug --self-contained -r ${dotnet_rid}
-    dotnet build -f ${_netcoretarget} -c Debug Aaru.sln
-    dotnet publish -f ${_netcoretarget} -c Debug --self-contained -r ${dotnet_rid} Aaru.sln
 }
 
 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

pkg/pacman/stable/PKGBUILD

@@ -1,16 +1,17 @@
 # Maintainer: Natalia Portillo <claunia@claunia.com>
 packager='Natalia Portillo <claunia@claunia.com>'
-_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'
+source=('aaru-src-5.1.0.3214.tar.xz::local://aaru-src-5.1.0.3214.tar.xz'
-        'aaru-src-5.0.0.2879.tar.xz.asc::local://aaru-src-5.0.0.2879.tar.xz.asc')
+        'aaru-src-5.1.0.3214.tar.xz.asc::local://aaru-src-5.1.0.3214.tar.xz.asc')
-makedepends=('dotnet-sdk>=2.1.0')
+makedepends=('dotnet-sdk>=3.1.0')
 options=('staticlibs')
 validpgpkeys=('236F1E21B540FC0D40F7AD1751D20488C724CA9F')
 provides=('aaru')
@@ -26,19 +27,17 @@ else
 fi
 
 build() {
-    cd "${srcdir}"
+    cd "${srcdir}"/"${_aarubase}"
-    dotnet restore Aaru.sln
+    dotnet publish -f ${_netcoretarget} -c Release --self-contained -r ${dotnet_rid}
-    dotnet build -f ${_netcoretarget} -c Release Aaru.sln
-    dotnet publish -f ${_netcoretarget} -c Release --self-contained -r ${dotnet_rid} Aaru.sln
 }
 
 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"
-}
+}