diff --git a/.travis.yml b/.travis.yml
index c97ecf41c8..caf74367c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,45 +29,51 @@ addons:
       - zlib1g
       - curl
       - tree
-before_deploy:
-  - openssl enc -aes-256-cbc -a -salt -in travis_rsa.enc -out ~/.ssh/id_rsa -pass pass:$OPENSSL_PASSKEY -d
-  - chmod 600 ~/.ssh/id_rsa
-  - eval `ssh-agent -s`
-  - ssh-add ~/.ssh/id_rsa
 deploy:
   provider: releases
   api_key:
     secure: N9hansErZKHl7G5Ed/hcBgwcvLuRjB7YAskAvSAYB+luacV6rSK7Vlm/4NyjaZCwWv5wOdBphle2S4yZLRDTdMwLrdQWwWYeZI60kE22c1amKJaf6j5ai2u/P3bt55klQ2yO2U/LacwHVoRtJlVdwSAXuDQ3zMd88VbBModQyxE=
   file:
-    - 'omnisharp.tar.gz'
-    - 'omnisharp.bootstrap.tar.gz'
+    - 'artifacts/omnisharp-coreclr-darwin-x64.tar.gz'
+    - 'artifacts/omnisharp-coreclr-darwin-x64.tar.gz'
+    - 'artifacts/omnisharp.boostrap-coreclr-darwin-x64.tar.gz'
+    - 'artifacts/omnisharp-coreclr-linux-x64.tar.gz'
+    - 'artifacts/omnisharp-mono.tar.gz'
+    - 'artifacts/omnisharp-coreclr-linux-x64.tar.gz'
+    - 'artifacts/omnisharp-mono.tar.gz'
   skip_cleanup: true
   on:
     repo: OmniSharp/omnisharp-roslyn
     tags: true
 after_deploy: |
-  OMNISHARP_VERSION="1.0.0-dev";
-  if [ $TRAVIS_TAG ]; then
-    OMNISHARP_VERSION=${TRAVIS_TAG:1};
+  openssl enc -aes-256-cbc -a -salt -in travis_rsa.enc -out ~/.ssh/id_rsa -pass pass:$OPENSSL_PASSKEY -d
+  chmod 600 ~/.ssh/id_rsa
+  eval `ssh-agent -s`
+  ssh-add ~/.ssh/id_rsa
+  if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+    OMNISHARP_VERSION="1.0.0-dev";
+    if [ $TRAVIS_TAG ]; then
+      OMNISHARP_VERSION=${TRAVIS_TAG:1};
+    fi
+    nuget push artifacts/nuget/Release/OmniSharp.Host.$OMNISHARP_VERSION.nupkg $MYGET_AUTH -Source https://www.myget.org/F/omnisharp/api/v2/package
+    nuget push artifacts/nuget/Release/OmniSharp.Bootstrap.$OMNISHARP_VERSION.nupkg $MYGET_AUTH -Source https://www.myget.org/F/omnisharp/api/v2/package
+    nuget push artifacts/nuget/Release/OmniSharp.Dnx.$OMNISHARP_VERSION.nupkg $MYGET_AUTH -Source https://www.myget.org/F/omnisharp/api/v2/package
+    nuget push artifacts/nuget/Release/OmniSharp.MSBuild.$OMNISHARP_VERSION.nupkg $MYGET_AUTH -Source https://www.myget.org/F/omnisharp/api/v2/package
+    nuget push artifacts/nuget/Release/OmniSharp.Nuget.$OMNISHARP_VERSION.nupkg $MYGET_AUTH -Source https://www.myget.org/F/omnisharp/api/v2/package
+    nuget push artifacts/nuget/Release/OmniSharp.Roslyn.$OMNISHARP_VERSION.nupkg $MYGET_AUTH -Source https://www.myget.org/F/omnisharp/api/v2/package
+    nuget push artifacts/nuget/Release/OmniSharp.Roslyn.CSharp.$OMNISHARP_VERSION.nupkg $MYGET_AUTH -Source https://www.myget.org/F/omnisharp/api/v2/package
+    nuget push artifacts/nuget/Release/OmniSharp.ScriptCs.$OMNISHARP_VERSION.nupkg $MYGET_AUTH -Source https://www.myget.org/F/omnisharp/api/v2/package
+    nuget push artifacts/nuget/Release/OmniSharp.Stdio.$OMNISHARP_VERSION.nupkg $MYGET_AUTH -Source https://www.myget.org/F/omnisharp/api/v2/package
+    BRANCH_NAME="upgrade/omnisharp-roslyn-$TRAVIS_TAG"
+    git config --global user.name "OmniSharp Bot"
+    git config --global user.email "omnisharp-bot@users.noreply.github.com"
+    git clone git@github.com:OmniSharp/omnisharp-node-client.git ~/omnisharp-node-client
+    pushd ~/omnisharp-node-client
+    git checkout -b $BRANCH_NAME
+    cat package.json > package2.json
+    cat package2.json | jq '."omnisharp-roslyn"="'$TRAVIS_TAG'"' > package.json
+    git add package.json
+    git commit -m "Update omnisharp-roslyn to $TRAVIS_TAG"
+    git push origin $BRANCH_NAME
+    curl -X POST -H 'Authorization: token '$GITHUB_API_TOKEN'' -d '{ "title": "Upgrade to OmniSharp/omnisharp-roslyn '$TRAVIS_TAG'", "body": "*Automated PR*  -  Upgrade omnisharp-roslyn to '$TRAVIS_TAG'. [release patch]", "head": "'$BRANCH_NAME'", "base": "master" }' https://api.github.com/repos/OmniSharp/omnisharp-node-client/pulls
   fi
