diff --git a/Directory.Build.props b/Directory.Build.props index a0865029c..190a9d9d0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,15 @@ + 6.0.0 + 0.13.1 + 2.2.3 + 16.9.4 + 3.0.2 + 4.16.1 + 0.4.0-preview.5 + 7.3.0 + 1.5.0 + $(AssemblyName) packageIcon.png masastack diff --git a/src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Masa.Contrib.BasicAbility.Dcc.csproj b/src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Masa.Contrib.BasicAbility.Dcc.csproj index d0a1059fc..bba039c67 100644 --- a/src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Masa.Contrib.BasicAbility.Dcc.csproj +++ b/src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Masa.Contrib.BasicAbility.Dcc.csproj @@ -7,12 +7,12 @@ - - - - - - + + + + + + diff --git a/src/BasicAbility/Masa.Contrib.BasicAbility.Pm/Masa.Contrib.BasicAbility.Pm.csproj b/src/BasicAbility/Masa.Contrib.BasicAbility.Pm/Masa.Contrib.BasicAbility.Pm.csproj index 7ac5dac69..b38dc0579 100644 --- a/src/BasicAbility/Masa.Contrib.BasicAbility.Pm/Masa.Contrib.BasicAbility.Pm.csproj +++ b/src/BasicAbility/Masa.Contrib.BasicAbility.Pm/Masa.Contrib.BasicAbility.Pm.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/src/Data/Mapping/Masa.Contrib.Data.Mapping.Mapster/Masa.Contrib.Data.Mapping.Mapster.csproj b/src/Data/Mapping/Masa.Contrib.Data.Mapping.Mapster/Masa.Contrib.Data.Mapping.Mapster.csproj index 5a2b95d1a..d7501f704 100644 --- a/src/Data/Mapping/Masa.Contrib.Data.Mapping.Mapster/Masa.Contrib.Data.Mapping.Mapster.csproj +++ b/src/Data/Mapping/Masa.Contrib.Data.Mapping.Mapster/Masa.Contrib.Data.Mapping.Mapster.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -7,9 +7,9 @@ - - - + + + diff --git a/src/Data/Masa.Contrib.Data.Contracts.EF/Masa.Contrib.Data.Contracts.EF.csproj b/src/Data/Masa.Contrib.Data.Contracts.EF/Masa.Contrib.Data.Contracts.EF.csproj index 88848785d..efc51b03e 100644 --- a/src/Data/Masa.Contrib.Data.Contracts.EF/Masa.Contrib.Data.Contracts.EF.csproj +++ b/src/Data/Masa.Contrib.Data.Contracts.EF/Masa.Contrib.Data.Contracts.EF.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -12,8 +12,8 @@ - - + + diff --git a/src/Data/Masa.Contrib.Data.EntityFrameworkCore.Cosmos/Masa.Contrib.Data.EntityFrameworkCore.Cosmos.csproj b/src/Data/Masa.Contrib.Data.EntityFrameworkCore.Cosmos/Masa.Contrib.Data.EntityFrameworkCore.Cosmos.csproj index 16a6815c5..b9232abc8 100644 --- a/src/Data/Masa.Contrib.Data.EntityFrameworkCore.Cosmos/Masa.Contrib.Data.EntityFrameworkCore.Cosmos.csproj +++ b/src/Data/Masa.Contrib.Data.EntityFrameworkCore.Cosmos/Masa.Contrib.Data.EntityFrameworkCore.Cosmos.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -7,7 +7,7 @@ - + diff --git a/src/Data/Masa.Contrib.Data.EntityFrameworkCore.InMemory/Masa.Contrib.Data.EntityFrameworkCore.InMemory.csproj b/src/Data/Masa.Contrib.Data.EntityFrameworkCore.InMemory/Masa.Contrib.Data.EntityFrameworkCore.InMemory.csproj index e459bfda5..3edf550bc 100644 --- a/src/Data/Masa.Contrib.Data.EntityFrameworkCore.InMemory/Masa.Contrib.Data.EntityFrameworkCore.InMemory.csproj +++ b/src/Data/Masa.Contrib.Data.EntityFrameworkCore.InMemory/Masa.Contrib.Data.EntityFrameworkCore.InMemory.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Data/Masa.Contrib.Data.EntityFrameworkCore.MySql/Masa.Contrib.Data.EntityFrameworkCore.MySql.csproj b/src/Data/Masa.Contrib.Data.EntityFrameworkCore.MySql/Masa.Contrib.Data.EntityFrameworkCore.MySql.csproj index b78b4b775..77df81d87 100644 --- a/src/Data/Masa.Contrib.Data.EntityFrameworkCore.MySql/Masa.Contrib.Data.EntityFrameworkCore.MySql.csproj +++ b/src/Data/Masa.Contrib.Data.EntityFrameworkCore.MySql/Masa.Contrib.Data.EntityFrameworkCore.MySql.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Data/Masa.Contrib.Data.EntityFrameworkCore.Pomelo.MySql/Masa.Contrib.Data.EntityFrameworkCore.Pomelo.MySql.csproj b/src/Data/Masa.Contrib.Data.EntityFrameworkCore.Pomelo.MySql/Masa.Contrib.Data.EntityFrameworkCore.Pomelo.MySql.csproj index 44591917a..5abc63273 100644 --- a/src/Data/Masa.Contrib.Data.EntityFrameworkCore.Pomelo.MySql/Masa.Contrib.Data.EntityFrameworkCore.Pomelo.MySql.csproj +++ b/src/Data/Masa.Contrib.Data.EntityFrameworkCore.Pomelo.MySql/Masa.Contrib.Data.EntityFrameworkCore.Pomelo.MySql.csproj @@ -1,4 +1,4 @@ - + net6.0 diff --git a/src/Data/Masa.Contrib.Data.EntityFrameworkCore.PostgreSql/Masa.Contrib.Data.EntityFrameworkCore.PostgreSql.csproj b/src/Data/Masa.Contrib.Data.EntityFrameworkCore.PostgreSql/Masa.Contrib.Data.EntityFrameworkCore.PostgreSql.csproj index 127784087..699e24cd3 100644 --- a/src/Data/Masa.Contrib.Data.EntityFrameworkCore.PostgreSql/Masa.Contrib.Data.EntityFrameworkCore.PostgreSql.csproj +++ b/src/Data/Masa.Contrib.Data.EntityFrameworkCore.PostgreSql/Masa.Contrib.Data.EntityFrameworkCore.PostgreSql.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Data/Masa.Contrib.Data.EntityFrameworkCore.SqlServer/Masa.Contrib.Data.EntityFrameworkCore.SqlServer.csproj b/src/Data/Masa.Contrib.Data.EntityFrameworkCore.SqlServer/Masa.Contrib.Data.EntityFrameworkCore.SqlServer.csproj index d3de9d140..ee9aca007 100644 --- a/src/Data/Masa.Contrib.Data.EntityFrameworkCore.SqlServer/Masa.Contrib.Data.EntityFrameworkCore.SqlServer.csproj +++ b/src/Data/Masa.Contrib.Data.EntityFrameworkCore.SqlServer/Masa.Contrib.Data.EntityFrameworkCore.SqlServer.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -7,7 +7,7 @@ - + diff --git a/src/Data/Masa.Contrib.Data.EntityFrameworkCore.Sqlite/Masa.Contrib.Data.EntityFrameworkCore.Sqlite.csproj b/src/Data/Masa.Contrib.Data.EntityFrameworkCore.Sqlite/Masa.Contrib.Data.EntityFrameworkCore.Sqlite.csproj index ef57aefe8..6ddda3d22 100644 --- a/src/Data/Masa.Contrib.Data.EntityFrameworkCore.Sqlite/Masa.Contrib.Data.EntityFrameworkCore.Sqlite.csproj +++ b/src/Data/Masa.Contrib.Data.EntityFrameworkCore.Sqlite/Masa.Contrib.Data.EntityFrameworkCore.Sqlite.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -7,7 +7,7 @@ - + diff --git a/src/Data/Masa.Contrib.Data.EntityFrameworkCore/Masa.Contrib.Data.EntityFrameworkCore.csproj b/src/Data/Masa.Contrib.Data.EntityFrameworkCore/Masa.Contrib.Data.EntityFrameworkCore.csproj index cb32e9764..6b9c12923 100644 --- a/src/Data/Masa.Contrib.Data.EntityFrameworkCore/Masa.Contrib.Data.EntityFrameworkCore.csproj +++ b/src/Data/Masa.Contrib.Data.EntityFrameworkCore/Masa.Contrib.Data.EntityFrameworkCore.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -7,9 +7,9 @@ - - - + + + diff --git a/src/Data/Masa.Contrib.Data.UoW.EF/Masa.Contrib.Data.UoW.EF.csproj b/src/Data/Masa.Contrib.Data.UoW.EF/Masa.Contrib.Data.UoW.EF.csproj index 350ff23e2..94c27db47 100644 --- a/src/Data/Masa.Contrib.Data.UoW.EF/Masa.Contrib.Data.UoW.EF.csproj +++ b/src/Data/Masa.Contrib.Data.UoW.EF/Masa.Contrib.Data.UoW.EF.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/Ddd/Masa.Contrib.Ddd.Domain.Repository.EF/Masa.Contrib.Ddd.Domain.Repository.EF.csproj b/src/Ddd/Masa.Contrib.Ddd.Domain.Repository.EF/Masa.Contrib.Ddd.Domain.Repository.EF.csproj index d544c5a83..63d9d8c8f 100644 --- a/src/Ddd/Masa.Contrib.Ddd.Domain.Repository.EF/Masa.Contrib.Ddd.Domain.Repository.EF.csproj +++ b/src/Ddd/Masa.Contrib.Ddd.Domain.Repository.EF/Masa.Contrib.Ddd.Domain.Repository.EF.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/Ddd/Masa.Contrib.Ddd.Domain/Masa.Contrib.Ddd.Domain.csproj b/src/Ddd/Masa.Contrib.Ddd.Domain/Masa.Contrib.Ddd.Domain.csproj index 30414a42b..d65e436fa 100644 --- a/src/Ddd/Masa.Contrib.Ddd.Domain/Masa.Contrib.Ddd.Domain.csproj +++ b/src/Ddd/Masa.Contrib.Ddd.Domain/Masa.Contrib.Ddd.Domain.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/Dispatcher/Masa.Contrib.Dispatcher.Events/Masa.Contrib.Dispatcher.Events.csproj b/src/Dispatcher/Masa.Contrib.Dispatcher.Events/Masa.Contrib.Dispatcher.Events.csproj index 546835892..387f1d563 100644 --- a/src/Dispatcher/Masa.Contrib.Dispatcher.Events/Masa.Contrib.Dispatcher.Events.csproj +++ b/src/Dispatcher/Masa.Contrib.Dispatcher.Events/Masa.Contrib.Dispatcher.Events.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.csproj b/src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.csproj index e3a98baf5..fd746e8c5 100644 --- a/src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.csproj +++ b/src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.csproj @@ -7,11 +7,11 @@ - - - - - + + + + + diff --git a/src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.csproj b/src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.csproj index e9c553948..017afc367 100644 --- a/src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.csproj +++ b/src/Dispatcher/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/src/Isolation/Masa.Contrib.Isolation.UoW.EF/IsolationDbContext.cs b/src/Isolation/Masa.Contrib.Isolation.UoW.EF/IsolationDbContext.cs index 3a41a6fc7..fcdcee02f 100644 --- a/src/Isolation/Masa.Contrib.Isolation.UoW.EF/IsolationDbContext.cs +++ b/src/Isolation/Masa.Contrib.Isolation.UoW.EF/IsolationDbContext.cs @@ -55,7 +55,8 @@ public IsolationDbContext(MasaDbContextOptions options) : base(options) Expression> tenantFilter = entity => !IsTenantFilterEnabled || (Microsoft.EntityFrameworkCore.EF.Property(entity, nameof(IMultiTenant.TenantId)).ToString() ?? string.Empty) .Equals(_tenantContext.CurrentTenant != null ? _tenantContext.CurrentTenant.Id : defaultTenantId); - expression = tenantFilter.And(expression != null, expression); + + expression = ExpressionExtensions.And(tenantFilter, expression != null, expression); } if (typeof(IMultiEnvironment).IsAssignableFrom(typeof(TEntity)) && _environmentContext != null) @@ -63,12 +64,12 @@ public IsolationDbContext(MasaDbContextOptions options) : base(options) Expression> envFilter = entity => !IsEnvironmentFilterEnabled || Microsoft.EntityFrameworkCore.EF.Property(entity, nameof(IMultiEnvironment.Environment)) .Equals(_environmentContext != null ? _environmentContext.CurrentEnvironment : default); - expression = envFilter.And(expression != null, expression); + expression = ExpressionExtensions.And(envFilter, expression != null, expression); } var secondExpression = base.CreateFilterExpression(); if (secondExpression != null) - expression = secondExpression.And(expression != null, expression); + expression = ExpressionExtensions.And(secondExpression, expression != null, expression); return expression; } diff --git a/src/Isolation/Masa.Contrib.Isolation.UoW.EF/Masa.Contrib.Isolation.UoW.EF.csproj b/src/Isolation/Masa.Contrib.Isolation.UoW.EF/Masa.Contrib.Isolation.UoW.EF.csproj index 098d6d985..99c864943 100644 --- a/src/Isolation/Masa.Contrib.Isolation.UoW.EF/Masa.Contrib.Isolation.UoW.EF.csproj +++ b/src/Isolation/Masa.Contrib.Isolation.UoW.EF/Masa.Contrib.Isolation.UoW.EF.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -7,9 +7,8 @@ - - - + + diff --git a/src/Isolation/Masa.Contrib.Isolation.UoW.EF/_Imports.cs b/src/Isolation/Masa.Contrib.Isolation.UoW.EF/_Imports.cs index 0c716833b..ebe2b80ff 100644 --- a/src/Isolation/Masa.Contrib.Isolation.UoW.EF/_Imports.cs +++ b/src/Isolation/Masa.Contrib.Isolation.UoW.EF/_Imports.cs @@ -10,6 +10,7 @@ global using Masa.Contrib.Data.EntityFrameworkCore.Filters; global using Masa.Contrib.Data.UoW.EF; global using Masa.Contrib.Isolation.UoW.EF.Internal; +global using Masa.Utils.Extensions.Expressions; global using Microsoft.EntityFrameworkCore; global using Microsoft.EntityFrameworkCore.ChangeTracking; global using Microsoft.Extensions.DependencyInjection; diff --git a/src/Isolation/Masa.Contrib.Isolation/Masa.Contrib.Isolation.csproj b/src/Isolation/Masa.Contrib.Isolation/Masa.Contrib.Isolation.csproj index e92dd5fb0..f754966c6 100644 --- a/src/Isolation/Masa.Contrib.Isolation/Masa.Contrib.Isolation.csproj +++ b/src/Isolation/Masa.Contrib.Isolation/Masa.Contrib.Isolation.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -7,7 +7,7 @@ - + diff --git a/src/Isolation/Masa.Contrib.Isolation/_Imports.cs b/src/Isolation/Masa.Contrib.Isolation/_Imports.cs index cb06356dd..5906a8426 100644 --- a/src/Isolation/Masa.Contrib.Isolation/_Imports.cs +++ b/src/Isolation/Masa.Contrib.Isolation/_Imports.cs @@ -12,6 +12,7 @@ global using Masa.BuildingBlocks.Isolation.MultiTenant; global using Masa.BuildingBlocks.Isolation.Options; global using Masa.Contrib.Isolation.Middleware; +global using Masa.Utils.Extensions.Expressions; global using Microsoft.AspNetCore.Builder; global using Microsoft.AspNetCore.Http; global using Microsoft.Extensions.Configuration; diff --git a/src/ReadWriteSpliting/Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs.csproj b/src/ReadWriteSpliting/Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs.csproj index e7b7fd034..cea07d657 100644 --- a/src/ReadWriteSpliting/Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs.csproj +++ b/src/ReadWriteSpliting/Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs/Masa.Contrib.ReadWriteSpliting.Cqrs.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/SearchEngine/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch.csproj b/src/SearchEngine/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch.csproj index 1f8a9c36b..384a6f616 100644 --- a/src/SearchEngine/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch.csproj +++ b/src/SearchEngine/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -8,8 +8,8 @@ - - + + diff --git a/src/Service/Masa.Contrib.Service.MinimalAPIs/Masa.Contrib.Service.MinimalAPIs.csproj b/src/Service/Masa.Contrib.Service.MinimalAPIs/Masa.Contrib.Service.MinimalAPIs.csproj index c65d0d83c..b16803553 100644 --- a/src/Service/Masa.Contrib.Service.MinimalAPIs/Masa.Contrib.Service.MinimalAPIs.csproj +++ b/src/Service/Masa.Contrib.Service.MinimalAPIs/Masa.Contrib.Service.MinimalAPIs.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/src/Storage/Masa.Contrib.Storage.ObjectStorage.Aliyun/Masa.Contrib.Storage.ObjectStorage.Aliyun.csproj b/src/Storage/Masa.Contrib.Storage.ObjectStorage.Aliyun/Masa.Contrib.Storage.ObjectStorage.Aliyun.csproj index e3aa62b2c..744892984 100644 --- a/src/Storage/Masa.Contrib.Storage.ObjectStorage.Aliyun/Masa.Contrib.Storage.ObjectStorage.Aliyun.csproj +++ b/src/Storage/Masa.Contrib.Storage.ObjectStorage.Aliyun/Masa.Contrib.Storage.ObjectStorage.Aliyun.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -8,11 +8,11 @@ - - - - - + + + + + diff --git a/test/Masa.Contrib.BasicAbility.Dcc.Tests/Masa.Contrib.BasicAbility.Dcc.Tests.csproj b/test/Masa.Contrib.BasicAbility.Dcc.Tests/Masa.Contrib.BasicAbility.Dcc.Tests.csproj index f70158312..9f5805c7a 100644 --- a/test/Masa.Contrib.BasicAbility.Dcc.Tests/Masa.Contrib.BasicAbility.Dcc.Tests.csproj +++ b/test/Masa.Contrib.BasicAbility.Dcc.Tests/Masa.Contrib.BasicAbility.Dcc.Tests.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -17,16 +17,16 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Masa.Contrib.BasicAbility.Pm.Tests/Masa.Contrib.BasicAbility.Pm.Tests.csproj b/test/Masa.Contrib.BasicAbility.Pm.Tests/Masa.Contrib.BasicAbility.Pm.Tests.csproj index fd38268b2..7961c5194 100644 --- a/test/Masa.Contrib.BasicAbility.Pm.Tests/Masa.Contrib.BasicAbility.Pm.Tests.csproj +++ b/test/Masa.Contrib.BasicAbility.Pm.Tests/Masa.Contrib.BasicAbility.Pm.Tests.csproj @@ -8,11 +8,11 @@ - - - - - + + + + + diff --git a/test/Masa.Contrib.Configuration.Tests/Masa.Contrib.Configuration.Tests.csproj b/test/Masa.Contrib.Configuration.Tests/Masa.Contrib.Configuration.Tests.csproj index a47d9e505..5d9744d65 100644 --- a/test/Masa.Contrib.Configuration.Tests/Masa.Contrib.Configuration.Tests.csproj +++ b/test/Masa.Contrib.Configuration.Tests/Masa.Contrib.Configuration.Tests.csproj @@ -8,15 +8,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Masa.Contrib.Data.Contracts.EF.Tests/Masa.Contrib.Data.Contracts.EF.Tests.csproj b/test/Masa.Contrib.Data.Contracts.EF.Tests/Masa.Contrib.Data.Contracts.EF.Tests.csproj index 7627e5fd8..89f5e6f7d 100644 --- a/test/Masa.Contrib.Data.Contracts.EF.Tests/Masa.Contrib.Data.Contracts.EF.Tests.csproj +++ b/test/Masa.Contrib.Data.Contracts.EF.Tests/Masa.Contrib.Data.Contracts.EF.Tests.csproj @@ -8,15 +8,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Masa.Contrib.Data.EntityFrameworkCore.Tests/Masa.Contrib.Data.EntityFrameworkCore.Tests.csproj b/test/Masa.Contrib.Data.EntityFrameworkCore.Tests/Masa.Contrib.Data.EntityFrameworkCore.Tests.csproj index 70bbf7ce0..6661ec7b3 100644 --- a/test/Masa.Contrib.Data.EntityFrameworkCore.Tests/Masa.Contrib.Data.EntityFrameworkCore.Tests.csproj +++ b/test/Masa.Contrib.Data.EntityFrameworkCore.Tests/Masa.Contrib.Data.EntityFrameworkCore.Tests.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -8,13 +8,13 @@ - - - - - - - + + + + + + + diff --git a/test/Masa.Contrib.Data.Mapping.Mapster.Tests/Masa.Contrib.Data.Mapping.Mapster.Tests.csproj b/test/Masa.Contrib.Data.Mapping.Mapster.Tests/Masa.Contrib.Data.Mapping.Mapster.Tests.csproj index 9590f54b8..5bca141e5 100644 --- a/test/Masa.Contrib.Data.Mapping.Mapster.Tests/Masa.Contrib.Data.Mapping.Mapster.Tests.csproj +++ b/test/Masa.Contrib.Data.Mapping.Mapster.Tests/Masa.Contrib.Data.Mapping.Mapster.Tests.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -8,11 +8,11 @@ - - - - - + + + + + diff --git a/test/Masa.Contrib.Data.UoW.EF.Tests/Masa.Contrib.Data.UoW.EF.Tests.csproj b/test/Masa.Contrib.Data.UoW.EF.Tests/Masa.Contrib.Data.UoW.EF.Tests.csproj index ec650a403..34b795a59 100644 --- a/test/Masa.Contrib.Data.UoW.EF.Tests/Masa.Contrib.Data.UoW.EF.Tests.csproj +++ b/test/Masa.Contrib.Data.UoW.EF.Tests/Masa.Contrib.Data.UoW.EF.Tests.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -8,26 +8,26 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/test/Masa.Contrib.Ddd.Domain.Integrated.Tests/Masa.Contrib.Ddd.Domain.Integrated.Tests.csproj b/test/Masa.Contrib.Ddd.Domain.Integrated.Tests/Masa.Contrib.Ddd.Domain.Integrated.Tests.csproj index 00b652076..e703abce6 100644 --- a/test/Masa.Contrib.Ddd.Domain.Integrated.Tests/Masa.Contrib.Ddd.Domain.Integrated.Tests.csproj +++ b/test/Masa.Contrib.Ddd.Domain.Integrated.Tests/Masa.Contrib.Ddd.Domain.Integrated.Tests.csproj @@ -8,14 +8,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Masa.Contrib.Ddd.Domain.Repository.EF.Tests/Masa.Contrib.Ddd.Domain.Repository.EF.Tests.csproj b/test/Masa.Contrib.Ddd.Domain.Repository.EF.Tests/Masa.Contrib.Ddd.Domain.Repository.EF.Tests.csproj index 3453d12ad..f13787c92 100644 --- a/test/Masa.Contrib.Ddd.Domain.Repository.EF.Tests/Masa.Contrib.Ddd.Domain.Repository.EF.Tests.csproj +++ b/test/Masa.Contrib.Ddd.Domain.Repository.EF.Tests/Masa.Contrib.Ddd.Domain.Repository.EF.Tests.csproj @@ -8,15 +8,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Masa.Contrib.Ddd.Domain.Tests/Masa.Contrib.Ddd.Domain.Tests.csproj b/test/Masa.Contrib.Ddd.Domain.Tests/Masa.Contrib.Ddd.Domain.Tests.csproj index fe10dfb4e..e7826da78 100644 --- a/test/Masa.Contrib.Ddd.Domain.Tests/Masa.Contrib.Ddd.Domain.Tests.csproj +++ b/test/Masa.Contrib.Ddd.Domain.Tests/Masa.Contrib.Ddd.Domain.Tests.csproj @@ -8,19 +8,19 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/test/Masa.Contrib.Dispatcher.Events.BenchmarkDotnet.Tests/Masa.Contrib.Dispatcher.Events.BenchmarkDotnet.Tests.csproj b/test/Masa.Contrib.Dispatcher.Events.BenchmarkDotnet.Tests/Masa.Contrib.Dispatcher.Events.BenchmarkDotnet.Tests.csproj index d51a2338a..9cdd8e415 100644 --- a/test/Masa.Contrib.Dispatcher.Events.BenchmarkDotnet.Tests/Masa.Contrib.Dispatcher.Events.BenchmarkDotnet.Tests.csproj +++ b/test/Masa.Contrib.Dispatcher.Events.BenchmarkDotnet.Tests/Masa.Contrib.Dispatcher.Events.BenchmarkDotnet.Tests.csproj @@ -1,4 +1,4 @@ - + Exe @@ -11,8 +11,8 @@ - - + + diff --git a/test/Masa.Contrib.Dispatcher.Events.Tests/Masa.Contrib.Dispatcher.Events.Tests.csproj b/test/Masa.Contrib.Dispatcher.Events.Tests/Masa.Contrib.Dispatcher.Events.Tests.csproj index c9939117f..d1e7597d3 100644 --- a/test/Masa.Contrib.Dispatcher.Events.Tests/Masa.Contrib.Dispatcher.Events.Tests.csproj +++ b/test/Masa.Contrib.Dispatcher.Events.Tests/Masa.Contrib.Dispatcher.Events.Tests.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -13,20 +13,20 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/test/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.Tests/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.Tests.csproj b/test/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.Tests/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.Tests.csproj index 90e00882e..740e70a81 100644 --- a/test/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.Tests/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.Tests.csproj +++ b/test/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.Tests/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.Tests.csproj @@ -8,19 +8,19 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + diff --git a/test/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.Tests/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.Tests.csproj b/test/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.Tests/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.Tests.csproj index a79a2b295..c84c7ec4a 100644 --- a/test/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.Tests/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.Tests.csproj +++ b/test/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.Tests/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.Tests.csproj @@ -8,19 +8,19 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + diff --git a/test/Masa.Contrib.Isolation.MultiEnvironment.Tests/Masa.Contrib.Isolation.MultiEnvironment.Tests.csproj b/test/Masa.Contrib.Isolation.MultiEnvironment.Tests/Masa.Contrib.Isolation.MultiEnvironment.Tests.csproj index 4b682c531..1fb90cbfa 100644 --- a/test/Masa.Contrib.Isolation.MultiEnvironment.Tests/Masa.Contrib.Isolation.MultiEnvironment.Tests.csproj +++ b/test/Masa.Contrib.Isolation.MultiEnvironment.Tests/Masa.Contrib.Isolation.MultiEnvironment.Tests.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -8,18 +8,18 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/test/Masa.Contrib.Isolation.MultiTenant.Tests/Masa.Contrib.Isolation.MultiTenant.Tests.csproj b/test/Masa.Contrib.Isolation.MultiTenant.Tests/Masa.Contrib.Isolation.MultiTenant.Tests.csproj index 3d5292b60..670127c7a 100644 --- a/test/Masa.Contrib.Isolation.MultiTenant.Tests/Masa.Contrib.Isolation.MultiTenant.Tests.csproj +++ b/test/Masa.Contrib.Isolation.MultiTenant.Tests/Masa.Contrib.Isolation.MultiTenant.Tests.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -8,18 +8,18 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/test/Masa.Contrib.Isolation.Tests/Masa.Contrib.Isolation.Tests.csproj b/test/Masa.Contrib.Isolation.Tests/Masa.Contrib.Isolation.Tests.csproj index 9383a095b..38b6dd55e 100644 --- a/test/Masa.Contrib.Isolation.Tests/Masa.Contrib.Isolation.Tests.csproj +++ b/test/Masa.Contrib.Isolation.Tests/Masa.Contrib.Isolation.Tests.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -8,18 +8,18 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/test/Masa.Contrib.Isolation.UoW.EF.Tests/Masa.Contrib.Isolation.UoW.EF.Tests.csproj b/test/Masa.Contrib.Isolation.UoW.EF.Tests/Masa.Contrib.Isolation.UoW.EF.Tests.csproj index 0ff528134..863a918a9 100644 --- a/test/Masa.Contrib.Isolation.UoW.EF.Tests/Masa.Contrib.Isolation.UoW.EF.Tests.csproj +++ b/test/Masa.Contrib.Isolation.UoW.EF.Tests/Masa.Contrib.Isolation.UoW.EF.Tests.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -8,18 +8,18 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/test/Masa.Contrib.Isolation.UoW.EF.Web.Tests/Masa.Contrib.Isolation.UoW.EF.Web.Tests.csproj b/test/Masa.Contrib.Isolation.UoW.EF.Web.Tests/Masa.Contrib.Isolation.UoW.EF.Web.Tests.csproj index ca00f31a4..a228162a8 100644 --- a/test/Masa.Contrib.Isolation.UoW.EF.Web.Tests/Masa.Contrib.Isolation.UoW.EF.Web.Tests.csproj +++ b/test/Masa.Contrib.Isolation.UoW.EF.Web.Tests/Masa.Contrib.Isolation.UoW.EF.Web.Tests.csproj @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/test/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests.csproj b/test/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests.csproj index b15b461a0..0bbf33722 100644 --- a/test/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests.csproj +++ b/test/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests/Masa.Contrib.ReadWriteSpliting.Cqrs.Tests.csproj @@ -8,18 +8,18 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/test/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch.Tests/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch.Tests.csproj b/test/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch.Tests/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch.Tests.csproj index 2d4682b32..fd4bde057 100644 --- a/test/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch.Tests/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch.Tests.csproj +++ b/test/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch.Tests/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch.Tests.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -8,18 +8,18 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/test/Masa.Contrib.Service.MinimalAPIs.Tests/Masa.Contrib.Service.MinimalAPIs.Tests.csproj b/test/Masa.Contrib.Service.MinimalAPIs.Tests/Masa.Contrib.Service.MinimalAPIs.Tests.csproj index 03bd912e6..2bbfbe177 100644 --- a/test/Masa.Contrib.Service.MinimalAPIs.Tests/Masa.Contrib.Service.MinimalAPIs.Tests.csproj +++ b/test/Masa.Contrib.Service.MinimalAPIs.Tests/Masa.Contrib.Service.MinimalAPIs.Tests.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -8,18 +8,18 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/test/Masa.Contrib.Storage.ObjectStorage.Aliyun.Tests/Masa.Contrib.Storage.ObjectStorage.Aliyun.Tests.csproj b/test/Masa.Contrib.Storage.ObjectStorage.Aliyun.Tests/Masa.Contrib.Storage.ObjectStorage.Aliyun.Tests.csproj index 525dce999..132322e2b 100644 --- a/test/Masa.Contrib.Storage.ObjectStorage.Aliyun.Tests/Masa.Contrib.Storage.ObjectStorage.Aliyun.Tests.csproj +++ b/test/Masa.Contrib.Storage.ObjectStorage.Aliyun.Tests/Masa.Contrib.Storage.ObjectStorage.Aliyun.Tests.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -8,20 +8,20 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + + + + +