Skip to content

Commit fd70921

Browse files
author
Chris Young
committed
Merge branch 'hotfix/4.0.1' into develop
2 parents 97178be + 64e2951 commit fd70921

File tree

4 files changed

+201
-211
lines changed

4 files changed

+201
-211
lines changed
Lines changed: 67 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,68 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.6</TargetFrameworks>
5-
<Authors>ArchitectNow</Authors>
6-
<Company>ArchitectNow</Company>
7-
<Product>ArchitectNow.Web.Mongo</Product>
8-
<PackageId>ArchitectNow.Web.Mongo</PackageId>
9-
<PackageProjectUrl>https://github.com/ArchitectNow/ArchitectNow.Framework</PackageProjectUrl>
10-
<PackageIconUrl>https://secure.gravatar.com/avatar/83fed82c32dc5424b4245cfc03d57b39?s=32&amp;r=g&amp;d=retro</PackageIconUrl>
11-
<RepositoryUrl>https://github.com/ArchitectNow/ArchitectNow.Framework</RepositoryUrl>
12-
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
13-
<Copyright>Copyright © 2014-2017 ArchitectNow</Copyright>
14-
<PackageLicenseUrl>https://github.com/ArchitectNow/ArchitectNow.Framework/blob/master/LICENSE</PackageLicenseUrl>
15-
<Description>ArchitectNow Framework - Web.Models</Description>
16-
</PropertyGroup>
17-
18-
<PropertyGroup>
19-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
20-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
21-
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
22-
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
23-
</PropertyGroup>
24-
25-
<ItemGroup>
26-
<PackageReference Include="Autofac" Version="4.6.0" />
27-
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.1.0" />
28-
<PackageReference Include="Hangfire.AspNetCore" Version="1.6.14" />
29-
<PackageReference Include="Hangfire.Core" Version="1.6.14" />
30-
<PackageReference Include="HangFire.Mongo" Version="0.4.0" />
31-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="1.1.2" />
32-
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="1.1.2" />
33-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.2" />
34-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
35-
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="1.0.2" />
36-
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.1.2" />
37-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.2" />
38-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
39-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="1.1.2" />
40-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
41-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
42-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.2" />
43-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
44-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.2" />
45-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="1.1.1" />
46-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
47-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
48-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
49-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
50-
<PackageReference Include="Microsoft.Extensions.Options" Version="1.1.2" />
51-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
52-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
53-
<PackageReference Include="NSwag.AspNetCore" Version="11.1.1" />
54-
<PackageReference Include="Serilog" Version="2.4.0" />
55-
<PackageReference Include="Serilog.Extensions.Logging" Version="1.4.0" />
56-
<PackageReference Include="Serilog.Sinks.Async" Version="1.0.1" />
57-
<PackageReference Include="Serilog.Sinks.ColoredConsole" Version="2.0.0" />
58-
<PackageReference Include="Serilog.Sinks.MongoDB" Version="3.1.0" />
59-
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
60-
<PackageReference Include="Serilog.Sinks.Literate" Version="2.1.0" />
61-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.1" />
62-
</ItemGroup>
63-
64-
<ItemGroup>
65-
<ProjectReference Include="..\ArchitectNow.Mongo\ArchitectNow.Mongo.csproj" />
66-
<ProjectReference Include="..\ArchitectNow.Web\ArchitectNow.Web.csproj" />
67-
</ItemGroup>
68-
69-
<ItemGroup>
70-
<Compile Include="..\..\VersionAssemblyInfo.cs" Link="VersionAssemblyInfo.cs" />
71-
</ItemGroup>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFrameworks>netstandard1.6</TargetFrameworks>
4+
<Authors>ArchitectNow</Authors>
5+
<Company>ArchitectNow</Company>
6+
<Product>ArchitectNow.Web.Mongo</Product>
7+
<PackageId>ArchitectNow.Web.Mongo</PackageId>
8+
<PackageProjectUrl>https://github.com/ArchitectNow/ArchitectNow.Framework</PackageProjectUrl>
9+
<PackageIconUrl>https://secure.gravatar.com/avatar/83fed82c32dc5424b4245cfc03d57b39?s=32&amp;r=g&amp;d=retro</PackageIconUrl>
10+
<RepositoryUrl>https://github.com/ArchitectNow/ArchitectNow.Framework</RepositoryUrl>
11+
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
12+
<Copyright>Copyright © 2014-2017 ArchitectNow</Copyright>
13+
<PackageLicenseUrl>https://github.com/ArchitectNow/ArchitectNow.Framework/blob/master/LICENSE</PackageLicenseUrl>
14+
<Description>ArchitectNow Framework - Web.Models</Description>
15+
</PropertyGroup>
16+
<PropertyGroup>
17+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
18+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
19+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
20+
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
21+
</PropertyGroup>
22+
<ItemGroup>
23+
<PackageReference Include="Autofac" Version="4.6.0" />
24+
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.1.0" />
25+
<PackageReference Include="Hangfire.AspNetCore" Version="1.6.14" />
26+
<PackageReference Include="Hangfire.Core" Version="1.6.14" />
27+
<PackageReference Include="HangFire.Mongo" Version="0.4.0" />
28+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="1.1.2" />
29+
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="1.1.2" />
30+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.2" />
31+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
32+
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="1.0.2" />
33+
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.1.2" />
34+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.2" />
35+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
36+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="1.1.2" />
37+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
38+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
39+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.2" />
40+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
41+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.2" />
42+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="1.1.1" />
43+
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
44+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
45+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
46+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
47+
<PackageReference Include="Microsoft.Extensions.Options" Version="1.1.2" />
48+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
49+
<PackageReference Include="Mindscape.Raygun4Net.AspNetCore" Version="5.5.0" />
50+
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
51+
<PackageReference Include="NSwag.AspNetCore" Version="11.1.1" />
52+
<PackageReference Include="Serilog" Version="2.4.0" />
53+
<PackageReference Include="Serilog.Extensions.Logging" Version="1.4.0" />
54+
<PackageReference Include="Serilog.Sinks.Async" Version="1.0.1" />
55+
<PackageReference Include="Serilog.Sinks.ColoredConsole" Version="2.0.0" />
56+
<PackageReference Include="Serilog.Sinks.MongoDB" Version="3.1.0" />
57+
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
58+
<PackageReference Include="Serilog.Sinks.Literate" Version="2.1.0" />
59+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.1" />
60+
</ItemGroup>
61+
<ItemGroup>
62+
<ProjectReference Include="..\ArchitectNow.Mongo\ArchitectNow.Mongo.csproj" />
63+
<ProjectReference Include="..\ArchitectNow.Web\ArchitectNow.Web.csproj" />
64+
</ItemGroup>
65+
<ItemGroup>
66+
<Compile Include="..\..\VersionAssemblyInfo.cs" Link="VersionAssemblyInfo.cs" />
67+
</ItemGroup>
7268
</Project>
Lines changed: 68 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,69 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.6</TargetFrameworks>
5-
<Authors>ArchitectNow</Authors>
6-
<Company>ArchitectNow</Company>
7-
<Product>ArchitectNow.Web.Redis</Product>
8-
<PackageId>ArchitectNow.Web.Redis</PackageId>
9-
<PackageProjectUrl>https://github.com/ArchitectNow/ArchitectNow.Framework</PackageProjectUrl>
10-
<PackageIconUrl>https://secure.gravatar.com/avatar/83fed82c32dc5424b4245cfc03d57b39?s=32&amp;r=g&amp;d=retro</PackageIconUrl>
11-
<RepositoryUrl>https://github.com/ArchitectNow/ArchitectNow.Framework</RepositoryUrl>
12-
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
13-
<Copyright>Copyright © 2014-2017 ArchitectNow</Copyright>
14-
<PackageLicenseUrl>https://github.com/ArchitectNow/ArchitectNow.Framework/blob/master/LICENSE</PackageLicenseUrl>
15-
<Description>ArchitectNow Framework - Web.Redis</Description>
16-
</PropertyGroup>
17-
18-
<PropertyGroup>
19-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
20-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
21-
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
22-
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
23-
</PropertyGroup>
24-
25-
<ItemGroup>
26-
<PackageReference Include="Autofac" Version="4.6.0" />
27-
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.1.0" />
28-
<PackageReference Include="Hangfire.AspNetCore" Version="1.6.14" />
29-
<PackageReference Include="Hangfire.Core" Version="1.6.14" />
30-
<PackageReference Include="Hangfire.Pro" Version="2.0.1" />
31-
<PackageReference Include="Hangfire.Pro.Redis" Version="2.1.1" />
32-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="1.1.2" />
33-
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="1.1.2" />
34-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.2" />
35-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
36-
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="1.0.2" />
37-
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.1.2" />
38-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.2" />
39-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
40-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="1.1.2" />
41-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
42-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
43-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.2" />
44-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
45-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.2" />
46-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="1.1.1" />
47-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
48-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
49-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
50-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
51-
<PackageReference Include="Microsoft.Extensions.Options" Version="1.1.2" />
52-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
53-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
54-
<PackageReference Include="NSwag.AspNetCore" Version="11.1.1" />
55-
<PackageReference Include="Serilog" Version="2.4.0" />
56-
<PackageReference Include="Serilog.Extensions.Logging" Version="1.4.0" />
57-
<PackageReference Include="Serilog.Sinks.Async" Version="1.0.1" />
58-
<PackageReference Include="Serilog.Sinks.ColoredConsole" Version="2.0.0" />
59-
<PackageReference Include="Serilog.Sinks.MongoDB" Version="3.1.0" />
60-
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
61-
<PackageReference Include="Serilog.Sinks.Literate" Version="2.1.0" />
62-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.1" />
63-
</ItemGroup>
64-
65-
<ItemGroup>
66-
<ProjectReference Include="..\ArchitectNow.Services\ArchitectNow.Services.csproj" />
67-
<ProjectReference Include="..\ArchitectNow.Web\ArchitectNow.Web.csproj" />
68-
</ItemGroup>
69-
70-
<ItemGroup>
71-
<Compile Include="..\..\VersionAssemblyInfo.cs" Link="VersionAssemblyInfo.cs" />
72-
</ItemGroup>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFrameworks>netstandard1.6</TargetFrameworks>
4+
<Authors>ArchitectNow</Authors>
5+
<Company>ArchitectNow</Company>
6+
<Product>ArchitectNow.Web.Redis</Product>
7+
<PackageId>ArchitectNow.Web.Redis</PackageId>
8+
<PackageProjectUrl>https://github.com/ArchitectNow/ArchitectNow.Framework</PackageProjectUrl>
9+
<PackageIconUrl>https://secure.gravatar.com/avatar/83fed82c32dc5424b4245cfc03d57b39?s=32&amp;r=g&amp;d=retro</PackageIconUrl>
10+
<RepositoryUrl>https://github.com/ArchitectNow/ArchitectNow.Framework</RepositoryUrl>
11+
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
12+
<Copyright>Copyright © 2014-2017 ArchitectNow</Copyright>
13+
<PackageLicenseUrl>https://github.com/ArchitectNow/ArchitectNow.Framework/blob/master/LICENSE</PackageLicenseUrl>
14+
<Description>ArchitectNow Framework - Web.Redis</Description>
15+
</PropertyGroup>
16+
<PropertyGroup>
17+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
18+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
19+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
20+
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
21+
</PropertyGroup>
22+
<ItemGroup>
23+
<PackageReference Include="Autofac" Version="4.6.0" />
24+
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.1.0" />
25+
<PackageReference Include="Hangfire.AspNetCore" Version="1.6.14" />
26+
<PackageReference Include="Hangfire.Core" Version="1.6.14" />
27+
<PackageReference Include="Hangfire.Pro" Version="2.0.1" />
28+
<PackageReference Include="Hangfire.Pro.Redis" Version="2.1.1" />
29+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="1.1.2" />
30+
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="1.1.2" />
31+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.2" />
32+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
33+
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="1.0.2" />
34+
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.1.2" />
35+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.2" />
36+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
37+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="1.1.2" />
38+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
39+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
40+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.2" />
41+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
42+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.2" />
43+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="1.1.1" />
44+
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
45+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
46+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
47+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
48+
<PackageReference Include="Microsoft.Extensions.Options" Version="1.1.2" />
49+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
50+
<PackageReference Include="Mindscape.Raygun4Net.AspNetCore" Version="5.5.0" />
51+
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
52+
<PackageReference Include="NSwag.AspNetCore" Version="11.1.1" />
53+
<PackageReference Include="Serilog" Version="2.4.0" />
54+
<PackageReference Include="Serilog.Extensions.Logging" Version="1.4.0" />
55+
<PackageReference Include="Serilog.Sinks.Async" Version="1.0.1" />
56+
<PackageReference Include="Serilog.Sinks.ColoredConsole" Version="2.0.0" />
57+
<PackageReference Include="Serilog.Sinks.MongoDB" Version="3.1.0" />
58+
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
59+
<PackageReference Include="Serilog.Sinks.Literate" Version="2.1.0" />
60+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.1" />
61+
</ItemGroup>
62+
<ItemGroup>
63+
<ProjectReference Include="..\ArchitectNow.Services\ArchitectNow.Services.csproj" />
64+
<ProjectReference Include="..\ArchitectNow.Web\ArchitectNow.Web.csproj" />
65+
</ItemGroup>
66+
<ItemGroup>
67+
<Compile Include="..\..\VersionAssemblyInfo.cs" Link="VersionAssemblyInfo.cs" />
68+
</ItemGroup>
7369
</Project>

0 commit comments

Comments
 (0)