-  nuget push artifacts/build/nuget/Release/OmniSharp.Host.$OMNISHARP_VERSION.nupkg $MYGET_AUTH -Source https://www.myget.org/F/omnisharp/api/v2/package
-  nuget push artifacts/build/nuget/Release/OmniSharp.Bootstrap.$OMNISHARP_VERSION.nupkg $MYGET_AUTH -Source https://www.myget.org/F/omnisharp/api/v2/package
-  nuget push artifacts/build/nuget/Release/OmniSharp.Dnx.$OMNISHARP_VERSION.nupkg $MYGET_AUTH -Source https://www.myget.org/F/omnisharp/api/v2/package
-  nuget push artifacts/build/nuget/Release/OmniSharp.MSBuild.$OMNISHARP_VERSION.nupkg $MYGET_AUTH -Source https://www.myget.org/F/omnisharp/api/v2/package
-  nuget push artifacts/build/nuget/Release/OmniSharp.Nuget.$OMNISHARP_VERSION.nupkg $MYGET_AUTH -Source https://www.myget.org/F/omnisharp/api/v2/package
-  nuget push artifacts/build/nuget/Release/OmniSharp.Roslyn.$OMNISHARP_VERSION.nupkg $MYGET_AUTH -Source https://www.myget.org/F/omnisharp/api/v2/package
-  nuget push artifacts/build/nuget/Release/OmniSharp.Roslyn.CSharp.$OMNISHARP_VERSION.nupkg $MYGET_AUTH -Source https://www.myget.org/F/omnisharp/api/v2/package
-  nuget push artifacts/build/nuget/Release/OmniSharp.ScriptCs.$OMNISHARP_VERSION.nupkg $MYGET_AUTH -Source https://www.myget.org/F/omnisharp/api/v2/package
-  nuget push artifacts/build/nuget/Release/OmniSharp.Stdio.$OMNISHARP_VERSION.nupkg $MYGET_AUTH -Source https://www.myget.org/F/omnisharp/api/v2/package
-  BRANCH_NAME="upgrade/omnisharp-roslyn-$TRAVIS_TAG"
-  git config --global user.name "OmniSharp Bot"
-  git config --global user.email "omnisharp-bot@users.noreply.github.com"
-  git clone git@github.com:OmniSharp/omnisharp-node-client.git ~/omnisharp-node-client
-  pushd ~/omnisharp-node-client
-  git checkout -b $BRANCH_NAME
-  cat package.json > package2.json
-  cat package2.json | jq '."omnisharp-roslyn"="'$TRAVIS_TAG'"' > package.json
-  git add package.json
-  git commit -m "Update omnisharp-roslyn to $TRAVIS_TAG"
-  git push origin $BRANCH_NAME
-  curl -X POST -H 'Authorization: token '$GITHUB_API_TOKEN'' -d '{ "title": "Upgrade to OmniSharp/omnisharp-roslyn '$TRAVIS_TAG'", "body": "*Automated PR*  -  Upgrade omnisharp-roslyn to '$TRAVIS_TAG'. [release patch]", "head": "'$BRANCH_NAME'", "base": "master" }' https://api.github.com/repos/OmniSharp/omnisharp-node-client/pulls
diff --git a/README.md b/README.md
index 27d62b131a..e6f5ed4d4d 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,13 @@ Run the server with ```./scripts/Omnisharp -s /path/to/project -p portnumber```
 
 Check out the issue tracker https://huboard.com/OmniSharp/omnisharp-roslyn
 
+## ASPNET RC2 Note
+For the latest version you must have one of the specific pinned versions of ASPNET RC2 installed, they are as follows...
+* `dnx-clr-win-x86.1.0.0-rc2-16386`
+* `dnx-mono.1.0.0-rc2-16386`
+* `dnx-coreclr-win-x64.1.0.0-rc2-16386`
+* `dnx-coreclr-darwin-x64.1.0.0-rc2-16386`
+* `dnx-coreclr-linux-x64.1.0.0-rc2-16386`
 
 ## Help wanted!
 Visit https://jabbr.net/#/rooms/omnisharp if you'd like to help out.
diff --git a/appveyor.yml b/appveyor.yml
index dfa5f43067..3b145918be 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,3 +4,11 @@ init:
 test: off # this turns of AppVeyor automatic searching for test-assemblies, not the actual testing
 build_script:
   - build.cmd
