From 3d226213ed1584960c7b8be7456ee28d2465c505 Mon Sep 17 00:00:00 2001 From: David Driscoll Date: Wed, 1 Jul 2015 11:23:32 -0400 Subject: [PATCH 1/2] Download windows dnx runtime and include in release --- build.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/build.sh b/build.sh index ae1f0ee8e6..2436eb0bbb 100755 --- a/build.sh +++ b/build.sh @@ -28,6 +28,20 @@ dnvm use 1.0.0-beta4 dnu publish src/OmniSharp --configuration Release --no-source --out artifacts/build/omnisharp --runtime dnx-mono.1.0.0-beta4 2>&1 | tee buildlog # work around for kpm bundle returning an exit code 0 on failure grep "Build failed" buildlog + +curl -LO http://nuget.org/nuget.exe +mono nuget.exe install dnx-clr-win-x86 -Version 1.0.0-beta4 -Prerelease -OutputDirectory artifacts/build/omnisharp/approot/packages + +if [ ! -d "artifacts/build/omnisharp/approot/packages/dnx-clr-win-x86.1.0.0-beta4" ]; then + echo 'ERROR: Can not find dnx-clr-win-x86.1.0.0-beta4 in output exiting!' + exit 1 +fi + +if [ ! -d "artifacts/build/omnisharp/approot/packages/dnx-mono.1.0.0-beta4" ]; then + echo 'ERROR: Can not find dnx-mono.1.0.0-beta4 in output exiting!' + exit 1 +fi + rc=$?; if [[ $rc == 0 ]]; then exit 1; fi cd artifacts/build/omnisharp tar -zcf ../../../omnisharp.tar.gz . From cc70800b9078414ccc604ba828bad06d3e897d52 Mon Sep 17 00:00:00 2001 From: David Driscoll Date: Wed, 1 Jul 2015 11:34:34 -0400 Subject: [PATCH 2/2] Fixed issue with placement of installing runtime. --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 2436eb0bbb..6bfa6f59e5 100755 --- a/build.sh +++ b/build.sh @@ -28,6 +28,7 @@ dnvm use 1.0.0-beta4 dnu publish src/OmniSharp --configuration Release --no-source --out artifacts/build/omnisharp --runtime dnx-mono.1.0.0-beta4 2>&1 | tee buildlog # work around for kpm bundle returning an exit code 0 on failure grep "Build failed" buildlog +rc=$?; if [[ $rc == 0 ]]; then exit 1; fi curl -LO http://nuget.org/nuget.exe mono nuget.exe install dnx-clr-win-x86 -Version 1.0.0-beta4 -Prerelease -OutputDirectory artifacts/build/omnisharp/approot/packages @@ -42,7 +43,6 @@ if [ ! -d "artifacts/build/omnisharp/approot/packages/dnx-mono.1.0.0-beta4" ]; t exit 1 fi -rc=$?; if [[ $rc == 0 ]]; then exit 1; fi cd artifacts/build/omnisharp tar -zcf ../../../omnisharp.tar.gz . cd ../../..