Skip to content

Commit 39fc8ac

Browse files
authored
Merge branch 'master' into document-release
2 parents 813a555 + 06b131e commit 39fc8ac

File tree

184 files changed

+2724
-1430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+2724
-1430
lines changed

.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,10 @@ src/GitVersionTfsTask/*.js
110110
####################
111111
# Cake
112112
####################
113-
/tools
113+
tools/*
114+
!tools/packages.config
114115
/*.zip
115116
GitVersion.CommandLine/*/
116117

117-
releaseArtifacts
118+
releaseArtifacts
119+
/ILMergeTemp

.travis.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
language: csharp
2-
sudo: false
2+
sudo: required
3+
dist: trusty
4+
dotnet: 2.1.105
35
mono:
46
- latest
57
os:
68
- linux
79
- osx
810
before_install:
9-
- git fetch --unshallow # Travis always does a shallow clone, but GitVersion needs the full history including branches and tags
11+
- git fetch --unshallow # Travis always does a shallow clone, but GitVersion needs the full history including branches and tags
1012
script:
11-
- ./build.sh
12-
cache:
13-
directories:
14-
- src/packages
15-
- tools
13+
- ./build.sh -v Diagnostic
14+
env:
15+
global:
16+
- DOTNET_CLI_TELEMETRY_OPTOUT: 1
17+
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ We love contributions to get started contributing you might need:
44
- [Get started with git](http://rogerdudler.github.io/git-guide)
55
- [How to create a pull request](https://help.github.com/articles/using-pull-requests)
66
- [An issue to work on](https://github.com/GitTools/GitVersion/labels/up-for-grabs) - We are on [Up for grabs](http://up-for-grabs.net/), our up for grabs issues are tagged `up-for-grabs`
7-
- An understanding of our [http://gitversion.readthedocs.org/en/latest/more-info/how-it-works/#architecture](#architecture) and how [we write tests](#writing-tests)
7+
- An understanding of our [architecture](http://gitversion.readthedocs.org/en/latest/more-info/how-it-works/#architecture) and how [we write tests](#writing-tests)
88

99
Once you know how to create a pull request and have an issue to work on, just post a comment saying you will work on it.
1010
If you end up not being able to complete the task, please post another comment so others can pick it up.

GitVersion.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ branches:
33
master:
44
tag: beta
55
ignore:
6-
sha: []
6+
sha:
7+
- 0e77e2e16a136a1cd0f0474fe5710f617d508d81
8+
- af73f6a349456f146a8d0a413de1331eddf61bc2

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Tip: If you get `System.TypeInitializationException: The type initializer for
2626
'LibGit2Sharp.Core.NativeMethods' threw an exception. --->
2727
System.DllNotFoundException: lib/linux/x86_64/libgit2-baa87df.so`
2828

29-
You likely need to install `libcurl3`. Run `sudo get-get install libcurl3`
29+
You likely need to install `libcurl3`. Run `sudo apt-get install libcurl3`
3030

3131
## Quick Links
3232
- [Documentation][docs]

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
image: Visual Studio 2017
12
install:
23
npm i -g tfx-cli
34

0 commit comments

Comments
 (0)