+deploy:
+- provider: GitHub
+  tag: $(APPVEYOR_REPO_TAG_NAME)
+  auth_token:
+    secure: YW4vAIFrVIdyKBNxyVGWGKHP2UejoZcTcD0cf7KYEgZefUWY2XFHjetDW4Q0cICx
+  artifact: /artifact/.*\.zip/
+  on:
+    appveyor_repo_tag: true
diff --git a/build.cmd b/build.cmd
index ce5bb7c979..90f4f23b6a 100644
--- a/build.cmd
+++ b/build.cmd
@@ -16,118 +16,115 @@ if %ERRORLEVEL% neq 0 (
 rmdir /s /q artifacts
 set
 call dnvm update-self
-call dnvm upgrade -u
-call dnvm upgrade -u -r coreclr
+call dnvm install 1.0.0-rc2-16386 -u -r clr -arch x86
+call dnvm install 1.0.0-rc2-16386 -u -r clr -arch x64
+call dnvm install 1.0.0-rc2-16386 -u -r coreclr -arch x86
+call dnvm install 1.0.0-rc2-16386 -u -r coreclr -arch x64
 
-call dnu restore
+call dnu restore --quiet --parallel
 if %errorlevel% neq 0 exit /b %errorlevel%
 
-pushd tests\OmniSharp.Bootstrap.Tests
-call dnx test
-if %errorlevel% neq 0 exit /b %errorlevel%
-popd
-
-pushd tests\OmniSharp.Dnx.Tests
-call dnx test
-if %errorlevel% neq 0 exit /b %errorlevel%
-popd
-
-pushd tests\OmniSharp.Plugins.Tests
-call dnx test
-if %errorlevel% neq 0 exit /b %errorlevel%
-popd
-
-pushd tests\OmniSharp.Roslyn.CSharp.Tests
-call dnx test -parallel none
-if %errorlevel% neq 0 exit /b %errorlevel%
-popd
-
-pushd tests\OmniSharp.Stdio.Tests
-call dnx test
-if %errorlevel% neq 0 exit /b %errorlevel%
-popd
+call:_test "OmniSharp.Bootstrap.Tests" "clr"
+call:_test "OmniSharp.Bootstrap.Tests" "coreclr"
+call:_test "OmniSharp.Dnx.Tests" "clr"
+call:_test "OmniSharp.Dnx.Tests" "coreclr"
+call:_test "OmniSharp.MSBuild.Tests" "clr"
+:: Not supported yet
+::call:_test "OmniSharp.MSBuild.Tests" "coreclr"
+call:_test "OmniSharp.Plugins.Tests" "clr"
+call:_test "OmniSharp.Plugins.Tests" "coreclr"
+call:_test "OmniSharp.Roslyn.CSharp.Tests" "clr" "none"
+call:_test "OmniSharp.Roslyn.CSharp.Tests" "coreclr" "none"
+call:_test "OmniSharp.ScriptCs.Tests" "clr"
+:: Not supported yet
+::call:_test "OmniSharp.ScriptCs.Tests" "coreclr"
+call:_test "OmniSharp.Stdio.Tests" "clr"
+call:_test "OmniSharp.Stdio.Tests" "coreclr"
+call:_test "OmniSharp.Tests" "clr"
+call:_test "OmniSharp.Tests" "coreclr"
+
+:: omnisharp-clr-win-x86.zip
+call:_publish "OmniSharp" "clr" "x86" "artifacts\clr-win-x86" "..\omnisharp-clr-win-x86"
+:: omnisharp-coreclr-win-x86.zip
+call:_publish "OmniSharp" "coreclr" "x86" "artifacts\coreclr-win-x86" "..\omnisharp-coreclr-win-x86"
+:: omnisharp-clr-win-x64.zip
+call:_publish "OmniSharp" "clr" "x64" "artifacts\clr-win-x64" "..\omnisharp-clr-win-x64"
+:: omnisharp-coreclr-win-x64.zip
+call:_publish "OmniSharp" "coreclr" "x64" "artifacts\coreclr-win-x64" "..\omnisharp-coreclr-win-x64"
+:: omnisharp.zip
+:::: TODO
+
+:: omnisharp.bootstrap-clr-win-x86.zip
+call:_publish "OmniSharp.Bootstrap" "clr" "x86" "artifacts\boot-clr-win-x86" "..\omnisharp.bootstrap-clr-win-x86"
+:: omnisharp.bootstrap-coreclr-win-x86.zip
+call:_publish "OmniSharp.Bootstrap" "coreclr" "x86" "artifacts\boot-coreclr-win-x86" "..\omnisharp.bootstrap-coreclr-win-x86"
+:: omnisharp.bootstrap-clr-win-x64.zip
+call:_publish "OmniSharp.Bootstrap" "clr" "x64" "artifacts\boot-clr-win-x64" "..\omnisharp.bootstrap-clr-win-x64"
+:: omnisharp.bootstrap-coreclr-win-x64.zip
+call:_publish "OmniSharp.Bootstrap" "coreclr" "x64" "artifacts\boot-coreclr-win-x64" "..\omnisharp.bootstrap-coreclr-win-x64"
+:: omnisharp.boostrap.zip
+:::: TODO
+
+call dnvm use 1.0.0-rc2-16386 -r coreclr -arch x86
+call:_pack OmniSharp.Host
+call:_pack OmniSharp.Abstractions
+call:_pack OmniSharp.Bootstrap
+call:_pack OmniSharp.Dnx
+call:_pack OmniSharp.MSBuild
+call:_pack OmniSharp.Nuget
+call:_pack OmniSharp.Roslyn
+call:_pack OmniSharp.Roslyn.CSharp
+call:_pack OmniSharp.ScriptCs
+call:_pack OmniSharp.Stdio
 
-pushd tests\OmniSharp.Tests
-call dnx test
-if %errorlevel% neq 0 exit /b %errorlevel%
 popd
-
-call dnvm upgrade -u -r clr
-
-pushd tests\OmniSharp.Bootstrap.Tests
-call dnx test
-if %errorlevel% neq 0 exit /b %errorlevel%
-popd
-
-pushd tests\OmniSharp.Dnx.Tests
-call dnx test
-if %errorlevel% neq 0 exit /b %errorlevel%
-popd
-
-pushd tests\OmniSharp.Plugins.Tests
-call dnx test
-if %errorlevel% neq 0 exit /b %errorlevel%
-popd
-
-pushd tests\OmniSharp.Roslyn.CSharp.Tests
-call dnx test -parallel none
-if %errorlevel% neq 0 exit /b %errorlevel%
-popd
-
-pushd tests\OmniSharp.Stdio.Tests
-call dnx test
-if %errorlevel% neq 0 exit /b %errorlevel%
-popd
-
-pushd tests\OmniSharp.Tests
-call dnx test
-if %errorlevel% neq 0 exit /b %errorlevel%
-popd
-
-pushd tests\OmniSharp.MSBuild.Tests
-call dnx test
-if %errorlevel% neq 0 exit /b %errorlevel%
-popd
-
-pushd tests\OmniSharp.ScriptCs.Tests
-call dnx test
-if %errorlevel% neq 0 exit /b %errorlevel%
+GOTO:EOF
+
+::--------------------------------------------------------
+::-- Functions
+::--------------------------------------------------------
+:_test - %~1=project %~2=parallel
+setlocal
+call dnvm use 1.0.0-rc2-16386 -r %~2 -arch x86
+pushd tests\%~1
+if "%~2" == "" (
+  call dnx test
+) else (
+  call dnx test -parallel none
+)
+if %errorlevel% neq 0 (
+  echo "Tests failed for src/%~1 with runtime %~2"
+  exit /b 1
+)
 popd
-
-call dnvm upgrade -u -r coreclr
-
-rem call dnu pack src\OmniSharp.Host --configuration Release --out artifacts\build\nuget
-rem if %errorlevel% neq 0 exit /b %errorlevel%
-rem call dnu pack src\OmniSharp.Abstractions --configuration Release --out artifacts\build\nuget
-rem if %errorlevel% neq 0 exit /b %errorlevel%
-rem call dnu pack src\OmniSharp.Bootstrap --configuration Release --out artifacts\build\nuget
-rem if %errorlevel% neq 0 exit /b %errorlevel%
-rem call dnu pack src\OmniSharp.Dnx --configuration Release --out artifacts\build\nuget
-rem if %errorlevel% neq 0 exit /b %errorlevel%
-rem call dnu pack src\OmniSharp.MSBuild --configuration Release --out artifacts\build\nuget
-rem if %errorlevel% neq 0 exit /b %errorlevel%
-rem call dnu pack src\OmniSharp.Nuget --configuration Release --out artifacts\build\nuget
-rem if %errorlevel% neq 0 exit /b %errorlevel%
-rem call dnu pack src\OmniSharp.Roslyn --configuration Release --out artifacts\build\nuget
-rem if %errorlevel% neq 0 exit /b %errorlevel%
-rem call dnu pack src\OmniSharp.Roslyn.CSharp --configuration Release --out artifacts\build\nuget
-rem if %errorlevel% neq 0 exit /b %errorlevel%
-rem call dnu pack src\OmniSharp.ScriptCs --configuration Release --out artifacts\build\nuget
-rem if %errorlevel% neq 0 exit /b %errorlevel%
-rem call dnu pack src\OmniSharp.Stdio --configuration Release --out artifacts\build\nuget
-rem if %errorlevel% neq 0 exit /b %errorlevel%
-
-rem call dnu publish artifacts\OmniSharp --configuration Release --no-source --out artifacts\build\omnisharp --runtime active
-rem if %errorlevel% neq 0 exit /b %errorlevel%
-
-rem pushd artifacts\build\omnisharp
-rem call tar -zcf ..\..\..\omnisharp.tar.gz .
-rem popd
-
-rem call dnu publish src\OmniSharp.Bootstrap --configuration Release --no-source --out artifacts\build\omnisharp.bootstrap --runtime active
-
-rem pushd artifacts\build\omnisharp.bootstrap
-rem call tar -zcf ..\..\..\omnisharp.bootstrap.tar.gz .
-rem popd
-
+endlocal
+GOTO:EOF
+
+:_pack - %~1=project
+setlocal
+call dnu restore src\%~1 --quiet
+call dnu pack src\%~1 --configuration Release --quiet --out artifacts\nuget
+if %errorlevel% neq 0 (
+  echo "Package failed for src/%~1, destination: %~4"
+  exit /b 1
+)
+endlocal
+GOTO:EOF
+
+:_publish - %~1=project %~2=runtime %~3=arch %~4=dest %~5=zip
+setlocal
+call dnvm use 1.0.0-rc2-16386 -r %~2 -arch %~3
+call dnu publish "src\%~1" --configuration Release --no-source --quiet --runtime active --out "%~4"
+if %errorlevel% neq 0 (
+  echo "Publish failed for src/%~1 with runtime %~2-%~3, destination: %~4"
+  exit /b 1
+)
+pushd %~4\approot
+call 7z a -r ..\%~5.zip .
+if %errorlevel% neq 0 (
+  echo "Zip failed for src/%~1 with runtime %~2-%~3, destination: %~4"
+  exit /b 1
+)
 popd
+endlocal
+GOTO:EOF
diff --git a/build.sh b/build.sh
index c511e07599..8ffe022475 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,62 @@
 #!/bin/bash
-
+_test() {
+  local _project="$1"
+  local _runtime="$2"
+  dnvm use 1.0.0-rc2-16386 -r $_runtime
+  pushd tests/$_project
+  dnx test -parallel none
+  rc=$?; if [[ $rc != 0 ]]; then
+    echo "Tests failed for tests/$_project with runtime $_runtime"
+    exit $rc;
+  fi
+  popd
+}
+
+_patch_project() {
+  local _project="$1"
+  jq '.version="'$OMNISHARP_VERSION'"' src/$_project/project.json > src/$_project/project.json.temp
+  mv src/$_project/project.json.temp src/$_project/project.json
+}
+
+_pack() {
+  local _project="$1"
+  dnu restore src/$_project --quiet
+  dnu pack src/$_project --configuration Release --out artifacts/nuget --quiet
+  rc=$?; if [[ $rc != 0 ]]; then
+    echo "Pack failed for src/$_project"
+    exit 1;
+  fi
+}
+
+_publish() {
+  local _project="$1"
+  local _runtime="$2"
+  local _version="1.0.0-rc2-16386"
+  local _dest="$3"
+  local _tar="$4"
+
+  dnvm use $_version -r $_runtime
+  dnu publish src/$_project --configuration Release --no-source --quiet --runtime active --out $_dest
+  rc=$?; if [[ $rc != 0 ]]; then
+    echo "Publish failed for src/$_project with runtime $_runtime, destination: $_dest"
+    exit 1;
+  fi
+
+  pushd $_dest/approot/packages/$_project/1.0.0/root/
+  jq '.entryPoint="OmniSharp.Host"' project.json > project.json.temp
+  mv project.json.temp project.json
+  popd
+
+  tree -if $_dest | grep .nupkg | xargs rm
+  pushd $_dest/approot
+  tar -zcf "../$_tar.tar.gz" .
+  rc=$?; if [[ $rc != 0 ]]; then
+    echo "Tar failed for src/$_project with runtime $_runtime, destination: $_dest"
+    exit 1;
+  fi
+  popd
+}
+#########################
 if (! $TRAVIS) then
     pushd "$(dirname "$0")"
 fi
@@ -9,205 +66,89 @@ if ! type dnvm > /dev/null 2>&1; then
     curl -sSL https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.sh | DNX_BRANCH=dev sh && source ~/.dnx/dnvm/dnvm.sh
 fi
 
+# Handle to many files on osx
+if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+  ulimit -n 4096
+fi
+
 # work around restore timeouts on Mono
 [ -z "$MONO_THREADS_PER_CPU" ] && export MONO_THREADS_PER_CPU=50
 
 export DNX_UNSTABLE_FEED=https://www.myget.org/F/aspnetcidev/api/v2
 dnvm update-self
-dnvm upgrade -u
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-dnvm upgrade -u -r coreclr
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-
-dnvm use default -r coreclr
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-
-dnu restore
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-
-dnvm use default -r coreclr
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-
-pushd tests/OmniSharp.Bootstrap.Tests
-dnx test -parallel none
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-popd
-
-pushd tests/OmniSharp.Dnx.Tests
-dnx test -parallel none
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-popd
-
-pushd tests/OmniSharp.Plugins.Tests
-dnx test -parallel none
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-popd
-
-pushd tests/OmniSharp.Roslyn.CSharp.Tests
-dnx test -parallel none
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-popd
 
-pushd tests/OmniSharp.Stdio.Tests
-dnx test -parallel none
+dnvm install 1.0.0-rc2-16386 -u -r mono
 rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-popd
 
-pushd tests/OmniSharp.Tests
-dnx test -parallel none
+dnvm install 1.0.0-rc2-16386 -u -r coreclr
 rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-popd
 
-dnvm use default -r mono
+dnu restore --quiet --parallel
 rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
 
-pushd tests/OmniSharp.Bootstrap.Tests
-dnx test -parallel none
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-popd
-
-pushd tests/OmniSharp.Dnx.Tests
-dnx test -parallel none
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-popd
-
-pushd tests/OmniSharp.Plugins.Tests
-dnx test -parallel none
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-popd
-
-pushd tests/OmniSharp.Roslyn.CSharp.Tests
-dnx test -parallel none
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-popd
-
-pushd tests/OmniSharp.Stdio.Tests
-dnx test -parallel none
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-popd
-
-pushd tests/OmniSharp.Tests
-dnx test -parallel none
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-popd
-
-pushd tests/OmniSharp.MSBuild.Tests
-dnx test -parallel none
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-popd
-
-pushd tests/OmniSharp.ScriptCs.Tests
-dnx test -parallel none
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-popd
-
+_test "OmniSharp.Bootstrap.Tests" "coreclr"
+_test "OmniSharp.Bootstrap.Tests" "mono"
+_test "OmniSharp.Dnx.Tests" "coreclr"
+_test "OmniSharp.Dnx.Tests" "mono"
+#_test "OmniSharp.MSBuild.Tests" "coreclr"
+_test "OmniSharp.MSBuild.Tests" "mono"
+_test "OmniSharp.Plugins.Tests" "coreclr"
+_test "OmniSharp.Plugins.Tests" "mono"
+_test "OmniSharp.Roslyn.CSharp.Tests" "coreclr"
+_test "OmniSharp.Roslyn.CSharp.Tests" "mono"
+#_test "OmniSharp.ScriptCs.Tests" "coreclr"
+_test "OmniSharp.ScriptCs.Tests" "mono"
+_test "OmniSharp.Stdio.Tests" "coreclr"
+_test "OmniSharp.Stdio.Tests" "mono"
+_test "OmniSharp.Tests" "coreclr"
+_test "OmniSharp.Tests" "mono"
 
 OMNISHARP_VERSION="1.0.0-dev";
 if [ $TRAVIS_TAG ]; then
   OMNISHARP_VERSION=${TRAVIS_TAG:1};
 fi
 
-if [ $TRAVIS ]; then
-  jq '.version="'$OMNISHARP_VERSION'"' src/OmniSharp.Host/project.json > src/OmniSharp.Host/project.json.temp
-  jq '.version="'$OMNISHARP_VERSION'"' src/OmniSharp.Abstractions/project.json > src/OmniSharp.Abstractions/project.json.temp
-  jq '.version="'$OMNISHARP_VERSION'"' src/OmniSharp.Bootstrap/project.json > src/OmniSharp.Bootstrap/project.json.temp
-  jq '.version="'$OMNISHARP_VERSION'"' src/OmniSharp.Dnx/project.json > src/OmniSharp.Dnx/project.json.temp
-  jq '.version="'$OMNISHARP_VERSION'"' src/OmniSharp.MSBuild/project.json > src/OmniSharp.MSBuild/project.json.temp
-  jq '.version="'$OMNISHARP_VERSION'"' src/OmniSharp.Nuget/project.json > src/OmniSharp.Nuget/project.json.temp
-  jq '.version="'$OMNISHARP_VERSION'"' src/OmniSharp.Roslyn/project.json > src/OmniSharp.Roslyn/project.json.temp
-  jq '.version="'$OMNISHARP_VERSION'"' src/OmniSharp.Roslyn.CSharp/project.json > src/OmniSharp.Roslyn.CSharp/project.json.temp
-  jq '.version="'$OMNISHARP_VERSION'"' src/OmniSharp.ScriptCs/project.json > src/OmniSharp.ScriptCs/project.json.temp
-  jq '.version="'$OMNISHARP_VERSION'"' src/OmniSharp.Stdio/project.json > src/OmniSharp.Stdio/project.json.temp
-
-  mv src/OmniSharp.Host/project.json.temp src/OmniSharp.Host/project.json
-  mv src/OmniSharp.Abstractions/project.json.temp src/OmniSharp.Abstractions/project.json
-  mv src/OmniSharp.Bootstrap/project.json.temp src/OmniSharp.Bootstrap/project.json
-  mv src/OmniSharp.Dnx/project.json.temp src/OmniSharp.Dnx/project.json
-  mv src/OmniSharp.MSBuild/project.json.temp src/OmniSharp.MSBuild/project.json
-  mv src/OmniSharp.Nuget/project.json.temp src/OmniSharp.Nuget/project.json
-  mv src/OmniSharp.Roslyn/project.json.temp src/OmniSharp.Roslyn/project.json
-  mv src/OmniSharp.Roslyn.CSharp/project.json.temp src/OmniSharp.Roslyn.CSharp/project.json
-  mv src/OmniSharp.ScriptCs/project.json.temp src/OmniSharp.ScriptCs/project.json
-  mv src/OmniSharp.Stdio/project.json.temp src/OmniSharp.Stdio/project.json
+if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+  # omnisharp-coreclr-darwin-x64.tar.gz
+  _publish "OmniSharp" "coreclr" "artifacts/build/omnisharp-coreclr" "../omnisharp-coreclr-darwin-x64"
+  # omnisharp.boostrap-coreclr-darwin-x64.tar.gz
+  _publish "OmniSharp.Bootstrap" "coreclr" "artifacts/build/omnisharp.boostrap-coreclr" "../omnisharp.boostrap-coreclr-darwin-x64"
+else
+  # omnisharp-coreclr-linux-x64.tar.gz
+  _publish "OmniSharp" "coreclr" "artifacts/build/omnisharp-coreclr" "../omnisharp-coreclr-linux-x64"
+  # omnisharp-mono.tar.gz
+  _publish "OmniSharp" "mono" "artifacts/build/omnisharp-coreclr" "../omnisharp-mono"
+
+  # omnisharp-coreclr-linux-x64.tar.gz
+  _publish "OmniSharp.Bootstrap" "coreclr" "artifacts/build/omnisharp.boostrap-coreclr" "../omnisharp.boostrap-coreclr-linux-x64"
+  # omnisharp-mono.tar.gz
+  _publish "OmniSharp.Bootstrap" "mono" "artifacts/build/omnisharp.boostrap-coreclr" "../omnisharp.boostrap-mono"
+
+  if [ $TRAVIS ]; then
+    _patch_project "OmniSharp.Host"
+    _patch_project "OmniSharp.Abstractions"
+    _patch_project "OmniSharp.Bootstrap"
+    _patch_project "OmniSharp.Dnx"
+    _patch_project "OmniSharp.MSBuild"
+    _patch_project "OmniSharp.Nuget"
+    _patch_project "OmniSharp.Roslyn"
+    _patch_project "OmniSharp.Roslyn.CSharp"
+    _patch_project "OmniSharp.ScriptCs"
+    _patch_project "OmniSharp.Stdio"
+  fi
+
+  _pack "OmniSharp.Host"
+  _pack "OmniSharp.Abstractions"
+  _pack "OmniSharp.Bootstrap"
+  _pack "OmniSharp.Dnx"
+  _pack "OmniSharp.MSBuild"
+  _pack "OmniSharp.Nuget"
+  _pack "OmniSharp.Roslyn"
+  _pack "OmniSharp.Roslyn.CSharp"
+  _pack "OmniSharp.ScriptCs"
+  _pack "OmniSharp.Stdio"
 fi
 
-dnvm use default -r mono
-rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
-
-dnu pack src/OmniSharp.Host --configuration Release --out artifacts/build/nuget --quiet
-rc=$?; if [[ $rc != 0 ]]; then exit 1; fi
-dnu pack src/OmniSharp.Abstractions --configuration Release --out artifacts/build/nuget --quiet
-rc=$?; if [[ $rc != 0 ]]; then exit 1; fi
-dnu pack src/OmniSharp.Bootstrap --configuration Release --out artifacts/build/nuget --quiet
-rc=$?; if [[ $rc != 0 ]]; then exit 1; fi
-dnu pack src/OmniSharp.Dnx --configuration Release --out artifacts/build/nuget --quiet
-rc=$?; if [[ $rc != 0 ]]; then exit 1; fi
-dnu pack src/OmniSharp.MSBuild --configuration Release --out artifacts/build/nuget --quiet
-rc=$?; if [[ $rc != 0 ]]; then exit 1; fi
-dnu pack src/OmniSharp.Nuget --configuration Release --out artifacts/build/nuget --quiet
-rc=$?; if [[ $rc != 0 ]]; then exit 1; fi
-dnu pack src/OmniSharp.Roslyn --configuration Release --out artifacts/build/nuget --quiet
-rc=$?; if [[ $rc != 0 ]]; then exit 1; fi
-dnu pack src/OmniSharp.Roslyn.CSharp --configuration Release --out artifacts/build/nuget --quiet
-rc=$?; if [[ $rc != 0 ]]; then exit 1; fi
-dnu pack src/OmniSharp.ScriptCs --configuration Release --out artifacts/build/nuget --quiet
-rc=$?; if [[ $rc != 0 ]]; then exit 1; fi
-dnu pack src/OmniSharp.Stdio --configuration Release --out artifacts/build/nuget --quiet
-rc=$?; if [[ $rc != 0 ]]; then exit 1; fi
-
-dnvm use default -r coreclr
-dnu publish src/OmniSharp --configuration Release --no-source --out artifacts/build/omnisharp --runtime active
-rc=$?; if [[ $rc != 0 ]]; then exit 1; fi
-
-pushd artifacts/build/omnisharp/approot/packages/OmniSharp/1.0.0/root/
-jq '.entryPoint="OmniSharp.Host"' project.json > project.json.temp
-mv project.json.temp project.json
-popd
-
-# 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 -Prerelease -Source https://www.myget.org/F/aspnetcidev/api/v2 -OutputDirectory artifacts/build/omnisharp/approot/packages
-
-find artifacts/build/omnisharp/approot/packages/dnx-clr-win-x86.1.0.0-rc2-* -type d -maxdepth 0
-rc=$?; if [[ $rc != 0 ]]; then exit 1; fi
-
-mono nuget.exe install dnx-mono -Prerelease -Source https://www.myget.org/F/aspnetcidev/api/v2 -OutputDirectory artifacts/build/omnisharp/approot/packages
-
-find artifacts/build/omnisharp/approot/packages/dnx-mono.1.0.0-rc2-* -type d -maxdepth 0
-rc=$?; if [[ $rc != 0 ]]; then exit 1; fi
-
-tree -if artifacts/build/omnisharp | grep .nupkg | xargs rm
-pushd artifacts/build/omnisharp
-tar -zcf ../../../omnisharp.tar.gz .
-popd
-
-# Publish just the bootstrap
-dnu publish src/OmniSharp.Bootstrap --configuration Release --no-source --out artifacts/build/omnisharp.bootstrap --runtime active
-rc=$?; if [[ $rc != 0 ]]; then exit 1; fi
-
-# 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 -Prerelease -Source https://www.myget.org/F/aspnetcidev/api/v2 -OutputDirectory artifacts/build/omnisharp/approot/packages
-
-find artifacts/build/omnisharp/approot/packages/dnx-clr-win-x86.1.0.0-rc2-* -type d -maxdepth 0
-rc=$?; if [[ $rc != 0 ]]; then exit 1; fi
-
-mono nuget.exe install dnx-mono -Prerelease -Source https://www.myget.org/F/aspnetcidev/api/v2 -OutputDirectory artifacts/build/omnisharp/approot/packages
-
-find artifacts/build/omnisharp/approot/packages/dnx-mono.1.0.0-rc2-* -type d -maxdepth 0
-rc=$?; if [[ $rc != 0 ]]; then exit 1; fi
-
-tree -if artifacts/build/omnisharp.bootstrap | grep .nupkg | xargs rm
-pushd artifacts/build/omnisharp.bootstrap
-tar -zcf ../../../omnisharp.bootstrap.tar.gz .
-popd
-
 tree artifacts
 
 if (! $TRAVIS) then
diff --git a/scripts/Bootstrap b/scripts/Bootstrap
index ad65ceb377..864ab1b95f 100644
--- a/scripts/Bootstrap
+++ b/scripts/Bootstrap
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+RUNTIME="dnx-mono.1.0.0-rc2-16386"
+# Enable if you wish to run on coreclr
+#if [[ "$OSTYPE" == "linux-gnu" ]]; then
+#  RUNTIME="dnx-coreclr-linux-x64.1.0.0-rc2-16386"
+#elif [[ "$OSTYPE" == "darwin"* ]]; then
+#  RUNTIME="dnx-coreclr-darwin-x64.1.0.0-rc2-16386"
+#fi
+
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
   DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
@@ -8,8 +16,8 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
 done
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
-BOOTSTRAP=$("$HOME/.dnx/runtimes/dnx-mono.1.0.0-rc2-16337/bin/dnx" "$DIR/../src/OmniSharp" run "$@")
+BOOTSTRAP=$("$HOME/.dnx/runtimes/$RUNTIME/bin/dnx" "$DIR/../src/OmniSharp" run "$@")
 if test -e "$BOOTSTRAP/project.lock.json";then
-  "$HOME/.dnx/runtimes/dnx-mono.1.0.0-rc2-16337/bin/dnu" restore "$BOOTSTRAP"
+  "$HOME/.dnx/runtimes/$RUNTIME/bin/dnu" restore "$BOOTSTRAP"
 fi
-"$HOME/.dnx/runtimes/dnx-mono.1.0.0-rc2-16337/bin/dnx" "$BOOTSTRAP" run "$@"
+"$HOME/.dnx/runtimes/$RUNTIME/bin/dnx" "$BOOTSTRAP" run "$@"
diff --git a/scripts/Bootstrap-coreclr.cmd b/scripts/Bootstrap-coreclr.cmd
index 2ee967ae9d..aba39505b0 100644
--- a/scripts/Bootstrap-coreclr.cmd
+++ b/scripts/Bootstrap-coreclr.cmd
@@ -1,12 +1,10 @@
 SETLOCAL
 
-for /F "delims=" %%I in ('dir %USERPROFILE%\.dnx\runtimes\dnx-coreclr-win-*-rc2-* /b /ad /on') do set RUNTIME=%%I
 rem make sure we're bootstrapped
 for /f "delims=" %%a in ('%~dp0Bootstrap.cmd') do @set LOCATION=%%a
 echo exist %LOCATION%\project.lock.json
 if not exist %LOCATION%\project.lock.json (
-  call "%USERPROFILE%\.dnx\runtimes\%RUNTIME%\bin\dnu.cmd" restore %LOCATION%
+  call "%USERPROFILE%\.dnx\runtimes\dnx-coreclr-win-x64.1.0.0-rc2-16386\bin\dnu.cmd" restore %LOCATION%
 )
 echo %LOCATION%
-
-"%USERPROFILE%\.dnx\runtimes\%RUNTIME%\bin\dnx" %LOCATION% run %*
+"%USERPROFILE%\.dnx\runtimes\dnx-coreclr-win-x64.1.0.0-rc2-16386\bin\dnx" %LOCATION% run %*
diff --git a/scripts/Bootstrap.cmd b/scripts/Bootstrap.cmd
index da4ac7020f..c0ef7d8322 100644
--- a/scripts/Bootstrap.cmd
+++ b/scripts/Bootstrap.cmd
@@ -1,12 +1,10 @@
 SETLOCAL
 
-for /F "delims=" %%I in ('dir %USERPROFILE%\.dnx\runtimes\dnx-clr-win-*-rc2-* /b /ad /on') do set RUNTIME=%%I
 rem make sure we're bootstrapped
 for /f "delims=" %%a in ('%~dp0Bootstrap.cmd') do @set LOCATION=%%a
 echo exist %LOCATION%\project.lock.json
 if not exist %LOCATION%\project.lock.json (
-  call "%USERPROFILE%\.dnx\runtimes\%RUNTIME%\bin\dnu.cmd" restore %LOCATION%
+  call "%USERPROFILE%\.dnx\runtimes\dnx-clr-win-x86.1.0.0-rc2-16386\bin\dnu.cmd" restore %LOCATION%
 )
 echo %LOCATION%
-
-"%USERPROFILE%\.dnx\runtimes\%RUNTIME%\bin\dnx" %LOCATION% run %*
+"%USERPROFILE%\.dnx\runtimes\dnx-clr-win-x86.1.0.0-rc2-16386\bin\dnx" %LOCATION% run %*
diff --git a/scripts/Omnisharp b/scripts/Omnisharp
index 76a88be6a9..dbfd007a47 100755
--- a/scripts/Omnisharp
+++ b/scripts/Omnisharp
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+RUNTIME="dnx-mono.1.0.0-rc2-16386"
+# Enable if you wish to run on coreclr
+#if [[ "$OSTYPE" == "linux-gnu" ]]; then
+#  RUNTIME="dnx-coreclr-linux-x64.1.0.0-rc2-16386"
+#elif [[ "$OSTYPE" == "darwin"* ]]; then
+#  RUNTIME="dnx-coreclr-darwin-x64.1.0.0-rc2-16386"
+#fi
+
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
   DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
@@ -8,4 +16,4 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
 done
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
-"$HOME/.dnx/runtimes/dnx-mono.1.0.0-rc2-16337/bin/dnx" "$DIR/../src/OmniSharp" run "$@"
+"$HOME/.dnx/runtimes/$RUNTIME/bin/dnx" "$DIR/../src/OmniSharp" run "$@"
diff --git a/scripts/Omnisharp-coreclr.cmd b/scripts/Omnisharp-coreclr.cmd
index d7bcd8dc0e..e1f6baf5f7 100644
--- a/scripts/Omnisharp-coreclr.cmd
+++ b/scripts/Omnisharp-coreclr.cmd
@@ -1,4 +1,3 @@
 SETLOCAL
 
-for /F "delims=" %%I in ('dir %USERPROFILE%\.dnx\runtimes\dnx-coreclr-win-*-rc2-* /b /ad /on') do set RUNTIME=%%I
-"%USERPROFILE%\.dnx\runtimes\%RUNTIME%\bin\dnx" -p %~dp0..\src\OmniSharp run %*
+"%USERPROFILE%\.dnx\runtimes\dnx-coreclr-win-x64.1.0.0-rc2-16386\bin\dnx" %~dp0..\src\OmniSharp run %*
diff --git a/scripts/Omnisharp.cmd b/scripts/Omnisharp.cmd
index adc2b71ae0..4b89a36ca0 100755
--- a/scripts/Omnisharp.cmd
+++ b/scripts/Omnisharp.cmd
@@ -1,4 +1,3 @@
 SETLOCAL
 
-for /F "delims=" %%I in ('dir %USERPROFILE%\.dnx\runtimes\dnx-clr-win-*-rc2-* /b /ad /on') do set RUNTIME=%%I
-"%USERPROFILE%\.dnx\runtimes\%RUNTIME%\bin\dnx" -p %~dp0..\src\OmniSharp run %*
+"%USERPROFILE%\.dnx\runtimes\dnx-clr-win-x86.1.0.0-rc2-16386\bin\dnx" %~dp0..\src\OmniSharp run %*
diff --git a/src/OmniSharp.Abstractions/project.json b/src/OmniSharp.Abstractions/project.json
index 7326526cd5..266ed73d3e 100644
--- a/src/OmniSharp.Abstractions/project.json
+++ b/src/OmniSharp.Abstractions/project.json
@@ -33,22 +33,22 @@
     },
     "dnxcore50": {
       "dependencies": {
-        "System.Collections": "4.0.11-rc2-16319",
-        "System.ComponentModel.TypeConverter": "4.0.1-rc2-16319",
-        "System.Diagnostics.Process": "4.1.0-rc2-16319",
-        "System.Globalization.Extensions": "4.0.1-rc2-16319",
-        "System.IO": "4.0.11-rc2-16319",
-        "System.IO.FileSystem": "4.0.1-rc2-16319",
-        "System.IO.FileSystem.Watcher": "4.0.0-rc2-16319",
-        "System.Linq": "4.0.1-rc2-16319",
-        "System.Net.Sockets": "4.1.0-rc2-16319",
-        "System.Runtime": "4.0.21-rc2-16319",
-        "System.Text.Encoding": "4.0.11-rc2-16319",
-        "System.Threading": "4.0.11-rc2-16319",
-        "System.Threading.Tasks": "4.0.11-rc2-16319",
-        "System.Threading.Tasks.Parallel": "4.0.1-rc2-16319",
-        "System.Threading.Thread": "4.0.0-rc2-16319",
-        "System.Xml.XDocument": "4.0.11-rc2-16319"
+        "System.Collections": "4.0.11-rc2-23629",
+        "System.ComponentModel.TypeConverter": "4.0.1-rc2-23629",
+        "System.Diagnostics.Process": "4.1.0-rc2-23629",
+        "System.Globalization.Extensions": "4.0.1-rc2-23629",
+        "System.IO": "4.0.11-rc2-23629",
+        "System.IO.FileSystem": "4.0.1-rc2-23629",
+        "System.IO.FileSystem.Watcher": "4.0.0-rc2-23629",
+        "System.Linq": "4.0.1-rc2-23629",
+        "System.Net.Sockets": "4.1.0-rc2-23629",
+        "System.Runtime": "4.0.21-rc2-23629",
+        "System.Text.Encoding": "4.0.11-rc2-23629",
+        "System.Threading": "4.0.11-rc2-23629",
+        "System.Threading.Tasks": "4.0.11-rc2-23629",
+        "System.Threading.Tasks.Parallel": "4.0.1-rc2-23629",
+        "System.Threading.Thread": "4.0.0-rc2-23629",
+        "System.Xml.XDocument": "4.0.11-rc2-23629"
       }
     }
   }
