Skip to content

Commit 1ed7748

Browse files
author
Chris Young
committed
Updated to core 2.0
1 parent 5ec9708 commit 1ed7748

File tree

17 files changed

+231
-232
lines changed

17 files changed

+231
-232
lines changed

‎global.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"sdk": {
3+
"version": "2.0.0"
4+
}
5+
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard1.6</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
44
<Authors>ArchitectNow</Authors>
55
<Company>ArchitectNow</Company>
66
<Product>ArchitectNow.Web.Models</Product>
@@ -20,9 +20,9 @@
2020
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
2121
</PropertyGroup>
2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
24-
<PackageReference Include="Microsoft.Extensions.Options" Version="1.1.2" />
25-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
23+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
24+
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
25+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
2626
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.1.4" />
2727
</ItemGroup>
2828
<ItemGroup>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.6</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
55
<Authors>ArchitectNow</Authors>
66
<Company>ArchitectNow</Company>
77
<Product>ArchitectNow.Mongo</Product>
@@ -23,14 +23,14 @@
2323
</PropertyGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Autofac" Version="4.6.0" />
27-
<PackageReference Include="FluentValidation" Version="7.0.3" />
28-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
29-
<PackageReference Include="Microsoft.Extensions.Options" Version="1.1.2" />
30-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
26+
<PackageReference Include="Autofac" Version="4.6.1" />
27+
<PackageReference Include="FluentValidation" Version="7.1.1" />
28+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
29+
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
30+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
3131
<PackageReference Include="MongoDB.Driver" Version="2.4.4" />
3232
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
33-
<PackageReference Include="System.ComponentModel.Annotations" Version="4.3.0" />
33+
<PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0" />
3434
</ItemGroup>
3535

3636
<ItemGroup>

‎src/ArchitectNow.Mongo/Models/MongoDataContext.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ public class MongoDataContext:BaseDataContext<DataContextOptions>
99
public MongoDataContext(DataContextOptions options): base(options)
1010
{
1111
ResetContext();
12+
// ReSharper disable once VirtualMemberCallInConstructor
1213
EnvironmentName = Options?.Environment;
1314
}
1415

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.6</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
55
<Authors>ArchitectNow</Authors>
66
<Company>ArchitectNow</Company>
77
<Product>ArchitectNow.Services</Product>
@@ -23,8 +23,8 @@
2323
</PropertyGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Autofac" Version="4.6.0" />
27-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
26+
<PackageReference Include="Autofac" Version="4.6.1" />
27+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
2828
</ItemGroup>
2929
<ItemGroup>
3030
<Compile Include="..\..\VersionAssemblyInfo.cs" Link="VersionAssemblyInfo.cs" />

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

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard1.6</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
44
<Authors>ArchitectNow</Authors>
55
<Company>ArchitectNow</Company>
66
<Product>ArchitectNow.Web.Mongo</Product>
@@ -20,43 +20,43 @@
2020
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
2121
</PropertyGroup>
2222
<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" />
23+
<PackageReference Include="Autofac" Version="4.6.1" />
24+
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.0" />
25+
<PackageReference Include="Hangfire.AspNetCore" Version="1.6.16" />
26+
<PackageReference Include="Hangfire.Core" Version="1.6.16" />
27+
<PackageReference Include="HangFire.Mongo" Version="1.0.0" />
28+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.0" />
29+
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.0.0" />
30+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.0" />
31+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
32+
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.0.0" />
33+
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.0.0" />
34+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.0" />
35+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
36+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.0.0" />
37+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
38+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
39+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.0" />
40+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
41+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.0.0" />
42+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
43+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
44+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
45+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.0" />
46+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
47+
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
48+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
4949
<PackageReference Include="Mindscape.Raygun4Net.AspNetCore" Version="5.5.0" />
5050
<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" />
51+
<PackageReference Include="NSwag.AspNetCore" Version="11.7.2" />
52+
<PackageReference Include="Serilog" Version="2.5.0" />
53+
<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
54+
<PackageReference Include="Serilog.Sinks.Async" Version="1.1.0" />
55+
<PackageReference Include="Serilog.Sinks.ColoredConsole" Version="3.0.1" />
5656
<PackageReference Include="Serilog.Sinks.MongoDB" Version="3.1.0" />
5757
<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" />
58+
<PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
59+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.1.1" />
6060
</ItemGroup>
6161
<ItemGroup>
6262
<ProjectReference Include="..\ArchitectNow.Mongo\ArchitectNow.Mongo.csproj" />

‎src/ArchitectNow.Web.Mongo/Configuration/HangfireExtensions.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using Hangfire;
3-
using Hangfire.Mongo;
43
using Microsoft.Extensions.DependencyInjection;
54

65
namespace ArchitectNow.Web.Mongo.Configuration
@@ -11,8 +10,6 @@ public static void ConfigureHangfire(this IServiceCollection services, Func<stri
1110
{
1211
services.AddHangfire(globalConfiguration =>
1312
{
14-
var connectionString = getConnectionString();
15-
//globalConfiguration.UseMongoStorage(connectionString, databaseName);
1613
setupAction?.Invoke(globalConfiguration);
1714
});
1815
}

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

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard1.6</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
44
<Authors>ArchitectNow</Authors>
55
<Company>ArchitectNow</Company>
66
<Product>ArchitectNow.Web.Redis</Product>
@@ -20,44 +20,44 @@
2020
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
2121
</PropertyGroup>
2222
<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" />
23+
<PackageReference Include="Autofac" Version="4.6.1" />
24+
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.0" />
25+
<PackageReference Include="Hangfire.AspNetCore" Version="1.6.16" />
26+
<PackageReference Include="Hangfire.Core" Version="1.6.16" />
2727
<PackageReference Include="Hangfire.Pro" Version="2.0.1" />
2828
<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" />
29+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.0" />
30+
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.0.0" />
31+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.0" />
32+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
33+
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.0.0" />
34+
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.0.0" />
35+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.0" />
36+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
37+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.0.0" />
38+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
39+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
40+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.0" />
41+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
42+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.0.0" />
43+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
44+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
45+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
46+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.0" />
47+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
48+
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
49+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
5050
<PackageReference Include="Mindscape.Raygun4Net.AspNetCore" Version="5.5.0" />
5151
<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" />
52+
<PackageReference Include="NSwag.AspNetCore" Version="11.7.2" />
53+
<PackageReference Include="Serilog" Version="2.5.0" />
54+
<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
55+
<PackageReference Include="Serilog.Sinks.Async" Version="1.1.0" />
56+
<PackageReference Include="Serilog.Sinks.ColoredConsole" Version="3.0.1" />
5757
<PackageReference Include="Serilog.Sinks.MongoDB" Version="3.1.0" />
5858
<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" />
59+
<PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
60+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.1.1" />
6161
</ItemGroup>
6262
<ItemGroup>
6363
<ProjectReference Include="..\ArchitectNow.Services\ArchitectNow.Services.csproj" />

0 commit comments

Comments
 (0)