From c8667233b457984579cf558df1d021ddfc1b312c Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Tue, 11 Jul 2023 16:26:15 +0800 Subject: [PATCH] Enable nullable annotations for Volo.Abp.AspNetCore.Mvc.Contracts --- .../MauiBlazor/MauiBlazorRemoteTenantStore.cs | 2 +- .../MvcCachedApplicationConfigurationClient.cs | 4 ++-- .../Mvc/Client/MvcRemoteTenantStore.cs | 2 +- .../Volo.Abp.AspNetCore.Mvc.Contracts.csproj | 2 ++ .../ApplicationConfigurationDto.cs | 16 ++++++++++++++++ .../ApplicationLocalizationConfigurationDto.cs | 5 ++++- .../ApplicationLocalizationDto.cs | 5 +++++ .../ApplicationLocalizationRequestDto.cs | 2 +- .../ApplicationLocalizationResourceDto.cs | 9 +++++++-- .../ApplicationSettingConfigurationDto.cs | 7 ++++++- .../Mvc/ApplicationConfigurations/ClockDto.cs | 2 +- .../CurrentCultureDto.cs | 16 ++++++++-------- .../ApplicationConfigurations/CurrentUserDto.cs | 16 ++++++++-------- .../DateTimeFormatDto.cs | 14 +++++++------- .../ObjectExtending/EntityExtensionDto.cs | 6 ++++++ .../ObjectExtending/ExtensionEnumDto.cs | 7 ++++++- .../ObjectExtending/ExtensionEnumFieldDto.cs | 4 ++-- .../ExtensionPropertyAttributeDto.cs | 7 ++++++- .../ObjectExtending/ExtensionPropertyDto.cs | 17 ++++++++++++----- .../ObjectExtending/ExtensionPropertyUiDto.cs | 8 ++++++++ .../ExtensionPropertyUiLookupDto.cs | 10 +++++----- .../ObjectExtending/LocalizableStringDto.cs | 5 ++--- .../ObjectExtending/ModuleExtensionDto.cs | 6 ++++++ .../ObjectExtending/ObjectExtensionsDto.cs | 6 ++++++ .../Mvc/ApplicationConfigurations/TimingDto.cs | 15 +++++++++++++-- .../Mvc/MultiTenancy/CurrentTenantDto.cs | 2 +- .../Mvc/MultiTenancy/FindTenantResultDto.cs | 2 +- .../AbpApplicationConfigurationAppService.cs | 6 +++--- .../CachedObjectExtensionsDtoService.cs | 4 ++-- 29 files changed, 148 insertions(+), 59 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/MauiBlazorRemoteTenantStore.cs b/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/MauiBlazorRemoteTenantStore.cs index 235fe74354..d17a2b6f87 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/MauiBlazorRemoteTenantStore.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/MauiBlazorRemoteTenantStore.cs @@ -98,7 +98,7 @@ public class MauiBlazorRemoteTenantStore : ITenantStore, ITransientDependency return null; } - return new TenantConfiguration(tenantResultDto.TenantId.Value, tenantResultDto.Name); + return new TenantConfiguration(tenantResultDto.TenantId.Value, tenantResultDto.Name!); } protected virtual string CreateCacheKey(string tenantName) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs index eb3c84bc78..b7d8a0df40 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcCachedApplicationConfigurationClient.cs @@ -37,7 +37,7 @@ public class MvcCachedApplicationConfigurationClient : ICachedApplicationConfigu Cache = cache; } - public async Task GetAsync() + public async Task GetAsync() { var cacheKey = CreateCacheKey(); var httpContext = HttpContextAccessor?.HttpContext; @@ -85,7 +85,7 @@ public class MvcCachedApplicationConfigurationClient : ICachedApplicationConfigu return config; } - public ApplicationConfigurationDto? Get() + public ApplicationConfigurationDto Get() { var cacheKey = CreateCacheKey(); var httpContext = HttpContextAccessor?.HttpContext; diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcRemoteTenantStore.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcRemoteTenantStore.cs index 7b3670eb2a..aa9fc4beb8 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcRemoteTenantStore.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo/Abp/AspNetCore/Mvc/Client/MvcRemoteTenantStore.cs @@ -146,7 +146,7 @@ public class MvcRemoteTenantStore : ITenantStore, ITransientDependency return null; } - return new TenantConfiguration(tenantResultDto.TenantId.Value, tenantResultDto.Name); + return new TenantConfiguration(tenantResultDto.TenantId.Value, tenantResultDto.Name!); } protected virtual string CreateCacheKey(string tenantName) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.csproj index a89f7c60a7..e0ddc7cdbe 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo.Abp.AspNetCore.Mvc.Contracts.csproj @@ -5,6 +5,8 @@ netstandard2.0;netstandard2.1;net7.0 + enable + Nullable Volo.Abp.AspNetCore.Mvc.Contracts Volo.Abp.AspNetCore.Mvc.Contracts $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationDto.cs index 61b5ec18db..e9c079cc84 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationConfigurationDto.cs @@ -31,4 +31,20 @@ public class ApplicationConfigurationDto : IHasExtraProperties public ObjectExtensionsDto ObjectExtensions { get; set; } public ExtraPropertyDictionary ExtraProperties { get; set; } + + public ApplicationConfigurationDto() + { + Localization = new ApplicationLocalizationConfigurationDto(); + Auth = new ApplicationAuthConfigurationDto(); + Setting = new ApplicationSettingConfigurationDto(); + CurrentUser = new CurrentUserDto(); + Features = new ApplicationFeatureConfigurationDto(); + GlobalFeatures = new ApplicationGlobalFeatureConfigurationDto(); + MultiTenancy = new MultiTenancyInfoDto(); + CurrentTenant = new CurrentTenantDto(); + Timing = new TimingDto(); + Clock = new ClockDto(); + ObjectExtensions = new ObjectExtensionsDto(); + ExtraProperties = new ExtraPropertyDictionary(); + } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationConfigurationDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationConfigurationDto.cs index b1c0c16e76..5ae2a8ed2d 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationConfigurationDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationConfigurationDto.cs @@ -28,7 +28,7 @@ public class ApplicationLocalizationConfigurationDto public CurrentCultureDto CurrentCulture { get; set; } - public string DefaultResourceName { get; set; } + public string? DefaultResourceName { get; set; } public Dictionary> LanguagesMap { get; set; } @@ -38,5 +38,8 @@ public class ApplicationLocalizationConfigurationDto { Values = new Dictionary>(); Languages = new List(); + CurrentCulture = new CurrentCultureDto(); + LanguagesMap = new Dictionary>(); + LanguageFilesMap = new Dictionary>(); } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationDto.cs index d301490bed..2bbc604c95 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationDto.cs @@ -7,4 +7,9 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations; public class ApplicationLocalizationDto { public Dictionary Resources { get; set; } + + public ApplicationLocalizationDto() + { + Resources = new Dictionary(); + } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationRequestDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationRequestDto.cs index 535d572b3f..3b6debe695 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationRequestDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationRequestDto.cs @@ -5,7 +5,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations; public class ApplicationLocalizationRequestDto { [Required] - public string CultureName { get; set; } + public string CultureName { get; set; } = default!; public bool OnlyDynamics { get; set; } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationResourceDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationResourceDto.cs index a7200423d2..bca4ccd8ee 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationResourceDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationLocalizationResourceDto.cs @@ -7,6 +7,11 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations; public class ApplicationLocalizationResourceDto { public Dictionary Texts { get; set; } - - public string[] BaseResources { get; set; } + + public string[] BaseResources { get; set; } = default!; + + public ApplicationLocalizationResourceDto() + { + Texts = new Dictionary(); + } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationSettingConfigurationDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationSettingConfigurationDto.cs index a1fbba2bbf..1ae30828cf 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationSettingConfigurationDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ApplicationSettingConfigurationDto.cs @@ -6,5 +6,10 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations; [Serializable] public class ApplicationSettingConfigurationDto { - public Dictionary Values { get; set; } + public Dictionary Values { get; set; } + + public ApplicationSettingConfigurationDto() + { + Values = new Dictionary(); + } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ClockDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ClockDto.cs index 5112ac80ed..96cd5bd38b 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ClockDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ClockDto.cs @@ -2,5 +2,5 @@ public class ClockDto { - public string Kind { get; set; } + public string Kind { get; set; } = default!; } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/CurrentCultureDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/CurrentCultureDto.cs index 83f1e0c803..054e626844 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/CurrentCultureDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/CurrentCultureDto.cs @@ -5,21 +5,21 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations; [Serializable] public class CurrentCultureDto { - public string DisplayName { get; set; } + public string DisplayName { get; set; } = default!; - public string EnglishName { get; set; } + public string EnglishName { get; set; } = default!; - public string ThreeLetterIsoLanguageName { get; set; } + public string ThreeLetterIsoLanguageName { get; set; } = default!; - public string TwoLetterIsoLanguageName { get; set; } + public string TwoLetterIsoLanguageName { get; set; } = default!; public bool IsRightToLeft { get; set; } - public string CultureName { get; set; } + public string CultureName { get; set; } = default!; - public string Name { get; set; } + public string Name { get; set; } = default!; - public string NativeName { get; set; } + public string NativeName { get; set; } = default!; - public DateTimeFormatDto DateTimeFormat { get; set; } + public DateTimeFormatDto DateTimeFormat { get; set; } = default!; } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/CurrentUserDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/CurrentUserDto.cs index 08a8c4c873..63a4b7a0e9 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/CurrentUserDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/CurrentUserDto.cs @@ -15,23 +15,23 @@ public class CurrentUserDto public Guid? ImpersonatorTenantId { get; set; } - public string ImpersonatorUserName { get; set; } + public string? ImpersonatorUserName { get; set; } - public string ImpersonatorTenantName { get; set; } + public string? ImpersonatorTenantName { get; set; } - public string UserName { get; set; } + public string? UserName { get; set; } - public string Name { get; set; } + public string? Name { get; set; } - public string SurName { get; set; } + public string? SurName { get; set; } - public string Email { get; set; } + public string? Email { get; set; } public bool EmailVerified { get; set; } - public string PhoneNumber { get; set; } + public string? PhoneNumber { get; set; } public bool PhoneNumberVerified { get; set; } - public string[] Roles { get; set; } + public string[] Roles { get; set; } = default!; } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/DateTimeFormatDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/DateTimeFormatDto.cs index 5f5ad14a5a..a16282efdd 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/DateTimeFormatDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/DateTimeFormatDto.cs @@ -2,17 +2,17 @@ public class DateTimeFormatDto { - public string CalendarAlgorithmType { get; set; } + public string CalendarAlgorithmType { get; set; } = default!; - public string DateTimeFormatLong { get; set; } + public string DateTimeFormatLong { get; set; } = default!; - public string ShortDatePattern { get; set; } + public string ShortDatePattern { get; set; } = default!; - public string FullDateTimePattern { get; set; } + public string FullDateTimePattern { get; set; } = default!; - public string DateSeparator { get; set; } + public string DateSeparator { get; set; } = default!; - public string ShortTimePattern { get; set; } + public string ShortTimePattern { get; set; } = default!; - public string LongTimePattern { get; set; } + public string LongTimePattern { get; set; } = default!; } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/EntityExtensionDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/EntityExtensionDto.cs index 742da779f6..533349527c 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/EntityExtensionDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/EntityExtensionDto.cs @@ -9,4 +9,10 @@ public class EntityExtensionDto public Dictionary Properties { get; set; } public Dictionary Configuration { get; set; } + + public EntityExtensionDto() + { + Properties = new Dictionary(); + Configuration = new Dictionary(); + } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionEnumDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionEnumDto.cs index 24e9ec9a2f..cd1d210005 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionEnumDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionEnumDto.cs @@ -8,5 +8,10 @@ public class ExtensionEnumDto { public List Fields { get; set; } - public string LocalizationResource { get; set; } + public string? LocalizationResource { get; set; } + + public ExtensionEnumDto() + { + Fields = new List(); + } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionEnumFieldDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionEnumFieldDto.cs index 13728d8409..03c0213015 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionEnumFieldDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionEnumFieldDto.cs @@ -5,7 +5,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending; [Serializable] public class ExtensionEnumFieldDto { - public string Name { get; set; } + public string? Name { get; set; } - public object Value { get; set; } + public object? Value { get; set; } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyAttributeDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyAttributeDto.cs index 492756168d..ea28fb3cb9 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyAttributeDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyAttributeDto.cs @@ -6,7 +6,12 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending; [Serializable] public class ExtensionPropertyAttributeDto { - public string TypeSimple { get; set; } + public string TypeSimple { get; set; } = default!; public Dictionary Config { get; set; } + + public ExtensionPropertyAttributeDto() + { + Config = new Dictionary(); + } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyDto.cs index a1fb628e1a..68a915309d 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyDto.cs @@ -7,12 +7,11 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending; [Serializable] public class ExtensionPropertyDto { - public string Type { get; set; } + public string Type { get; set; } = default!; - public string TypeSimple { get; set; } + public string TypeSimple { get; set; } = default!; - [CanBeNull] - public LocalizableStringDto DisplayName { get; set; } + public LocalizableStringDto? DisplayName { get; set; } public ExtensionPropertyApiDto Api { get; set; } @@ -22,5 +21,13 @@ public class ExtensionPropertyDto public Dictionary Configuration { get; set; } - public object DefaultValue { get; set; } + public object? DefaultValue { get; set; } + + public ExtensionPropertyDto() + { + Api = new ExtensionPropertyApiDto(); + Ui = new ExtensionPropertyUiDto(); + Attributes = new List(); + Configuration = new Dictionary(); + } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyUiDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyUiDto.cs index cd43df5446..2c90299b15 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyUiDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyUiDto.cs @@ -9,4 +9,12 @@ public class ExtensionPropertyUiDto public ExtensionPropertyUiFormDto OnCreateForm { get; set; } public ExtensionPropertyUiFormDto OnEditForm { get; set; } public ExtensionPropertyUiLookupDto Lookup { get; set; } + + public ExtensionPropertyUiDto() + { + OnTable = new ExtensionPropertyUiTableDto(); + OnCreateForm = new ExtensionPropertyUiFormDto(); + OnEditForm = new ExtensionPropertyUiFormDto(); + Lookup = new ExtensionPropertyUiLookupDto(); + } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyUiLookupDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyUiLookupDto.cs index b9bc94399c..ae5fd451de 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyUiLookupDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ExtensionPropertyUiLookupDto.cs @@ -5,9 +5,9 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending; [Serializable] public class ExtensionPropertyUiLookupDto { - public string Url { get; set; } - public string ResultListPropertyName { get; set; } - public string DisplayPropertyName { get; set; } - public string ValuePropertyName { get; set; } - public string FilterParamName { get; set; } + public string Url { get; set; } = default!; + public string ResultListPropertyName { get; set; } = default!; + public string DisplayPropertyName { get; set; } = default!; + public string ValuePropertyName { get; set; } = default!; + public string FilterParamName { get; set; } = default!; } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/LocalizableStringDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/LocalizableStringDto.cs index 8127a90bd7..2fc1989ad5 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/LocalizableStringDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/LocalizableStringDto.cs @@ -9,10 +9,9 @@ public class LocalizableStringDto [NotNull] public string Name { get; private set; } - [CanBeNull] - public string Resource { get; set; } + public string? Resource { get; set; } - public LocalizableStringDto([NotNull] string name, string resource = null) + public LocalizableStringDto([NotNull] string name, string? resource = null) { Name = Check.NotNullOrEmpty(name, nameof(name)); Resource = resource; diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ModuleExtensionDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ModuleExtensionDto.cs index aadd08cd28..50c944f6ec 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ModuleExtensionDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ModuleExtensionDto.cs @@ -9,4 +9,10 @@ public class ModuleExtensionDto public Dictionary Entities { get; set; } public Dictionary Configuration { get; set; } + + public ModuleExtensionDto() + { + Entities = new Dictionary(); + Configuration = new Dictionary(); + } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ObjectExtensionsDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ObjectExtensionsDto.cs index f63935847b..b07855057b 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ObjectExtensionsDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/ObjectExtensionsDto.cs @@ -9,4 +9,10 @@ public class ObjectExtensionsDto public Dictionary Modules { get; set; } public Dictionary Enums { get; set; } + + public ObjectExtensionsDto() + { + Modules = new Dictionary(); + Enums = new Dictionary(); + } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/TimingDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/TimingDto.cs index ca03407ee5..7aa38ede79 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/TimingDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/TimingDto.cs @@ -3,6 +3,11 @@ public class TimingDto { public TimeZone TimeZone { get; set; } + + public TimingDto() + { + TimeZone = new TimeZone(); + } } public class TimeZone @@ -10,14 +15,20 @@ public class TimeZone public IanaTimeZone Iana { get; set; } public WindowsTimeZone Windows { get; set; } + + public TimeZone() + { + Iana = new IanaTimeZone(); + Windows = new WindowsTimeZone(); + } } public class WindowsTimeZone { - public string TimeZoneId { get; set; } + public string? TimeZoneId { get; set; } } public class IanaTimeZone { - public string TimeZoneName { get; set; } + public string? TimeZoneName { get; set; } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/MultiTenancy/CurrentTenantDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/MultiTenancy/CurrentTenantDto.cs index b8b361e7c8..d8c1351b3e 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/MultiTenancy/CurrentTenantDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/MultiTenancy/CurrentTenantDto.cs @@ -8,7 +8,7 @@ public class CurrentTenantDto { public Guid? Id { get; set; } - public string Name { get; set; } + public string? Name { get; set; } public bool IsAvailable { get; set; } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/MultiTenancy/FindTenantResultDto.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/MultiTenancy/FindTenantResultDto.cs index 64bcc77554..599b0b8a67 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/MultiTenancy/FindTenantResultDto.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.Contracts/Volo/Abp/AspNetCore/Mvc/MultiTenancy/FindTenantResultDto.cs @@ -9,7 +9,7 @@ public class FindTenantResultDto public Guid? TenantId { get; set; } - public string Name { get; set; } + public string? Name { get; set; } public bool IsActive { get; set; } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs index 4a6560b08a..e15bc7c136 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/AbpApplicationConfigurationAppService.cs @@ -127,7 +127,7 @@ public class AbpApplicationConfigurationAppService : ApplicationService, IAbpApp return new CurrentTenantDto() { Id = CurrentTenant.Id, - Name = CurrentTenant.Name, + Name = CurrentTenant.Name!, IsAvailable = CurrentTenant.IsAvailable }; } @@ -286,7 +286,7 @@ public class AbpApplicationConfigurationAppService : ApplicationService, IAbpApp { var result = new ApplicationSettingConfigurationDto { - Values = new Dictionary() + Values = new Dictionary() }; var settingDefinitions = _settingDefinitionManager.GetAll().Where(x => x.IsVisibleToClients); @@ -356,7 +356,7 @@ public class AbpApplicationConfigurationAppService : ApplicationService, IAbpApp { return new ClockDto { - Kind = Enum.GetName(typeof(DateTimeKind), _abpClockOptions.Kind) + Kind = Enum.GetName(typeof(DateTimeKind), _abpClockOptions.Kind)! }; } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/CachedObjectExtensionsDtoService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/CachedObjectExtensionsDtoService.cs index 6b99451b77..66232802c0 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/CachedObjectExtensionsDtoService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/CachedObjectExtensionsDtoService.cs @@ -231,7 +231,7 @@ public class CachedObjectExtensionsDtoService : ICachedObjectExtensionsDtoServic foreach (var enumProperty in enumProperties) { // ReSharper disable once AssignNullToNotNullAttribute (enumProperty.Type.FullName can not be null for this case) - objectExtensionsDto.Enums[enumProperty.Type.FullName] = CreateExtensionEnumDto(enumProperty); + objectExtensionsDto.Enums[enumProperty.Type.FullName!] = CreateExtensionEnumDto(enumProperty); } } @@ -248,7 +248,7 @@ public class CachedObjectExtensionsDtoService : ICachedObjectExtensionsDtoServic extensionEnumDto.Fields.Add( new ExtensionEnumFieldDto { - Name = enumProperty.Type.GetEnumName(enumValue), + Name = enumProperty.Type.GetEnumName(enumValue)!, Value = enumValue } );