diff --git a/src/OmniSharp.Dnx/project.json b/src/OmniSharp.Dnx/project.json
index cf13a86fc7..908e30ac44 100644
--- a/src/OmniSharp.Dnx/project.json
+++ b/src/OmniSharp.Dnx/project.json
@@ -16,14 +16,14 @@
     },
     "dnxcore50": {
       "dependencies": {
-        "System.Diagnostics.Process": "4.1.0-rc2-16319",
-        "System.Dynamic.Runtime": "4.0.11-rc2-16319",
-        "System.IO.FileSystem.Watcher": "4.0.0-rc2-16319",
-        "System.Net.Sockets": "4.1.0-rc2-16319",
-        "System.Runtime": "4.0.21-rc2-16319",
-        "System.Threading": "4.0.11-rc2-16319",
-        "System.Threading.Tasks": "4.0.11-rc2-16319",
-        "System.Threading.Thread": "4.0.0-rc2-16319"
+        "System.Diagnostics.Process": "4.1.0-rc2-23629",
+        "System.Dynamic.Runtime": "4.0.11-rc2-23629",
+        "System.IO.FileSystem.Watcher": "4.0.0-rc2-23629",
+        "System.Net.Sockets": "4.1.0-rc2-23629",
+        "System.Runtime": "4.0.21-rc2-23629",
+        "System.Threading": "4.0.11-rc2-23629",
+        "System.Threading.Tasks": "4.0.11-rc2-23629",
+        "System.Threading.Thread": "4.0.0-rc2-23629"
       }
     }
   }
