Update nuget packages. (#33)

Choc13 · web-flow · commit 38486ca73d46 · 2018-03-13T08:06:51.000Z
diff --git a/src/Winton.Extensions.Configuration.Consul/Winton.Extensions.Configuration.Consul.csproj b/src/Winton.Extensions.Configuration.Consul/Winton.Extensions.Configuration.Consul.csproj
@@ -31,10 +31,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Consul" Version="0.7.2.3" />
-    <PackageReference Include="GitVersionTask" Version="4.0.0-beta0011" PrivateAssets="All" />
+    <PackageReference Include="Consul" Version="0.7.2.4" />
+    <PackageReference Include="GitVersionTask" Version="4.0.0-beta0012" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/test/Website/Website.csproj b/test/Website/Website.csproj
@@ -19,7 +19,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="All" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Winton.Extensions.Configuration.Consul\Winton.Extensions.Configuration.Consul.csproj" />
diff --git a/test/Winton.Extensions.Configuration.Consul.Test/ConsulConfigurationClientTests.cs b/test/Winton.Extensions.Configuration.Consul.Test/ConsulConfigurationClientTests.cs
@@ -62,7 +62,7 @@ private async Task ShouldGetConfigAtSpecifiedKey()
                 await _consulConfigurationClient.GetConfig();
 
                 Action verifying = () => _kvMock.Verify(kv => kv.Get("Test", null, _cancellationToken), Times.Once);
-                verifying.ShouldNotThrow();
+                verifying.Should().NotThrow();
             }
 
             [Theory]
@@ -95,7 +95,7 @@ private void ShouldThrowExceptionWhenBadResponseRecieved()
 
                 Func<Task> gettingConfig = _consulConfigurationClient.Awaiting(ccc => ccc.GetConfig());
 
-                gettingConfig.ShouldThrow<Exception>()
+                gettingConfig.Should().Throw<Exception>()
                              .WithMessage("Error loading configuration from consul. Status code: BadRequest.");
             }
 
@@ -108,7 +108,7 @@ private void ShouldThrowExceptionWhenExceptionalResponseRecieved()
 
                 Func<Task> gettingConfig = _consulConfigurationClient.Awaiting(ccc => ccc.GetConfig());
 
-                gettingConfig.ShouldThrow<WebException>().WithMessage("Failed to connect to Consul client");
+                gettingConfig.Should().Throw<WebException>().WithMessage("Failed to connect to Consul client");
             }
         }
 
@@ -164,7 +164,7 @@ private void ShouldUseLongPollingToPollForChanges()
             {
                 Func<Task<bool>> watching = () => SimulateConfigChange(1);
 
-                watching.ShouldNotThrow();
+                watching.Should().NotThrow();
             }
 
             [Fact]
diff --git a/test/Winton.Extensions.Configuration.Consul.Test/ConsulConfigurationProviderTests.cs b/test/Winton.Extensions.Configuration.Consul.Test/ConsulConfigurationProviderTests.cs
@@ -37,7 +37,7 @@ public void ShouldThrowIfParserIsNull()
                     () =>
                         new ConsulConfigurationProvider(_consulConfigSourceMock.Object, _consulConfigClientMock.Object);
 
-                constructing.ShouldThrow<ArgumentNullException>()
+                constructing.Should().Throw<ArgumentNullException>()
                             .And.Message.Should().Contain(nameof(_consulConfigSourceMock.Object.Parser));
             }
         }
@@ -103,7 +103,7 @@ private void ShouldNotParseIfConfigBytesIsNull()
                 _consulConfigProvider.Load();
 
                 Action verifying = () => _configParserMock.Verify(cp => cp.Parse(It.IsAny<MemoryStream>()), Times.Never);
-                verifying.ShouldNotThrow();
+                verifying.Should().NotThrow();
             }
 
             [Fact]
@@ -116,7 +116,7 @@ private void ShouldNotThrowExceptionIfOnLoadExceptionIsSetToIgnore()
                     .Returns(exceptionContext => { exceptionContext.Ignore = true; });
 
                 Action loading = () => _consulConfigProvider.Load();
-                loading.ShouldNotThrow();
+                loading.Should().NotThrow();
             }
 
             [Theory]
@@ -191,7 +191,7 @@ private void ShouldThrowExceptionIfOnLoadExceptionDoesNotSetIgnoreWhenExceptionD
                     .Returns(exceptionContext => { exceptionContext.Ignore = false; });
 
                 Action loading = _consulConfigProvider.Invoking(ccp => ccp.Load());
-                loading.ShouldThrow<Exception>().WithMessage("Error");
+                loading.Should().Throw<Exception>().WithMessage("Error");
             }
 
             [Fact]
@@ -207,7 +207,7 @@ private void ShouldThrowIfConfigDoesNotExistAndIsNotOptonalWhenLoad()
                     .Returns(context => context.Ignore = false);
 
                 Action loading = _consulConfigProvider.Invoking(ccp => ccp.Load());
