Update build scripts

Author: aensidhe

.travis.yml

@@ -3,24 +3,20 @@ matrix:
     - os: linux # Ubuntu 14.04
       dist: trusty
       sudo: required
-    - os: linux # Ubuntu 14.04
-      dist: trusty
-      env: BUILD_DOCKER=true
     - os: osx # OSX 10.12
       osx_image: xcode8.3
 
 before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD_DOCKER" != true ]]; then sudo ./scripts/ubuntu-prereqs.sh ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo ./scripts/ubuntu-prereqs.sh ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./scripts/mac-prereqs.sh ; fi
 
 install:
-  - if [[ "$BUILD_DOCKER" != true ]]; then ./scripts/dotnet-install.sh ; fi
-  - if [[ "$BUILD_DOCKER" != true ]]; then PATH=$PATH:$HOME/.dotnet && export PATH ; fi
+  - ./scripts/dotnet-install.sh
+  - PATH=$PATH:$HOME/.dotnet && export PATH
   - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then docker-compose -f docker-compose.yml up -d ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then tarantool tarantool/tarantool.lua ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then redis-server --daemonize yes ; fi
 
 script:
-  - if [[ "$BUILD_DOCKER" != true ]]; then ./scripts/build-netcore.sh ; fi
-  - if [[ "$BUILD_DOCKER" != true ]]; then ./scripts/test-netcore.sh ; fi
-  - if [[ "$BUILD_DOCKER" == true  ]]; then docker-compose -f docker-compose.yml -f docker-compose.tests.yml up --build tarantool-client ; fi
+  - ./scripts/build-netcore.sh
+  - ./scripts/test-netcore.sh

appveyor.yml

@@ -8,7 +8,9 @@ cd ..
 
 dotnet restore
 dotnet build -c Release -f netstandard1.4 src/progaudi.tarantool/progaudi.tarantool.csproj
+dotnet build -c Release -f netstandard2.0 src/progaudi.tarantool/progaudi.tarantool.csproj
 dotnet build -c Release -f netcoreapp1.0 tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj
 dotnet build -c Release -f netcoreapp1.1 tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj
+dotnet build -c Release -f netcoreapp2.0 tests/progaudi.tarantool.tests/progaudi.tarantool.tests.csproj
 
 popd

scripts/build-netcore.sh

@@ -4,5 +4,5 @@ set -ev
 
 curl -o ./dotnet-install.sh -fL https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh
 chmod +x ./dotnet-install.sh
-version=$(jq -r .sdk.version global.json)
-./dotnet-install.sh --version $version
+./dotnet-install.sh --version 1.0.4
+./dotnet-install.sh --version 2.0.0