diff --git a/src/OmniSharp.Host/project.json b/src/OmniSharp.Host/project.json
index fb304bcdcf..9034abb8ca 100644
--- a/src/OmniSharp.Host/project.json
+++ b/src/OmniSharp.Host/project.json
@@ -32,8 +32,8 @@
     },
     "dnxcore50": {
       "dependencies": {
-        "System.Threading.Tasks": "4.0.11-rc2-16319",
-        "System.Linq.Expressions": "4.0.11-rc2-16319"
+        "System.Threading.Tasks": "4.0.11-rc2-23629",
+        "System.Linq.Expressions": "4.0.11-rc2-23629"
       }
     }
   }
diff --git a/src/OmniSharp.Nuget/project.json b/src/OmniSharp.Nuget/project.json
index 5c0db2f62e..bf012fdc10 100644
--- a/src/OmniSharp.Nuget/project.json
+++ b/src/OmniSharp.Nuget/project.json
@@ -30,7 +30,7 @@
     },
     "dnxcore50": {
       "dependencies": {
-        "System.Runtime": "4.0.21-rc2-16319"
+        "System.Runtime": "4.0.21-rc2-23629"
       }
     }
   }
diff --git a/src/OmniSharp.Plugins/project.json b/src/OmniSharp.Plugins/project.json
index 7539bb1267..c20b058d59 100644
--- a/src/OmniSharp.Plugins/project.json
+++ b/src/OmniSharp.Plugins/project.json
@@ -20,9 +20,9 @@
     },
     "dnxcore50": {
       "dependencies": {
-        "System.Collections.Concurrent": "4.0.11-rc2-16319",
-        "System.Diagnostics.Process": "4.1.0-rc2-16319",
-        "System.Runtime": "4.0.21-rc2-16319"
+        "System.Collections.Concurrent": "4.0.11-rc2-23629",
+        "System.Diagnostics.Process": "4.1.0-rc2-23629",
+        "System.Runtime": "4.0.21-rc2-23629"
       }
     }
   }
