Skip to content

Commit c713f20

Browse files
author
Chris Young
committed
Merge tag '7.0.0' into develop
7.0.0 7.0.0
2 parents 390af22 + 4d014e7 commit c713f20

File tree

13 files changed

+57
-54
lines changed

13 files changed

+57
-54
lines changed

‎.DS_Store‎

6 KB
Binary file not shown.

‎src/.DS_Store‎

6 KB
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
2424
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
2525
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
26-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.2.4" />
26+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.3.0" />
2727
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
2828
</ItemGroup>
2929
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>netstandard2.0</TargetFrameworks>
44
<Authors>ArchitectNow</Authors>
@@ -25,7 +25,7 @@
2525
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
2626
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
2727
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
28-
<PackageReference Include="MongoDB.Driver" Version="2.7.0" />
28+
<PackageReference Include="MongoDB.Driver" Version="2.7.2" />
2929
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
3030
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
3131
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />

‎src/ArchitectNow.Mongo/Db/BaseRepository.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace ArchitectNow.Mongo.Db
1616
{
1717
public abstract class BaseRepository<TModel, TDataContext, TId> : IBaseRepository<TModel, TId> where TModel : BaseDocument<TId>
1818
where TDataContext : MongoDataContext
19-
where TId : IComparable<TId>, IEquatable<TId>
19+
where TId : IComparable<TId>
2020
{
2121
private readonly IValidator<TModel> _validator;
2222

‎src/ArchitectNow.Mongo/Db/GuidBaseRepository.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ protected override FilterDefinition<TModel> AreIdsEqual(Guid id)
2424

2525
protected override Guid CreateNewId() => Guid.NewGuid();
2626
}
27-
}
27+
}

‎src/ArchitectNow.Mongo/Db/IBaseRepository.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace ArchitectNow.Mongo.Db
77
{
88
public interface IBaseRepository<T, TId> : IBaseRepository
99
where T : BaseDocument<TId>
10-
where TId: IComparable<TId>, IEquatable<TId>
10+
where TId: IComparable<TId>
1111
{
1212
Task<bool> DeleteAllAsync();
1313
Task<List<T>> GetAllAsync();

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66

77
namespace ArchitectNow.Mongo.Models
88
{
9-
public abstract class BaseDocument<TId> where TId: IComparable<TId>, IEquatable<TId>
9+
public abstract class BaseDocument<TId> where TId: IComparable<TId>
1010
{
1111
protected BaseDocument()
1212
{
1313
ValidationErrors = new List<ValidationResult>();
1414
}
1515

16+
[BsonIgnore]
1617
public abstract TId Id { get; set; }
1718

1819
/// <summary>

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@
2121
</PropertyGroup>
2222
<ItemGroup>
2323
<PackageReference Include="Autofac" Version="4.8.1" />
24-
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.2" />
25-
<PackageReference Include="Hangfire.AspNetCore" Version="1.6.19" />
26-
<PackageReference Include="Hangfire.Core" Version="1.6.19" />
27-
<PackageReference Include="HangFire.Mongo" Version="0.5.10" />
28-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.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.Mongo" Version="0.5.12" />
28+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.2" />
2929
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.1.1" />
3030
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" />
31-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.1" />
31+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
3232
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.1.1" />
3333
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.1.1" />
34-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.1" />
35-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.2" />
36-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.2" />
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" />
3737
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
3838
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
3939
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.1" />
@@ -47,14 +47,14 @@
4747
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
4848
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
4949
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
50-
<PackageReference Include="NSwag.AspNetCore" Version="11.17.21" />
50+
<PackageReference Include="NSwag.AspNetCore" Version="11.20.1" />
5151
<PackageReference Include="Serilog" Version="2.7.1" />
5252
<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
5353
<PackageReference Include="Serilog.Sinks.Async" Version="1.3.0" />
54-
<PackageReference Include="Serilog.Sinks.MongoDB" Version="3.1.0" />
54+
<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.3.0" />
57+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.5.1" />
5858
</ItemGroup>
5959
<ItemGroup>
6060
<ProjectReference Include="..\ArchitectNow.Mongo\ArchitectNow.Mongo.csproj" />

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@
2121
</PropertyGroup>
2222
<ItemGroup>
2323
<PackageReference Include="Autofac" Version="4.8.1" />
24-
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.2" />
25-
<PackageReference Include="Hangfire.AspNetCore" Version="1.6.19" />
26-
<PackageReference Include="Hangfire.Core" Version="1.6.19" />
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" />
2727
<PackageReference Include="Hangfire.Pro" Version="2.1.1" />
28-
<PackageReference Include="Hangfire.Pro.Redis" Version="2.2.1" />
29-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" 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" />
3030
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.1.1" />
3131
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" />
32-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.1" />
32+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
3333
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.1.1" />
3434
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.1.1" />
35-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.1" />
36-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.2" />
37-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.2" />
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" />
3838
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
3939
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
4040
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.1" />
@@ -48,14 +48,14 @@
4848
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.1" />
4949
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
5050
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
51-
<PackageReference Include="NSwag.AspNetCore" Version="11.17.21" />
51+
<PackageReference Include="NSwag.AspNetCore" Version="11.20.1" />
5252
<PackageReference Include="Serilog" Version="2.7.1" />
5353
<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
5454
<PackageReference Include="Serilog.Sinks.Async" Version="1.3.0" />
55-
<PackageReference Include="Serilog.Sinks.MongoDB" Version="3.1.0" />
55+
<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.3.0" />
58+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.5.1" />
5959
</ItemGroup>
6060
<ItemGroup>
6161
<ProjectReference Include="..\ArchitectNow.Services\ArchitectNow.Services.csproj" />

0 commit comments

Comments
 (0)