summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Sferrazza2018-12-07 01:20:29 -0500
committerKyle Sferrazza2018-12-07 01:20:29 -0500
commitd17817b7e8a7490c9d83ce4f437fa0472219827d (patch)
tree066dda9c7a87b2cef577c396d3d35369aa057edb
parent38c350b438a028bc48e8e073d299e5bfb53d19ee (diff)
downloadaur-d17817b7e8a7490c9d83ce4f437fa0472219827d.tar.gz
delete global.json so dotnet version doesn't de-sync
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD10
-rw-r--r--dotnet-version.patch9
3 files changed, 5 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c37eb30551a8..3794b391f22d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = powershell-git
pkgdesc = A cross-platform automation and configuration tool/framework (git version)
- pkgver = 6.2.0.preview.2.10.gdedddb6b5
+ pkgver = 6.2.0.preview.2.60.gb55dc807c
pkgrel = 1
url = https://github.com/PowerShell/PowerShell
install = powershell.install
@@ -19,12 +19,10 @@ pkgbase = powershell-git
source = pester::git+https://github.com/PowerShell/psl-pester.git#branch=develop
source = googletest::git+https://github.com/google/googletest.git
source = build.sh
- source = dotnet-version.patch
md5sums = SKIP
md5sums = SKIP
md5sums = SKIP
md5sums = 70d89b489a4ae0198b9f8dbeb7bb9c40
- md5sums = 17cf304cc89b323ea2a8c97de83267b2
pkgname = powershell-git
diff --git a/PKGBUILD b/PKGBUILD
index bb4288c424e8..0acf9a0b3e78 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname='powershell-git'
_pkgname='powershell'
_binaryname='pwsh'
-pkgver=6.2.0.preview.2.10.gdedddb6b5
+pkgver=6.2.0.preview.2.60.gb55dc807c
pkgrel=1
pkgdesc='A cross-platform automation and configuration tool/framework (git version)'
arch=('x86_64')
@@ -16,13 +16,11 @@ conflicts=('powershell')
source=($_pkgname::'git+https://github.com/PowerShell/PowerShell.git'
'pester::git+https://github.com/PowerShell/psl-pester.git#branch=develop'
'googletest::git+https://github.com/google/googletest.git'
- build.sh
- 'dotnet-version.patch')
+ build.sh)
md5sums=('SKIP'
'SKIP'
'SKIP'
- '70d89b489a4ae0198b9f8dbeb7bb9c40'
- '17cf304cc89b323ea2a8c97de83267b2')
+ '70d89b489a4ae0198b9f8dbeb7bb9c40')
install=powershell.install
pkgver() {
@@ -38,7 +36,7 @@ prepare() {
git submodule update
git clean -dfx
- cat $srcdir/dotnet-version.patch | patch -p1
+ rm global.json
}
build() {
diff --git a/dotnet-version.patch b/dotnet-version.patch
deleted file mode 100644
index 4c65a5d10f66..000000000000
--- a/dotnet-version.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/global.json
-+++ b/global.json
-@@ -1,5 +1,5 @@
- {
- "sdk": {
-- "version": "2.1.403"
-+ "version": "2.1.500"
- }
- }