aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to .NET Core 3.1.

Browse Source
This commit is contained in:
Natalia Portillo
2020-06-14 16:13:47 +01:00
parent 78ee88a799
commit b4c4086ab7
20 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
.idea/.idea.Aaru/.idea/contentModel.xml generated
View File

@@ -5,8 +5,6 @@
<e p="$USER_HOME$/.cache/JetBrains/Rider2020.1/resharper-host/local/Transient/ReSharperHost/v201/SolutionCaches/_Aaru.232757112.00" t="ExcludeRecursive" />
<e p="$APPLICATION_CONFIG_DIR$/consoles/db" t="IncludeRecursive" />
<e p="$APPLICATION_CONFIG_DIR$/extensions" t="IncludeRecursive" />
<e p="$APPLICATION_CONFIG_DIR$/scratches" t="IncludeRecursive" />
<e p="$USER_HOME$/.config/git/ignore" t="IncludeRecursive" />
<e p="$APPLICATION_PLUGINS_DIR$/puppet/lib/stubs" t="IncludeRecursive" />
<e p="$PROJECT_DIR$" t="IncludeFlat">
<e p=".git/info/exclude" t="IncludeRecursive" />
@@ -83,7 +81,7 @@
<e p="bin" t="ExcludeRecursive" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.0" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="Aaru.AssemblyInfo.cs" t="Include" />
</e>
</e>
@@ -112,7 +110,7 @@
<e p="bin" t="ExcludeRecursive" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.0" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="Aaru.Checksums.AssemblyInfo.cs" t="Include" />
</e>
</e>
@@ -203,7 +201,7 @@
<e p="bin" t="ExcludeRecursive" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.0" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="Aaru.CommonTypes.AssemblyInfo.cs" t="Include" />
</e>
</e>
@@ -216,7 +214,7 @@
<e p="bin" t="ExcludeRecursive" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.0" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="Aaru.Compression.AssemblyInfo.cs" t="Include" />
</e>
</e>
@@ -230,7 +228,7 @@
<e p="bin" t="ExcludeRecursive" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.0" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="Aaru.Console.AssemblyInfo.cs" t="Include" />
</e>
</e>
@@ -344,7 +342,7 @@
<e p="bin" t="ExcludeRecursive" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.0" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="Aaru.Core.AssemblyInfo.cs" t="Include" />
</e>
</e>
@@ -430,7 +428,7 @@
<e p="bin" t="ExcludeRecursive" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.0" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="Aaru.Database.AssemblyInfo.cs" t="Include" />
</e>
</e>
@@ -588,7 +586,7 @@
<e p="bin" t="ExcludeRecursive" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.0" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="Aaru.Decoders.AssemblyInfo.cs" t="Include" />
</e>
</e>
@@ -672,7 +670,7 @@
<e p="bin" t="ExcludeRecursive" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.0" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="Aaru.Devices.AssemblyInfo.cs" t="Include" />
</e>
</e>
@@ -690,7 +688,7 @@
<e p="bin" t="ExcludeRecursive" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.0" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="Aaru.Dto.AssemblyInfo.cs" t="Include" />
</e>
</e>
@@ -894,7 +892,7 @@
<e p="extFS.cs" t="Include" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.0" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="Aaru.Filesystems.AssemblyInfo.cs" t="Include" />
</e>
</e>
@@ -917,7 +915,7 @@
<e p="bin" t="ExcludeRecursive" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.0" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="Aaru.Filters.AssemblyInfo.cs" t="Include" />
</e>
</e>
@@ -1374,7 +1372,8 @@
<e p="bin" t="ExcludeRecursive" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.0" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="Aaru.Gui.AssemblyInfo.cs" t="Include" />
<e p="Avalonia" t="Include">
<e p="resources" t="Include" />
</e>
@@ -1402,7 +1401,7 @@
<e p="bin" t="ExcludeRecursive" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.0" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="Aaru.Helpers.AssemblyInfo.cs" t="Include" />
</e>
</e>
@@ -1970,7 +1969,7 @@
<e p="bin" t="ExcludeRecursive" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.0" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="Aaru.Images.AssemblyInfo.cs" t="Include" />
</e>
</e>
@@ -2003,7 +2002,7 @@
<e p="bin" t="ExcludeRecursive" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.0" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="Aaru.Partitions.AssemblyInfo.cs" t="Include" />
</e>
</e>
@@ -2015,7 +2014,7 @@
<e p="bin" t="ExcludeRecursive" />
<e p="obj" t="ExcludeRecursive">
<e p="Debug" t="Include">
<e p="netcoreapp3.0" t="Include">
<e p="netcoreapp3.1" t="Include">
<e p="Aaru.Settings.AssemblyInfo.cs" t="Include" />
</e>
</e>
@@ -2224,7 +2223,6 @@
<e p="Avalonia" t="Include">
<e p="resources" t="Include" />
</e>
<e p="OxyPlot.Avalonia.AssemblyInfo.cs" t="Include" />
</e>
</e>
</e>

