Skip to content

Commit 3db06ea

Browse files
author
Chris Young
committed
Merge branch 'release/7.2.0'
2 parents 53d0bbb + 3ef251e commit 3db06ea

File tree

13 files changed

+154
-155
lines changed

13 files changed

+154
-155
lines changed

‎src/ArchitectNow.Caching/ArchitectNow.Caching.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
2121
</PropertyGroup>
2222
<ItemGroup>
23-
<PackageReference Include="Autofac" Version="4.8.1" />
24-
<PackageReference Include="CacheManager.Serialization.Json" Version="1.1.2" />
25-
<PackageReference Include="CacheManager.StackExchange.Redis" Version="1.1.2" />
26-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.1" />
27-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
28-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
23+
<PackageReference Include="Autofac" Version="4.9.1" />
24+
<PackageReference Include="CacheManager.Serialization.Json" Version="1.2.0" />
25+
<PackageReference Include="CacheManager.StackExchange.Redis" Version="1.2.0" />
26+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
27+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
28+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
2929

3030
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
3131
</ItemGroup>

‎src/ArchitectNow.Models/ArchitectNow.Models.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
2121
</PropertyGroup>
2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
24-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
25-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
26-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.3.0" />
23+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
24+
<PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
25+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
26+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.4.0" />
2727
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
2828
</ItemGroup>
2929
<ItemGroup>

‎src/ArchitectNow.Mongo/ArchitectNow.Mongo.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
2121
</PropertyGroup>
2222
<ItemGroup>
23-
<PackageReference Include="Autofac" Version="4.8.1" />
24-
<PackageReference Include="FluentValidation" Version="7.6.104" />
25-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
26-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
27-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
28-
<PackageReference Include="MongoDB.Driver" Version="2.7.2" />
29-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
23+
<PackageReference Include="Autofac" Version="4.9.1" />
24+
<PackageReference Include="FluentValidation" Version="8.1.3" />
25+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
26+
<PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
27+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
28+
<PackageReference Include="MongoDB.Driver" Version="2.7.3" />
29+
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
3030
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
3131
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
3232
</ItemGroup>

‎src/ArchitectNow.Services/ArchitectNow.Services.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
2121
</PropertyGroup>
2222
<ItemGroup>
23-
<PackageReference Include="Autofac" Version="4.8.1" />
24-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
23+
<PackageReference Include="Autofac" Version="4.9.1" />
24+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
2525

2626
</ItemGroup>
2727
<ItemGroup>

‎src/ArchitectNow.Web.Mongo/ArchitectNow.Web.Mongo.csproj‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,41 @@
2020
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
2121
</PropertyGroup>
2222
<ItemGroup>
23-
<PackageReference Include="Autofac" Version="4.8.1" />
24-
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.3.1" />
25-
<PackageReference Include="Hangfire.AspNetCore" Version="1.6.21" />
26-
<PackageReference Include="Hangfire.Core" Version="1.6.21" />
23+
<PackageReference Include="Autofac" Version="4.9.1" />
24+
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.4.0" />
25+
<PackageReference Include="Hangfire.AspNetCore" Version="1.6.22" />
26+
<PackageReference Include="Hangfire.Core" Version="1.6.22" />
2727
<PackageReference Include="HangFire.Mongo" Version="0.5.12" />
28-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.2" />
29-
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.1.1" />
30-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" />
31-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
32-
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.1.1" />
33-
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.1.1" />
34-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.2" />
35-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.3" />
36-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.3" />
37-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
38-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
39-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.1" />
40-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
41-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.1.1" />
42-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
43-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
44-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
45-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
46-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
47-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
48-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
49-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
50-
<PackageReference Include="NSwag.AspNetCore" Version="11.20.1" />
51-
<PackageReference Include="Serilog" Version="2.7.1" />
28+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.2.0" />
29+
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.2.0" />
30+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />
31+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
32+
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.2.0" />
33+
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.2.2" />
34+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.2.1" />
35+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
36+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.2.0" />
37+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
38+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.0" />
39+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
40+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
41+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.2.0" />
42+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
43+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
44+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
45+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
46+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.2.0" />
47+
<PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
48+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
49+
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
50+
<PackageReference Include="NSwag.AspNetCore" Version="12.0.14" />
51+
<PackageReference Include="Serilog" Version="2.8.0" />
5252
<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
5353
<PackageReference Include="Serilog.Sinks.Async" Version="1.3.0" />
5454
<PackageReference Include="Serilog.Sinks.MongoDB" Version="4.0.0" />
5555
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
5656
<PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
57-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.5.1" />
57+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.6.1" />
5858
</ItemGroup>
5959
<ItemGroup>
6060
<ProjectReference Include="..\ArchitectNow.Mongo\ArchitectNow.Mongo.csproj" />

