Ver 2.1.14 Update

2 files changed, 26 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 60b5f3d06077..a91be95ac9c6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = dotnet-core-2.1
-	pkgver = 2.1.13
+	pkgver = 2.1.14
 	pkgrel = 1
 	url = https://www.microsoft.com/net/core
 	arch = x86_64
@@ -21,21 +21,21 @@ pkgbase = dotnet-core-2.1
 	options = staticlibs
 	source = dotnet.sh
 	sha512sums = a6ee992d7ab08adb916f0b5d72d203f8ab38cfa2e354f062d499d4d8a64ab2b95e5511a041d859331e560f45c5bb642c2f118951e2104f362e10b31cf07e95b0
-	source_x86_64 = https://download.visualstudio.microsoft.com/download/pr/8029a774-0cc8-4c62-945e-169a473b51d3/2c3f6a18aed152e5e498035695ed816f/dotnet-sdk-2.1.802-linux-x64.tar.gz
-	sha512sums_x86_64 = 8601ec68fa8978c5a08a696cc69f5e0aa9dabf274bade40e2fd9ded2e563f2cc7a1cb418a95c9b52e1fa9b6c4a30993be68cb3b6bbda4598c57b37ec9ce992ad
-	source_armv7h = https://download.visualstudio.microsoft.com/download/pr/516cf8d3-f536-4f58-a5ce-aa6f2f85d1c8/98aab0aaedd12e987310f4c2c1f327d3/dotnet-sdk-2.1.802-linux-arm.tar.gz
-	sha512sums_armv7h = 12717f5b37d689eaba49fc9c3c40a8fac097022390c19d348b388456e73819c3e0442c3bc06cc49259404dc6d46d63cd951abb232aa1244f2de0763b785bdb42
-	source_aarch64 = https://download.visualstudio.microsoft.com/download/pr/df4506c8-dbaa-4fc9-910b-63044c6d7ecf/0c4530092606a9ba32045996b64749fe/dotnet-sdk-2.1.802-linux-arm64.tar.gz
-	sha512sums_aarch64 = 42b77b1aa2533c03199884cdd0520777054b662be27d0e27b993bcceadff0d426b76cd6d5426a64b5634543d9f14436cdb15bb54e043fdff444eaec8fcdc2ac7
+	source_x86_64 = https://download.visualstudio.microsoft.com/download/pr/39e68289-0364-4173-a12b-c6234e94c527/92f3eb83bfca8b7cd360868996763125/dotnet-sdk-2.1.607-linux-x64.tar.gz
+	sha512sums_x86_64 = bfcee5d0121bc3b4dcd08c7a99e700a9dc89e9dcf326ae40046a222bc2fe0212bca14811dcf1e96a6cc6ecd085fbc492e30dc2c2d19ee1741960bbd5e238233a
+	source_armv7h = https://download.visualstudio.microsoft.com/download/pr/94409a9a-41e3-4df9-83bc-9e23ed96abaf/2b75460d9a8eef8361c01bafc1783fab/dotnet-sdk-2.1.607-linux-arm.tar.gz
+	sha512sums_armv7h = 2cd8fa250e6a0e81faf409e7dc4f6d581117f565d58cff48b31f457e7cafc7f3cfe0de0df2b1c5d035733879750eb2af22fcc950720a7a7192e4221318052838
+	source_aarch64 = https://download.visualstudio.microsoft.com/download/pr/7522a153-84f6-447e-afe8-ffe2f5724478/a9370fb612f1501241b199a5e479200b/dotnet-sdk-2.1.607-linux-arm64.tar.gz
+	sha512sums_aarch64 = e7f5e30a55bb5af3ecec0ee5566622755db4199de488e89c5e4b5d5f870d0a2c77f337346ddd9711c8c4f25b1fc85f1b4ba219bef9706e9b9510d718b5e5f9d6
 
 pkgname = dotnet-host-2.1
 	pkgdesc = A generic driver for the .NET Core Command Line Interface version 2.1
-	provides = dotnet-host=2.1.13
+	provides = dotnet-host=2.1.14
 	conflicts = dotnet-host
 
 pkgname = dotnet-runtime-2.1
 	pkgdesc = The .NET Core runtime version 2.1
