Skip to content

Commit 332834c

Browse files
AntonioFalcaoJrAntonioFalcaoJr
authored
Merge pull request #189 from AntonioFalcao/release
Updating
2 parents 27f8e6e + 3461e17 commit 332834c

21 files changed

Lines changed: 194 additions & 130 deletions

File tree

‎Directory.Build.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
<PropertyGroup Label="Packages dependency versions">
99

1010
<!--Microsoft-->
11-
<Microsoft_Extensions_Version>6.0.0-preview.2.21154.6</Microsoft_Extensions_Version>
11+
<Microsoft_Extensions_Version>6.0.0-preview.3.21201.4</Microsoft_Extensions_Version>
1212

1313
<!--EF Core-->
14-
<Microsoft_EntityFrameworkCore_Version>6.0.0-preview.2.21154.2</Microsoft_EntityFrameworkCore_Version>
14+
<Microsoft_EntityFrameworkCore_Version>6.0.0-preview.3.21201.2</Microsoft_EntityFrameworkCore_Version>
1515
<Microsoft_EntityFrameworkCore_DependencyInjection_Version>6.0.0-preview.2.21154.6</Microsoft_EntityFrameworkCore_DependencyInjection_Version>
16-
<Microsoft_HealthChecks_EntityFrameworkCore_Version>6.0.0-preview.2.21154.6</Microsoft_HealthChecks_EntityFrameworkCore_Version>
16+
<Microsoft_HealthChecks_EntityFrameworkCore_Version>6.0.0-preview.3.21201.13</Microsoft_HealthChecks_EntityFrameworkCore_Version>
1717

1818
<!--GraphQL-->
1919
<GraphQL_Server_Version>5.0.1</GraphQL_Server_Version>
20-
<GraphQL_Client_Version>3.2.2</GraphQL_Client_Version>
20+
<GraphQL_Client_Version>3.2.3</GraphQL_Client_Version>
2121
<GraphQL_Version>4.2.0</GraphQL_Version>
2222

2323
<!--AutoMapper-->
@@ -31,7 +31,7 @@
3131
<HealthChecks_Version>5.0.1</HealthChecks_Version>
3232

3333
<!--Others-->
34-
<FluentValidation_Version>10.0.0.0-preview4</FluentValidation_Version>
34+
<FluentValidation_Version>10.0.2</FluentValidation_Version>
3535
<Scrutor_Version>3.3.0</Scrutor_Version>
3636

3737
</PropertyGroup>

‎src/Dotnet6.GraphQL4.CrossCutting/Application.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Dotnet6.GraphQL4.CrossCutting
77
{
88
public static class Application
99
{
10-
public static string Prefix { get; } = Assembly.GetEntryAssembly()?.FullName?.Substring(0, 16);
10+
public static string Prefix { get; } = Assembly.GetEntryAssembly()?.FullName?[..16];
1111

1212
public static IEnumerable<Assembly> Assemblies { get; } =
1313
DependencyContext.Default.RuntimeLibraries

src/Dotnet6.GraphQL4.CrossCutting/Extensions/DependencyInjection/ServiceCollectionExtensions.cs renamed to src/Dotnet6.GraphQL4.CrossCutting/DependencyInjection/Extensions/ServiceCollectionExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Dotnet6.GraphQL4.CrossCutting.Notifications;
22
using Microsoft.Extensions.DependencyInjection;
33

4-
namespace Dotnet6.GraphQL4.CrossCutting.Extensions.DependencyInjection
4+
namespace Dotnet6.GraphQL4.CrossCutting.DependencyInjection.Extensions
55
{
66
public static class ServiceCollectionExtensions
77
{

src/Dotnet6.GraphQL4.Domain.Abstractions/Extensions/DependencyInjection/ServiceCollectionExtensions.cs renamed to src/Dotnet6.GraphQL4.Domain.Abstractions/DependencyInjection/Extensions/ServiceCollectionExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Microsoft.Extensions.DependencyInjection;
44
using Scrutor;
55

6-
namespace Dotnet6.GraphQL4.Domain.Abstractions.Extensions.DependencyInjection
6+
namespace Dotnet6.GraphQL4.Domain.Abstractions.DependencyInjection.Extensions
77
{
88
public static class ServiceCollectionExtensions
99
{

‎src/Dotnet6.GraphQL4.Repositories.Abstractions/DependencyInjection/Extensions/ServiceCollectionExtensions.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Transactions;
22
using Dotnet6.GraphQL4.CrossCutting;
3+
using Dotnet6.GraphQL4.Repositories.Abstractions.DependencyInjection.Options;
34
using Dotnet6.GraphQL4.Repositories.Abstractions.UnitsOfWork;
45
using Microsoft.Extensions.Configuration;
56
using Microsoft.Extensions.DependencyInjection;

src/Dotnet6.GraphQL4.Repositories.Abstractions/DependencyInjection/ApplicationTransactionOptions.cs renamed to src/Dotnet6.GraphQL4.Repositories.Abstractions/DependencyInjection/Options/ApplicationTransactionOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Transactions;
22

3-
namespace Dotnet6.GraphQL4.Repositories.Abstractions.DependencyInjection
3+
namespace Dotnet6.GraphQL4.Repositories.Abstractions.DependencyInjection.Options
44
{
55
public class ApplicationTransactionOptions
66
{

‎src/Dotnet6.GraphQL4.Repositories.Abstractions/Transactions/Extensions/TransactionScopeExecuterExtensions.cs‎

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

‎src/Dotnet6.GraphQL4.Repositories.Abstractions/Transactions/Extensions/TransactionScopeExecutorExtensions.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using System;
2+
using System.Threading;
3+
using System.Threading.Tasks;
4+
5+
namespace Dotnet6.GraphQL4.Repositories.Abstractions.Transactions.Extensions
6+
{
7+
public static class TransactionScopeExecutorExtensions
8+
{
9+
public static TransactionScopeExecutor<T> BeginTransactionScope<T>(this Func<T> operation)
10+
=> new(operation);
11+
12+
public static TransactionScopeExecutor<T> BeginTransactionScope<T>(this Func<CancellationToken, Task<T>> operationAsync)
13+
=> new(operationAsync);
14+
}
15+
}

‎src/Dotnet6.GraphQL4.Repositories.Abstractions/UnitsOfWork/UnitOfWork.cs‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Threading.Tasks;
44
using System.Transactions;
55
using Dotnet6.GraphQL4.CrossCutting.Notifications;
6-
using Dotnet6.GraphQL4.Repositories.Abstractions.DependencyInjection;
6+
using Dotnet6.GraphQL4.Repositories.Abstractions.DependencyInjection.Options;
77
using Dotnet6.GraphQL4.Repositories.Abstractions.Transactions.Extensions;
88
using Microsoft.EntityFrameworkCore;
99
using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -16,13 +16,16 @@ public class UnitOfWork : IUnitOfWork
1616
{
1717
private readonly DatabaseFacade _database;
1818
private readonly DbContext _dbContext;
19-
private readonly IOptionsMonitor<ApplicationTransactionOptions> _options;
19+
private readonly ApplicationTransactionOptions _options;
2020
private readonly INotificationContext _notificationContext;
2121

22-
public UnitOfWork(DbContext dbContext, IOptionsMonitor<ApplicationTransactionOptions> options, INotificationContext notificationContext)
22+
public UnitOfWork(
23+
DbContext dbContext,
24+
IOptionsMonitor<ApplicationTransactionOptions> optionsMonitor,
25+
INotificationContext notificationContext)
2326
{
2427
_dbContext = dbContext;
25-
_options = options;
28+
_options = optionsMonitor.CurrentValue;
2629
_database = _dbContext.Database;
2730
_notificationContext = notificationContext;
2831
}
@@ -35,18 +38,18 @@ public Task<TResult> ExecuteInTransactionAsync<TResult>(Func<CancellationToken,
3538

3639
private Task<TResult> ExecuteWithScopeAsync<TResult>(Func<CancellationToken, Task<TResult>> operationAsync, Func<CancellationToken, Task<bool>> condition, CancellationToken cancellationToken)
3740
=> operationAsync
38-
.TransactionAsync()
41+
.BeginTransactionScope()
3942
.WithScopeOption(TransactionScopeOption.Required)
40-
.WithOptions(options => options.IsolationLevel = _options.CurrentValue.IsolationLevel)
43+
.WithOptions(options => options.IsolationLevel = _options.IsolationLevel)
4144
.WithScopeAsyncFlowOption(TransactionScopeAsyncFlowOption.Enabled)
4245
.WithConditionAsync(condition ?? (_ => _notificationContext.AllValidAsync))
4346
.ExecuteAsync(cancellationToken);
4447

4548
private TResult ExecuteWithScope<TResult>(Func<TResult> operation, Func<bool> condition)
4649
=> operation
47-
.Transaction()
50+
.BeginTransactionScope()
4851
.WithScopeOption(TransactionScopeOption.Required)
49-
.WithOptions(options => options.IsolationLevel = _options.CurrentValue.IsolationLevel)
52+
.WithOptions(options => options.IsolationLevel = _options.IsolationLevel)
5053
.WithScopeAsyncFlowOption(TransactionScopeAsyncFlowOption.Enabled)
5154
.WithCondition(condition ?? (() => _notificationContext.AllValid))
5255
.Execute();
@@ -55,9 +58,9 @@ private IExecutionStrategy CreateExecutionStrategy()
5558
=> _database.CreateExecutionStrategy();
5659

5760
public bool SaveChanges()
58-
=> _dbContext.SaveChanges(true) > default(int);
61+
=> _dbContext.SaveChanges(false) > default(int);
5962

6063
public async Task<bool> SaveChangesAsync(CancellationToken cancellationToken)
61-
=> await _dbContext.SaveChangesAsync(true, cancellationToken) > default(int);
64+
=> await _dbContext.SaveChangesAsync(false, cancellationToken) > default(int);
6265
}
6366
}

src/Dotnet6.GraphQL4.Services.Abstractions/Extensions/DependencyInjection/ServiceCollectionExtensions.cs renamed to src/Dotnet6.GraphQL4.Services.Abstractions/DependencyInjection/Extensions/ServiceCollectionExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using Microsoft.Extensions.DependencyInjection;
55
using Scrutor;
66

7-
namespace Dotnet6.GraphQL4.Services.Abstractions.Extensions.DependencyInjection
7+
namespace Dotnet6.GraphQL4.Services.Abstractions.DependencyInjection.Extensions
88
{
99
public static class ServiceCollectionExtensions
1010
{

0 commit comments

Comments
 (0)