Update paths and exclude NETStandard to allow simultaneous install with 3.1

3 files changed, 75 insertions, 76 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c2153446670..03c5a47b06bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,41 +1,40 @@
 pkgbase = dotnet-core-preview
 	pkgver = 5.0.0+100+preview.5.20279.10
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.microsoft.com/net/core
 	arch = x86_64
 	arch = armv7h
 	arch = aarch64
 	license = MIT
-	makedepends = clang
-	makedepends = cmake
-	makedepends = curl
-	makedepends = git
-	makedepends = icu
-	makedepends = krb5
-	makedepends = libunwind
-	makedepends = lldb
-	makedepends = llvm
-	makedepends = lttng-ust
-	makedepends = openssl
-	makedepends = zlib
 	options = staticlibs
 	source = dotnet.sh
-	sha256sums = 4978b3a31a94032b425d2a2a9b5a17f506f36fb784fbfefdf2cfea9485a30f47
+	sha512sums = 448e2ad41a1ac5b7adf4a17ef27d01d1f20c6d355fdb1e10b0ceb4bd6edd8b3a24874aa8c42cfcf56267a6a85c5896b5f69764e5e59526f6938ec7c9d1ec7383
 	source_x86_64 = https://download.visualstudio.microsoft.com/download/pr/7cf9fa3e-af03-4181-baab-e04ed4b05268/fd44776a5169d6b126ee11d6140691be/dotnet-sdk-5.0.100-preview.5.20279.10-linux-x64.tar.gz
-	sha256sums_x86_64 = aa2d59719fa26a872c00a1d63c4e2984473f12958500c6abe6134c7cedaff20b
+	sha512sums_x86_64 = 0ee982dd7b6015d05c04a33ffba77fa9f61863578c5fd7c4b3847043da2fd17c36b2f8535af53f46dee66e9e59a52f5e7c995af7f9a69fbd3abbc524aca5931b
 	source_armv7h = https://download.visualstudio.microsoft.com/download/pr/6fb3f700-22ed-43d8-8f54-8152f359054b/050d3254d477aeb124a45d0cb13f864d/dotnet-sdk-5.0.100-preview.5.20279.10-linux-arm.tar.gz
-	sha256sums_armv7h = 6de678da7df725c27f3aa93f5a549178a06cfb9cba28290f87b7f1824dbad5f9
+	sha512sums_armv7h = 6256e013e0e1a153671b9ac3afb49db2646d5e9710112626f52f91070e9832fd17c475414387c6d544dadf2b62df342400d7c34ac01e7a1807d53587ac2d0bc8
 	source_aarch64 = https://download.visualstudio.microsoft.com/download/pr/a529731c-7c51-42f4-9386-46c6466019dc/e408a0275c2333ae29a6e31c00c1ae64/dotnet-sdk-5.0.100-preview.5.20279.10-linux-arm64.tar.gz
-	sha256sums_aarch64 = 4bb9bbc71473aa66b8e16ce9bf302d43ca860f05acc2d11bbef49d49ef73a3ba
+	sha512sums_aarch64 = 426caa42f586f5213169828c8ee049f10bb8ee0aa1c8961d006396e74c995f0cadc88c9dffeb13f573f3b21bdd9a11279adb0f00bccd20f38da66153b8be43d0
 
 pkgname = dotnet-host-preview
-	pkgdesc = A generic driver for the .NET Core Command Line Interface (preview)
-	provides = dotnet-host=5.0.0+100
+	pkgdesc = A generic driver for the .NET Core Command Line Interface (preview, binary)
+	provides = dotnet-host
+	provides = dotnet-host=5.0.0
 	conflicts = dotnet-host
 
+pkgname = aspnet-runtime-preview
+	pkgdesc = The ASP.NET Core runtime (preview, binary)
+	depends = dotnet-runtime-preview
+	provides = aspnet-runtime-preview
+	provides = aspnet-runtime=5.0.0
+	provides = aspnet-runtime-5.0
+	conflicts = aspnet-runtime-preview
+	conflicts = aspnet-runtime=5.0.0
+	conflicts = aspnet-runtime-5.0
+
 pkgname = dotnet-runtime-preview
