Skip to content

Commit 954d572

Browse files
author
Chris Young
committed
Merge branch 'release/5.3.0'
2 parents 6ba98f6 + 09ac486 commit 954d572

File tree

12 files changed

+111
-141
lines changed

12 files changed

+111
-141
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@
2020
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
2121
</PropertyGroup>
2222
<ItemGroup>
23-
<PackageReference Include="Autofac" Version="4.8.0" />
23+
<PackageReference Include="Autofac" Version="4.8.1" />
2424
<PackageReference Include="CacheManager.Serialization.Json" Version="1.1.2" />
2525
<PackageReference Include="CacheManager.StackExchange.Redis" Version="1.1.2" />
26-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.0.1" />
27-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.1" />
28-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.1" />
29-
26+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.0-rc1-final" />
27+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0-rc1-final" />
28+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.0-rc1-final" />
3029
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
3130
</ItemGroup>
3231
<ItemGroup>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
2121
</PropertyGroup>
2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.1" />
24-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.1" />
25-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.1" />
23+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0-rc1-final" />
24+
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.0-rc1-final" />
25+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.0-rc1-final" />
2626
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.2.2" />
2727

2828
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,15 @@
2020
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
2121
</PropertyGroup>
2222
<ItemGroup>
23-
<PackageReference Include="Autofac" Version="4.8.0" />
23+
<PackageReference Include="Autofac" Version="4.8.1" />
2424
<PackageReference Include="FluentValidation" Version="7.5.2" />
25-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.1" />
26-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.1" />
27-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.1" />
25+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0-rc1-final" />
26+
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.0-rc1-final" />
27+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.0-rc1-final" />
2828
<PackageReference Include="MongoDB.Driver" Version="2.6.0" />
29-
3029
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
3130
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
32-
<PackageReference Include="System.ComponentModel.Annotations" Version="4.4.1" />
31+
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0-rc1" />
3332
</ItemGroup>
3433
<ItemGroup>
3534
<Compile Include="..\..\VersionAssemblyInfo.cs" Link="VersionAssemblyInfo.cs" />

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,9 @@ public virtual async Task<bool> DeleteAllAsync()
8080
return true;
8181
}
8282