-                loading.ShouldThrow<Exception>()
+                loading.Should().Throw<Exception>()
                        .WithMessage("The configuration for key Test was not found and is not optional.");
             }
         }
@@ -268,7 +268,7 @@ private void ShouldNotThrowIfDoesNotExist(bool optional)
                     .ReturnsAsync(new QueryResult<KVPair> { StatusCode = HttpStatusCode.NotFound });
 
                 Action reloading = _firstChangeToken.Invoking(ct => ct.OnReload());
-                reloading.ShouldNotThrow();
+                reloading.Should().NotThrow();
             }
 
             [Fact]
@@ -282,7 +282,7 @@ private void ShouldReloadConfigIfReloadOnChangeAndDataInConsulHasChanged()
                 _firstChangeToken.OnReload();
 
                 Action verifying = () => _consulConfigClientMock.Verify(ccc => ccc.GetConfig(), Times.Once);
-                verifying.ShouldNotThrow();
+                verifying.Should().NotThrow();
             }
 
             [Fact]
@@ -293,7 +293,7 @@ private void ShouldWatchForChangesIfSourceReloadOnChangesIsTrue()
                         _consulConfigClientMock.Verify(
                             ccs => ccs.Watch(_consulConfigSourceMock.Object.OnWatchException),
                             Times.Once);
-                verifying.ShouldNotThrow();
+                verifying.Should().NotThrow();
             }
         }
     }
diff --git a/test/Winton.Extensions.Configuration.Consul.Test/ConsulConfigurationSourceTests.cs b/test/Winton.Extensions.Configuration.Consul.Test/ConsulConfigurationSourceTests.cs
@@ -60,7 +60,7 @@ private void ShouldThrowIfKeyIsInvalid(string key)
                 // ReSharper disable once ObjectCreationAsStatement
                 Action constructing = () => new ConsulConfigurationSource(key, default(CancellationToken));
 
-                constructing.ShouldThrow<ArgumentNullException>().And.Message.Should().Contain("key");
+                constructing.Should().Throw<ArgumentNullException>().And.Message.Should().Contain("key");
             }
         }
     }
diff --git a/test/Winton.Extensions.Configuration.Consul.Test/Parsers/Json/JsonFlattenerTests.cs b/test/Winton.Extensions.Configuration.Consul.Test/Parsers/Json/JsonFlattenerTests.cs
@@ -34,7 +34,7 @@ private void ShouldThrowIfDuplicateKeyWhenFlattened(string key1, string key2)
 
                 Action flattening = () => jObject.Flatten();
 
-                flattening.ShouldThrow<FormatException>();
+                flattening.Should().Throw<FormatException>();
             }
         }
     }
