Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update target framework to .NET 8, and Umbraco dependency to 14 #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update target framework to .NET 8, and Umbraco dependency to 14 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/Components/ValidationAttributesComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -22,6 +20,6 @@ IConfiguration configuration
}

public void Initialize() => ValidationAttributesService.Start(_umbracoHelperAccessor, _configuration);
public void Terminate() {}
public void Terminate() { }
}
}
4 changes: 2 additions & 2 deletions src/Conditionals/ConditionalValidationAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
5 changes: 2 additions & 3 deletions src/Our.Umbraco.ValidationAttributes.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ContentTargetFolders>.</ContentTargetFolders>
<Product>Our.Umbraco.ValidationAttributes</Product>
<PackageId>Our.Umbraco.ValidationAttributes</PackageId>
Expand All @@ -18,8 +18,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Umbraco.Cms.Web.Website" Version="9.0.1"/>
<PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="9.0.1"/>
<PackageReference Include="Umbraco.Cms.Web.Common" Version="14.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 3 additions & 4 deletions src/UmbracoIFormFileExtensionsAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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; }

Expand Down Expand Up @@ -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));
Expand Down
1 change: 0 additions & 1 deletion src/UmbracoMaxFileSizeAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
13 changes: 5 additions & 8 deletions src/UmbracoRemoteAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand All @@ -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)
{
Expand Down