From df69837d6ce6e2c09597b58726194e5d7f294c19 Mon Sep 17 00:00:00 2001 From: Adam Chester Date: Sun, 5 Mar 2017 08:11:55 +1000 Subject: [PATCH] Fix travis build, remove OpenCover --- .travis.yml | 6 ++++-- appveyor.yml | 6 ------ build.cmd | 1 + build.sh | 8 ++++++++ 4 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 build.cmd diff --git a/.travis.yml b/.travis.yml index 7170ffafe..15fad5c21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,12 @@ matrix: - os: linux # Ubuntu 14.04 dist: trusty sudo: required - dotnet: 1.0.0-rc4-004771 + dotnet: 1.0.0-preview2-003121 + CLI_VERSION: 1.0.0-rc4-004771 - os: osx # OSX 10.11 osx_image: xcode7.3 - dotnet: 1.0.0-rc4-004771 + dotnet: 1.0.0-preview2-003121 + CLI_VERSION: 1.0.0-rc4-004771 script: - ./build.sh \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 180e92536..af782b38a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,12 +10,6 @@ install: - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" build_script: - ps: ./Build.ps1 -test_script: - - nuget.exe install OpenCover -ExcludeVersion - - OpenCover\tools\OpenCover.Console.exe -register:user -filter:"+[Serilog]*" -target:"dotnet.exe" "-targetargs:test test\Serilog.Tests\Serilog.Tests.csproj" -returntargetcode -hideskipped:All -output:coverage.xml - - "SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%" - - pip install codecov - - codecov -f "coverage.xml" artifacts: - path: artifacts/Serilog.*.nupkg deploy: diff --git a/build.cmd b/build.cmd new file mode 100644 index 000000000..29af91cd3 --- /dev/null +++ b/build.cmd @@ -0,0 +1 @@ +@powershell .\Build.ps1 %* \ No newline at end of file diff --git a/build.sh b/build.sh index 0d185a815..546235185 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,13 @@ #!/bin/bash +export DOTNET_INSTALL_DIR="$PWD/.dotnetcli" +DotnetCliVersion=${CLI_VERSION:="1.0.0-rc4-004771"} +install_script_url=https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.sh +curl -sSL $install_script_url | bash /dev/stdin --version "$DotnetCliVersion" --install-dir "$DOTNET_INSTALL_DIR" +export PATH="$DOTNET_INSTALL_DIR:$PATH" + +dotnet --info dotnet restore + for path in src/**/*.csproj; do dotnet build -c Release ${path} done