Merge pull request #10 from Microsoft/v1.0

Merge v1.0 to master
This commit is contained in:
Andrew Arnott 2017-01-18 11:45:42 -08:00 коммит произвёл GitHub
Родитель 727bc6db4e 219e239d93
Коммит 536bd203a2
2 изменённых файлов: 5 добавлений и 1 удалений

Просмотреть файл

@ -2,7 +2,7 @@ version: 1.0.{build}
branches:
only:
- master
- /^v\\d+(?:.\\d+)?$/
- /^v\d+(?:.\d+)?$/
- /[\b_]validate\b/
skip_tags: true
nuget:

Просмотреть файл

@ -460,6 +460,7 @@ public class JsonRpcTests : TestBase
[Fact]
[Trait("GC", "")]
[Trait("TestCategory", "FailsInCloudTest")]
public async Task InvokeWithCancellationAsync_UncancellableMethodWithoutCancellationToken()
{
await CheckGCPressureAsync(
@ -471,6 +472,7 @@ public class JsonRpcTests : TestBase
[Fact]
[Trait("GC", "")]
[Trait("TestCategory", "FailsInCloudTest")]
public async Task InvokeWithCancellationAsync_UncancellableMethodWithCancellationToken()
{
var cts = new CancellationTokenSource();
@ -483,6 +485,7 @@ public class JsonRpcTests : TestBase
[Fact]
[Trait("GC", "")]
[Trait("TestCategory", "FailsInCloudTest")]
public async Task InvokeWithCancellationAsync_CancellableMethodWithoutCancellationToken()
{
await CheckGCPressureAsync(
@ -495,6 +498,7 @@ public class JsonRpcTests : TestBase
[Fact]
[Trait("GC", "")]
[Trait("TestCategory", "FailsInCloudTest")]
public async Task InvokeWithCancellationAsync_CancellableMethodWithCancellationToken()
{
var cts = new CancellationTokenSource();