diff --git a/.travis.yml b/.travis.yml
index 4b25bcc..5dfe0f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,48 @@
-language: csharp
+#language: csharp
+language: cpp
+sudo: required
+dist: trusty
 
-matrix:
-  include:
-  - os: linux
-    dist: trusty # Ubuntu 14.04
-    dotnet: 2.0.0
-    sudo: required
-  - os: osx
-    osx_image: xcode8.3 # macOS 10.12
-    dotnet: 2.0.0
+os:  
+  - linux
+  - osx
 
-before_install:
-  - chmod a+x ./build.sh
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then ulimit -n 1024 ; fi
+env:  
+  global:
+    - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+    - DOTNET_CLI_TELEMETRY_OPTOUT: 1
+    - CLI_VERSION=2.0.0
+  
+addons:  
+  apt:
+    packages:
+    - gettext
+    - libcurl4-openssl-dev
+    - libicu-dev
+    - libssl-dev
+    - libunwind8
+    - zlib1g
+    
+# Make sure build dependencies are installed.
+before_install:  
+  - if test "$TRAVIS_OS_NAME" == "osx"; then ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi
+#  - curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg
+#  - sudo mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg
+#  - sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
+#  - sudo apt-get update
+#  - sudo apt-get install -y dotnet-sdk-2.0.0 dotnet-sharedframework-microsoft.netcore.app-1.1.2
+  - export DOTNET_INSTALL_DIR="$PWD/.dotnetcli"
+  - export PATH="$DOTNET_INSTALL_DIR:$PATH"  
+  
+install:
+  - travis_retry curl -sSL https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.sh | bash /dev/stdin --version "$CLI_VERSION" --install-dir "$DOTNET_INSTALL_DIR"
 
-#install:
-#  - export DOTNET_CLI_TELEMETRY_OPTOUT=1
-#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm get stable; brew update; brew install openssl; fi
+#cache: 
+# - apt
+# - directories:
+#   - packages
 
+# Run the build script
 script:
-  - ./build.sh
+  - travis_retry dotnet restore --disable-parallel
+  - dotnet test test\DotNetCore.CAP.Test -verbose