Skip to content

Commit 1652983

Browse files
committed
Build def changes for VS2017 tooling
1 parent cf4f6b8 commit 1652983

File tree

2 files changed

+12
-43
lines changed

2 files changed

+12
-43
lines changed

.travis.yml

Lines changed: 9 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,15 @@
11
language: csharp
22

3-
#dotnet cli require Ubuntu 14.04
4-
sudo: required
5-
dist: trusty
6-
7-
#dotnet cli require OSX 10.10
8-
osx_image: xcode7.1
9-
10-
addons:
11-
apt:
12-
packages:
13-
- gettext
14-
- libcurl4-openssl-dev
15-
- libicu-dev
16-
- libssl-dev
17-
- libunwind8
18-
- zlib1g
19-
20-
os:
21-
#- osx
22-
- linux
23-
24-
env:
25-
matrix:
26-
- CLI_VERSION=1.0.0-preview2-003121
27-
# - CLI_VERSION=Latest
28-
293
matrix:
30-
allow_failures:
31-
- env: CLI_VERSION=Latest
32-
33-
before_install:
34-
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; brew link --force openssl; fi
35-
# Download script to install dotnet cli
36-
- if test "$CLI_OBTAIN_URL" == ""; then export CLI_OBTAIN_URL="https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.sh"; fi
37-
- curl -L --create-dirs $CLI_OBTAIN_URL -o ./scripts/obtain/install.sh
38-
- find ./scripts -name "*.sh" -exec chmod +x {} \;
39-
- export DOTNET_INSTALL_DIR="$PWD/.dotnetcli"
40-
# use bash to workaround bug https://github.com/dotnet/cli/issues/1725
41-
- sudo bash ./scripts/obtain/install.sh --channel "preview" --version "$CLI_VERSION" --install-dir "$DOTNET_INSTALL_DIR" --no-path
42-
# add dotnet to PATH
43-
- export PATH="$DOTNET_INSTALL_DIR:$PATH"
4+
include:
5+
- os: linux # Ubuntu 14.04
6+
dist: trusty
7+
sudo: required
8+
dotnet: 1.0.1
9+
# Disabled temporarily due to Travis OSX issues
10+
# - os: osx # OSX 10.11
11+
# osx_image: xcode7.3
12+
# dotnet: 1.0.1
4413

4514
script:
4615
- ./build.sh

appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ image: Visual Studio 2015
44
configuration: Release
55
install:
66
- ps: mkdir -Force ".\build\" | Out-Null
7-
- ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
7+
- ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
88
- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli"
9-
- ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-preview2-003121'
9+
- ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.1'
1010
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
1111
build_script:
1212
- ps: ./Build.ps1
@@ -26,4 +26,4 @@ deploy:
2626
artifact: /Serilog.*\.nupkg/
2727
tag: v$(appveyor_build_version)
2828
on:
29-
branch: master
29+
branch: master

0 commit comments

Comments
 (0)