Merge pull request #1269 from dazinator/feature/netstandard

#1175 - NetStandard
GitTools · Jun 28, 2018 · 62df1d0 · 62df1d0
2 parents dbd80e1 + 4a5356b
commit 62df1d0
Show file tree

Hide file tree

Showing 166 changed files with 2,304 additions and 1,331 deletions.
diff --git a/.gitignore b/.gitignore
@@ -110,8 +110,10 @@ src/GitVersionTfsTask/*.js
 ####################
 # Cake
 ####################
-/tools
+tools/*
+!tools/packages.config
 /*.zip
 GitVersion.CommandLine/*/
 
-releaseArtifacts
+releaseArtifacts
+/ILMergeTemp
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,17 @@
 language: csharp
-sudo: false
+sudo: required
+dist: trusty
+dotnet: 2.1.105
 mono:
   - latest
 os:
   - linux
   - osx
 before_install:
-  - git fetch --unshallow # Travis always does a shallow clone, but GitVersion needs the full history including branches and tags
+  - git fetch --unshallow # Travis always does a shallow clone, but GitVersion needs the full history including branches and tags 
 script:
-  - ./build.sh
-cache:
-  directories:
-    - src/packages
-    - tools
+  - ./build.sh -v Diagnostic
+env:
+  global:
+    - DOTNET_CLI_TELEMETRY_OPTOUT: 1
+    - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,3 +1,4 @@
+image: Visual Studio 2017
 install:
   npm i -g tfx-cli