Skip to content

Commit 630d445

Browse files
Choc13Choc13
authored
Bump versions of all dependencies to latest, except for ASP.NET which is bumped to latest minor. (#27)
1 parent e9a74da commit 630d445

7 files changed

Lines changed: 53 additions & 50 deletions

File tree

‎src/Winton.Extensions.Configuration.Consul/Winton.Extensions.Configuration.Consul.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<PropertyGroup>
44
<Authors>Winton</Authors>
55
<Company>Winton</Company>
6-
<Copyright>Copyright 2017 Winton</Copyright>
7-
<Description>Provides support for configuring .Net Core applications with Consul</Description>
6+
<Copyright>Copyright 2018 Winton</Copyright>
7+
<Description>Provides support for configuring .NET Core applications with Consul</Description>
88
<GenerateDocumentationFile>True</GenerateDocumentationFile>
99
<GetVersion>False</GetVersion>
10-
<NoWarn>$(NoWarn);SA1101;SA1309;SA1413</NoWarn>
10+
<NoWarn>$(NoWarn);SA1101;SA1309;SA1413;</NoWarn>
1111
<PackageId>Winton.Extensions.Configuration.Consul</PackageId>
1212
<PackageIconUrl>https://raw.githubusercontent.com/wintoncode/Winton.Extensions.Configuration.Consul/master/icon.jpg</PackageIconUrl>
1313
<PackageLicenseUrl>https://raw.githubusercontent.com/wintoncode/Winton.Extensions.Configuration.Consul/master/LICENSE</PackageLicenseUrl>
1414
<PackageProjectUrl>https://github.com/wintoncode/Winton.Extensions.Configuration.Consul</PackageProjectUrl>
1515
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
16-
<PackageTags>.Net;.Net Core;dotnetcore;Asp.Net;Asp.Net Core;aspnetcore;configuration;consul;winton;wintoncode</PackageTags>
16+
<PackageTags>.NET;Core;dotnetcore;ASP.NET;aspnetcore;configuration;consul;winton;wintoncode</PackageTags>
1717
<PackageVersion>$(NuGetVersion)</PackageVersion>
1818
<RepositoryType>git</RepositoryType>
1919
<RepositoryUrl>https://github.com/wintoncode/Winton.Extensions.Configuration.Consul</RepositoryUrl>
@@ -31,10 +31,10 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="Consul" Version="0.7.0.3" />
34+
<PackageReference Include="Consul" Version="0.7.2.3" />
3535
<PackageReference Include="GitVersionTask" Version="4.0.0-beta0011" PrivateAssets="All" />
3636
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.0.2" />
37-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
37+
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
3838
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="All" />
3939
</ItemGroup>
4040

‎test/Website/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:1.1.4-runtime
1+
FROM microsoft/dotnet:1.1.5-runtime
22

33
COPY bin/Release/netcoreapp1.1/publish /app
44
WORKDIR /app

‎test/Website/Startup.cs‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Microsoft.Extensions.Configuration;
66
using Microsoft.Extensions.DependencyInjection;
77
using Microsoft.Extensions.Logging;
8+
using Swashbuckle.AspNetCore.Swagger;
89

910
namespace Winton.Extensions.Configuration.Consul.Website
1011
{
@@ -44,17 +45,23 @@ public Startup(IHostingEnvironment env, ILoggerFactory loggerFactory)
4445
public void ConfigureServices(IServiceCollection services)
4546
{
4647
services
48+
.AddSwaggerGen(c =>
49+
{
50+
c.SwaggerDoc("v1", new Info { Title = "Test Website", Version = "v1" });
51+
})
4752
.AddSingleton(_configuration)
4853
.AddMvc();
49-
services.AddSwaggerGen();
5054
}
5155

5256
public void Configure(IApplicationBuilder app, IApplicationLifetime appLifetime)
5357
{
5458
app
5559
.UseMvc()
5660
.UseSwagger()
57-
.UseSwaggerUi("swagger");
61+
.UseSwaggerUI(c =>
62+
{
63+
c.SwaggerEndpoint("/swagger/v1/swagger.json", "Test Website");
64+
});
5865

5966
appLifetime.ApplicationStopping.Register(_consulConfigCancellationTokenSource.Cancel);
6067
}

‎test/Website/Website.csproj‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,14 @@
1717
<Folder Include="wwwroot\" />
1818
</ItemGroup>
1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.2" />
21-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
20+
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.5" />
21+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.6" />
2222
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
2323
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="All" />
24-
<PackageReference Include="Swashbuckle" Version="6.0.0-beta902" />
24+
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
2525
</ItemGroup>
2626
<ItemGroup>
2727
<ProjectReference Include="..\..\src\Winton.Extensions.Configuration.Consul\Winton.Extensions.Configuration.Consul.csproj" />
2828
</ItemGroup>
2929

30-
<ItemGroup>
31-
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.1" />
32-
</ItemGroup>
33-
3430
</Project>

‎test/Winton.Extensions.Configuration.Consul.Test/ConsulConfigurationClientTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ public void SetUp()
2929
_cancellationToken = _cancellationTokenSource.Token;
3030

3131
_consulConfigurationSourceMock = new Mock<IConsulConfigurationSource>(MockBehavior.Strict);
32-
_consulConfigurationSourceMock.SetupGet(ccs => ccs.CancellationToken).Returns(_cancellationToken);
33-
_consulConfigurationSourceMock.SetupGet(ccs => ccs.Key).Returns(_Key);
32+
_consulConfigurationSourceMock.Setup(ccs => ccs.CancellationToken).Returns(_cancellationToken);
33+
_consulConfigurationSourceMock.Setup(ccs => ccs.Key).Returns(_Key);
3434

3535
_kvMock = new Mock<IKVEndpoint>(MockBehavior.Strict);
3636

3737
_consulClientMock = new Mock<IConsulClient>(MockBehavior.Strict);
3838
_consulClientMock.Setup(cc => cc.Dispose());
39-
_consulClientMock.SetupGet(cc => cc.KV).Returns(_kvMock.Object);
39+
_consulClientMock.Setup(cc => cc.KV).Returns(_kvMock.Object);
4040
_consulClientFactoryMock = new Mock<IConsulClientFactory>(MockBehavior.Strict);
4141
_consulClientFactoryMock.Setup(ccf => ccf.Create()).Returns(_consulClientMock.Object);
4242

‎test/Winton.Extensions.Configuration.Consul.Test/ConsulConfigurationProviderTests.cs‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ public void SetUp()
2727
{
2828
_configParserMock = new Mock<IConfigurationParser>(MockBehavior.Strict);
2929
_consulConfigSourceMock = new Mock<IConsulConfigurationSource>(MockBehavior.Strict);
30-
_consulConfigSourceMock.SetupGet(ccs => ccs.Parser).Returns(_configParserMock.Object);
31-
_consulConfigSourceMock.SetupGet(ccs => ccs.Key).Returns(_Key);
32-
_consulConfigSourceMock.SetupGet(ccs => ccs.Optional).Returns(false);
33-
_consulConfigSourceMock.SetupGet(ccs => ccs.ReloadOnChange).Returns(false);
34-
_consulConfigSourceMock.SetupGet(ccs => ccs.OnLoadException).Returns(null);
35-
_consulConfigSourceMock.SetupGet(ccs => ccs.OnWatchException).Returns(null);
30+
_consulConfigSourceMock.Setup(ccs => ccs.Parser).Returns(_configParserMock.Object);
31+
_consulConfigSourceMock.Setup(ccs => ccs.Key).Returns(_Key);
32+
_consulConfigSourceMock.Setup(ccs => ccs.Optional).Returns(false);
33+
_consulConfigSourceMock.Setup(ccs => ccs.ReloadOnChange).Returns(false);
34+
_consulConfigSourceMock.Setup(ccs => ccs.OnLoadException).Returns(null);
35+
_consulConfigSourceMock.Setup(ccs => ccs.OnWatchException).Returns(() => ctx => { });
3636

3737
_changeTokenMock = new Mock<IChangeToken>(MockBehavior.Strict);
3838
_configQueryResultMock = new Mock<IConfigQueryResult>(MockBehavior.Strict);
@@ -52,7 +52,7 @@ public void SetUp()
5252
[Test]
5353
public void ShouldThrowIfParserIsNullWhenConstructed()
5454
{
55-
_consulConfigSourceMock.SetupGet(ccs => ccs.Parser).Returns((IConfigurationParser)null);
55+
_consulConfigSourceMock.Setup(ccs => ccs.Parser).Returns((IConfigurationParser)null);
5656

5757
Assert.That(
5858
() => new ConsulConfigurationProvider(_consulConfigSourceMock.Object, _consulConfigClientMock.Object),
@@ -77,7 +77,7 @@ public void ShouldParseLoadedConfigIntoDictionary(string actualKey, string looku
7777
[Test]
7878
public void ShouldHaveEmptyDataIfConfigDoesNotExistdAndIsOptional()
7979
{
80-
_consulConfigSourceMock.SetupGet(ccs => ccs.Optional).Returns(true);
80+
_consulConfigSourceMock.Setup(ccs => ccs.Optional).Returns(true);
8181
_configQueryResultMock.Setup(cqr => cqr.Exists).Returns(false);
8282

8383
_consulConfigProvider.Load();
@@ -90,7 +90,7 @@ public void ShouldHaveEmptyDataIfConfigDoesNotExistdAndIsOptional()
9090
[Test]
9191
public void ShouldNotParseIfConfigBytesIsNullWhenLoad()
9292
{
93-
_consulConfigSourceMock.SetupGet(ccs => ccs.Optional).Returns(true);
93+
_consulConfigSourceMock.Setup(ccs => ccs.Optional).Returns(true);
9494
_configQueryResultMock.Setup(cqr => cqr.Exists).Returns(false);
9595

9696
_consulConfigProvider.Load();
@@ -104,11 +104,11 @@ public void ShouldNotParseIfConfigBytesIsNullWhenLoad()
104104
public void ShouldThrowIfConfigDoesNotExistAndIsNotOptonalWhenLoad()
105105
{
106106
ConsulLoadExceptionContext actualExceptionContext = null;
107-
_consulConfigSourceMock.SetupGet(ccs => ccs.Optional).Returns(false);
107+
_consulConfigSourceMock.Setup(ccs => ccs.Optional).Returns(false);
108108
_configQueryResultMock.Setup(cqr => cqr.Exists).Returns(false);
109109

110110
_consulConfigSourceMock
111-
.SetupGet(ccs => ccs.OnLoadException)
111+
.Setup(ccs => ccs.OnLoadException)
112112
.Returns(exceptionContext =>
113113
{
114114
actualExceptionContext = exceptionContext;
@@ -134,7 +134,7 @@ public void ShouldCallSourceOnLoadExceptionActionWhenExceptionDuringLoad()
134134

135135
_consulConfigClientMock.Setup(ccc => ccc.GetConfig()).ThrowsAsync(new Exception());
136136
_consulConfigSourceMock
137-
.SetupGet(ccs => ccs.OnLoadException)
137+
.Setup(ccs => ccs.OnLoadException)
138138
.Returns(exceptionContext =>
139139
{
140140
calledOnLoadException = true;
@@ -159,7 +159,7 @@ public void ShouldSetExceptionInLoadExceptionContextWhenExceptionDuringLoad()
159159

160160
_consulConfigClientMock.Setup(ccc => ccc.GetConfig()).ThrowsAsync(expectedException);
161161
_consulConfigSourceMock
162-
.SetupGet(ccs => ccs.OnLoadException)
162+
.Setup(ccs => ccs.OnLoadException)
163163
.Returns(exceptionContext =>
164164
{
165165
actualExceptionContext = exceptionContext;
@@ -183,7 +183,7 @@ public void ShouldSetSourceInLoadExceptionContextWhenExceptionDuringLoad()
183183

184184
_consulConfigClientMock.Setup(ccc => ccc.GetConfig()).ThrowsAsync(new Exception());
185185
_consulConfigSourceMock
186-
.SetupGet(ccs => ccs.OnLoadException)
186+
.Setup(ccs => ccs.OnLoadException)
187187
.Returns(exceptionContext =>
188188
{
189189
actualExceptionContext = exceptionContext;
@@ -207,7 +207,7 @@ public void ShouldThrowExceptionIfOnLoadExceptionDoesNotSetIgnoreWhenExceptionDu
207207

208208
_consulConfigClientMock.Setup(ccc => ccc.GetConfig()).ThrowsAsync(exception);
209209
_consulConfigSourceMock
210-
.SetupGet(ccs => ccs.OnLoadException)
210+
.Setup(ccs => ccs.OnLoadException)
211211
.Returns(exceptionContext =>
212212
{
213213
exceptionContext.Ignore = false;
@@ -223,7 +223,7 @@ public void ShouldNotThrowExceptionIfOnLoadExceptionDoesSetIgnoreWhenExceptionDu
223223

224224
_consulConfigClientMock.Setup(ccc => ccc.GetConfig()).ThrowsAsync(exception);
225225
_consulConfigSourceMock
226-
.SetupGet(ccs => ccs.OnLoadException)
226+
.Setup(ccs => ccs.OnLoadException)
227227
.Returns(exceptionContext =>
228228
{
229229
exceptionContext.Ignore = true;
@@ -235,7 +235,7 @@ public void ShouldNotThrowExceptionIfOnLoadExceptionDoesSetIgnoreWhenExceptionDu
235235
[Test]
236236
public void ShouldWatchForChangesIfSourceReloadOnChangesIsTrue()
237237
{
238-
_consulConfigSourceMock.SetupGet(ccs => ccs.ReloadOnChange).Returns(true);
238+
_consulConfigSourceMock.Setup(ccs => ccs.ReloadOnChange).Returns(true);
239239
_changeTokenMock
240240
.Setup(ct => ct.RegisterChangeCallback(It.IsAny<Action<object>>(), It.IsAny<object>()))
241241
.Returns(null as IDisposable);
@@ -252,8 +252,8 @@ public void ShouldWatchForChangesIfSourceReloadOnChangesIsTrue()
252252
public void ShouldReloadConfigIfReloadOnChangesAndDataInConsulHasChanged()
253253
{
254254
Action<object> onChangeAction = null;
255-
_consulConfigSourceMock.SetupGet(ccs => ccs.ReloadOnChange).Returns(true);
256-
_configQueryResultMock.SetupGet(cqr => cqr.Exists).Returns(false);
255+
_consulConfigSourceMock.Setup(ccs => ccs.ReloadOnChange).Returns(true);
256+
_configQueryResultMock.Setup(cqr => cqr.Exists).Returns(false);
257257
_changeTokenMock
258258
.Setup(ct => ct.RegisterChangeCallback(It.IsAny<Action<object>>(), It.IsAny<object>()))
259259
.Callback((Action<object> action, object state) =>
@@ -276,9 +276,9 @@ public void ShouldReloadConfigIfReloadOnChangesAndDataInConsulHasChanged()
276276
public void ShouldNotThrowIfDoesNotExistOnReload(bool optional)
277277
{
278278
Action<object> onChangeAction = null;
279-
_consulConfigSourceMock.SetupGet(ccs => ccs.Optional).Returns(optional);
280-
_consulConfigSourceMock.SetupGet(ccs => ccs.ReloadOnChange).Returns(true);
281-
_configQueryResultMock.SetupGet(cqr => cqr.Exists).Returns(false);
279+
_consulConfigSourceMock.Setup(ccs => ccs.Optional).Returns(optional);
280+
_consulConfigSourceMock.Setup(ccs => ccs.ReloadOnChange).Returns(true);
281+
_configQueryResultMock.Setup(cqr => cqr.Exists).Returns(false);
282282
_changeTokenMock
283283
.Setup(ct => ct.RegisterChangeCallback(It.IsAny<Action<object>>(), It.IsAny<object>()))
284284
.Callback((Action<object> action, object state) =>
@@ -301,9 +301,9 @@ public void ShouldNotOverwriteNonOptionalConfigIfDoesNotExistOnReload()
301301
var originalData = new Dictionary<string, string> { { key, value } };
302302
Action<object> onChangeAction = null;
303303

304-
_consulConfigSourceMock.SetupGet(ccs => ccs.Optional).Returns(false);
305-
_consulConfigSourceMock.SetupGet(ccs => ccs.ReloadOnChange).Returns(true);
306-
_configQueryResultMock.SetupGet(cqr => cqr.Exists).Returns(false);
304+
_consulConfigSourceMock.Setup(ccs => ccs.Optional).Returns(false);
305+
_consulConfigSourceMock.Setup(ccs => ccs.ReloadOnChange).Returns(true);
306+
_configQueryResultMock.Setup(cqr => cqr.Exists).Returns(false);
307307
_changeTokenMock
308308
.Setup(ct => ct.RegisterChangeCallback(It.IsAny<Action<object>>(), It.IsAny<object>()))
309309
.Callback((Action<object> action, object state) =>
@@ -324,8 +324,8 @@ public void ShouldNotOverwriteNonOptionalConfigIfDoesNotExistOnReload()
324324
private void DoLoad(IDictionary<string, string> data)
325325
{
326326
_configParserMock.Setup(cp => cp.Parse(It.IsAny<MemoryStream>())).Returns(data);
327-
_configQueryResultMock.SetupGet(cqr => cqr.Exists).Returns(true);
328-
_configQueryResultMock.SetupGet(cqr => cqr.Value).Returns(new byte[] { });
327+
_configQueryResultMock.Setup(cqr => cqr.Exists).Returns(true);
328+
_configQueryResultMock.Setup(cqr => cqr.Value).Returns(new byte[] { });
329329

330330
_consulConfigProvider.Load();
331331
}

‎test/Winton.Extensions.Configuration.Consul.Test/Winton.Extensions.Configuration.Consul.Test.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
22-
<PackageReference Include="Moq" Version="4.7.63" />
23-
<PackageReference Include="NUnit" Version="3.7.1" />
24-
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
22+
<PackageReference Include="Moq" Version="4.8.1" />
23+
<PackageReference Include="NUnit" Version="3.9.0" />
24+
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
2525
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="All" />
2626
</ItemGroup>
2727

0 commit comments

Comments
 (0)