diff --git a/test/Winton.Extensions.Configuration.Consul.Test/Winton.Extensions.Configuration.Consul.Test.csproj b/test/Winton.Extensions.Configuration.Consul.Test/Winton.Extensions.Configuration.Consul.Test.csproj
@@ -18,9 +18,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="4.19.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="Moq" Version="4.8.1" />
+    <PackageReference Include="FluentAssertions" Version="5.1.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
+    <PackageReference Include="Moq" Version="4.8.2" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="All" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ private async Task ShouldGetConfigAtSpecifiedKey()`
`62`	`62`	`await _consulConfigurationClient.GetConfig();`
`63`	`63`
`64`	`64`	`Action verifying = () => _kvMock.Verify(kv => kv.Get("Test", null, _cancellationToken), Times.Once);`
`65`		`- verifying.ShouldNotThrow();`
	`65`	`+ verifying.Should().NotThrow();`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`[Theory]`
`@@ -95,7 +95,7 @@ private void ShouldThrowExceptionWhenBadResponseRecieved()`
`95`	`95`
`96`	`96`	`Func<Task> gettingConfig = _consulConfigurationClient.Awaiting(ccc => ccc.GetConfig());`
`97`	`97`
`98`		`- gettingConfig.ShouldThrow<Exception>()`
	`98`	`+ gettingConfig.Should().Throw<Exception>()`
`99`	`99`	`.WithMessage("Error loading configuration from consul. Status code: BadRequest.");`
`100`	`100`	`}`
`101`	`101`
`@@ -108,7 +108,7 @@ private void ShouldThrowExceptionWhenExceptionalResponseRecieved()`
`108`	`108`
`109`	`109`	`Func<Task> gettingConfig = _consulConfigurationClient.Awaiting(ccc => ccc.GetConfig());`
`110`	`110`
`111`		`- gettingConfig.ShouldThrow<WebException>().WithMessage("Failed to connect to Consul client");`
	`111`	`+ gettingConfig.Should().Throw<WebException>().WithMessage("Failed to connect to Consul client");`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
`@@ -164,7 +164,7 @@ private void ShouldUseLongPollingToPollForChanges()`
`164`	`164`	`{`
`165`	`165`	`Func<Task<bool>> watching = () => SimulateConfigChange(1);`
`166`	`166`
`167`		`- watching.ShouldNotThrow();`
	`167`	`+ watching.Should().NotThrow();`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public void ShouldThrowIfParserIsNull()`
`37`	`37`	`() =>`
`38`	`38`	`new ConsulConfigurationProvider(_consulConfigSourceMock.Object, _consulConfigClientMock.Object);`
`39`	`39`
`40`		`- constructing.ShouldThrow<ArgumentNullException>()`
	`40`	`+ constructing.Should().Throw<ArgumentNullException>()`
`41`	`41`	`.And.Message.Should().Contain(nameof(_consulConfigSourceMock.Object.Parser));`
`42`	`42`	`}`
`43`	`43`	`}`
`@@ -103,7 +103,7 @@ private void ShouldNotParseIfConfigBytesIsNull()`
`103`	`103`	`_consulConfigProvider.Load();`
`104`	`104`
`105`	`105`	`Action verifying = () => _configParserMock.Verify(cp => cp.Parse(It.IsAny<MemoryStream>()), Times.Never);`
`106`		`- verifying.ShouldNotThrow();`
	`106`	`+ verifying.Should().NotThrow();`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`[Fact]`
`@@ -116,7 +116,7 @@ private void ShouldNotThrowExceptionIfOnLoadExceptionIsSetToIgnore()`
`116`	`116`	`.Returns(exceptionContext => { exceptionContext.Ignore = true; });`
`117`	`117`
`118`	`118`	`Action loading = () => _consulConfigProvider.Load();`
`119`		`- loading.ShouldNotThrow();`
	`119`	`+ loading.Should().NotThrow();`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`[Theory]`
`@@ -191,7 +191,7 @@ private void ShouldThrowExceptionIfOnLoadExceptionDoesNotSetIgnoreWhenExceptionD`
`191`	`191`	`.Returns(exceptionContext => { exceptionContext.Ignore = false; });`
`192`	`192`
`193`	`193`	`Action loading = _consulConfigProvider.Invoking(ccp => ccp.Load());`
`194`		`- loading.ShouldThrow<Exception>().WithMessage("Error");`
	`194`	`+ loading.Should().Throw<Exception>().WithMessage("Error");`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`[Fact]`
`@@ -207,7 +207,7 @@ private void ShouldThrowIfConfigDoesNotExistAndIsNotOptonalWhenLoad()`
`207`	`207`	`.Returns(context => context.Ignore = false);`
`208`	`208`
`209`	`209`	`Action loading = _consulConfigProvider.Invoking(ccp => ccp.Load());`
`210`		`- loading.ShouldThrow<Exception>()`
	`210`	`+ loading.Should().Throw<Exception>()`
`211`	`211`	`.WithMessage("The configuration for key Test was not found and is not optional.");`
`212`	`212`	`}`
`213`	`213`	`}`
`@@ -268,7 +268,7 @@ private void ShouldNotThrowIfDoesNotExist(bool optional)`
`268`	`268`	`.ReturnsAsync(new QueryResult<KVPair> { StatusCode = HttpStatusCode.NotFound });`
`269`	`269`
`270`	`270`	`Action reloading = _firstChangeToken.Invoking(ct => ct.OnReload());`
`271`		`- reloading.ShouldNotThrow();`
	`271`	`+ reloading.Should().NotThrow();`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`[Fact]`
`@@ -282,7 +282,7 @@ private void ShouldReloadConfigIfReloadOnChangeAndDataInConsulHasChanged()`
`282`	`282`	`_firstChangeToken.OnReload();`
`283`	`283`
`284`	`284`	`Action verifying = () => _consulConfigClientMock.Verify(ccc => ccc.GetConfig(), Times.Once);`
`285`		`- verifying.ShouldNotThrow();`
	`285`	`+ verifying.Should().NotThrow();`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`[Fact]`
`@@ -293,7 +293,7 @@ private void ShouldWatchForChangesIfSourceReloadOnChangesIsTrue()`
`293`	`293`	`_consulConfigClientMock.Verify(`
`294`	`294`	`ccs => ccs.Watch(_consulConfigSourceMock.Object.OnWatchException),`
`295`	`295`	`Times.Once);`
`296`		`- verifying.ShouldNotThrow();`
	`296`	`+ verifying.Should().NotThrow();`
`297`	`297`	`}`
`298`	`298`	`}`
`299`	`299`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ private void ShouldThrowIfKeyIsInvalid(string key)`
`60`	`60`	`// ReSharper disable once ObjectCreationAsStatement`
`61`	`61`	`Action constructing = () => new ConsulConfigurationSource(key, default(CancellationToken));`
`62`	`62`
`63`		`- constructing.ShouldThrow<ArgumentNullException>().And.Message.Should().Contain("key");`
	`63`	`+ constructing.Should().Throw<ArgumentNullException>().And.Message.Should().Contain("key");`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ private void ShouldThrowIfDuplicateKeyWhenFlattened(string key1, string key2)`
`34`	`34`
`35`	`35`	`Action flattening = () => jObject.Flatten();`
`36`	`36`
`37`		`- flattening.ShouldThrow<FormatException>();`
	`37`	`+ flattening.Should().Throw<FormatException>();`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`}`