From 5050a3e296c3f2878d6ed29ee0e0a860e4d51571 Mon Sep 17 00:00:00 2001 From: Mathieu Deslauriers Date: Mon, 1 Jul 2024 13:28:45 -0400 Subject: [PATCH] Update target framework to .NET 8, and Umbraco dependency to 14 --- src/Components/ValidationAttributesComponent.cs | 4 +--- src/Conditionals/ConditionalValidationAttribute.cs | 4 ++-- src/Our.Umbraco.ValidationAttributes.csproj | 5 ++--- src/UmbracoIFormFileExtensionsAttribute.cs | 7 +++---- src/UmbracoMaxFileSizeAttribute.cs | 1 - src/UmbracoRemoteAttribute.cs | 13 +++++-------- 6 files changed, 13 insertions(+), 21 deletions(-) diff --git a/src/Components/ValidationAttributesComponent.cs b/src/Components/ValidationAttributesComponent.cs index 5fc8a9e..e9745c4 100644 --- a/src/Components/ValidationAttributesComponent.cs +++ b/src/Components/ValidationAttributesComponent.cs @@ -1,8 +1,6 @@ using Microsoft.Extensions.Configuration; using Our.Umbraco.ValidationAttributes.Services; using Umbraco.Cms.Core.Composing; -using Umbraco.Cms.Core.Dictionary; -using Umbraco.Cms.Core.Web; using Umbraco.Cms.Web.Common; namespace Our.Umbraco.ValidationAttributes.Components @@ -22,6 +20,6 @@ IConfiguration configuration } public void Initialize() => ValidationAttributesService.Start(_umbracoHelperAccessor, _configuration); - public void Terminate() {} + public void Terminate() { } } } \ No newline at end of file diff --git a/src/Conditionals/ConditionalValidationAttribute.cs b/src/Conditionals/ConditionalValidationAttribute.cs index 7208276..88e9c2d 100644 --- a/src/Conditionals/ConditionalValidationAttribute.cs +++ b/src/Conditionals/ConditionalValidationAttribute.cs @@ -1,10 +1,10 @@ -using Our.Umbraco.ValidationAttributes.Helpers; -using Our.Umbraco.ValidationAttributes.Interfaces; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; using Microsoft.AspNetCore.Mvc.Rendering; +using Our.Umbraco.ValidationAttributes.Helpers; +using Our.Umbraco.ValidationAttributes.Interfaces; namespace Our.Umbraco.ValidationAttributes.Conditionals { diff --git a/src/Our.Umbraco.ValidationAttributes.csproj b/src/Our.Umbraco.ValidationAttributes.csproj index 52c63b7..1139f2b 100644 --- a/src/Our.Umbraco.ValidationAttributes.csproj +++ b/src/Our.Umbraco.ValidationAttributes.csproj @@ -1,6 +1,6 @@ - net5.0 + net8.0 . Our.Umbraco.ValidationAttributes Our.Umbraco.ValidationAttributes @@ -18,8 +18,7 @@ - - + diff --git a/src/UmbracoIFormFileExtensionsAttribute.cs b/src/UmbracoIFormFileExtensionsAttribute.cs index 02b7adf..22eeac9 100644 --- a/src/UmbracoIFormFileExtensionsAttribute.cs +++ b/src/UmbracoIFormFileExtensionsAttribute.cs @@ -1,8 +1,7 @@ using System; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; -using J2N.Collections.Generic; -using Lucene.Net.Analysis.Hunspell; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; using Our.Umbraco.ValidationAttributes.Helpers; @@ -14,7 +13,7 @@ namespace Our.Umbraco.ValidationAttributes [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)] public sealed class UmbracoIFormFileExtensionsAttribute : ValidationAttribute, IClientModelValidator, IUmbracoValidationAttribute { - public string DictionaryKey {get; set;} = "FormFileExtensionsError"; + public string DictionaryKey { get; set; } = "FormFileExtensionsError"; public string[] ValidFileTypes { get; set; } @@ -50,7 +49,7 @@ public override bool IsValid(object value) { IFormFile file = value as IFormFile; bool isValid = true; - + if (file != null) { isValid = ValidFileTypes.Any(x => file.FileName.EndsWith(x)); diff --git a/src/UmbracoMaxFileSizeAttribute.cs b/src/UmbracoMaxFileSizeAttribute.cs index 6b62608..da98ca7 100644 --- a/src/UmbracoMaxFileSizeAttribute.cs +++ b/src/UmbracoMaxFileSizeAttribute.cs @@ -1,6 +1,5 @@ using System; using System.ComponentModel.DataAnnotations; -using Lucene.Net.Analysis.Hunspell; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; using Our.Umbraco.ValidationAttributes.Helpers; diff --git a/src/UmbracoRemoteAttribute.cs b/src/UmbracoRemoteAttribute.cs index 2493b03..cd27404 100644 --- a/src/UmbracoRemoteAttribute.cs +++ b/src/UmbracoRemoteAttribute.cs @@ -1,10 +1,7 @@ -using Our.Umbraco.ValidationAttributes.Helpers; -using Our.Umbraco.ValidationAttributes.Interfaces; -using Our.Umbraco.ValidationAttributes.Services; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; -using Microsoft.Extensions.Configuration; -using Umbraco.Cms.Web.Common; +using Our.Umbraco.ValidationAttributes.Interfaces; +using Our.Umbraco.ValidationAttributes.Services; namespace Our.Umbraco.ValidationAttributes { @@ -19,9 +16,9 @@ public sealed class UmbracoRemoteAttribute : RemoteAttribute, IClientModelValida { public string DictionaryKey { get; set; } - public UmbracoRemoteAttribute(string routeName) : base(routeName) {} - public UmbracoRemoteAttribute(string action, string controller) : base(action, controller) {} - public UmbracoRemoteAttribute(string action, string controller, string areaName) : base(action, controller, areaName) {} + public UmbracoRemoteAttribute(string routeName) : base(routeName) { } + public UmbracoRemoteAttribute(string action, string controller) : base(action, controller) { } + public UmbracoRemoteAttribute(string action, string controller, string areaName) : base(action, controller, areaName) { } public override void AddValidation(ClientModelValidationContext context) {