diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2017-07-18 16:26:16 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-07-18 16:26:16 -0700 |
| commit | 3af881c7e2db0553207876acbdb91c6e77974e44 (patch) | |
| tree | 35e2a96cce802d4235bd29afa396e28ead892fa2 /.travis.yml | |
| parent | 86975301f1876ce1934612777b8ca6c76520f5cc (diff) | |
| parent | 942a29cecd36f2a4b22fdd2179635cd548e6bd27 (diff) | |
Merge master into 3.4.x
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 8f6f90de..d49e0a71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,10 @@ matrix: # autogenerated matrix. - os: linux env: CONFIG=csharp + language: csharp dist: trusty + dotnet: 1.0.1 + mono: none # This test is kept on travis because it doesn't play nicely with other # tests on jenkins running in parallel. - os: linux |