2
Aaru.Checksums

Submodule Aaru.Checksums updated: d7e802338b...d4e706c90b

2
Aaru.CommonTypes

Submodule Aaru.CommonTypes updated: fa999bfe45...bea7e22c2a

2
Aaru.Compression/Aaru.Compression.csproj
View File

@@ -18,7 +18,7 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru Data Preservation Suite</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>

2
Aaru.Console

Submodule Aaru.Console updated: 3122330248...f908d537c3

2
Aaru.Core/Aaru.Core.csproj
View File

@@ -17,7 +17,7 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Core</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup>

2
Aaru.Database/Aaru.Database.csproj
View File

@@ -16,7 +16,7 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Database</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>

2
Aaru.Decoders

Submodule Aaru.Decoders updated: 0cdc850bf8...02fa1a1b0f

2
Aaru.Devices/Aaru.Devices.csproj
View File

@@ -17,7 +17,7 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Devices</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>

2
Aaru.Dto

Submodule Aaru.Dto updated: 4b27f3a389...f4aa43c5d4

2
Aaru.Filesystems/Aaru.Filesystems.csproj
View File

@@ -17,7 +17,7 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Filesystems</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<NoWarn>CS0649</NoWarn>
<LangVersion>latest</LangVersion>
</PropertyGroup>

2
Aaru.Filters/Aaru.Filters.csproj
View File

@@ -17,7 +17,7 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Filters</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>

2
Aaru.Gui/Aaru.Gui.csproj
View File

@@ -10,7 +10,7 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru Data Preservation Suite</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<NoWarn>CS0649,CS0169</NoWarn>
</PropertyGroup>
<PropertyGroup>

2
Aaru.Helpers

Submodule Aaru.Helpers updated: f2b5d64d4e...9abb9f23bc

2
Aaru.Images/Aaru.Images.csproj
View File

@@ -17,7 +17,7 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.DiscImages</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<NoWarn>CS0649</NoWarn>
</PropertyGroup>
<PropertyGroup>

2
Aaru.Partitions/Aaru.Partitions.csproj
View File

@@ -17,7 +17,7 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Partitions</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<NoWarn>CS0649</NoWarn>
</PropertyGroup>
<PropertyGroup>

2
Aaru.Settings/Aaru.Settings.csproj
View File

@@ -17,7 +17,7 @@
<Product>Aaru Data Preservation Suite</Product>
<Title>Aaru.Settings</Title>
<ApplicationVersion>$(Version)</ApplicationVersion>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>

2
Aaru/Aaru.csproj
View File

@@ -10,7 +10,7 @@
<AssemblyName>aaru</AssemblyName>
<ReleaseVersion>$(Version)</ReleaseVersion>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>5.0.99.2991</Version>
<Company>Claunia.com</Company>

8
build.sh
View File

@@ -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 netcoreapp3.0 -r ${distro} -c ${conf}
dotnet publish -f netcoreapp3.1 -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 netcoreapp3.0 -r ${distro} -c ${conf} -o ../build
dotnet ${pkg} -f netcoreapp3.1 -r ${distro} -c ${conf} -o ../build
done
done
@@ -66,10 +66,10 @@ 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
cp -r Aaru/bin/Release/netcoreapp3.1/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
cp -r Aaru/bin/Debug/netcoreapp3.1/osx-x64/publish/* build/macos-dbg/Aaru.app/Contents/MacOS

6
pkg/pacman/rolling/PKGBUILD
View File

@@ -1,6 +1,6 @@
#@IgnoreInspection BashAddShebang
# Maintainer: Natalia Portillo <claunia@claunia.com>
_netcoretarget='netcoreapp2.1'
_netcoretarget='netcoreapp3.1'
_aarubase='Aaru'
packager='Natalia Portillo <claunia@claunia.com>'
pkgbase='aaru-git'
@@ -12,7 +12,7 @@ arch=('x86_64' 'armv7h' 'aarch64')
url='http://www.aaru.app'
license=('GPL')
source=('git://github.com/aaru-dps/Aaru')
makedepends=('dotnet-sdk>=2.1.0' 'git')
makedepends=('dotnet-sdk>=3.1.0' 'git')
options=('!strip' 'staticlibs')
sha256sums=('SKIP')
provides=('aaru')
@@ -94,4 +94,4 @@ post_upgrade() {
post_remove() {
post_install "$1"
}
}