-	depends = dotnet-host>=2.1.13
+	depends = dotnet-host>=2.1.14
 	depends = icu
 	depends = krb5
 	depends = libunwind
@@ -43,10 +43,10 @@ pkgname = dotnet-runtime-2.1
 	depends = zlib
 	depends = libcurl.so
 	optdepends = lttng-ust: CoreCLR tracing
-	provides = dotnet-runtime=2.1.13
+	provides = dotnet-runtime=2.1.14
 
 pkgname = dotnet-sdk-2.1
 	pkgdesc = The .NET Core SDK version 2.1
-	depends = dotnet-runtime=2.1.13
-	provides = dotnet-sdk=2.1.802
+	depends = dotnet-runtime=2.1.14
+	provides = dotnet-sdk=2.1.607
 
diff --git a/PKGBUILD b/PKGBUILD
index 17e492fdb97e..779ac0a3d275 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=dotnet-core-2.1
 pkgname=('dotnet-host-2.1' 'dotnet-runtime-2.1' 'dotnet-sdk-2.1')
-pkgver=2.1.13
+pkgver=2.1.14
 pkgrel=1
 arch=('x86_64' 'armv7h' 'aarch64')
 url='https://www.microsoft.com/net/core'
@@ -13,13 +13,13 @@ makedepends=(
 )
 options=('staticlibs')
 source=('dotnet.sh')
-source_armv7h=('https://download.visualstudio.microsoft.com/download/pr/516cf8d3-f536-4f58-a5ce-aa6f2f85d1c8/98aab0aaedd12e987310f4c2c1f327d3/dotnet-sdk-2.1.802-linux-arm.tar.gz')
-source_aarch64=('https://download.visualstudio.microsoft.com/download/pr/df4506c8-dbaa-4fc9-910b-63044c6d7ecf/0c4530092606a9ba32045996b64749fe/dotnet-sdk-2.1.802-linux-arm64.tar.gz')
-source_x86_64=('https://download.visualstudio.microsoft.com/download/pr/8029a774-0cc8-4c62-945e-169a473b51d3/2c3f6a18aed152e5e498035695ed816f/dotnet-sdk-2.1.802-linux-x64.tar.gz')
 sha512sums=('a6ee992d7ab08adb916f0b5d72d203f8ab38cfa2e354f062d499d4d8a64ab2b95e5511a041d859331e560f45c5bb642c2f118951e2104f362e10b31cf07e95b0')
-sha512sums_armv7h=('12717f5b37d689eaba49fc9c3c40a8fac097022390c19d348b388456e73819c3e0442c3bc06cc49259404dc6d46d63cd951abb232aa1244f2de0763b785bdb42')
-sha512sums_aarch64=('42b77b1aa2533c03199884cdd0520777054b662be27d0e27b993bcceadff0d426b76cd6d5426a64b5634543d9f14436cdb15bb54e043fdff444eaec8fcdc2ac7')
-sha512sums_x86_64=('8601ec68fa8978c5a08a696cc69f5e0aa9dabf274bade40e2fd9ded2e563f2cc7a1cb418a95c9b52e1fa9b6c4a30993be68cb3b6bbda4598c57b37ec9ce992ad')
+source_armv7h=('https://download.visualstudio.microsoft.com/download/pr/94409a9a-41e3-4df9-83bc-9e23ed96abaf/2b75460d9a8eef8361c01bafc1783fab/dotnet-sdk-2.1.607-linux-arm.tar.gz')
+source_aarch64=('https://download.visualstudio.microsoft.com/download/pr/7522a153-84f6-447e-afe8-ffe2f5724478/a9370fb612f1501241b199a5e479200b/dotnet-sdk-2.1.607-linux-arm64.tar.gz')
+source_x86_64=('https://download.visualstudio.microsoft.com/download/pr/39e68289-0364-4173-a12b-c6234e94c527/92f3eb83bfca8b7cd360868996763125/dotnet-sdk-2.1.607-linux-x64.tar.gz')
+sha512sums_armv7h=('2cd8fa250e6a0e81faf409e7dc4f6d581117f565d58cff48b31f457e7cafc7f3cfe0de0df2b1c5d035733879750eb2af22fcc950720a7a7192e4221318052838')
+sha512sums_aarch64=('e7f5e30a55bb5af3ecec0ee5566622755db4199de488e89c5e4b5d5f870d0a2c77f337346ddd9711c8c4f25b1fc85f1b4ba219bef9706e9b9510d718b5e5f9d6')
+sha512sums_x86_64=('bfcee5d0121bc3b4dcd08c7a99e700a9dc89e9dcf326ae40046a222bc2fe0212bca14811dcf1e96a6cc6ecd085fbc492e30dc2c2d19ee1741960bbd5e238233a')
 
 # Versioning details for dependencies
 # https://docs.microsoft.com/en-us/dotnet/core/versions/#versioning-details
