From 5ea968cee531c545177ba05a1bc6c987c62b9e7b Mon Sep 17 00:00:00 2001 From: Hugo Ramos Montesinos Date: Fri, 26 Apr 2024 12:57:14 +0200 Subject: [PATCH 1/5] Revised changes --- .../Csv/CsvInputFormatter.cs | 2 +- src/Encamina.Enmarcha.AspNet.Mvc.Formatters/Csv/Helpers.cs | 2 +- .../Bindings/CustomDateTimeModelBinder.cs | 2 +- .../Bindings/CustomDateTimeModelBinderProvider.cs | 6 +++--- .../Extensions/IMvcBuilderExtensions.cs | 2 +- .../Filters/ApiKeyAsyncAuthorizationFilter.cs | 4 ++-- .../Extensions/IServiceCollectionExtensions.cs | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Encamina.Enmarcha.AspNet.Mvc.Formatters/Csv/CsvInputFormatter.cs b/src/Encamina.Enmarcha.AspNet.Mvc.Formatters/Csv/CsvInputFormatter.cs index 8ab05b2..23088b0 100644 --- a/src/Encamina.Enmarcha.AspNet.Mvc.Formatters/Csv/CsvInputFormatter.cs +++ b/src/Encamina.Enmarcha.AspNet.Mvc.Formatters/Csv/CsvInputFormatter.cs @@ -113,6 +113,6 @@ private async Task ReadStreamAsync(Type type, Stream stream) return array; } - return list; + return list!; } } \ No newline at end of file diff --git a/src/Encamina.Enmarcha.AspNet.Mvc.Formatters/Csv/Helpers.cs b/src/Encamina.Enmarcha.AspNet.Mvc.Formatters/Csv/Helpers.cs index b84b96c..ee3edd8 100644 --- a/src/Encamina.Enmarcha.AspNet.Mvc.Formatters/Csv/Helpers.cs +++ b/src/Encamina.Enmarcha.AspNet.Mvc.Formatters/Csv/Helpers.cs @@ -18,7 +18,7 @@ internal static string GetDisplayName(PropertyInfo property) return string.IsNullOrWhiteSpace(attrName) ? property.Name : attrName; } - internal static string GetAttributeDisplayName(PropertyInfo property) + internal static string? GetAttributeDisplayName(PropertyInfo property) { var atts = property.GetCustomAttributes(typeof(DisplayNameAttribute), true); diff --git a/src/Encamina.Enmarcha.AspNet.Mvc/Bindings/CustomDateTimeModelBinder.cs b/src/Encamina.Enmarcha.AspNet.Mvc/Bindings/CustomDateTimeModelBinder.cs index 2f2a8dc..2d08e50 100644 --- a/src/Encamina.Enmarcha.AspNet.Mvc/Bindings/CustomDateTimeModelBinder.cs +++ b/src/Encamina.Enmarcha.AspNet.Mvc/Bindings/CustomDateTimeModelBinder.cs @@ -80,7 +80,7 @@ public Task BindModelAsync(ModelBindingContext bindingContext) return Task.CompletedTask; } - private static DateTime? ParseDateTime(string dateToParse, string[] formats = null) + private static DateTime? ParseDateTime(string dateToParse, string[]? formats = null) { if (formats == null) { diff --git a/src/Encamina.Enmarcha.AspNet.Mvc/Bindings/CustomDateTimeModelBinderProvider.cs b/src/Encamina.Enmarcha.AspNet.Mvc/Bindings/CustomDateTimeModelBinderProvider.cs index de71318..03147f8 100644 --- a/src/Encamina.Enmarcha.AspNet.Mvc/Bindings/CustomDateTimeModelBinderProvider.cs +++ b/src/Encamina.Enmarcha.AspNet.Mvc/Bindings/CustomDateTimeModelBinderProvider.cs @@ -13,7 +13,7 @@ public class CustomDateTimeModelBinderProvider : IModelBinderProvider /// /// Initializes a new instance of the class. /// - public CustomDateTimeModelBinderProvider() : this(null) + public CustomDateTimeModelBinderProvider() : this(null!) { } @@ -27,10 +27,10 @@ public CustomDateTimeModelBinderProvider(string customDateTimeFormat) } /// - public virtual IModelBinder GetBinder(ModelBinderProviderContext context) + public virtual IModelBinder? GetBinder(ModelBinderProviderContext context) { return CustomDateTimeModelBinder.SupportedDateTimeTypes.Contains(context.Metadata.ModelType) ? new CustomDateTimeModelBinder(customDateTimeFormat) - : (IModelBinder)null; + : (IModelBinder?)null; } } diff --git a/src/Encamina.Enmarcha.AspNet.Mvc/Extensions/IMvcBuilderExtensions.cs b/src/Encamina.Enmarcha.AspNet.Mvc/Extensions/IMvcBuilderExtensions.cs index b0a61e5..a84123c 100644 --- a/src/Encamina.Enmarcha.AspNet.Mvc/Extensions/IMvcBuilderExtensions.cs +++ b/src/Encamina.Enmarcha.AspNet.Mvc/Extensions/IMvcBuilderExtensions.cs @@ -46,7 +46,7 @@ public static IMvcBuilder AddApiKeyAuthorizationFilter(this IMvcBuilder builder) return builder.AddApiKeyAuthorizationFilter(setupOptions: null); } - private static IMvcBuilder AddApiKeyAuthorizationFilter(this IMvcBuilder builder, Action> setupOptions) + private static IMvcBuilder AddApiKeyAuthorizationFilter(this IMvcBuilder builder, Action>? setupOptions) { var options = builder.Services.AddOptions(); diff --git a/src/Encamina.Enmarcha.AspNet.Mvc/Filters/ApiKeyAsyncAuthorizationFilter.cs b/src/Encamina.Enmarcha.AspNet.Mvc/Filters/ApiKeyAsyncAuthorizationFilter.cs index 0babb46..86d00e1 100644 --- a/src/Encamina.Enmarcha.AspNet.Mvc/Filters/ApiKeyAsyncAuthorizationFilter.cs +++ b/src/Encamina.Enmarcha.AspNet.Mvc/Filters/ApiKeyAsyncAuthorizationFilter.cs @@ -75,14 +75,14 @@ public async Task OnAuthorizationAsync(AuthorizationFilterContext context) context.Result = new UnauthorizedResult(); } - private static string GetApiKeyName(ActionDescriptor descriptor) + private static string? GetApiKeyName(ActionDescriptor descriptor) { return descriptor is ControllerActionDescriptor controllerActionDescriptor ? GetApiKeyName(controllerActionDescriptor.MethodInfo) ?? GetApiKeyName(controllerActionDescriptor.ControllerTypeInfo) : null; } - private static string GetApiKeyName(MemberInfo memberInfo) + private static string? GetApiKeyName(MemberInfo memberInfo) { return memberInfo?.GetCustomAttribute(true)?.ApiKeyName; } diff --git a/src/Encamina.Enmarcha.AspNet.OpenApi.Swashbuckle/Extensions/IServiceCollectionExtensions.cs b/src/Encamina.Enmarcha.AspNet.OpenApi.Swashbuckle/Extensions/IServiceCollectionExtensions.cs index a8f5d40..83ec0a6 100644 --- a/src/Encamina.Enmarcha.AspNet.OpenApi.Swashbuckle/Extensions/IServiceCollectionExtensions.cs +++ b/src/Encamina.Enmarcha.AspNet.OpenApi.Swashbuckle/Extensions/IServiceCollectionExtensions.cs @@ -43,7 +43,7 @@ public static IServiceCollection AddVersionSwaggerGenConfigureOptions(this IServ return services.AddVersionSwaggerGenConfigureOptions(setupOptions: null); } - private static IServiceCollection AddVersionSwaggerGenConfigureOptions(this IServiceCollection services, Action> setupOptions) + private static IServiceCollection AddVersionSwaggerGenConfigureOptions(this IServiceCollection services, Action>? setupOptions) { var options = services.AddOptions(); From d4209b24c77f1777d11784f42acd520124c5b965 Mon Sep 17 00:00:00 2001 From: Hugo Ramos Montesinos Date: Fri, 26 Apr 2024 13:04:23 +0200 Subject: [PATCH 2/5] Updated CHANGELOG.md and Directory.Build.props --- CHANGELOG.md | 1 + Directory.Build.props | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 559d796..744ecde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -79,6 +79,7 @@ Previous classification is not required if changes are simple or all belong to t - Added `RequiredIfAttribute` to validate properties based on the value of another property. - Fixed warnings CS8603 and CS8025 in: - `Encamina.Enmarcha.AI`. + - `Encamina.Enmarcha.AspNet` ## [8.1.5] diff --git a/Directory.Build.props b/Directory.Build.props index b533b2a..8e6111e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -17,7 +17,7 @@ 8.1.6 - preview-07 + preview-08