Up version.

aaru-dps · Apr 17, 2020 · a374ee6 · a374ee6
1 parent 06674ab
commit a374ee6
Show file tree

Hide file tree

Showing 23 changed files with 72 additions and 50 deletions.
diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml
diff --git a/Aaru.Checksums b/Aaru.Checksums
diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
diff --git a/Aaru.Compression/Aaru.Compression.csproj b/Aaru.Compression/Aaru.Compression.csproj
@@ -12,7 +12,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.1.99.2880</Version>
+    <Version>5.1.99.2967</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
@@ -21,7 +21,7 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
+    <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>

diff --git a/Aaru.Console b/Aaru.Console
diff --git a/Aaru.Core/Aaru.Core.csproj b/Aaru.Core/Aaru.Core.csproj
@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.1.99.2880</Version>
+    <Version>5.1.99.2967</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
@@ -21,7 +21,7 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
+    <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>

diff --git a/Aaru.Database/Aaru.Database.csproj b/Aaru.Database/Aaru.Database.csproj
@@ -10,7 +10,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.1.99.2880</Version>
+    <Version>5.1.99.2967</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
@@ -19,7 +19,7 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
+    <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>

diff --git a/Aaru.Decoders b/Aaru.Decoders
diff --git a/Aaru.Devices/Aaru.Devices.csproj b/Aaru.Devices/Aaru.Devices.csproj
@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.1.99.2880</Version>
+    <Version>5.1.99.2967</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
@@ -20,7 +20,7 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
+    <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>

diff --git a/Aaru.Dto b/Aaru.Dto
diff --git a/Aaru.Filesystems/Aaru.Filesystems.csproj b/Aaru.Filesystems/Aaru.Filesystems.csproj
@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.1.99.2880</Version>
+    <Version>5.1.99.2967</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
@@ -22,7 +22,7 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
+    <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>

diff --git a/Aaru.Filters/Aaru.Filters.csproj b/Aaru.Filters/Aaru.Filters.csproj
@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.1.99.2880</Version>
+    <Version>5.1.99.2967</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
@@ -20,7 +20,7 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
+    <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>

diff --git a/Aaru.Gui/Aaru.Gui.csproj b/Aaru.Gui/Aaru.Gui.csproj
@@ -4,7 +4,7 @@
     <AssemblyName>Aaru.Gui</AssemblyName>
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>4.5.99.2020</Version>
+    <Version>5.99.0.2967</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
@@ -14,7 +14,7 @@
     <NoWarn>CS0649,CS0169</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
+    <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>

diff --git a/Aaru.Helpers b/Aaru.Helpers
diff --git a/Aaru.Images/Aaru.Images.csproj b/Aaru.Images/Aaru.Images.csproj
@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.1.99.2880</Version>
+    <Version>5.1.99.2967</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
@@ -21,7 +21,7 @@
     <NoWarn>CS0649</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
+    <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>

diff --git a/Aaru.Partitions/Aaru.Partitions.csproj b/Aaru.Partitions/Aaru.Partitions.csproj
@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.1.99.2880</Version>
+    <Version>5.1.99.2967</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
@@ -21,7 +21,7 @@
     <NoWarn>CS0649</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
+    <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>

diff --git a/Aaru.Settings/Aaru.Settings.csproj b/Aaru.Settings/Aaru.Settings.csproj
@@ -11,7 +11,7 @@
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.1.99.2880</Version>
+    <Version>5.1.99.2967</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
@@ -20,7 +20,7 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
+    <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>

diff --git a/Aaru/Aaru.csproj b/Aaru/Aaru.csproj
@@ -12,7 +12,7 @@
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <Version>5.1.99.2880</Version>
+    <Version>5.1.99.2967</Version>
     <Company>Claunia.com</Company>
     <Copyright>Copyright © 2011-2020 Natalia Portillo</Copyright>
     <Product>Aaru Data Preservation Suite</Product>
@@ -22,7 +22,7 @@
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
   </PropertyGroup>
   <PropertyGroup>
-    <NrtRevisionFormat>$(Version)-{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
+    <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
     <NrtResolveSimpleAttributes>true</NrtResolveSimpleAttributes>
     <NrtShowRevision>true</NrtShowRevision>
   </PropertyGroup>

diff --git a/Aaru/MacIcon.icns → Aaru/Aaru.icns b/Aaru/MacIcon.icns → Aaru/Aaru.icns
diff --git a/Aaru/Info.plist b/Aaru/Info.plist
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.7</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>NSHumanReadableCopyright</key>
-	<string></string>
-	<key>CFBundleIconFile</key>
-	<string>MacIcon.icns</string>
-	<key>CFBundleName</key>
-	<string>Aaru</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.claunia.com.Aaru</string>
-	<key>CFBundleShortVersionString</key>
-	<string>4.99.0</string>
-</dict>
+    <dict>
+        <key>LSMinimumSystemVersion</key>
+        <string>10.13</string>
+        <key>CFBundleDevelopmentRegion</key>
+        <string>en</string>
+        <key>NSHumanReadableCopyright</key>
+        <string>© Natalia Portillo</string>
+        <key>CFBundleIconFile</key>
+        <string>MacIcon.icns</string>
+        <key>CFBundleName</key>
+        <string>Aaru</string>
+        <key>CFBundleIdentifier</key>
+        <string>app.aaru</string>
+        <key>CFBundleShortVersionString</key>
+        <string>5.99.0.2967-alpha1</string>
+        <key>CFBundleExecutable</key>
+        <string>aaru</string>
+        <key>LSExecutableArchitectures</key>
+        <array>
+            <string>x86_64</string>
+        </array>
+        <key>NSHighResolutionCapable</key>
+        <true/>
+    </dict>
 </plist>
diff --git 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
@@ -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
diff --git a/pkg/pacman/rolling/PKGBUILD b/pkg/pacman/rolling/PKGBUILD
@@ -5,7 +5,7 @@ _aarubase='Aaru'
 packager='Natalia Portillo <[email protected]>'
 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')