@@ -29,15 +29,17 @@ package_dotnet-host-2.1() {
   provides=("dotnet-host=${pkgver%+*}")
   conflicts=('dotnet-host')
 
-  install -dm 755 "${pkgdir}"/{opt/dotnet,usr/share/licenses/dotnet-host-2.1}
+  install -dm 755 "${pkgdir}"/{opt/dotnet,usr/share/licenses/dotnet-host-2.1,usr/bin,usr/lib}
   cp -dr --no-preserve='ownership' dotnet host "${pkgdir}"/opt/dotnet/
   cp -dr --no-preserve='ownership' LICENSE.txt ThirdPartyNotices.txt "${pkgdir}"/usr/share/licenses/dotnet-host-2.1
-  install -Dm 755 "${srcdir}"/dotnet.sh "${pkgdir}"/usr/bin/dotnet
+  install -Dm 755 "${srcdir}"/dotnet.sh "${pkgdir}"/opt/dotnet
+  ln -sf /opt/dotnet/dotnet.sh "${pkgdir}"/usr/bin/dotnet
+  ln -sf /opt/dotnet/host/fxr/"${pkgver}"/libhostfxr.so "${pkgdir}"/usr/lib/libhostfxr.so
 }
 
 package_dotnet-runtime-2.1() {
   pkgdesc='The .NET Core runtime version 2.1'
-  depends=('dotnet-host>=2.1.13' 'icu' 'krb5' 'libunwind' 'openssl' 'zlib'
+  depends=('dotnet-host>=2.1.14' 'icu' 'krb5' 'libunwind' 'openssl' 'zlib'
            'libcurl.so')
   optdepends=('lttng-ust: CoreCLR tracing')
   provides=("dotnet-runtime=${pkgver%+*}")
@@ -47,21 +49,10 @@ package_dotnet-runtime-2.1() {
   ln -s dotnet-host-2.1 "${pkgdir}"/usr/share/licenses/dotnet-runtime-2.1
 }
 
-#package_aspnet-runtime-2.1() {
-#  arch=('x86_64' 'armv7h')
-#  pkgdesc='The ASP.NET Core runtime version 2.1'
-#  depends=('dotnet-runtime=2.1.13')
-#  provides=("aspnet-runtime=${pkgver%+*}")
-
-#  install -dm 755 "${pkgdir}"/{opt/dotnet/shared,usr/share/licenses}
-#  cp -dr --no-preserve='ownership' shared/Microsoft.AspNetCore.App "${pkgdir}"/opt/dotnet/shared/
-#  ln -s dotnet-host-2.1 "${pkgdir}"/usr/share/licenses/aspnet-runtime-2.1
-#}
-
 package_dotnet-sdk-2.1() {
   pkgdesc='The .NET Core SDK version 2.1'
-  depends=('dotnet-runtime=2.1.13')
-  provides=("dotnet-sdk=2.1.802")
+  depends=('dotnet-runtime=2.1.14')
+  provides=("dotnet-sdk=2.1.607")
 
   install -dm 755 "${pkgdir}"/{opt/dotnet,usr/share/licenses}
   cp -dr --no-preserve='ownership' sdk "${pkgdir}"/opt/dotnet/