diff --git a/src/OmniSharp.Roslyn.CSharp/project.json b/src/OmniSharp.Roslyn.CSharp/project.json
index f41d9d1cc3..62fe2ee7e9 100644
--- a/src/OmniSharp.Roslyn.CSharp/project.json
+++ b/src/OmniSharp.Roslyn.CSharp/project.json
@@ -31,8 +31,8 @@
     },
     "dnxcore50": {
       "dependencies": {
-        "System.Runtime": "4.0.21-rc2-16319",
-        "System.Xml.ReaderWriter": "4.0.11-rc2-16319"
+        "System.Runtime": "4.0.21-rc2-23629",
+        "System.Xml.ReaderWriter": "4.0.11-rc2-23629"
       }
     }
   }
diff --git a/src/OmniSharp.Roslyn/project.json b/src/OmniSharp.Roslyn/project.json
index 3f90c1bc3b..4d68e9fb4a 100644
--- a/src/OmniSharp.Roslyn/project.json
+++ b/src/OmniSharp.Roslyn/project.json
@@ -29,11 +29,11 @@
     },
     "dnxcore50": {
       "dependencies": {
-        "System.Linq.Parallel": "4.0.1-rc2-16319",
-        "System.Reflection": "4.1.0-rc2-16319",
-        "System.Reflection.TypeExtensions": "4.1.0-rc2-16319",
-        "System.Runtime": "4.0.21-rc2-16319",
-        "System.Xml.ReaderWriter": "4.0.11-rc2-16319"
+        "System.Linq.Parallel": "4.0.1-rc2-23629",
+        "System.Reflection": "4.1.0-rc2-23629",
+        "System.Reflection.TypeExtensions": "4.1.0-rc2-23629",
+        "System.Runtime": "4.0.21-rc2-23629",
+        "System.Xml.ReaderWriter": "4.0.11-rc2-23629"
       }
     }
   }