‎src/ArchitectNow.Web.Mongo/StartupSample.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ public void Configure(
9494
{
9595
settings.GeneratorSettings.Title = "API";
9696
settings.GeneratorSettings.Description = "API";
97-
settings.SwaggerRoute = "/app/docs/v1/swagger.json";
98-
settings.SwaggerUiRoute = "/app/docs";
97+
settings.DocumentPath = "/app/docs/v1/swagger.json";
98+
settings.Path = "/app/docs";
9999
settings.GeneratorSettings.DefaultEnumHandling = EnumHandling.String;
100100
settings.GeneratorSettings.DefaultPropertyNameHandling = PropertyNameHandling.CamelCase;
101101
settings.GeneratorSettings.Version = Assembly.GetEntryAssembly().GetName().Version.ToString();

‎src/ArchitectNow.Web.Redis/ArchitectNow.Web.Redis.csproj‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,42 +20,42 @@
2020
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
2121
</PropertyGroup>
2222
<ItemGroup>
23-
<PackageReference Include="Autofac" Version="4.8.1" />
24-
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.3.1" />
25-
<PackageReference Include="Hangfire.AspNetCore" Version="1.6.21" />
26-
<PackageReference Include="Hangfire.Core" Version="1.6.21" />
27-
<PackageReference Include="Hangfire.Pro" Version="2.1.1" />
28-
<PackageReference Include="Hangfire.Pro.Redis" Version="2.3.1" />
29-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.2" />
30-
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.1.1" />
31-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" />
32-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
33-
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.1.1" />
34-
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.1.1" />
35-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.2" />
36-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.3" />
37-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.3" />
38-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
39-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
40-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.1" />
41-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
42-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.1.1" />
43-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
44-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
45-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
46-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
47-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
48-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
49-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
50-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
51-
<PackageReference Include="NSwag.AspNetCore" Version="11.20.1" />
52-
<PackageReference Include="Serilog" Version="2.7.1" />
23+
<PackageReference Include="Autofac" Version="4.9.1" />
24+
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.4.0" />
25+
<PackageReference Include="Hangfire.AspNetCore" Version="1.6.22" />
26+
<PackageReference Include="Hangfire.Core" Version="1.6.22" />
27+
<PackageReference Include="Hangfire.Pro" Version="2.1.2" />
28+
<PackageReference Include="Hangfire.Pro.Redis" Version="2.4.0" />
29+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.2.0" />
30+
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.2.0" />
31+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />
32+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
33+
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.2.0" />
34+
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.2.2" />
35+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.2.1" />
36+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
37+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.2.0" />
38+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
39+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.0" />
40+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
41+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
42+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.2.0" />
43+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
44+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
45+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
46+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
47+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.2.0" />
48+
<PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
49+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
50+
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
51+
<PackageReference Include="NSwag.AspNetCore" Version="12.0.14" />
52+
<PackageReference Include="Serilog" Version="2.8.0" />
5353
<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
5454
<PackageReference Include="Serilog.Sinks.Async" Version="1.3.0" />
5555
<PackageReference Include="Serilog.Sinks.MongoDB" Version="4.0.0" />
5656
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
5757
<PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
58-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.5.1" />
58+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.6.1" />
5959
</ItemGroup>
6060
<ItemGroup>
6161
<ProjectReference Include="..\ArchitectNow.Services\ArchitectNow.Services.csproj" />

‎src/ArchitectNow.Web.Redis/StartupSample.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ public void Configure(
9393
{
9494
settings.GeneratorSettings.Title = "API";
9595
settings.GeneratorSettings.Description = "API";
96-
settings.SwaggerRoute = "/app/docs/v1/swagger.json";
97-
settings.SwaggerUiRoute = "/app/docs";
96+
settings.DocumentPath = "/app/docs/v1/swagger.json";
97+
settings.Path = "/app/docs";
9898
settings.GeneratorSettings.DefaultEnumHandling = EnumHandling.String;
9999
settings.GeneratorSettings.DefaultPropertyNameHandling = PropertyNameHandling.CamelCase;
100100
settings.GeneratorSettings.Version = Assembly.GetEntryAssembly().GetName().Version.ToString();

0 commit comments

Comments
 (0)