diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml
index 158505e17..505b1b940 100644
--- a/.idea/.idea.Aaru/.idea/contentModel.xml
+++ b/.idea/.idea.Aaru/.idea/contentModel.xml
@@ -23,6 +23,7 @@
+
@@ -69,7 +70,6 @@
-
@@ -2186,6 +2186,7 @@
+
diff --git a/Aaru.Checksums b/Aaru.Checksums
index 3c84cc53e..41a3ba9bd 160000
--- a/Aaru.Checksums
+++ b/Aaru.Checksums
@@ -1 +1 @@
-Subproject commit 3c84cc53ed28db1eaded56313d02989d597f3ef2
+Subproject commit 41a3ba9bddb89e9e0ea54c468cf991a7bb88f3a8
diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
index 931b89da2..60f1376cc 160000
--- a/Aaru.CommonTypes
+++ b/Aaru.CommonTypes
@@ -1 +1 @@
-Subproject commit 931b89da2e3976eec4bf8f64cfb9d27a183681a4
+Subproject commit 60f1376ccf061e0cab5946704f212019049acc82
diff --git a/Aaru.Compression/Aaru.Compression.csproj b/Aaru.Compression/Aaru.Compression.csproj
index 372088033..e035be915 100644
--- a/Aaru.Compression/Aaru.Compression.csproj
+++ b/Aaru.Compression/Aaru.Compression.csproj
@@ -12,7 +12,7 @@
$(Version)
false
true
- 5.1.99.2880
+ 5.1.99.2967
Claunia.com
Copyright © 2011-2020 Natalia Portillo
Aaru Data Preservation Suite
@@ -21,7 +21,7 @@
netcoreapp3.0
- $(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}
+ $(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}
true
true
diff --git a/Aaru.Console b/Aaru.Console
index 40d55b246..89c4b17c0 160000
--- a/Aaru.Console
+++ b/Aaru.Console
@@ -1 +1 @@
-Subproject commit 40d55b2460bc095a88be7c0daa2e878b6352ce1c
+Subproject commit 89c4b17c039215e56043119b8278ea322613ef86
diff --git a/Aaru.Core/Aaru.Core.csproj b/Aaru.Core/Aaru.Core.csproj
index 4f09cba31..f7bd20504 100644
--- a/Aaru.Core/Aaru.Core.csproj
+++ b/Aaru.Core/Aaru.Core.csproj
@@ -11,7 +11,7 @@
$(Version)
false
true
- 5.1.99.2880
+ 5.1.99.2967
Claunia.com
Copyright © 2011-2020 Natalia Portillo
Aaru Data Preservation Suite
@@ -21,7 +21,7 @@
latest
- $(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}
+ $(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}
true
true
diff --git a/Aaru.Database/Aaru.Database.csproj b/Aaru.Database/Aaru.Database.csproj
index d9e58db62..774a21c8f 100644
--- a/Aaru.Database/Aaru.Database.csproj
+++ b/Aaru.Database/Aaru.Database.csproj
@@ -10,7 +10,7 @@
$(Version)
false
true
- 5.1.99.2880
+ 5.1.99.2967
Claunia.com
Copyright © 2011-2020 Natalia Portillo
Aaru Data Preservation Suite
@@ -19,7 +19,7 @@
netcoreapp3.0
- $(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}
+ $(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}
true
true
diff --git a/Aaru.Decoders b/Aaru.Decoders
index 02866c29e..5d145f051 160000
--- a/Aaru.Decoders
+++ b/Aaru.Decoders
@@ -1 +1 @@
-Subproject commit 02866c29e294b683c787f6041587d73d4ffcf180
+Subproject commit 5d145f051b789964fa07b30db4a1829fdf8ff814
diff --git a/Aaru.Devices/Aaru.Devices.csproj b/Aaru.Devices/Aaru.Devices.csproj
index 565d5ce1c..0c57cf432 100644
--- a/Aaru.Devices/Aaru.Devices.csproj
+++ b/Aaru.Devices/Aaru.Devices.csproj
@@ -11,7 +11,7 @@
$(Version)
false
true
- 5.1.99.2880
+ 5.1.99.2967
Claunia.com
Copyright © 2011-2020 Natalia Portillo
Aaru Data Preservation Suite
@@ -20,7 +20,7 @@
netcoreapp3.0
- $(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}
+ $(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}
true
true
diff --git a/Aaru.Dto b/Aaru.Dto
index c5416bbaf..f749e4f9c 160000
--- a/Aaru.Dto
+++ b/Aaru.Dto
@@ -1 +1 @@
-Subproject commit c5416bbaf7fe21e0d32ade2eeec78f9e6301b828
+Subproject commit f749e4f9c5eb12af7816f95ab8b3bb56a1c4612d
diff --git a/Aaru.Filesystems/Aaru.Filesystems.csproj b/Aaru.Filesystems/Aaru.Filesystems.csproj
index 77c0175be..01a21bc69 100644
--- a/Aaru.Filesystems/Aaru.Filesystems.csproj
+++ b/Aaru.Filesystems/Aaru.Filesystems.csproj
@@ -11,7 +11,7 @@
$(Version)
false
true
- 5.1.99.2880
+ 5.1.99.2967
Claunia.com
Copyright © 2011-2020 Natalia Portillo
Aaru Data Preservation Suite
@@ -22,7 +22,7 @@
latest
- $(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}
+ $(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}
true
true
diff --git a/Aaru.Filters/Aaru.Filters.csproj b/Aaru.Filters/Aaru.Filters.csproj
index ae6b518eb..a3008556b 100644
--- a/Aaru.Filters/Aaru.Filters.csproj
+++ b/Aaru.Filters/Aaru.Filters.csproj
@@ -11,7 +11,7 @@
$(Version)
false
true
- 5.1.99.2880
+ 5.1.99.2967
Claunia.com
Copyright © 2011-2020 Natalia Portillo
Aaru Data Preservation Suite
@@ -20,7 +20,7 @@
netcoreapp3.0
- $(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}
+ $(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}
true
true
diff --git a/Aaru.Gui/Aaru.Gui.csproj b/Aaru.Gui/Aaru.Gui.csproj
index e2f192566..f80fa0ce2 100644
--- a/Aaru.Gui/Aaru.Gui.csproj
+++ b/Aaru.Gui/Aaru.Gui.csproj
@@ -4,7 +4,7 @@
Aaru.Gui
$(Version)
true
- 4.5.99.2020
+ 5.99.0.2967
Claunia.com
Copyright © 2011-2020 Natalia Portillo
Aaru Data Preservation Suite
@@ -14,7 +14,7 @@
CS0649,CS0169
- $(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}
+ $(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}
true
true
diff --git a/Aaru.Helpers b/Aaru.Helpers
index c3ab7ac75..e7c0f1b7f 160000
--- a/Aaru.Helpers
+++ b/Aaru.Helpers
@@ -1 +1 @@
-Subproject commit c3ab7ac7526c6821ff1856c7b5d3d9704230e24f
+Subproject commit e7c0f1b7f74c25695c1c893282e15f473be261d6
diff --git a/Aaru.Images/Aaru.Images.csproj b/Aaru.Images/Aaru.Images.csproj
index 1dab050a5..5295a19ca 100644
--- a/Aaru.Images/Aaru.Images.csproj
+++ b/Aaru.Images/Aaru.Images.csproj
@@ -11,7 +11,7 @@
$(Version)
false
true
- 5.1.99.2880
+ 5.1.99.2967
Claunia.com
Copyright © 2011-2020 Natalia Portillo
Aaru Data Preservation Suite
@@ -21,7 +21,7 @@
CS0649
- $(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}
+ $(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}
true
true
diff --git a/Aaru.Partitions/Aaru.Partitions.csproj b/Aaru.Partitions/Aaru.Partitions.csproj
index ae0a249e6..9aa00601b 100644
--- a/Aaru.Partitions/Aaru.Partitions.csproj
+++ b/Aaru.Partitions/Aaru.Partitions.csproj
@@ -11,7 +11,7 @@
$(Version)
false
true
- 5.1.99.2880
+ 5.1.99.2967
Claunia.com
Copyright © 2011-2020 Natalia Portillo
Aaru Data Preservation Suite
@@ -21,7 +21,7 @@
CS0649
- $(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}
+ $(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}
true
true
diff --git a/Aaru.Settings/Aaru.Settings.csproj b/Aaru.Settings/Aaru.Settings.csproj
index cf97c791f..8bcb99640 100644
--- a/Aaru.Settings/Aaru.Settings.csproj
+++ b/Aaru.Settings/Aaru.Settings.csproj
@@ -11,7 +11,7 @@
$(Version)
false
true
- 5.1.99.2880
+ 5.1.99.2967
Claunia.com
Copyright © 2011-2020 Natalia Portillo
Aaru Data Preservation Suite
@@ -20,7 +20,7 @@
netcoreapp3.0
- $(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}
+ $(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}
true
true
diff --git a/Aaru/Aaru.csproj b/Aaru/Aaru.csproj
index 8ae41948d..4057a11ab 100644
--- a/Aaru/Aaru.csproj
+++ b/Aaru/Aaru.csproj
@@ -12,7 +12,7 @@
false
netcoreapp3.0
true
- 5.1.99.2880
+ 5.1.99.2967
Claunia.com
Copyright © 2011-2020 Natalia Portillo
Aaru Data Preservation Suite
@@ -22,7 +22,7 @@
true
- $(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}
+ $(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}
true
true
diff --git a/Aaru/MacIcon.icns b/Aaru/Aaru.icns
similarity index 100%
rename from Aaru/MacIcon.icns
rename to Aaru/Aaru.icns
diff --git a/Aaru/Info.plist b/Aaru/Info.plist
index a0570831d..d985a82bf 100644
--- a/Aaru/Info.plist
+++ b/Aaru/Info.plist
@@ -1,20 +1,28 @@
-
- LSMinimumSystemVersion
- 10.7
- CFBundleDevelopmentRegion
- en
- NSHumanReadableCopyright
-
- CFBundleIconFile
- MacIcon.icns
- CFBundleName
- Aaru
- CFBundleIdentifier
- com.claunia.com.Aaru
- CFBundleShortVersionString
- 4.99.0
-
+
+ LSMinimumSystemVersion
+ 10.13
+ CFBundleDevelopmentRegion
+ en
+ NSHumanReadableCopyright
+ © Natalia Portillo
+ CFBundleIconFile
+ MacIcon.icns
+ CFBundleName
+ Aaru
+ CFBundleIdentifier
+ app.aaru
+ CFBundleShortVersionString
+ 5.99.0.2967-alpha1
+ CFBundleExecutable
+ aaru
+ LSExecutableArchitectures
+
+ x86_64
+
+ NSHighResolutionCapable
+
+
diff --git a/README.md b/README.md
index 7db8d0216..f98635bd2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Aaru Data Preservation Suite v5.1.99.2880
+Aaru Data Preservation Suite v5.1.99.2967
Aaru
diff --git a/build.sh b/build.sh
old mode 100644
new mode 100755
index 745313c49..ce6f9b52b
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-AARU_VERSION=5.1.99.2880.0.0.2879
+AARU_VERSION=5.1.99.2967
OS_NAME=`uname`
mkdir -p build
@@ -10,7 +10,7 @@ for conf in Debug Release;
do
for distro in 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;
do
- dotnet publish -f netcoreapp2.1 -r ${distro} -c ${conf}
+ dotnet publish -f netcoreapp3.0 -r ${distro} -c ${conf}
# Package the Linux packages
if [[ ${distro} == alpine* ]] || [[ ${distro} == linux* ]]; then
@@ -22,7 +22,7 @@ do
else
pkg="deb"
fi
- dotnet ${pkg} -f netcoreapp2.1 -r ${distro} -c ${conf} -o ../build
+ dotnet ${pkg} -f netcoreapp3.0 -r ${distro} -c ${conf} -o ../build
done
done
@@ -59,3 +59,16 @@ for i in *.deb *.rpm *.zip *.tar.gz;
do
gpg --armor --detach-sign "$i"
done
+
+rm -Rf build/macos/Aaru.app
+mkdir -p build/macos/Aaru.app/Contents/Resources
+mkdir -p build/macos/Aaru.app/Contents/MacOS
+cp Aaru/Aaru.icns build/macos/Aaru.app/Contents/Resources
+cp Aaru/Info.plist build/macos/Aaru.app/Contents
+cp -r Aaru/bin/Release/netcoreapp3.0/osx-x64/publish/* build/macos/Aaru.app/Contents/MacOS
+rm -Rf build/macos-dbg/Aaru.app
+mkdir -p build/macos-dbg/Aaru.app/Contents/Resources
+mkdir -p build/macos-dbg/Aaru.app/Contents/MacOS
+cp Aaru/Aaru.icns build/macos-dbg/Aaru.app/Contents/Resources
+cp Aaru/Info.plist build/macos-dbg/Aaru.app/Contents
+cp -r Aaru/bin/Debug/netcoreapp3.0/osx-x64/publish/* build/macos-dbg/Aaru.app/Contents/MacOS
\ No newline at end of file
diff --git a/pkg/pacman/rolling/PKGBUILD b/pkg/pacman/rolling/PKGBUILD
index 4f2479f61..2a0f67db5 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.2880.r1190.g4decb6d4
+pkgver=v5.1.99.2967.r1190.g4decb6d4
pkgrel=1
pkgdesc='Disc image management and creation tool for disks, tapes, optical and solid state media'
arch=('x86_64' 'armv7h' 'aarch64')