diff --git a/src/OmniSharp.Stdio/project.json b/src/OmniSharp.Stdio/project.json
index 558ec22fa3..968614e0a3 100644
--- a/src/OmniSharp.Stdio/project.json
+++ b/src/OmniSharp.Stdio/project.json
@@ -14,7 +14,7 @@
     "dnx451": { },
     "dnxcore50": {
       "dependencies": {
-        "System.Runtime": "4.0.21-rc2-16319",
+        "System.Runtime": "4.0.21-rc2-23629",
         "System.Runtime.Serialization.Primitives": "4.0.11-*"
       }
     }
diff --git a/tests/OmniSharp.Bootstrap.Tests/project.json b/tests/OmniSharp.Bootstrap.Tests/project.json
index 8455c1c8d1..4d281ab06d 100644
--- a/tests/OmniSharp.Bootstrap.Tests/project.json
+++ b/tests/OmniSharp.Bootstrap.Tests/project.json
@@ -16,7 +16,7 @@
     "dnx451": { },
     "dnxcore50": {
       "dependencies": {
-        "System.Collections": "4.0.11-rc2-16319"
+        "System.Collections": "4.0.11-rc2-23629"
       }
     }
   }
diff --git a/tests/OmniSharp.Dnx.Tests/project.json b/tests/OmniSharp.Dnx.Tests/project.json
index 0c94aac597..b62022c908 100644
--- a/tests/OmniSharp.Dnx.Tests/project.json
+++ b/tests/OmniSharp.Dnx.Tests/project.json
@@ -19,7 +19,7 @@
     },
     "dnxcore50": {
       "dependencies": {
-        "System.Collections": "4.0.11-rc2-16319"
+        "System.Collections": "4.0.11-rc2-23629"
       }
     }
   }
diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/project.json b/tests/OmniSharp.Roslyn.CSharp.Tests/project.json
index 3c8c7348b0..002a3da238 100644
--- a/tests/OmniSharp.Roslyn.CSharp.Tests/project.json
+++ b/tests/OmniSharp.Roslyn.CSharp.Tests/project.json
@@ -17,7 +17,7 @@
     "dnx451": { },
     "dnxcore50": {
       "dependencies": {
-        "System.Collections": "4.0.11-rc2-16319"
+        "System.Collections": "4.0.11-rc2-23629"
       }
     }
   }
diff --git a/tests/OmniSharp.Stdio.Tests/project.json b/tests/OmniSharp.Stdio.Tests/project.json
index f0aa340b6b..35696dd445 100644
--- a/tests/OmniSharp.Stdio.Tests/project.json
+++ b/tests/OmniSharp.Stdio.Tests/project.json
@@ -16,7 +16,7 @@
     "dnx451": { },
     "dnxcore50": {
       "dependencies": {
-        "System.Console": "4.0.0-rc2-16319"
+        "System.Console": "4.0.0-rc2-23629"
       }
     }
   }