83-
public virtual Task<List<TModel>> GetAllAsync(bool onlyActive = true)
83+
public virtual Task<List<TModel>> GetAllAsync()
8484
{
85-
Task<List<TModel>> results;
86-
if (onlyActive)
87-
results = GetCollection().Find(x => x.IsActive).ToListAsync();
88-
else
89-
results = GetCollection().Find(model => true).ToListAsync();
85+
var results = GetCollection().Find(model => true).ToListAsync();
9086

9187
return results;
9288
}
@@ -102,11 +98,7 @@ public virtual async Task<TModel> SaveAsync(TModel item)
10298
{
10399
if (item.Id != Guid.Empty)
104100
item.UpdatedDate = DateTime.UtcNow;
105-
106-
if (item.OwnerUserId == null || item.OwnerUserId == Guid.Empty)
107-
if (CurrentContext != null && CurrentContext.CurrentUserId != Guid.Empty)
108-
item.OwnerUserId = CurrentContext.CurrentUserId;
109-
101+
110102
var errors = await ValidateObject(item);
111103

112104
if (errors.Any())
@@ -150,9 +142,9 @@ public virtual Task<bool> DeleteAsync(TModel item)
150142
/// <summary>
151143
/// Configures the indexes.
152144
/// </summary>
153-
public virtual async Task ConfigureIndexes()
145+
public virtual Task ConfigureIndexes()
154146
{
155-
await CreateIndex("Id", Builders<TModel>.IndexKeys.Ascending(x => x.Id).Ascending(x => x.IsActive));
147+
return Task.Run(() => { });
156148
}
157149

158150
/// <summary>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public interface IBaseRepository<T> : IBaseRepository
99
where T : BaseDocument
1010
{
1111
Task<bool> DeleteAllAsync();
12-
Task<List<T>> GetAllAsync(bool onlyActive = true);
12+
Task<List<T>> GetAllAsync();
1313
Task<T> GetOneAsync(Guid id);
1414
Task<T> SaveAsync(T item);
1515
Task<bool> DeleteAsync(Guid id);

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

Lines changed: 0 additions & 13 deletions
This file was deleted.

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ public abstract class BaseDocument
1212
protected BaseDocument()
1313
{
1414
ValidationErrors = new List<ValidationResult>();
15-
IsActive = true;
1615
}
1716

1817
[BsonId(IdGenerator = typeof(CombGuidGenerator))]
@@ -27,10 +26,7 @@ protected BaseDocument()
2726
public DateTimeOffset? CreatedDate { get; set; } = DateTime.UtcNow;
2827

2928
public DateTimeOffset? UpdatedDate { get; set; } = DateTime.UtcNow;
30-
31-
public Guid? OwnerUserId { get; set; }
32-
public bool IsActive { get; set; }
33-
29+
3430
[JsonIgnore]
3531
[BsonIgnore]
3632
public List<ValidationResult> ValidationErrors { get; set; }

‎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.0" />
24-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.1" />
23+
<PackageReference Include="Autofac" Version="4.8.1" />
24+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.0-rc1-final" />
2525

2626
</ItemGroup>
2727
<ItemGroup>

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

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,34 +20,33 @@
2020
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
2121
</PropertyGroup>
2222
<ItemGroup>
23-
<PackageReference Include="Autofac" Version="4.8.0" />
23+
<PackageReference Include="Autofac" Version="4.8.1" />
2424
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.2" />
2525
<PackageReference Include="Hangfire.AspNetCore" Version="1.6.19" />
2626
<PackageReference Include="Hangfire.Core" Version="1.6.19" />
2727
<PackageReference Include="HangFire.Mongo" Version="0.5.9" />
28-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.3" />
29-
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.0.2" />
30-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.2" />
31-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.3" />
32-
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.0.2" />
33-
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.0.2" />
34-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.2" />
35-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.2" />
36-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.0.2" />
37-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.2" />
38-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.1" />
39-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.1" />
40-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.1" />
41-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.0.1" />
42-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
43-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.1" />
44-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.1" />
45-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.1" />
46-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.1" />
47-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.1" />
48-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.1" />
49-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
50-
28+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.0-rc1-final" />
29+
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.1.0-rc1-final" />
30+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.1.0-rc1-final" />
31+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0-rc1-final" />
32+
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.1.0-rc1-final" />
33+
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.1.0-rc1-final" />
34+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.0-rc1-final" />
35+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.0-rc1-final" />
36+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.0-rc1-final" />
37+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.0-rc1-final" />
38+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.0-rc1-final" />
39+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.0-rc1-final" />
40+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0-rc1-final" />
41+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.1.0-rc1-final" />
42+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0-rc1-final" />
43+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0-rc1-final" />
44+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0-rc1-final" />
45+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.0-rc1-final" />
46+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.0-rc1-final" />
47+
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.0-rc1-final" />
48+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.0-rc1-final" />
49+
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
5150
<PackageReference Include="NSwag.AspNetCore" Version="11.17.3" />
5251
<PackageReference Include="Serilog" Version="2.6.0" />
5352
<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />

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

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,34 +20,33 @@
2020
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
2121
</PropertyGroup>
2222
<ItemGroup>
23-
<PackageReference Include="Autofac" Version="4.8.0" />
23+
<PackageReference Include="Autofac" Version="4.8.1" />
2424
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.2" />
2525
<PackageReference Include="Hangfire.AspNetCore" Version="1.6.19" />
2626
<PackageReference Include="Hangfire.Core" Version="1.6.19" />
2727
<PackageReference Include="Hangfire.Pro" Version="2.1.0" />
2828
<PackageReference Include="Hangfire.Pro.Redis" Version="2.2.1" />
29-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.3" />
30-
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.0.2" />
31-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.2" />
32-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.3" />
33-
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.0.2" />
34-
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.0.2" />
35-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.2" />
36-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.2" />
37-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.0.2" />
38-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.2" />
39-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.1" />
40-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.1" />
41-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.1" />
42-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.0.1" />
43-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
44-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.1" />
45-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.1" />
46-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.1" />
47-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.1" />
48-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.1" />
49-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.1" />
50-
29+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.0-rc1-final" />
30+
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.1.0-rc1-final" />
31+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.1.0-rc1-final" />
32+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0-rc1-final" />
33+
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.1.0-rc1-final" />
34+
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.1.0-rc1-final" />
35+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.0-rc1-final" />
36+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.0-rc1-final" />
37+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.1.0-rc1-final" />
38+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.0-rc1-final" />
39+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.0-rc1-final" />
40+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.0-rc1-final" />
41+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0-rc1-final" />
42+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.1.0-rc1-final" />
43+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0-rc1-final" />
44+
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0-rc1-final" />
45+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0-rc1-final" />
46+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.0-rc1-final" />
47+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.0-rc1-final" />
48+
<PackageReference Include="Microsoft.Extensions.Options" Version="2.1.0-rc1-final" />
49+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.0-rc1-final" />
5150
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
5251
<PackageReference Include="NSwag.AspNetCore" Version="11.17.3" />
5352
<PackageReference Include="Serilog" Version="2.6.0" />

0 commit comments

Comments
 (0)