1) 'SKIP' parameter added for the 'dotnet-cli' source.

2) 'pkgver()' function is added to automatically determine new version of the package.

2 files changed, 21 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 69302482501d..061ebbbc1449 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dotnet-cli-git
 	pkgdesc = The .NET Core command-line (CLI) tools, used for building .NET Core apps and libraries through your development flow (compiling, NuGet package management, running, testing, ...)
-	pkgver = 1.0.0_rc4_004793
+	pkgver = 1.0.0_rc4_004823
 	pkgrel = 1
 	url = https://github.com/dotnet/cli
 	arch = x86_64
@@ -17,16 +17,16 @@ pkgbase = dotnet-cli-git
 	depends = openssl
 	depends = curl
 	provides = dotnet
-	noextract = dotnet-cli-git-1.0.0_rc4_004793.tar.gz
+	noextract = dotnet-cli-git-1.0.0_rc4_004823.tar.gz
 	options = staticlibs
 	source = coreclr-1.1.0.tar.gz::https://github.com/dotnet/coreclr/archive/v1.1.0.tar.gz
 	source = corefx-1.1.0.tar.gz::https://github.com/dotnet/corefx/archive/v1.1.0.tar.gz
-	source = dotnet-cli-git-1.0.0_rc4_004793.tar.gz::https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-debian-x64.latest.tar.gz
+	source = dotnet-cli-git-1.0.0_rc4_004823.tar.gz::https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/dotnet-dev-debian-x64.latest.tar.gz
 	source = llvm-39-github-pull-8311.patch
 	source = llvm-39-move.patch
 	sha256sums = edc1e416f07a71e2b3f70c1f1412e45a7396b3f0daac5bcb267d5f779b9d7444
 	sha256sums = ca48ad090c72129ef145ef9b414767408a8fc1249e94a14dc6d4255b1e0b8648
-	sha256sums = a9e72c98b3e26f51090d41df8edb90314da93b490be02ca675b79234aa3c4974
+	sha256sums = SKIP
 	sha256sums = 581d6484626bbae820feb19d0613955fea333c025fb06d43a731a3db776686f7
 	sha256sums = 84a0e56d00fd2f3f9f82b7d017652f03d4e7f80c6968d7fa1274f6e46af0ff3d
 
diff --git a/PKGBUILD b/PKGBUILD
index 83eae3fd61bc..1b2cb69806d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Dmitry Kalinin <lwinch2006.rss@protonmail.ch>
 pkgname=dotnet-cli-git
-pkgver="1.0.0_rc4_004793"
+pkgver=1.0.0_rc4_004823
 pkgrel=1
 pkgdesc="The .NET Core command-line (CLI) tools, used for building .NET Core apps and libraries through your development flow (compiling, NuGet package management, running, testing, ...)"
 arch=(x86_64)
@@ -30,10 +30,20 @@ source=(
 noextract=("${pkgname}-${pkgver}.tar.gz")
 sha256sums=('edc1e416f07a71e2b3f70c1f1412e45a7396b3f0daac5bcb267d5f779b9d7444'
             'ca48ad090c72129ef145ef9b414767408a8fc1249e94a14dc6d4255b1e0b8648'
-            'a9e72c98b3e26f51090d41df8edb90314da93b490be02ca675b79234aa3c4974'
+            'SKIP'
             '581d6484626bbae820feb19d0613955fea333c025fb06d43a731a3db776686f7'
             '84a0e56d00fd2f3f9f82b7d017652f03d4e7f80c6968d7fa1274f6e46af0ff3d')
 
+pkgver() {
+  local _versionDetailsAsString=$(curl https://dotnetcli.blob.core.windows.net/dotnet/Sdk/rel-1.0.0/latest.version);
+  readarray -t _versionDetailsAsArray <<< "${_versionDetailsAsString}";
+  local _version="${_versionDetailsAsArray[1]}";
+  _version="${_version//[$'\t\r\n']}";
+  _version="${_version//-/_}";
+  mv "${srcdir}/${pkgname}-${pkgver}.tar.gz" "${srcdir}/${pkgname}-${_version}.tar.gz"
+  echo "${_version}"
+}
+
 prepare() {
   cd "${srcdir}/${_coreclrname}-${_coreclrver}"
   patch -p1 < "${srcdir}/llvm-39-github-pull-8311.patch"
@@ -57,8 +67,11 @@ _corefx_files=(
 )
 
 _copy_file() {
-  cp --force --preserve=mode $1 "$2/shared/Microsoft.NETCore.App/1.1.0/"
-  cp --force --preserve=mode $1 "$2/shared/Microsoft.NETCore.App/1.0.3/"
+  local _netcoreappverdir1="$(ls -d $2/shared/Microsoft.NETCore.App/*/ | head -n 1 | tail -n 1)";
+  local _netcoreappverdir2="$(ls -d $2/shared/Microsoft.NETCore.App/*/ | head -n 2 | tail -n 1)";
+
+  cp --force --preserve=mode $1 "${_netcoreappverdir1}"
+  cp --force --preserve=mode $1 "${_netcoreappverdir2}"
 }
 
 package() {