From efa694f4d03778cb177437a5a71d85ed9ab33474 Mon Sep 17 00:00:00 2001 From: "hualin.zhu" Date: Tue, 23 Apr 2024 19:07:53 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20upgrade=20to=20.net8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Application/Application.csproj | 36 ++++++++-------- .../AddEdit/AddEditCustomerCommand.cs | 2 +- .../Commands/Delete/DeleteCustomerCommand.cs | 2 +- .../Commands/Import/ImportCustomersCommand.cs | 2 +- .../AddEdit/AddEditDocumentTypeCommand.cs | 2 +- .../Delete/DeleteDocumentTypeCommand.cs | 4 +- .../SaveChangedKeyValuesCommand.cs | 2 +- src/Domain/Domain.csproj | 4 +- src/Infrastructure/Infrastructure.csproj | 42 +++++++++---------- src/SmartAdmin.WebUI/SmartAdmin.WebUI.csproj | 24 ++++------- .../Application.IntegrationTests.csproj | 2 +- .../Application.UnitTests.csproj | 2 +- .../Domain.UnitTests/Domain.UnitTests.csproj | 2 +- 13 files changed, 60 insertions(+), 66 deletions(-) diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj index 99a4f885..97cad8cb 100644 --- a/src/Application/Application.csproj +++ b/src/Application/Application.csproj @@ -1,38 +1,38 @@ - net7.0 + net8.0 CleanArchitecture.Razor.Application CleanArchitecture.Razor.Application enable - - + + - + - - + + - + - - - - + + + + - - - - - - - + + + + + + + diff --git a/src/Application/Customers/Commands/AddEdit/AddEditCustomerCommand.cs b/src/Application/Customers/Commands/AddEdit/AddEditCustomerCommand.cs index 4f5fddc8..84cc28d2 100644 --- a/src/Application/Customers/Commands/AddEdit/AddEditCustomerCommand.cs +++ b/src/Application/Customers/Commands/AddEdit/AddEditCustomerCommand.cs @@ -10,7 +10,7 @@ public class AddEditCustomerCommand : CustomerDto, IRequest>, IMapFr { public string CacheKey => CustomerCacheKey.GetAllCacheKey; - public CancellationTokenSource ResetCacheToken => CustomerCacheTokenSource.ResetCacheToken; + public CancellationTokenSource SharedExpiryTokenSource => CustomerCacheTokenSource.ResetCacheToken; } public class AddEditCustomerCommandHandler : IRequestHandler> diff --git a/src/Application/Customers/Commands/Delete/DeleteCustomerCommand.cs b/src/Application/Customers/Commands/Delete/DeleteCustomerCommand.cs index e138bbd4..4ce02adb 100644 --- a/src/Application/Customers/Commands/Delete/DeleteCustomerCommand.cs +++ b/src/Application/Customers/Commands/Delete/DeleteCustomerCommand.cs @@ -10,7 +10,7 @@ public class DeleteCustomerCommand: IRequest, ICacheInvalidator public int Id { get; set; } public string CacheKey => CustomerCacheKey.GetAllCacheKey; - public CancellationTokenSource ResetCacheToken => CustomerCacheTokenSource.ResetCacheToken; + public CancellationTokenSource SharedExpiryTokenSource => CustomerCacheTokenSource.ResetCacheToken; } public class DeleteCheckedCustomersCommand : IRequest, ICacheInvalidator { diff --git a/src/Application/Customers/Commands/Import/ImportCustomersCommand.cs b/src/Application/Customers/Commands/Import/ImportCustomersCommand.cs index b51069d6..dc9b084d 100644 --- a/src/Application/Customers/Commands/Import/ImportCustomersCommand.cs +++ b/src/Application/Customers/Commands/Import/ImportCustomersCommand.cs @@ -13,7 +13,7 @@ public class ImportCustomersCommand : IRequest, ICacheInvalidator public byte[] Data { get; set; } public string CacheKey => CustomerCacheKey.GetAllCacheKey; - public CancellationTokenSource ResetCacheToken => CustomerCacheTokenSource.ResetCacheToken; + public CancellationTokenSource SharedExpiryTokenSource => CustomerCacheTokenSource.ResetCacheToken; } public class CreateCustomerTemplateCommand : IRequest { diff --git a/src/Application/DocumentTypes/Commands/AddEdit/AddEditDocumentTypeCommand.cs b/src/Application/DocumentTypes/Commands/AddEdit/AddEditDocumentTypeCommand.cs index 4f7ec679..b174fef8 100644 --- a/src/Application/DocumentTypes/Commands/AddEdit/AddEditDocumentTypeCommand.cs +++ b/src/Application/DocumentTypes/Commands/AddEdit/AddEditDocumentTypeCommand.cs @@ -10,7 +10,7 @@ public class AddEditDocumentTypeCommand : DocumentTypeDto, IRequest> { public string CacheKey => string.Empty; - public CancellationTokenSource ResetCacheToken => DocumentTypeCacheTokenSource.ResetCacheToken; + public CancellationTokenSource SharedExpiryTokenSource => DocumentTypeCacheTokenSource.ResetCacheToken; } public class AddEditDocumentTypeCommandHandler : IRequestHandler> diff --git a/src/Application/DocumentTypes/Commands/Delete/DeleteDocumentTypeCommand.cs b/src/Application/DocumentTypes/Commands/Delete/DeleteDocumentTypeCommand.cs index 7b3e3a9f..09138b6b 100644 --- a/src/Application/DocumentTypes/Commands/Delete/DeleteDocumentTypeCommand.cs +++ b/src/Application/DocumentTypes/Commands/Delete/DeleteDocumentTypeCommand.cs @@ -11,7 +11,7 @@ public class DeleteDocumentTypeCommand: IRequest, ICacheInvalidator public string CacheKey => DocumentTypeCacheKey.GetAllCacheKey; - public CancellationTokenSource ResetCacheToken => DocumentTypeCacheTokenSource.ResetCacheToken; + public CancellationTokenSource SharedExpiryTokenSource => DocumentTypeCacheTokenSource.ResetCacheToken; } public class DeleteCheckedDocumentTypesCommand : IRequest, ICacheInvalidator { @@ -19,7 +19,7 @@ public class DeleteCheckedDocumentTypesCommand : IRequest, ICacheInvalid public string CacheKey => DocumentTypeCacheKey.GetAllCacheKey; - public CancellationTokenSource ResetCacheToken => DocumentTypeCacheTokenSource.ResetCacheToken; + public CancellationTokenSource SharedExpiryTokenSource => DocumentTypeCacheTokenSource.ResetCacheToken; } public class DeleteDocumentTypeCommandHandler : IRequestHandler, diff --git a/src/Application/KeyValues/Commands/SaveChanged/SaveChangedKeyValuesCommand.cs b/src/Application/KeyValues/Commands/SaveChanged/SaveChangedKeyValuesCommand.cs index 68641365..e174bfe2 100644 --- a/src/Application/KeyValues/Commands/SaveChanged/SaveChangedKeyValuesCommand.cs +++ b/src/Application/KeyValues/Commands/SaveChanged/SaveChangedKeyValuesCommand.cs @@ -12,7 +12,7 @@ public class SaveChangedKeyValuesCommand:IRequest, ICacheInvalidator public string CacheKey => KeyValueCacheKey.GetAllCacheKey; - public CancellationTokenSource ResetCacheToken => KeyValueCacheTokenSource.ResetCacheToken; + public CancellationTokenSource SharedExpiryTokenSource => KeyValueCacheTokenSource.ResetCacheToken; } public class SaveChangedKeyValuesCommandHandler : IRequestHandler diff --git a/src/Domain/Domain.csproj b/src/Domain/Domain.csproj index aa2b7706..65b79d7e 100644 --- a/src/Domain/Domain.csproj +++ b/src/Domain/Domain.csproj @@ -1,7 +1,7 @@ - + - net7.0 + net8.0 CleanArchitecture.Razor.Domain CleanArchitecture.Razor.Domain enable diff --git a/src/Infrastructure/Infrastructure.csproj b/src/Infrastructure/Infrastructure.csproj index 34754138..7eac842d 100644 --- a/src/Infrastructure/Infrastructure.csproj +++ b/src/Infrastructure/Infrastructure.csproj @@ -1,36 +1,36 @@ - net7.0 + net8.0 CleanArchitecture.Razor.Infrastructure CleanArchitecture.Razor.Infrastructure enable - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/src/SmartAdmin.WebUI/SmartAdmin.WebUI.csproj b/src/SmartAdmin.WebUI/SmartAdmin.WebUI.csproj index 29c57a89..2264d455 100644 --- a/src/SmartAdmin.WebUI/SmartAdmin.WebUI.csproj +++ b/src/SmartAdmin.WebUI/SmartAdmin.WebUI.csproj @@ -1,34 +1,28 @@ - latest - net7.0 + net8.0 enable aspnet-SmartAdmin.WebUI-E383D1D3-A583-4134-97C9-6DFEB2F1657F - - - + - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + \ No newline at end of file diff --git a/tests/Application.IntegrationTests/Application.IntegrationTests.csproj b/tests/Application.IntegrationTests/Application.IntegrationTests.csproj index 2619b34f..0c55eae7 100644 --- a/tests/Application.IntegrationTests/Application.IntegrationTests.csproj +++ b/tests/Application.IntegrationTests/Application.IntegrationTests.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 CleanArchitecture.Application.IntegrationTests CleanArchitecture.Application.IntegrationTests diff --git a/tests/Application.UnitTests/Application.UnitTests.csproj b/tests/Application.UnitTests/Application.UnitTests.csproj index aa23f557..3b3fbd60 100644 --- a/tests/Application.UnitTests/Application.UnitTests.csproj +++ b/tests/Application.UnitTests/Application.UnitTests.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 CleanArchitecture.Application.UnitTests CleanArchitecture.Application.UnitTests diff --git a/tests/Domain.UnitTests/Domain.UnitTests.csproj b/tests/Domain.UnitTests/Domain.UnitTests.csproj index 0981d24b..12527a06 100644 --- a/tests/Domain.UnitTests/Domain.UnitTests.csproj +++ b/tests/Domain.UnitTests/Domain.UnitTests.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 CleanArchitecture.Domain.UnitTests CleanArchitecture.Domain.UnitTests