From 9198fdb7e33b0f8db5c9f6195275636e30352259 Mon Sep 17 00:00:00 2001 From: utilcore <8907060@qq.com> Date: Tue, 30 Jan 2024 16:37:14 +0800 Subject: [PATCH] =?UTF-8?q?.net=20sdk=20=E5=8D=87=E7=BA=A7=E5=88=B0=208.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/Build.csproj | 2 +- build/BuildScript.cs | 27 ++++++++++-- build/common.props | 2 +- build/version.props | 6 +-- .../03-Util.Aop.AspectCore.csproj | 2 +- src/Util.AspNetCore/08-Util.AspNetCore.csproj | 2 +- src/Util.Caching/01-Util.Caching.csproj | 2 +- src/Util.Core/01-Util.Core.csproj | 18 ++++---- src/Util.Data.Core/01-Util.Data.Core.csproj | 2 +- .../01-Util.Data.Dapper.Core.csproj | 2 +- .../04-Util.Data.Dapper.MySql.csproj | 2 +- .../05-Util.Data.Dapper.Oracle.csproj | 2 +- .../03-Util.Data.Dapper.PostgreSql.csproj | 2 +- .../02-Util.Data.Dapper.SqlServer.csproj | 2 +- ...Util.Data.EntityFrameworkCore.MySql.csproj | 2 +- .../AppBuilderExtensions.cs | 11 ++++- ...til.Data.EntityFrameworkCore.Oracle.csproj | 2 +- ...Data.EntityFrameworkCore.PostgreSql.csproj | 2 +- ....Data.EntityFrameworkCore.SqlServer.csproj | 2 +- ...til.Data.EntityFrameworkCore.Sqlite.csproj | 2 +- .../01-Util.Data.EntityFrameworkCore.csproj | 4 +- .../03-Util.Events.MediatR.csproj | 2 +- src/Util.FileStorage/Local/LocalFileStore.cs | 13 ++++-- src/Util.Http/07-Util.Http.csproj | 4 +- .../01-Util.Images.ImageSharp.csproj | 4 +- .../09-Util.Localization.csproj | 4 +- .../02-Util.Logging.Serilog.csproj | 6 +-- src/Util.Logging/01-Util.Logging.csproj | 4 +- .../04-Util.Microservices.HealthChecks.csproj | 6 +-- .../02-Util.Microservices.Polly.csproj | 2 +- .../03-Util.Scheduling.Hangfire.csproj | 2 +- .../02-Util.Scheduling.Quartz.csproj | 4 +- .../02-Util.Templates.Razor.csproj | 4 +- src/Util.Ui.NgZorro/03-Util.Ui.NgZorro.csproj | 2 +- src/Util.Ui/01-Util.Ui.csproj | 2 +- .../Util.Aop.AspectCore.Tests.csproj | 8 ++-- ...ameworkCore.MySql.Tests.Integration.csproj | 8 ++-- ...rkCore.PostgreSql.Tests.Integration.csproj | 8 ++-- ...orkCore.SqlServer.Tests.Integration.csproj | 8 ++-- .../appsettings.Development.json | 2 +- .../Util.Application.Tests.csproj | 6 +-- ...tion.WebApi.MySql.Tests.Integration.csproj | 10 ++--- ...WebApi.PostgreSql.Tests.Integration.csproj | 10 ++--- ....WebApi.SqlServer.Tests.Integration.csproj | 10 ++--- .../appsettings.Development.json | 2 +- ...pplication.WebApi.Tests.Integration.csproj | 10 ++--- .../Util.AspNetCore.Tests.Integration.csproj | 10 ++--- ...ching.EasyCaching.Tests.Integration.csproj | 8 ++-- .../Util.Core.Tests.Integration.csproj | 6 +-- test/Util.Core.Tests/Util.Core.Tests.csproj | 6 +-- ...Data.Dapper.MySql.Tests.Integration.csproj | 8 ++-- ...ata.Dapper.Oracle.Tests.Integration.csproj | 8 ++-- ...Dapper.PostgreSql.Tests.Integration.csproj | 8 ++-- ....Dapper.SqlServer.Tests.Integration.csproj | 8 ++-- .../appsettings.Development.json | 2 +- ...ameworkCore.MySql.Tests.Integration.csproj | 8 ++-- ...meworkCore.Oracle.Tests.Integration.csproj | 8 ++-- ...rkCore.PostgreSql.Tests.Integration.csproj | 8 ++-- ...orkCore.SqlServer.Tests.Integration.csproj | 10 ++--- .../appsettings.Development.json | 2 +- ...meworkCore.Sqlite.Tests.Integration.csproj | 8 ++-- .../Util.Data.Sql.Tests.csproj | 4 +- test/Util.Data.Tests/Util.Data.Tests.csproj | 4 +- .../Util.Domain.Tests.csproj | 6 +-- ...il.Events.MediatR.Tests.Integration.csproj | 8 ++-- .../Util.Events.Tests.Integration.csproj | 8 ++-- ...ileStorage.Aliyun.Tests.Integration.csproj | 10 ++--- .../Tests/MinioFileStoreTest.cs | 11 ++--- ...FileStorage.Minio.Tests.Integration.csproj | 10 ++--- .../Tests/LocalFileStoreTest.cs | 15 +------ .../Util.FileStorage.Tests.Integration.csproj | 10 ++--- ....Generators.Razor.Tests.Integration.csproj | 8 ++-- .../appsettings.json | 4 +- .../Util.Generators.Tests.csproj | 6 +-- .../Util.IdGenerator.Tests.csproj | 44 +++++++++---------- ...til.Images.Avatar.Tests.Integration.csproj | 8 ++-- ...Images.ImageSharp.Tests.Integration.csproj | 6 +-- ...Util.Localization.Tests.Integration.csproj | 10 ++--- .../Util.Localization.Tests.csproj | 6 +-- ...log.Exceptionless.Tests.Integration.csproj | 8 ++-- .../appsettings.json | 2 +- ...l.Logging.Serilog.Tests.Integration.csproj | 8 ++-- .../Util.Logging.Tests.csproj | 6 +-- ...icroservices.Dapr.Tests.Integration.csproj | 10 ++--- .../Util.Microservices.Dapr.Tests.csproj | 6 +-- ...croservices.Polly.Tests.Integration.csproj | 6 +-- ...Util.ObjectMapping.AutoMapper.Tests.csproj | 8 ++-- ...heduling.Hangfire.Tests.Integration.csproj | 10 ++--- .../appsettings.Development.json | 4 +- ...Scheduling.Quartz.Tests.Integration.csproj | 8 ++-- .../appsettings.Development.json | 2 +- .../Util.Security.Tests.csproj | 4 +- ...plates.Handlebars.Tests.Integration.csproj | 8 ++-- ...l.Templates.Razor.Tests.Integration.csproj | 8 ++-- .../Util.Tenants.Tests.Integration.csproj | 10 ++--- .../Util.Tenants.Tests.csproj | 6 +-- .../Util.Ui.NgAlain.Tests.csproj | 8 ++-- .../Util.Ui.NgZorro.Tests.csproj | 8 ++-- test/Util.Ui.Tests/Util.Ui.Tests.csproj | 4 +- .../Util.Validation.Tests.csproj | 8 ++-- 100 files changed, 344 insertions(+), 323 deletions(-) diff --git a/build/Build.csproj b/build/Build.csproj index a2fbee17d..154b7d157 100644 --- a/build/Build.csproj +++ b/build/Build.csproj @@ -11,7 +11,7 @@ - + diff --git a/build/BuildScript.cs b/build/BuildScript.cs index d6aa96889..b995f676f 100644 --- a/build/BuildScript.cs +++ b/build/BuildScript.cs @@ -62,6 +62,10 @@ public class BuildScript : DefaultBuildScript { /// 忽略测试项目文件列表 /// public List IgnoreTestProjecs { get; set; } + /// + /// 忽略打包项目文件列表 + /// + public List IgnorePackProjecs { get; set; } /// /// 获取集成测试项目文件列表 @@ -70,6 +74,13 @@ protected List GetIntegrationTestProjecs() { return IntegrationTestProjecs.Where( t => IgnoreTestProjecs.Exists( p => p.FileName == t.FileName ) == false ).ToList(); } + /// + /// 获取打包项目文件列表 + /// + protected List GetPackProjecs() { + return Projects.Where( t => IgnorePackProjecs.Exists( p => p.FileName == t.FileName ) == false ).ToList(); + } + /// /// 构建前操作 /// @@ -79,7 +90,9 @@ protected override void BeforeBuildExecution( ITaskContext context ) { UnitTestProjecs = context.GetFiles( TestDir, "*/*.Tests.csproj" ); IntegrationTestProjecs = context.GetFiles( TestDir, "*/*.Tests.Integration.csproj" ); IgnoreTestProjecs = new List(); + IgnorePackProjecs = new List(); AddIgnoreTestProjecs( context ); + AddIgnorePackProjecs( context ); } /// @@ -88,8 +101,16 @@ protected override void BeforeBuildExecution( ITaskContext context ) { private void AddIgnoreTestProjecs( ITaskContext context ) { IgnoreTestProjecs.AddRange( context.GetFiles( TestDir, "*/Util.Images.*.Tests.Integration.csproj" ) ); IgnoreTestProjecs.AddRange( context.GetFiles( TestDir, "*/*.Oracle.Tests.Integration.csproj" ) ); - IgnoreTestProjecs.AddRange( context.GetFiles( TestDir, "*/*.Dapper.*.Tests.Integration.csproj" ) ); - } + IgnoreTestProjecs.AddRange( context.GetFiles( TestDir, "*/Util.Data.Dapper.PostgreSql.Tests.Integration.csproj" ) ); + IgnoreTestProjecs.AddRange( context.GetFiles( TestDir, "*/*.Dapr.Tests.Integration.csproj" ) ); + } + + /// + /// 添加忽略打包项目文件列表 + /// + private void AddIgnorePackProjecs( ITaskContext context ) { + IgnorePackProjecs.AddRange( context.GetFiles( SourceDir, "*/*.WebApiClient.csproj" ) ); + } /// /// 配置构建目标 @@ -175,7 +196,7 @@ private ITarget Pack( ITaskContext context, params ITarget[] dependTargets ) { return context.CreateTarget( "pack" ) .SetDescription( "Create nuget packages." ) .DependsOn( dependTargets ) - .ForEach( Projects, ( project, target ) => { + .ForEach( GetPackProjecs(), ( project, target ) => { target.AddCoreTask( t => t.Pack() .Project( project ) .IncludeSymbols() diff --git a/build/common.props b/build/common.props index 8a047dc01..08ea70dcb 100644 --- a/build/common.props +++ b/build/common.props @@ -1,7 +1,7 @@ - net7.0 + net8.0 Util Application Framework diff --git a/build/version.props b/build/version.props index 0bed1a537..270c3cd3e 100644 --- a/build/version.props +++ b/build/version.props @@ -1,8 +1,8 @@  - 7 - 1 - 131 + 8 + 0 + 0 $(VersionMajor).$(VersionMinor).$(VersionPatch) diff --git a/src/Util.Aop.AspectCore/03-Util.Aop.AspectCore.csproj b/src/Util.Aop.AspectCore/03-Util.Aop.AspectCore.csproj index 792f12d4b..1d8d5c920 100644 --- a/src/Util.Aop.AspectCore/03-Util.Aop.AspectCore.csproj +++ b/src/Util.Aop.AspectCore/03-Util.Aop.AspectCore.csproj @@ -29,7 +29,7 @@ - + diff --git a/src/Util.AspNetCore/08-Util.AspNetCore.csproj b/src/Util.AspNetCore/08-Util.AspNetCore.csproj index ea8ec1911..19384da25 100644 --- a/src/Util.AspNetCore/08-Util.AspNetCore.csproj +++ b/src/Util.AspNetCore/08-Util.AspNetCore.csproj @@ -31,7 +31,7 @@ - + diff --git a/src/Util.Caching/01-Util.Caching.csproj b/src/Util.Caching/01-Util.Caching.csproj index 38b4a5f7f..3774f25ab 100644 --- a/src/Util.Caching/01-Util.Caching.csproj +++ b/src/Util.Caching/01-Util.Caching.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/Util.Core/01-Util.Core.csproj b/src/Util.Core/01-Util.Core.csproj index 61b98b00c..278cf799e 100644 --- a/src/Util.Core/01-Util.Core.csproj +++ b/src/Util.Core/01-Util.Core.csproj @@ -27,15 +27,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/Util.Data.Core/01-Util.Data.Core.csproj b/src/Util.Data.Core/01-Util.Data.Core.csproj index 059581bda..9def18053 100644 --- a/src/Util.Data.Core/01-Util.Data.Core.csproj +++ b/src/Util.Data.Core/01-Util.Data.Core.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/Util.Data.Dapper.Core/01-Util.Data.Dapper.Core.csproj b/src/Util.Data.Dapper.Core/01-Util.Data.Dapper.Core.csproj index 8e6610221..e83073e3c 100644 --- a/src/Util.Data.Dapper.Core/01-Util.Data.Dapper.Core.csproj +++ b/src/Util.Data.Dapper.Core/01-Util.Data.Dapper.Core.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/Util.Data.Dapper.MySql/04-Util.Data.Dapper.MySql.csproj b/src/Util.Data.Dapper.MySql/04-Util.Data.Dapper.MySql.csproj index 14884b26d..ed17551c5 100644 --- a/src/Util.Data.Dapper.MySql/04-Util.Data.Dapper.MySql.csproj +++ b/src/Util.Data.Dapper.MySql/04-Util.Data.Dapper.MySql.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/Util.Data.Dapper.Oracle/05-Util.Data.Dapper.Oracle.csproj b/src/Util.Data.Dapper.Oracle/05-Util.Data.Dapper.Oracle.csproj index 1d9abe5b5..739a57b71 100644 --- a/src/Util.Data.Dapper.Oracle/05-Util.Data.Dapper.Oracle.csproj +++ b/src/Util.Data.Dapper.Oracle/05-Util.Data.Dapper.Oracle.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/Util.Data.Dapper.PostgreSql/03-Util.Data.Dapper.PostgreSql.csproj b/src/Util.Data.Dapper.PostgreSql/03-Util.Data.Dapper.PostgreSql.csproj index 6fb3b5af1..92bbb28b8 100644 --- a/src/Util.Data.Dapper.PostgreSql/03-Util.Data.Dapper.PostgreSql.csproj +++ b/src/Util.Data.Dapper.PostgreSql/03-Util.Data.Dapper.PostgreSql.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/Util.Data.Dapper.SqlServer/02-Util.Data.Dapper.SqlServer.csproj b/src/Util.Data.Dapper.SqlServer/02-Util.Data.Dapper.SqlServer.csproj index ebcb5e5f9..f7eba09f5 100644 --- a/src/Util.Data.Dapper.SqlServer/02-Util.Data.Dapper.SqlServer.csproj +++ b/src/Util.Data.Dapper.SqlServer/02-Util.Data.Dapper.SqlServer.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/Util.Data.EntityFrameworkCore.MySql/04-Util.Data.EntityFrameworkCore.MySql.csproj b/src/Util.Data.EntityFrameworkCore.MySql/04-Util.Data.EntityFrameworkCore.MySql.csproj index b0beab74f..75b0b92f1 100644 --- a/src/Util.Data.EntityFrameworkCore.MySql/04-Util.Data.EntityFrameworkCore.MySql.csproj +++ b/src/Util.Data.EntityFrameworkCore.MySql/04-Util.Data.EntityFrameworkCore.MySql.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/Util.Data.EntityFrameworkCore.MySql/AppBuilderExtensions.cs b/src/Util.Data.EntityFrameworkCore.MySql/AppBuilderExtensions.cs index eb928c6d5..8c99ca350 100644 --- a/src/Util.Data.EntityFrameworkCore.MySql/AppBuilderExtensions.cs +++ b/src/Util.Data.EntityFrameworkCore.MySql/AppBuilderExtensions.cs @@ -48,11 +48,18 @@ private static IAppBuilder AddMySqlUnitOfWork( this I void Action( DbContextOptionsBuilder options ) { setupAction?.Invoke( options ); if ( connectionString.IsEmpty() == false ) { - options.UseMySql( connectionString, ServerVersion.AutoDetect( connectionString ), mySqlSetupAction ); + options.UseMySql( connectionString, ServerVersion.AutoDetect( connectionString ), + optionsBuilder => { + optionsBuilder.EnableRetryOnFailure(); + mySqlSetupAction?.Invoke( optionsBuilder ); + } ); return; } if ( connection != null ) { - options.UseMySql( connection, ServerVersion.AutoDetect( (MySqlConnection)connection ), mySqlSetupAction ); + options.UseMySql( connection, ServerVersion.AutoDetect( (MySqlConnection)connection ), optionsBuilder => { + optionsBuilder.EnableRetryOnFailure(); + mySqlSetupAction?.Invoke( optionsBuilder ); + } ); } } services.AddDbContext( Action ); diff --git a/src/Util.Data.EntityFrameworkCore.Oracle/06-Util.Data.EntityFrameworkCore.Oracle.csproj b/src/Util.Data.EntityFrameworkCore.Oracle/06-Util.Data.EntityFrameworkCore.Oracle.csproj index eae7fb27c..bca8b4564 100644 --- a/src/Util.Data.EntityFrameworkCore.Oracle/06-Util.Data.EntityFrameworkCore.Oracle.csproj +++ b/src/Util.Data.EntityFrameworkCore.Oracle/06-Util.Data.EntityFrameworkCore.Oracle.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/Util.Data.EntityFrameworkCore.PostgreSql/03-Util.Data.EntityFrameworkCore.PostgreSql.csproj b/src/Util.Data.EntityFrameworkCore.PostgreSql/03-Util.Data.EntityFrameworkCore.PostgreSql.csproj index 606743f7f..97500e239 100644 --- a/src/Util.Data.EntityFrameworkCore.PostgreSql/03-Util.Data.EntityFrameworkCore.PostgreSql.csproj +++ b/src/Util.Data.EntityFrameworkCore.PostgreSql/03-Util.Data.EntityFrameworkCore.PostgreSql.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/Util.Data.EntityFrameworkCore.SqlServer/02-Util.Data.EntityFrameworkCore.SqlServer.csproj b/src/Util.Data.EntityFrameworkCore.SqlServer/02-Util.Data.EntityFrameworkCore.SqlServer.csproj index 510bc9550..b3babd45c 100644 --- a/src/Util.Data.EntityFrameworkCore.SqlServer/02-Util.Data.EntityFrameworkCore.SqlServer.csproj +++ b/src/Util.Data.EntityFrameworkCore.SqlServer/02-Util.Data.EntityFrameworkCore.SqlServer.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/Util.Data.EntityFrameworkCore.Sqlite/05-Util.Data.EntityFrameworkCore.Sqlite.csproj b/src/Util.Data.EntityFrameworkCore.Sqlite/05-Util.Data.EntityFrameworkCore.Sqlite.csproj index e0dbf5c5a..4fedce6d6 100644 --- a/src/Util.Data.EntityFrameworkCore.Sqlite/05-Util.Data.EntityFrameworkCore.Sqlite.csproj +++ b/src/Util.Data.EntityFrameworkCore.Sqlite/05-Util.Data.EntityFrameworkCore.Sqlite.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/Util.Data.EntityFrameworkCore/01-Util.Data.EntityFrameworkCore.csproj b/src/Util.Data.EntityFrameworkCore/01-Util.Data.EntityFrameworkCore.csproj index 618ed8c7b..e2929b15d 100644 --- a/src/Util.Data.EntityFrameworkCore/01-Util.Data.EntityFrameworkCore.csproj +++ b/src/Util.Data.EntityFrameworkCore/01-Util.Data.EntityFrameworkCore.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/src/Util.Events.MediatR/03-Util.Events.MediatR.csproj b/src/Util.Events.MediatR/03-Util.Events.MediatR.csproj index fe2a2d455..13143137e 100644 --- a/src/Util.Events.MediatR/03-Util.Events.MediatR.csproj +++ b/src/Util.Events.MediatR/03-Util.Events.MediatR.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/Util.FileStorage/Local/LocalFileStore.cs b/src/Util.FileStorage/Local/LocalFileStore.cs index 26e85f04b..75f5f66d1 100644 --- a/src/Util.FileStorage/Local/LocalFileStore.cs +++ b/src/Util.FileStorage/Local/LocalFileStore.cs @@ -108,7 +108,7 @@ protected virtual async Task GetConfig() { /// 处理文件名 /// protected virtual ProcessedName ProcessFileName( FileStorageArgs args ) { - if( args.FileName.IsEmpty() ) + if ( args.FileName.IsEmpty() ) throw new ArgumentNullException( nameof( args.FileName ) ); var processor = _fileNameProcessorFactory.CreateProcessor( args.FileNamePolicy ); return processor.Process( args.FileName ); @@ -127,7 +127,14 @@ protected virtual ProcessedName ProcessFileName( FileStorageArgs args ) { /// protected virtual async Task GetPhysicalPath( ProcessedName fileName ) { var config = await GetConfig(); - return Path.Combine( Util.Helpers.Web.Environment.WebRootPath, config.RootPath, fileName.Name ); + return Path.Combine( GetRootPath(), config.RootPath, fileName.Name ); + } + + /// + /// 获取根路径 + /// + protected virtual string GetRootPath() { + return Util.Helpers.Web.Environment == null ? string.Empty : Util.Helpers.Web.Environment.WebRootPath; } #endregion @@ -172,7 +179,7 @@ protected virtual async Task GetPhysicalPath( ProcessedName fileName ) { stream.CheckNull( nameof( stream ) ); var config = await GetConfig(); var filePath = Path.Combine( config.RootPath, fileName.Name ); - var physicalPath = Path.Combine( Util.Helpers.Web.Environment.WebRootPath, filePath ); + var physicalPath = Path.Combine( GetRootPath(), filePath ); await Util.Helpers.File.WriteAsync( physicalPath, stream, cancellationToken ); return new FileResult( filePath, stream.Length, fileName.OriginalName ); } diff --git a/src/Util.Http/07-Util.Http.csproj b/src/Util.Http/07-Util.Http.csproj index e2ac3ccd9..f7f0ed4f3 100644 --- a/src/Util.Http/07-Util.Http.csproj +++ b/src/Util.Http/07-Util.Http.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/src/Util.Images.ImageSharp/01-Util.Images.ImageSharp.csproj b/src/Util.Images.ImageSharp/01-Util.Images.ImageSharp.csproj index 247ab5f4a..179927e5f 100644 --- a/src/Util.Images.ImageSharp/01-Util.Images.ImageSharp.csproj +++ b/src/Util.Images.ImageSharp/01-Util.Images.ImageSharp.csproj @@ -31,8 +31,8 @@ - - + + diff --git a/src/Util.Localization/09-Util.Localization.csproj b/src/Util.Localization/09-Util.Localization.csproj index c8816ba5f..fd9d3ec67 100644 --- a/src/Util.Localization/09-Util.Localization.csproj +++ b/src/Util.Localization/09-Util.Localization.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/src/Util.Logging.Serilog/02-Util.Logging.Serilog.csproj b/src/Util.Logging.Serilog/02-Util.Logging.Serilog.csproj index 91ce94c0f..644463ca9 100644 --- a/src/Util.Logging.Serilog/02-Util.Logging.Serilog.csproj +++ b/src/Util.Logging.Serilog/02-Util.Logging.Serilog.csproj @@ -27,10 +27,10 @@ - - + + - + diff --git a/src/Util.Logging/01-Util.Logging.csproj b/src/Util.Logging/01-Util.Logging.csproj index 1344d8830..0703271a3 100644 --- a/src/Util.Logging/01-Util.Logging.csproj +++ b/src/Util.Logging/01-Util.Logging.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/src/Util.Microservices.HealthChecks/04-Util.Microservices.HealthChecks.csproj b/src/Util.Microservices.HealthChecks/04-Util.Microservices.HealthChecks.csproj index 8d1c2d683..2603d6fad 100644 --- a/src/Util.Microservices.HealthChecks/04-Util.Microservices.HealthChecks.csproj +++ b/src/Util.Microservices.HealthChecks/04-Util.Microservices.HealthChecks.csproj @@ -27,9 +27,9 @@ - - - + + + diff --git a/src/Util.Microservices.Polly/02-Util.Microservices.Polly.csproj b/src/Util.Microservices.Polly/02-Util.Microservices.Polly.csproj index e06af5441..e93427983 100644 --- a/src/Util.Microservices.Polly/02-Util.Microservices.Polly.csproj +++ b/src/Util.Microservices.Polly/02-Util.Microservices.Polly.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/Util.Scheduling.Hangfire/03-Util.Scheduling.Hangfire.csproj b/src/Util.Scheduling.Hangfire/03-Util.Scheduling.Hangfire.csproj index e9f47d486..6395f67c8 100644 --- a/src/Util.Scheduling.Hangfire/03-Util.Scheduling.Hangfire.csproj +++ b/src/Util.Scheduling.Hangfire/03-Util.Scheduling.Hangfire.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/Util.Scheduling.Quartz/02-Util.Scheduling.Quartz.csproj b/src/Util.Scheduling.Quartz/02-Util.Scheduling.Quartz.csproj index a3ee087c3..a10fd388f 100644 --- a/src/Util.Scheduling.Quartz/02-Util.Scheduling.Quartz.csproj +++ b/src/Util.Scheduling.Quartz/02-Util.Scheduling.Quartz.csproj @@ -27,8 +27,8 @@ - - + + diff --git a/src/Util.Templates.Razor/02-Util.Templates.Razor.csproj b/src/Util.Templates.Razor/02-Util.Templates.Razor.csproj index c76a6e936..389b84385 100644 --- a/src/Util.Templates.Razor/02-Util.Templates.Razor.csproj +++ b/src/Util.Templates.Razor/02-Util.Templates.Razor.csproj @@ -37,7 +37,7 @@ - - + + diff --git a/src/Util.Ui.NgZorro/03-Util.Ui.NgZorro.csproj b/src/Util.Ui.NgZorro/03-Util.Ui.NgZorro.csproj index b7a0cea38..9f8399155 100644 --- a/src/Util.Ui.NgZorro/03-Util.Ui.NgZorro.csproj +++ b/src/Util.Ui.NgZorro/03-Util.Ui.NgZorro.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/Util.Ui/01-Util.Ui.csproj b/src/Util.Ui/01-Util.Ui.csproj index 6a8b76283..d675e3dea 100644 --- a/src/Util.Ui/01-Util.Ui.csproj +++ b/src/Util.Ui/01-Util.Ui.csproj @@ -28,7 +28,7 @@ - + diff --git a/test/Util.Aop.AspectCore.Tests/Util.Aop.AspectCore.Tests.csproj b/test/Util.Aop.AspectCore.Tests/Util.Aop.AspectCore.Tests.csproj index 60c3b0f9c..c76f903d5 100644 --- a/test/Util.Aop.AspectCore.Tests/Util.Aop.AspectCore.Tests.csproj +++ b/test/Util.Aop.AspectCore.Tests/Util.Aop.AspectCore.Tests.csproj @@ -6,12 +6,12 @@ - + - - + + - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Application.EntityFrameworkCore.MySql.Tests.Integration/Util.Application.EntityFrameworkCore.MySql.Tests.Integration.csproj b/test/Util.Application.EntityFrameworkCore.MySql.Tests.Integration/Util.Application.EntityFrameworkCore.MySql.Tests.Integration.csproj index f800566ac..675b85aac 100644 --- a/test/Util.Application.EntityFrameworkCore.MySql.Tests.Integration/Util.Application.EntityFrameworkCore.MySql.Tests.Integration.csproj +++ b/test/Util.Application.EntityFrameworkCore.MySql.Tests.Integration/Util.Application.EntityFrameworkCore.MySql.Tests.Integration.csproj @@ -17,12 +17,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Application.EntityFrameworkCore.PostgreSql.Tests.Integration/Util.Application.EntityFrameworkCore.PostgreSql.Tests.Integration.csproj b/test/Util.Application.EntityFrameworkCore.PostgreSql.Tests.Integration/Util.Application.EntityFrameworkCore.PostgreSql.Tests.Integration.csproj index e486ff5ee..7ac35a229 100644 --- a/test/Util.Application.EntityFrameworkCore.PostgreSql.Tests.Integration/Util.Application.EntityFrameworkCore.PostgreSql.Tests.Integration.csproj +++ b/test/Util.Application.EntityFrameworkCore.PostgreSql.Tests.Integration/Util.Application.EntityFrameworkCore.PostgreSql.Tests.Integration.csproj @@ -17,12 +17,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Application.EntityFrameworkCore.SqlServer.Tests.Integration/Util.Application.EntityFrameworkCore.SqlServer.Tests.Integration.csproj b/test/Util.Application.EntityFrameworkCore.SqlServer.Tests.Integration/Util.Application.EntityFrameworkCore.SqlServer.Tests.Integration.csproj index c8c843f86..99a633ab6 100644 --- a/test/Util.Application.EntityFrameworkCore.SqlServer.Tests.Integration/Util.Application.EntityFrameworkCore.SqlServer.Tests.Integration.csproj +++ b/test/Util.Application.EntityFrameworkCore.SqlServer.Tests.Integration/Util.Application.EntityFrameworkCore.SqlServer.Tests.Integration.csproj @@ -17,12 +17,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Application.EntityFrameworkCore.SqlServer.Tests.Integration/appsettings.Development.json b/test/Util.Application.EntityFrameworkCore.SqlServer.Tests.Integration/appsettings.Development.json index 18f513d52..45e8537c5 100644 --- a/test/Util.Application.EntityFrameworkCore.SqlServer.Tests.Integration/appsettings.Development.json +++ b/test/Util.Application.EntityFrameworkCore.SqlServer.Tests.Integration/appsettings.Development.json @@ -6,6 +6,6 @@ } }, "ConnectionStrings": { - "connection": "Server=.\\sql2019;Database=Util.Application.EntityFrameworkCore.Test;uid=sa;pwd=sa;MultipleActiveResultSets=true;TrustServerCertificate=true" + "connection": "Server=.;Database=Util.Application.EntityFrameworkCore.Test;uid=sa;pwd=Pass@word;MultipleActiveResultSets=true;TrustServerCertificate=true" } } diff --git a/test/Util.Application.Tests/Util.Application.Tests.csproj b/test/Util.Application.Tests/Util.Application.Tests.csproj index 9ff2dc875..c501b64e3 100644 --- a/test/Util.Application.Tests/Util.Application.Tests.csproj +++ b/test/Util.Application.Tests/Util.Application.Tests.csproj @@ -15,9 +15,9 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Application.WebApi.MySql.Tests.Integration/Util.Application.WebApi.MySql.Tests.Integration.csproj b/test/Util.Application.WebApi.MySql.Tests.Integration/Util.Application.WebApi.MySql.Tests.Integration.csproj index 75c872393..81f3139b7 100644 --- a/test/Util.Application.WebApi.MySql.Tests.Integration/Util.Application.WebApi.MySql.Tests.Integration.csproj +++ b/test/Util.Application.WebApi.MySql.Tests.Integration/Util.Application.WebApi.MySql.Tests.Integration.csproj @@ -8,14 +8,14 @@ - - + + - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Application.WebApi.PostgreSql.Tests.Integration/Util.Application.WebApi.PostgreSql.Tests.Integration.csproj b/test/Util.Application.WebApi.PostgreSql.Tests.Integration/Util.Application.WebApi.PostgreSql.Tests.Integration.csproj index e15b73fdb..fe6056653 100644 --- a/test/Util.Application.WebApi.PostgreSql.Tests.Integration/Util.Application.WebApi.PostgreSql.Tests.Integration.csproj +++ b/test/Util.Application.WebApi.PostgreSql.Tests.Integration/Util.Application.WebApi.PostgreSql.Tests.Integration.csproj @@ -8,14 +8,14 @@ - - + + - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Application.WebApi.SqlServer.Tests.Integration/Util.Application.WebApi.SqlServer.Tests.Integration.csproj b/test/Util.Application.WebApi.SqlServer.Tests.Integration/Util.Application.WebApi.SqlServer.Tests.Integration.csproj index 009896e52..6436ad899 100644 --- a/test/Util.Application.WebApi.SqlServer.Tests.Integration/Util.Application.WebApi.SqlServer.Tests.Integration.csproj +++ b/test/Util.Application.WebApi.SqlServer.Tests.Integration/Util.Application.WebApi.SqlServer.Tests.Integration.csproj @@ -8,14 +8,14 @@ - - + + - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Application.WebApi.SqlServer.Tests.Integration/appsettings.Development.json b/test/Util.Application.WebApi.SqlServer.Tests.Integration/appsettings.Development.json index 3a3095995..fb96acf05 100644 --- a/test/Util.Application.WebApi.SqlServer.Tests.Integration/appsettings.Development.json +++ b/test/Util.Application.WebApi.SqlServer.Tests.Integration/appsettings.Development.json @@ -6,6 +6,6 @@ } }, "ConnectionStrings": { - "connection": "Server=.\\sql2019;Database=Util.WebApi.Test;uid=sa;pwd=sa;MultipleActiveResultSets=true;TrustServerCertificate=true" + "connection": "Server=.;Database=Util.WebApi.Test;uid=sa;pwd=Pass@word;MultipleActiveResultSets=true;TrustServerCertificate=true" } } diff --git a/test/Util.Application.WebApi.Tests.Integration/Util.Application.WebApi.Tests.Integration.csproj b/test/Util.Application.WebApi.Tests.Integration/Util.Application.WebApi.Tests.Integration.csproj index 0cfde8bd9..514333bfd 100644 --- a/test/Util.Application.WebApi.Tests.Integration/Util.Application.WebApi.Tests.Integration.csproj +++ b/test/Util.Application.WebApi.Tests.Integration/Util.Application.WebApi.Tests.Integration.csproj @@ -8,14 +8,14 @@ - - - + + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.AspNetCore.Tests.Integration/Util.AspNetCore.Tests.Integration.csproj b/test/Util.AspNetCore.Tests.Integration/Util.AspNetCore.Tests.Integration.csproj index 598cd72be..133d066d2 100644 --- a/test/Util.AspNetCore.Tests.Integration/Util.AspNetCore.Tests.Integration.csproj +++ b/test/Util.AspNetCore.Tests.Integration/Util.AspNetCore.Tests.Integration.csproj @@ -8,13 +8,13 @@ - - + + - - + + - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Caching.EasyCaching.Tests.Integration/Util.Caching.EasyCaching.Tests.Integration.csproj b/test/Util.Caching.EasyCaching.Tests.Integration/Util.Caching.EasyCaching.Tests.Integration.csproj index 4005ca195..decc0ede9 100644 --- a/test/Util.Caching.EasyCaching.Tests.Integration/Util.Caching.EasyCaching.Tests.Integration.csproj +++ b/test/Util.Caching.EasyCaching.Tests.Integration/Util.Caching.EasyCaching.Tests.Integration.csproj @@ -22,12 +22,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Core.Tests.Integration/Util.Core.Tests.Integration.csproj b/test/Util.Core.Tests.Integration/Util.Core.Tests.Integration.csproj index 7edaf4e5d..26e35cd6d 100644 --- a/test/Util.Core.Tests.Integration/Util.Core.Tests.Integration.csproj +++ b/test/Util.Core.Tests.Integration/Util.Core.Tests.Integration.csproj @@ -19,10 +19,10 @@ - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Core.Tests/Util.Core.Tests.csproj b/test/Util.Core.Tests/Util.Core.Tests.csproj index 0bfc143e1..0d87ebac1 100644 --- a/test/Util.Core.Tests/Util.Core.Tests.csproj +++ b/test/Util.Core.Tests/Util.Core.Tests.csproj @@ -8,9 +8,9 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Data.Dapper.MySql.Tests.Integration/Util.Data.Dapper.MySql.Tests.Integration.csproj b/test/Util.Data.Dapper.MySql.Tests.Integration/Util.Data.Dapper.MySql.Tests.Integration.csproj index a704fde2e..1f5109020 100644 --- a/test/Util.Data.Dapper.MySql.Tests.Integration/Util.Data.Dapper.MySql.Tests.Integration.csproj +++ b/test/Util.Data.Dapper.MySql.Tests.Integration/Util.Data.Dapper.MySql.Tests.Integration.csproj @@ -17,15 +17,15 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Data.Dapper.Oracle.Tests.Integration/Util.Data.Dapper.Oracle.Tests.Integration.csproj b/test/Util.Data.Dapper.Oracle.Tests.Integration/Util.Data.Dapper.Oracle.Tests.Integration.csproj index a0e6a8460..2d021c2b6 100644 --- a/test/Util.Data.Dapper.Oracle.Tests.Integration/Util.Data.Dapper.Oracle.Tests.Integration.csproj +++ b/test/Util.Data.Dapper.Oracle.Tests.Integration/Util.Data.Dapper.Oracle.Tests.Integration.csproj @@ -23,15 +23,15 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Data.Dapper.PostgreSql.Tests.Integration/Util.Data.Dapper.PostgreSql.Tests.Integration.csproj b/test/Util.Data.Dapper.PostgreSql.Tests.Integration/Util.Data.Dapper.PostgreSql.Tests.Integration.csproj index 9e88e34c3..82cdccade 100644 --- a/test/Util.Data.Dapper.PostgreSql.Tests.Integration/Util.Data.Dapper.PostgreSql.Tests.Integration.csproj +++ b/test/Util.Data.Dapper.PostgreSql.Tests.Integration/Util.Data.Dapper.PostgreSql.Tests.Integration.csproj @@ -17,15 +17,15 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Data.Dapper.SqlServer.Tests.Integration/Util.Data.Dapper.SqlServer.Tests.Integration.csproj b/test/Util.Data.Dapper.SqlServer.Tests.Integration/Util.Data.Dapper.SqlServer.Tests.Integration.csproj index a7aece2b8..56b5bd752 100644 --- a/test/Util.Data.Dapper.SqlServer.Tests.Integration/Util.Data.Dapper.SqlServer.Tests.Integration.csproj +++ b/test/Util.Data.Dapper.SqlServer.Tests.Integration/Util.Data.Dapper.SqlServer.Tests.Integration.csproj @@ -17,15 +17,15 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Data.Dapper.SqlServer.Tests.Integration/appsettings.Development.json b/test/Util.Data.Dapper.SqlServer.Tests.Integration/appsettings.Development.json index d6fcfb958..6222e63e5 100644 --- a/test/Util.Data.Dapper.SqlServer.Tests.Integration/appsettings.Development.json +++ b/test/Util.Data.Dapper.SqlServer.Tests.Integration/appsettings.Development.json @@ -6,6 +6,6 @@ } }, "ConnectionStrings": { - "connection": "Server=.\\sql2019;Database=Util.Data.Dapper.Test;uid=sa;pwd=sa;MultipleActiveResultSets=true;TrustServerCertificate=true" + "connection": "Server=.;Database=Util.Data.Dapper.Test;uid=sa;pwd=Pass@word;MultipleActiveResultSets=true;TrustServerCertificate=true" } } \ No newline at end of file diff --git a/test/Util.Data.EntityFrameworkCore.MySql.Tests.Integration/Util.Data.EntityFrameworkCore.MySql.Tests.Integration.csproj b/test/Util.Data.EntityFrameworkCore.MySql.Tests.Integration/Util.Data.EntityFrameworkCore.MySql.Tests.Integration.csproj index 96bab3d3e..21f65c84e 100644 --- a/test/Util.Data.EntityFrameworkCore.MySql.Tests.Integration/Util.Data.EntityFrameworkCore.MySql.Tests.Integration.csproj +++ b/test/Util.Data.EntityFrameworkCore.MySql.Tests.Integration/Util.Data.EntityFrameworkCore.MySql.Tests.Integration.csproj @@ -17,12 +17,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Data.EntityFrameworkCore.Oracle.Tests.Integration/Util.Data.EntityFrameworkCore.Oracle.Tests.Integration.csproj b/test/Util.Data.EntityFrameworkCore.Oracle.Tests.Integration/Util.Data.EntityFrameworkCore.Oracle.Tests.Integration.csproj index ad70408d8..35a53fb8f 100644 --- a/test/Util.Data.EntityFrameworkCore.Oracle.Tests.Integration/Util.Data.EntityFrameworkCore.Oracle.Tests.Integration.csproj +++ b/test/Util.Data.EntityFrameworkCore.Oracle.Tests.Integration/Util.Data.EntityFrameworkCore.Oracle.Tests.Integration.csproj @@ -18,12 +18,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Data.EntityFrameworkCore.PostgreSql.Tests.Integration/Util.Data.EntityFrameworkCore.PostgreSql.Tests.Integration.csproj b/test/Util.Data.EntityFrameworkCore.PostgreSql.Tests.Integration/Util.Data.EntityFrameworkCore.PostgreSql.Tests.Integration.csproj index 9bd68d58a..8ac3805fe 100644 --- a/test/Util.Data.EntityFrameworkCore.PostgreSql.Tests.Integration/Util.Data.EntityFrameworkCore.PostgreSql.Tests.Integration.csproj +++ b/test/Util.Data.EntityFrameworkCore.PostgreSql.Tests.Integration/Util.Data.EntityFrameworkCore.PostgreSql.Tests.Integration.csproj @@ -17,12 +17,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Data.EntityFrameworkCore.SqlServer.Tests.Integration/Util.Data.EntityFrameworkCore.SqlServer.Tests.Integration.csproj b/test/Util.Data.EntityFrameworkCore.SqlServer.Tests.Integration/Util.Data.EntityFrameworkCore.SqlServer.Tests.Integration.csproj index 113a7293c..b50096266 100644 --- a/test/Util.Data.EntityFrameworkCore.SqlServer.Tests.Integration/Util.Data.EntityFrameworkCore.SqlServer.Tests.Integration.csproj +++ b/test/Util.Data.EntityFrameworkCore.SqlServer.Tests.Integration/Util.Data.EntityFrameworkCore.SqlServer.Tests.Integration.csproj @@ -27,16 +27,16 @@ - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Data.EntityFrameworkCore.SqlServer.Tests.Integration/appsettings.Development.json b/test/Util.Data.EntityFrameworkCore.SqlServer.Tests.Integration/appsettings.Development.json index 7758c021a..8ff212a2c 100644 --- a/test/Util.Data.EntityFrameworkCore.SqlServer.Tests.Integration/appsettings.Development.json +++ b/test/Util.Data.EntityFrameworkCore.SqlServer.Tests.Integration/appsettings.Development.json @@ -6,6 +6,6 @@ } }, "ConnectionStrings": { - "connection": "Server=.\\sql2019;Database=Util.Data.EntityFrameworkCore.Test;uid=sa;pwd=sa;TrustServerCertificate=true" + "connection": "Server=.;Database=Util.Data.EntityFrameworkCore.Test;uid=sa;pwd=Pass@word;TrustServerCertificate=true" } } \ No newline at end of file diff --git a/test/Util.Data.EntityFrameworkCore.Sqlite.Tests.Integration/Util.Data.EntityFrameworkCore.Sqlite.Tests.Integration.csproj b/test/Util.Data.EntityFrameworkCore.Sqlite.Tests.Integration/Util.Data.EntityFrameworkCore.Sqlite.Tests.Integration.csproj index ad68dd5b3..06c8473d4 100644 --- a/test/Util.Data.EntityFrameworkCore.Sqlite.Tests.Integration/Util.Data.EntityFrameworkCore.Sqlite.Tests.Integration.csproj +++ b/test/Util.Data.EntityFrameworkCore.Sqlite.Tests.Integration/Util.Data.EntityFrameworkCore.Sqlite.Tests.Integration.csproj @@ -17,12 +17,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Data.Sql.Tests/Util.Data.Sql.Tests.csproj b/test/Util.Data.Sql.Tests/Util.Data.Sql.Tests.csproj index 2115f2fc7..2172bc447 100644 --- a/test/Util.Data.Sql.Tests/Util.Data.Sql.Tests.csproj +++ b/test/Util.Data.Sql.Tests/Util.Data.Sql.Tests.csproj @@ -7,8 +7,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Data.Tests/Util.Data.Tests.csproj b/test/Util.Data.Tests/Util.Data.Tests.csproj index b90b2bded..54ec41ef0 100644 --- a/test/Util.Data.Tests/Util.Data.Tests.csproj +++ b/test/Util.Data.Tests/Util.Data.Tests.csproj @@ -7,8 +7,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Domain.Tests/Util.Domain.Tests.csproj b/test/Util.Domain.Tests/Util.Domain.Tests.csproj index ada22b382..67559403a 100644 --- a/test/Util.Domain.Tests/Util.Domain.Tests.csproj +++ b/test/Util.Domain.Tests/Util.Domain.Tests.csproj @@ -7,9 +7,9 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Events.MediatR.Tests.Integration/Util.Events.MediatR.Tests.Integration.csproj b/test/Util.Events.MediatR.Tests.Integration/Util.Events.MediatR.Tests.Integration.csproj index 116c60206..31516cc9b 100644 --- a/test/Util.Events.MediatR.Tests.Integration/Util.Events.MediatR.Tests.Integration.csproj +++ b/test/Util.Events.MediatR.Tests.Integration/Util.Events.MediatR.Tests.Integration.csproj @@ -8,12 +8,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Events.Tests.Integration/Util.Events.Tests.Integration.csproj b/test/Util.Events.Tests.Integration/Util.Events.Tests.Integration.csproj index 6766c9a2c..085a4b7e4 100644 --- a/test/Util.Events.Tests.Integration/Util.Events.Tests.Integration.csproj +++ b/test/Util.Events.Tests.Integration/Util.Events.Tests.Integration.csproj @@ -8,12 +8,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.FileStorage.Aliyun.Tests.Integration/Util.FileStorage.Aliyun.Tests.Integration.csproj b/test/Util.FileStorage.Aliyun.Tests.Integration/Util.FileStorage.Aliyun.Tests.Integration.csproj index ee228c814..47cd4667c 100644 --- a/test/Util.FileStorage.Aliyun.Tests.Integration/Util.FileStorage.Aliyun.Tests.Integration.csproj +++ b/test/Util.FileStorage.Aliyun.Tests.Integration/Util.FileStorage.Aliyun.Tests.Integration.csproj @@ -22,13 +22,13 @@ - - - + + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.FileStorage.Minio.Tests.Integration/Tests/MinioFileStoreTest.cs b/test/Util.FileStorage.Minio.Tests.Integration/Tests/MinioFileStoreTest.cs index 69b78d1bb..cf898ad57 100644 --- a/test/Util.FileStorage.Minio.Tests.Integration/Tests/MinioFileStoreTest.cs +++ b/test/Util.FileStorage.Minio.Tests.Integration/Tests/MinioFileStoreTest.cs @@ -32,6 +32,7 @@ public MinioFileStoreTest( IFileStore fileStore, ITestOutputHelper testOutputHel _fileStore = fileStore; _testOutputHelper = testOutputHelper; Time.SetTime( new DateTime( 2012, 12, 12, 12, 12, 12, 123 ) ); + Id.SetId("id"); } #endregion @@ -54,7 +55,7 @@ public void Dispose() { /// [Fact] public async Task TestBucketExistsAsync() { - var name = Id.Create(); + var name = $"{Guid.NewGuid()}"; //未创建的桶不存在 var result = await _fileStore.BucketExistsAsync( name ); @@ -123,7 +124,7 @@ public async Task TestDeleteBucketAsync_1() { [Fact] public async Task TestFileExistsAsync_1() { //定义文件名 - var name = $"{Id.Create()}.jpg"; + var name = $"{Guid.NewGuid()}.jpg"; //文件未创建不存在 var result = await _fileStore.FileExistsAsync( name ); @@ -147,7 +148,7 @@ public async Task TestFileExistsAsync_1() { [Fact] public async Task TestFileExistsAsync_2() { //定义变量 - var name = $"{Id.Create()}.jpg"; + var name = $"{Guid.NewGuid()}.jpg"; var bucketName = "TestFileExistsAsync_2"; //文件未创建不存在 @@ -250,8 +251,8 @@ public async Task TestSaveFileAsync_3() { var path = Common.GetPhysicalPath( "~/Resources/b.jpg" ); await using var stream = File.ReadToStream( path ); var result = await _fileStore.SaveFileAsync( stream, fileName,UserTimeFileNameProcessor.Policy ); - Assert.Equal( $"{TestSession.TestUserId}/2012-12-12-12-12-12-123/b.jpg", result.FilePath ); - Assert.Equal( "b.jpg", result.FileName ); + Assert.Equal( $"{TestSession.TestUserId}/2012-12-12/id.jpg", result.FilePath ); + Assert.Equal( "id.jpg", result.FileName ); Assert.Equal( "jpg", result.Extension ); } diff --git a/test/Util.FileStorage.Minio.Tests.Integration/Util.FileStorage.Minio.Tests.Integration.csproj b/test/Util.FileStorage.Minio.Tests.Integration/Util.FileStorage.Minio.Tests.Integration.csproj index 651e52ef1..b9323424e 100644 --- a/test/Util.FileStorage.Minio.Tests.Integration/Util.FileStorage.Minio.Tests.Integration.csproj +++ b/test/Util.FileStorage.Minio.Tests.Integration/Util.FileStorage.Minio.Tests.Integration.csproj @@ -22,13 +22,13 @@ - - - + + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.FileStorage.Tests.Integration/Tests/LocalFileStoreTest.cs b/test/Util.FileStorage.Tests.Integration/Tests/LocalFileStoreTest.cs index 792944576..a8a17350a 100644 --- a/test/Util.FileStorage.Tests.Integration/Tests/LocalFileStoreTest.cs +++ b/test/Util.FileStorage.Tests.Integration/Tests/LocalFileStoreTest.cs @@ -1,5 +1,4 @@ -using System; -using Util.Helpers; +using Util.Helpers; namespace Util.FileStorage.Tests; @@ -51,18 +50,6 @@ public async Task TestSaveFileAsync_2() { Assert.Equal( "png", result.Extension ); } - /// - /// 测试保存文件 - 验证扩展名 - /// - [Fact] - public async Task TestSaveFileAsync_3() { - var path = Common.GetPhysicalPath( "~/Resources/a.pdf" ); - await using var stream = File.ReadToStream( path ); - await Assert.ThrowsAsync( async () => { - await _fileStore.SaveFileAsync( stream, "a.pdf" ); - } ); - } - /// /// 测试获取文件流 /// diff --git a/test/Util.FileStorage.Tests.Integration/Util.FileStorage.Tests.Integration.csproj b/test/Util.FileStorage.Tests.Integration/Util.FileStorage.Tests.Integration.csproj index 5740a1243..04a5e637d 100644 --- a/test/Util.FileStorage.Tests.Integration/Util.FileStorage.Tests.Integration.csproj +++ b/test/Util.FileStorage.Tests.Integration/Util.FileStorage.Tests.Integration.csproj @@ -22,13 +22,13 @@ - - - + + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Generators.Razor.Tests.Integration/Util.Generators.Razor.Tests.Integration.csproj b/test/Util.Generators.Razor.Tests.Integration/Util.Generators.Razor.Tests.Integration.csproj index 3185f4604..756ae5bda 100644 --- a/test/Util.Generators.Razor.Tests.Integration/Util.Generators.Razor.Tests.Integration.csproj +++ b/test/Util.Generators.Razor.Tests.Integration/Util.Generators.Razor.Tests.Integration.csproj @@ -14,12 +14,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Generators.Razor.Tests.Integration/appsettings.json b/test/Util.Generators.Razor.Tests.Integration/appsettings.json index d2faca500..243202278 100644 --- a/test/Util.Generators.Razor.Tests.Integration/appsettings.json +++ b/test/Util.Generators.Razor.Tests.Integration/appsettings.json @@ -6,12 +6,12 @@ "Test": { "Name": "Project1", "DbType": "SqlServer", - "ConnectionString": "Server=.\\sql2014;Database=UtilTest;uid=sa;pwd=sa;MultipleActiveResultSets=true" + "ConnectionString": "Server=.;Database=UtilTest;uid=sa;pwd=Pass@word;MultipleActiveResultSets=true" }, "Test2": { "Name": "Project2", "DbType": "SqlServer", - "ConnectionString": "Server=.\\sql2014;Database=UtilTest;uid=sa;pwd=sa;MultipleActiveResultSets=true" + "ConnectionString": "Server=.;Database=UtilTest;uid=sa;pwd=Pass@word;MultipleActiveResultSets=true" } } } diff --git a/test/Util.Generators.Tests/Util.Generators.Tests.csproj b/test/Util.Generators.Tests/Util.Generators.Tests.csproj index b1500c7fb..cce5becc1 100644 --- a/test/Util.Generators.Tests/Util.Generators.Tests.csproj +++ b/test/Util.Generators.Tests/Util.Generators.Tests.csproj @@ -19,9 +19,9 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.IdGenerator.Tests/Util.IdGenerator.Tests.csproj b/test/Util.IdGenerator.Tests/Util.IdGenerator.Tests.csproj index 7aa38ccf6..6c02876a7 100644 --- a/test/Util.IdGenerator.Tests/Util.IdGenerator.Tests.csproj +++ b/test/Util.IdGenerator.Tests/Util.IdGenerator.Tests.csproj @@ -1,29 +1,27 @@ - - net7.0 - enable - enable + + $(NetTargetFramework) + enable + false + true + - false - true - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - + + + diff --git a/test/Util.Images.Avatar.Tests.Integration/Util.Images.Avatar.Tests.Integration.csproj b/test/Util.Images.Avatar.Tests.Integration/Util.Images.Avatar.Tests.Integration.csproj index e04e83a8b..a6d8a38e0 100644 --- a/test/Util.Images.Avatar.Tests.Integration/Util.Images.Avatar.Tests.Integration.csproj +++ b/test/Util.Images.Avatar.Tests.Integration/Util.Images.Avatar.Tests.Integration.csproj @@ -9,11 +9,11 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Images.ImageSharp.Tests.Integration/Util.Images.ImageSharp.Tests.Integration.csproj b/test/Util.Images.ImageSharp.Tests.Integration/Util.Images.ImageSharp.Tests.Integration.csproj index 33ccf807d..3c9fdd123 100644 --- a/test/Util.Images.ImageSharp.Tests.Integration/Util.Images.ImageSharp.Tests.Integration.csproj +++ b/test/Util.Images.ImageSharp.Tests.Integration/Util.Images.ImageSharp.Tests.Integration.csproj @@ -9,10 +9,10 @@ - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Localization.Tests.Integration/Util.Localization.Tests.Integration.csproj b/test/Util.Localization.Tests.Integration/Util.Localization.Tests.Integration.csproj index 9d91e955f..f4e3d8988 100644 --- a/test/Util.Localization.Tests.Integration/Util.Localization.Tests.Integration.csproj +++ b/test/Util.Localization.Tests.Integration/Util.Localization.Tests.Integration.csproj @@ -8,13 +8,13 @@ - - + + - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Localization.Tests/Util.Localization.Tests.csproj b/test/Util.Localization.Tests/Util.Localization.Tests.csproj index 8f1e29321..7a1a170ef 100644 --- a/test/Util.Localization.Tests/Util.Localization.Tests.csproj +++ b/test/Util.Localization.Tests/Util.Localization.Tests.csproj @@ -8,9 +8,9 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Logging.Serilog.Exceptionless.Tests.Integration/Util.Logging.Serilog.Exceptionless.Tests.Integration.csproj b/test/Util.Logging.Serilog.Exceptionless.Tests.Integration/Util.Logging.Serilog.Exceptionless.Tests.Integration.csproj index 29bacd1fa..cffeab7fe 100644 --- a/test/Util.Logging.Serilog.Exceptionless.Tests.Integration/Util.Logging.Serilog.Exceptionless.Tests.Integration.csproj +++ b/test/Util.Logging.Serilog.Exceptionless.Tests.Integration/Util.Logging.Serilog.Exceptionless.Tests.Integration.csproj @@ -8,12 +8,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Logging.Serilog.Exceptionless.Tests.Integration/appsettings.json b/test/Util.Logging.Serilog.Exceptionless.Tests.Integration/appsettings.json index 7a753ca9a..dbebfc878 100644 --- a/test/Util.Logging.Serilog.Exceptionless.Tests.Integration/appsettings.json +++ b/test/Util.Logging.Serilog.Exceptionless.Tests.Integration/appsettings.json @@ -6,7 +6,7 @@ } }, "Exceptionless": { - "ApiKey": "8JtknZBV1NRC7bdsv6SF5cbBFrMZipWMkARZxkxo", + "ApiKey": "iopUwmIbUdFKQs1WnUzxaPKg8lvJ02rxXjxHuhTg", "ServerUrl": "http://localhost:5480", "QueueMaxAttempts": 1 } diff --git a/test/Util.Logging.Serilog.Tests.Integration/Util.Logging.Serilog.Tests.Integration.csproj b/test/Util.Logging.Serilog.Tests.Integration/Util.Logging.Serilog.Tests.Integration.csproj index cb28ae3dd..c1a3bd6a3 100644 --- a/test/Util.Logging.Serilog.Tests.Integration/Util.Logging.Serilog.Tests.Integration.csproj +++ b/test/Util.Logging.Serilog.Tests.Integration/Util.Logging.Serilog.Tests.Integration.csproj @@ -8,12 +8,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Logging.Tests/Util.Logging.Tests.csproj b/test/Util.Logging.Tests/Util.Logging.Tests.csproj index ddf6679c1..8a3b43eb0 100644 --- a/test/Util.Logging.Tests/Util.Logging.Tests.csproj +++ b/test/Util.Logging.Tests/Util.Logging.Tests.csproj @@ -7,9 +7,9 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Microservices.Dapr.Tests.Integration/Util.Microservices.Dapr.Tests.Integration.csproj b/test/Util.Microservices.Dapr.Tests.Integration/Util.Microservices.Dapr.Tests.Integration.csproj index 20aa41d52..24e4ea9ef 100644 --- a/test/Util.Microservices.Dapr.Tests.Integration/Util.Microservices.Dapr.Tests.Integration.csproj +++ b/test/Util.Microservices.Dapr.Tests.Integration/Util.Microservices.Dapr.Tests.Integration.csproj @@ -25,14 +25,14 @@ - - - + + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Microservices.Dapr.Tests/Util.Microservices.Dapr.Tests.csproj b/test/Util.Microservices.Dapr.Tests/Util.Microservices.Dapr.Tests.csproj index 125c5d143..e77eee1db 100644 --- a/test/Util.Microservices.Dapr.Tests/Util.Microservices.Dapr.Tests.csproj +++ b/test/Util.Microservices.Dapr.Tests/Util.Microservices.Dapr.Tests.csproj @@ -8,9 +8,9 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Microservices.Polly.Tests.Integration/Util.Microservices.Polly.Tests.Integration.csproj b/test/Util.Microservices.Polly.Tests.Integration/Util.Microservices.Polly.Tests.Integration.csproj index e8d8e4195..46a976ace 100644 --- a/test/Util.Microservices.Polly.Tests.Integration/Util.Microservices.Polly.Tests.Integration.csproj +++ b/test/Util.Microservices.Polly.Tests.Integration/Util.Microservices.Polly.Tests.Integration.csproj @@ -9,10 +9,10 @@ - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.ObjectMapping.AutoMapper.Tests/Util.ObjectMapping.AutoMapper.Tests.csproj b/test/Util.ObjectMapping.AutoMapper.Tests/Util.ObjectMapping.AutoMapper.Tests.csproj index c537b825d..72f6b07f0 100644 --- a/test/Util.ObjectMapping.AutoMapper.Tests/Util.ObjectMapping.AutoMapper.Tests.csproj +++ b/test/Util.ObjectMapping.AutoMapper.Tests/Util.ObjectMapping.AutoMapper.Tests.csproj @@ -7,11 +7,11 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Scheduling.Hangfire.Tests.Integration/Util.Scheduling.Hangfire.Tests.Integration.csproj b/test/Util.Scheduling.Hangfire.Tests.Integration/Util.Scheduling.Hangfire.Tests.Integration.csproj index e197db78c..9557c913a 100644 --- a/test/Util.Scheduling.Hangfire.Tests.Integration/Util.Scheduling.Hangfire.Tests.Integration.csproj +++ b/test/Util.Scheduling.Hangfire.Tests.Integration/Util.Scheduling.Hangfire.Tests.Integration.csproj @@ -8,15 +8,15 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -27,7 +27,7 @@ - + diff --git a/test/Util.Scheduling.Hangfire.Tests.Integration/appsettings.Development.json b/test/Util.Scheduling.Hangfire.Tests.Integration/appsettings.Development.json index 877b6f30f..1ac80eae9 100644 --- a/test/Util.Scheduling.Hangfire.Tests.Integration/appsettings.Development.json +++ b/test/Util.Scheduling.Hangfire.Tests.Integration/appsettings.Development.json @@ -6,7 +6,7 @@ } }, "ConnectionStrings": { - "connection": "Server=.\\sql2019;Database=Util.Scheduling.Hangfire.Tests;uid=sa;pwd=sa;MultipleActiveResultSets=true;TrustServerCertificate=true", - "HangfireConnection": "Server=.\\sql2019;Database=Util.Scheduling.Hangfire.Tests;uid=sa;pwd=sa;MultipleActiveResultSets=true;TrustServerCertificate=true" + "connection": "Server=.;Database=Util.Scheduling.Hangfire.Tests;uid=sa;pwd=Pass@word;MultipleActiveResultSets=true;TrustServerCertificate=true", + "HangfireConnection": "Server=.;Database=Util.Scheduling.Hangfire.Tests;uid=sa;pwd=Pass@word;MultipleActiveResultSets=true;TrustServerCertificate=true" } } \ No newline at end of file diff --git a/test/Util.Scheduling.Quartz.Tests.Integration/Util.Scheduling.Quartz.Tests.Integration.csproj b/test/Util.Scheduling.Quartz.Tests.Integration/Util.Scheduling.Quartz.Tests.Integration.csproj index cbb34f6c6..3561da612 100644 --- a/test/Util.Scheduling.Quartz.Tests.Integration/Util.Scheduling.Quartz.Tests.Integration.csproj +++ b/test/Util.Scheduling.Quartz.Tests.Integration/Util.Scheduling.Quartz.Tests.Integration.csproj @@ -22,15 +22,15 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Scheduling.Quartz.Tests.Integration/appsettings.Development.json b/test/Util.Scheduling.Quartz.Tests.Integration/appsettings.Development.json index 8a6c2625c..92d69ac9e 100644 --- a/test/Util.Scheduling.Quartz.Tests.Integration/appsettings.Development.json +++ b/test/Util.Scheduling.Quartz.Tests.Integration/appsettings.Development.json @@ -6,6 +6,6 @@ } }, "ConnectionStrings": { - "connection": "Server=.\\sql2019;Database=Util.Scheduling.Quartz.Tests;uid=sa;pwd=sa;MultipleActiveResultSets=true;TrustServerCertificate=true" + "connection": "Server=.;Database=Util.Scheduling.Quartz.Tests;uid=sa;pwd=Pass@word;MultipleActiveResultSets=true;TrustServerCertificate=true" } } \ No newline at end of file diff --git a/test/Util.Security.Tests/Util.Security.Tests.csproj b/test/Util.Security.Tests/Util.Security.Tests.csproj index 46999f00c..910403e8c 100644 --- a/test/Util.Security.Tests/Util.Security.Tests.csproj +++ b/test/Util.Security.Tests/Util.Security.Tests.csproj @@ -7,8 +7,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Templates.Handlebars.Tests.Integration/Util.Templates.Handlebars.Tests.Integration.csproj b/test/Util.Templates.Handlebars.Tests.Integration/Util.Templates.Handlebars.Tests.Integration.csproj index a71875dc4..e0fe18a0d 100644 --- a/test/Util.Templates.Handlebars.Tests.Integration/Util.Templates.Handlebars.Tests.Integration.csproj +++ b/test/Util.Templates.Handlebars.Tests.Integration/Util.Templates.Handlebars.Tests.Integration.csproj @@ -6,12 +6,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Templates.Razor.Tests.Integration/Util.Templates.Razor.Tests.Integration.csproj b/test/Util.Templates.Razor.Tests.Integration/Util.Templates.Razor.Tests.Integration.csproj index 974dbccda..889289104 100644 --- a/test/Util.Templates.Razor.Tests.Integration/Util.Templates.Razor.Tests.Integration.csproj +++ b/test/Util.Templates.Razor.Tests.Integration/Util.Templates.Razor.Tests.Integration.csproj @@ -6,12 +6,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Tenants.Tests.Integration/Util.Tenants.Tests.Integration.csproj b/test/Util.Tenants.Tests.Integration/Util.Tenants.Tests.Integration.csproj index 7b6b53059..2022b7617 100644 --- a/test/Util.Tenants.Tests.Integration/Util.Tenants.Tests.Integration.csproj +++ b/test/Util.Tenants.Tests.Integration/Util.Tenants.Tests.Integration.csproj @@ -8,14 +8,14 @@ - - + + - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Tenants.Tests/Util.Tenants.Tests.csproj b/test/Util.Tenants.Tests/Util.Tenants.Tests.csproj index f0c696170..6a2921694 100644 --- a/test/Util.Tenants.Tests/Util.Tenants.Tests.csproj +++ b/test/Util.Tenants.Tests/Util.Tenants.Tests.csproj @@ -7,9 +7,9 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Ui.NgAlain.Tests/Util.Ui.NgAlain.Tests.csproj b/test/Util.Ui.NgAlain.Tests/Util.Ui.NgAlain.Tests.csproj index a6cff91f4..ce32488cb 100644 --- a/test/Util.Ui.NgAlain.Tests/Util.Ui.NgAlain.Tests.csproj +++ b/test/Util.Ui.NgAlain.Tests/Util.Ui.NgAlain.Tests.csproj @@ -6,12 +6,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Ui.NgZorro.Tests/Util.Ui.NgZorro.Tests.csproj b/test/Util.Ui.NgZorro.Tests/Util.Ui.NgZorro.Tests.csproj index f5b0b8b3f..f8682710a 100644 --- a/test/Util.Ui.NgZorro.Tests/Util.Ui.NgZorro.Tests.csproj +++ b/test/Util.Ui.NgZorro.Tests/Util.Ui.NgZorro.Tests.csproj @@ -6,12 +6,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Ui.Tests/Util.Ui.Tests.csproj b/test/Util.Ui.Tests/Util.Ui.Tests.csproj index b5c299bd1..ea4571476 100644 --- a/test/Util.Ui.Tests/Util.Ui.Tests.csproj +++ b/test/Util.Ui.Tests/Util.Ui.Tests.csproj @@ -7,8 +7,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Util.Validation.Tests/Util.Validation.Tests.csproj b/test/Util.Validation.Tests/Util.Validation.Tests.csproj index 70a2aa8ba..c04ff8b04 100644 --- a/test/Util.Validation.Tests/Util.Validation.Tests.csproj +++ b/test/Util.Validation.Tests/Util.Validation.Tests.csproj @@ -6,12 +6,12 @@ - - + + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all