-	pkgdesc = The .NET Core runtime (preview)
-	depends = dotnet-host-preview
+	pkgdesc = The .NET Core runtime (preview, binary)
+	depends = dotnet-host>=5.0.0
 	depends = icu
 	depends = krb5
 	depends = libunwind
@@ -43,15 +42,22 @@ pkgname = dotnet-runtime-preview
 	depends = zlib
 	depends = libcurl.so
 	optdepends = lttng-ust: CoreCLR tracing
-	provides = dotnet-runtime=5.0.0+100
-
-pkgname = aspnet-runtime-preview
-	pkgdesc = The ASP.NET Core runtime (preview)
-	depends = dotnet-runtime-preview
-	provides = aspnet-runtime=5.0.0+100
+	provides = dotnet-runtime-preview
+	provides = dotnet-runtime=5.0.0
+	provides = dotnet-runtime-5.0
+	conflicts = dotnet-runtime-preview
+	conflicts = dotnet-runtime=5.0.0
+	conflicts = dotnet-runtime-5.0
 
 pkgname = dotnet-sdk-preview
-	pkgdesc = The .NET Core SDK (preview)
+	pkgdesc = The .NET Core SDK (preview, binary)
+	depends = dotnet-sdk=3.1
 	depends = dotnet-runtime-preview
-	provides = dotnet-sdk=5.0.0+100
+	depends = glibc
+	provides = dotnet-sdk-preview
+	provides = dotnet-sdk=5.0.100
+	provides = dotnet-sdk-5.0
+	conflicts = dotnet-sdk-preview
+	conflicts = dotnet-sdk=5.0.100
+	conflicts = dotnet-sdk-5.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 64ae8e8e58ba..7c67bb10a645 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,77 +1,72 @@
 # Maintainer: Florian Maunier <fmauneko@dissidence.ovh>
 # Contributor: Maxime Gauduin <alucryd@archlinux.org>
 # Contributor: Max Liebkies <mail@maxliebkies.de>
+# Contributor: Attila Greguss <floyd0122[at]gmail[dot]com>
 
 pkgbase=dotnet-core-preview
-pkgname=('dotnet-host-preview' 'dotnet-runtime-preview' 'aspnet-runtime-preview' 'dotnet-sdk-preview')
+pkgname=('dotnet-host-preview' 'aspnet-runtime-preview' 'dotnet-runtime-preview' 'dotnet-sdk-preview')
 pkgver=5.0.0+100+preview.5.20279.10
-pkgrel=1
+_runtimever=5.0.0-preview.5.20278.1
+_sdkver=5.0.100-preview.5.20279.10
+pkgrel=2
 arch=('x86_64' 'armv7h' 'aarch64')
 url='https://www.microsoft.com/net/core'
 license=('MIT')
-makedepends=(
-  'clang' 'cmake' 'curl' 'git' 'icu' 'krb5' 'libunwind' 'lldb' 'llvm'
-  'lttng-ust' 'openssl' 'zlib'
-)
 options=('staticlibs')
-source=(
-  'dotnet.sh'
-)
-source_x86_64=(
-  'https://download.visualstudio.microsoft.com/download/pr/7cf9fa3e-af03-4181-baab-e04ed4b05268/fd44776a5169d6b126ee11d6140691be/dotnet-sdk-5.0.100-preview.5.20279.10-linux-x64.tar.gz'
-)
-source_armv7h=(
-  'https://download.visualstudio.microsoft.com/download/pr/6fb3f700-22ed-43d8-8f54-8152f359054b/050d3254d477aeb124a45d0cb13f864d/dotnet-sdk-5.0.100-preview.5.20279.10-linux-arm.tar.gz'
-)
-source_aarch64=(
-  'https://download.visualstudio.microsoft.com/download/pr/a529731c-7c51-42f4-9386-46c6466019dc/e408a0275c2333ae29a6e31c00c1ae64/dotnet-sdk-5.0.100-preview.5.20279.10-linux-arm64.tar.gz'
-)
-sha256sums=('4978b3a31a94032b425d2a2a9b5a17f506f36fb784fbfefdf2cfea9485a30f47')
-sha256sums_x86_64=('aa2d59719fa26a872c00a1d63c4e2984473f12958500c6abe6134c7cedaff20b')
-sha256sums_armv7h=('6de678da7df725c27f3aa93f5a549178a06cfb9cba28290f87b7f1824dbad5f9')
-sha256sums_aarch64=('4bb9bbc71473aa66b8e16ce9bf302d43ca860f05acc2d11bbef49d49ef73a3ba')
+source=('dotnet.sh')
+sha512sums=('448e2ad41a1ac5b7adf4a17ef27d01d1f20c6d355fdb1e10b0ceb4bd6edd8b3a24874aa8c42cfcf56267a6a85c5896b5f69764e5e59526f6938ec7c9d1ec7383')
+sha512sums_x86_64=('0ee982dd7b6015d05c04a33ffba77fa9f61863578c5fd7c4b3847043da2fd17c36b2f8535af53f46dee66e9e59a52f5e7c995af7f9a69fbd3abbc524aca5931b')
+sha512sums_armv7h=('6256e013e0e1a153671b9ac3afb49db2646d5e9710112626f52f91070e9832fd17c475414387c6d544dadf2b62df342400d7c34ac01e7a1807d53587ac2d0bc8')
+sha512sums_aarch64=('426caa42f586f5213169828c8ee049f10bb8ee0aa1c8961d006396e74c995f0cadc88c9dffeb13f573f3b21bdd9a11279adb0f00bccd20f38da66153b8be43d0')
+source_armv7h=('https://download.visualstudio.microsoft.com/download/pr/6fb3f700-22ed-43d8-8f54-8152f359054b/050d3254d477aeb124a45d0cb13f864d/dotnet-sdk-5.0.100-preview.5.20279.10-linux-arm.tar.gz')
+source_aarch64=('https://download.visualstudio.microsoft.com/download/pr/a529731c-7c51-42f4-9386-46c6466019dc/e408a0275c2333ae29a6e31c00c1ae64/dotnet-sdk-5.0.100-preview.5.20279.10-linux-arm64.tar.gz')
+source_x86_64=('https://download.visualstudio.microsoft.com/download/pr/7cf9fa3e-af03-4181-baab-e04ed4b05268/fd44776a5169d6b126ee11d6140691be/dotnet-sdk-5.0.100-preview.5.20279.10-linux-x64.tar.gz')
 
 package_dotnet-host-preview() {
-  pkgdesc='A generic driver for the .NET Core Command Line Interface (preview)'
-  provides=("dotnet-host=${pkgver%+*}")
+  pkgdesc='A generic driver for the .NET Core Command Line Interface (preview, binary)'
+  provides=('dotnet-host' "dotnet-host=${_runtimever%-*}")
   conflicts=('dotnet-host')
 
-  install -dm 755 "${pkgdir}"/{opt/dotnet,usr/share/licenses/dotnet-host-preview}
-  cp -dr --no-preserve='ownership' dotnet host "${pkgdir}"/opt/dotnet/
+  install -dm 755 "${pkgdir}"/usr/{bin,lib,share/{dotnet,licenses/dotnet-host-preview}}
+  cp -dr --no-preserve='ownership' dotnet host "${pkgdir}"/usr/share/dotnet/
   cp -dr --no-preserve='ownership' LICENSE.txt ThirdPartyNotices.txt "${pkgdir}"/usr/share/licenses/dotnet-host-preview
-  install -Dm 755 "${srcdir}"/dotnet.sh "${pkgdir}"/usr/bin/dotnet
+  install -Dm 755 "${srcdir}"/dotnet.sh "${pkgdir}"/usr/share/dotnet
+  ln -sf /usr/share/dotnet/dotnet.sh "${pkgdir}"/usr/bin/dotnet
+  ln -sf /usr/share/dotnet/host/fxr/"${_runtimever}"/libhostfxr.so "${pkgdir}"/usr/lib/libhostfxr.so
 }
 
 package_dotnet-runtime-preview() {
-  pkgdesc='The .NET Core runtime (preview)'
-  depends=('dotnet-host-preview' 'icu' 'krb5' 'libunwind' 'openssl' 'zlib'
+  pkgdesc='The .NET Core runtime (preview, binary)'
+  depends=("dotnet-host>=${_runtimever%-*}" 'icu' 'krb5' 'libunwind' 'openssl' 'zlib'
            'libcurl.so')
   optdepends=('lttng-ust: CoreCLR tracing')
-  provides=("dotnet-runtime=${pkgver%+*}")
+  provides=("dotnet-runtime-preview" "dotnet-runtime=${_runtimever%-*}" "dotnet-runtime-5.0")
+  conflicts=("dotnet-runtime-preview" "dotnet-runtime=${_runtimever%-*}" "dotnet-runtime-5.0")
 
-  install -dm 755 "${pkgdir}"/{opt/dotnet/shared,usr/share/licenses}
-  cp -dr --no-preserve='ownership' shared/Microsoft.NETCore.App "${pkgdir}"/opt/dotnet/shared/
+  install -dm 755 "${pkgdir}"/usr/share/{dotnet/shared,licenses}
+  cp -dr --no-preserve='ownership' shared/Microsoft.NETCore.App "${pkgdir}"/usr/share/dotnet/shared/
   ln -s dotnet-host-preview "${pkgdir}"/usr/share/licenses/dotnet-runtime-preview
 }
 
 package_aspnet-runtime-preview() {
-  pkgdesc='The ASP.NET Core runtime (preview)'
+  pkgdesc='The ASP.NET Core runtime (preview, binary)'
   depends=('dotnet-runtime-preview')
-  provides=("aspnet-runtime=${pkgver%+*}")
+  provides=("aspnet-runtime-preview" "aspnet-runtime=${_runtimever%-*}" "aspnet-runtime-5.0")
+  conflicts=("aspnet-runtime-preview" "aspnet-runtime=${_runtimever%-*}" "aspnet-runtime-5.0")
 
-  install -dm 755 "${pkgdir}"/{opt/dotnet/shared,usr/share/licenses}
-  cp -dr --no-preserve='ownership' shared/Microsoft.AspNetCore.App "${pkgdir}"/opt/dotnet/shared/
+  install -dm 755 "${pkgdir}"/usr/share/{dotnet/shared,licenses}
+  cp -dr --no-preserve='ownership' shared/Microsoft.AspNetCore.App "${pkgdir}"/usr/share/dotnet/shared/
   ln -s dotnet-host-preview "${pkgdir}"/usr/share/licenses/aspnet-runtime-preview
 }
 
 package_dotnet-sdk-preview() {
-  pkgdesc='The .NET Core SDK (preview)'
-  depends=('dotnet-runtime-preview')
-  provides=("dotnet-sdk=${pkgver%+*}")
+  pkgdesc='The .NET Core SDK (preview, binary)'
+  depends=('dotnet-sdk=3.1' 'dotnet-runtime-preview' 'glibc')
+  provides=("dotnet-sdk-preview" "dotnet-sdk=${_sdkver%-*}" "dotnet-sdk-5.0")
+  conflicts=("dotnet-sdk-preview" "dotnet-sdk=${_sdkver%-*}" "dotnet-sdk-5.0")
 
-  install -dm 755 "${pkgdir}"/{opt/dotnet,usr/share/licenses}
-  cp -dr --no-preserve='ownership' packs sdk templates "${pkgdir}"/opt/dotnet/
+  install -dm 755 "${pkgdir}"/usr/share/{dotnet,dotnet/packs,licenses}
+  cp -dr --no-preserve='ownership' sdk templates "${pkgdir}"/usr/share/dotnet/
+  cp -dr --no-preserve='ownership' packs/{Microsoft.AspNetCore.App.Ref,Microsoft.NETCore.App.Host.linux-x64,Microsoft.NETCore.App.Ref} "${pkgdir}"/usr/share/dotnet/packs/
   ln -s dotnet-host-preview "${pkgdir}"/usr/share/licenses/dotnet-sdk-preview
 }
-
-# vim: ts=2 sw=2 et:
diff --git a/dotnet.sh b/dotnet.sh
index 3e90896cdfd8..bea68a5ea98b 100755
--- a/dotnet.sh
+++ b/dotnet.sh
@@ -1,6 +1,4 @@
 #!/bin/sh
 
-export DOTNET_ROOT=/opt/dotnet
-exec /opt/dotnet/dotnet "$@"
-
-# vim: ts=2 sw=2 et:
+export DOTNET_ROOT=/usr/share/dotnet
+exec /usr/share/dotnet/dotnet "$@"
\ No newline at end of file