Skip to content

Commit a289747

Browse files
srkirklandsrkirkland
committed
Merge pull request #69 from srkirkland/aspmvc5
support and build against asp.net 5
2 parents 770c332 + c0e6d70 commit a289747

40 files changed

Lines changed: 213 additions & 162 deletions

‎Build/CommonAssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111

1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("3.0.1.0")]
14+
[assembly: AssemblyVersion("5.0.0.0")]
1515

1616
[assembly: NeutralResourcesLanguage("en-US")]

‎DataAnnotationsExtensions.ClientValidation/Adapters/DateAttributeAdapter.cs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Collections.Generic;
1+
using System;
2+
using System.Collections.Generic;
23
using System.Web.Mvc;
34
using DataAnnotationsExtensions.ClientValidation.Rules;
45

@@ -13,7 +14,12 @@ public DateAttributeAdapter(ModelMetadata metadata, ControllerContext context, D
1314

1415
public override IEnumerable<ModelClientValidationRule> GetClientValidationRules()
1516
{
16-
return new[] { new ModelClientValidationDateRule(ErrorMessage) };
17+
if (Metadata.ModelType != typeof (DateTime)) //only add validation for non
18+
{
19+
return new[] {new ModelClientValidationDateRule(ErrorMessage)};
20+
}
21+
22+
return new ModelClientValidationRule[0];
1723
}
1824
}
1925
}

‎DataAnnotationsExtensions.ClientValidation/Adapters/FileExtensionsAttributeAdapter.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ public FileExtensionsAttributeAdapter(ModelMetadata metadata, ControllerContext
1414

1515
public override IEnumerable<ModelClientValidationRule> GetClientValidationRules()
1616
{
17-
return new[] { new ModelClientValidationFileExtensionsRule(ErrorMessage, Attribute.Extensions) };
17+
var extensionsRegex = string.Format(@"^.*\.({0})$", Attribute.Extensions.Replace(",", "|"));
18+
return new[] { new ModelClientValidationFileExtensionsRule(ErrorMessage, extensionsRegex) };
1819
}
1920
}
2021
}

‎DataAnnotationsExtensions.ClientValidation/DataAnnotationsExtensions.ClientValidation.csproj‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>DataAnnotationsExtensions.ClientValidation</RootNamespace>
1212
<AssemblyName>DataAnnotationsExtensions.ClientValidation</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15+
<TargetFrameworkProfile />
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<DebugSymbols>true</DebugSymbols>
@@ -21,6 +22,7 @@
2122
<DefineConstants>DEBUG;TRACE</DefineConstants>
2223
<ErrorReport>prompt</ErrorReport>
2324
<WarningLevel>4</WarningLevel>
25+
<Prefer32Bit>false</Prefer32Bit>
2426
</PropertyGroup>
2527
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2628
<DebugType>pdbonly</DebugType>
@@ -29,6 +31,7 @@
2931
<DefineConstants>TRACE</DefineConstants>
3032
<ErrorReport>prompt</ErrorReport>
3133
<WarningLevel>4</WarningLevel>
34+
<Prefer32Bit>false</Prefer32Bit>
3235
</PropertyGroup>
3336
<PropertyGroup>
3437
<SignAssembly>false</SignAssembly>
@@ -45,28 +48,28 @@
4548
<Reference Include="System" />
4649
<Reference Include="System.ComponentModel.DataAnnotations" />
4750
<Reference Include="System.Core" />
48-
<Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.Helpers.dll</HintPath>
51+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
5053
<Private>True</Private>
5154
</Reference>
52-
<Reference Include="System.Web.Mvc, Version=3.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53-
<HintPath>..\packages\Microsoft.AspNet.Mvc.3.0.50813.1\lib\net40\System.Web.Mvc.dll</HintPath>
55+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
5457
<Private>True</Private>
5558
</Reference>
56-
<Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57-
<HintPath>..\packages\Microsoft.AspNet.Razor.1.0.20105.408\lib\net40\System.Web.Razor.dll</HintPath>
59+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
5861
<Private>True</Private>
5962
</Reference>
60-
<Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61-
<HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.dll</HintPath>
63+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
6265
<Private>True</Private>
6366
</Reference>
64-
<Reference Include="System.Web.WebPages.Deployment, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65-
<HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
67+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
6669
<Private>True</Private>
6770
</Reference>
68-
<Reference Include="System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69-
<HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
71+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
7073
<Private>True</Private>
7174
</Reference>
7275
<Reference Include="System.Xml.Linq" />
@@ -133,8 +136,7 @@
133136
</Target>
134137
-->
135138
<Target Name="AfterBuild" Condition=" '$(Configuration)' == 'Release'">
136-
137-
<Exec Command="nuget pack DataAnnotationsExtensions.ClientValidation.csproj -IncludeReferencedProjects -Prop Configuration=Release"></Exec>
138-
139+
<Exec Command="nuget pack DataAnnotationsExtensions.ClientValidation.csproj -IncludeReferencedProjects -Prop Configuration=Release">
140+
</Exec>
139141
</Target>
140142
</Project>

‎DataAnnotationsExtensions.ClientValidation/DataAnnotationsExtensions.ClientValidation.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<tags>ASP.NET Validation</tags>
1818
<copyright>Copyright 2016</copyright>
1919
<dependencies>
20-
<dependency id="WebActivator" version="1.2.0" />
20+
<dependency id="WebActivatorEx" version="2.1.0" />
2121
</dependencies>
2222
</metadata>
2323
<files>

‎DataAnnotationsExtensions.ClientValidation/Resources/ClientValidationResources.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DataAnnotationsExtensions.ClientValidation/Rules/ModelClientValidationFileExtensionsRule.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ namespace DataAnnotationsExtensions.ClientValidation.Rules
44
{
55
public class ModelClientValidationFileExtensionsRule : ModelClientValidationRule
66
{
7-
public ModelClientValidationFileExtensionsRule(string errorMessage, string extensions)
7+
public ModelClientValidationFileExtensionsRule(string errorMessage, string extensionsRegex)
88
{
99
ErrorMessage = errorMessage;
10-
ValidationType = "accept";
11-
ValidationParameters["exts"] = extensions;
10+
ValidationType = "regex";
11+
ValidationParameters["pattern"] = extensionsRegex; //match extensions at end of string
1212
}
1313
}
1414
}

‎DataAnnotationsExtensions.ClientValidation/Rules/ModelClientValidationMaxRule.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ public ModelClientValidationMaxRule(string errorMessage, object max)
88
{
99
ErrorMessage = errorMessage;
1010
ValidationType = "range";
11+
ValidationParameters["min"] = double.MinValue;
1112
ValidationParameters["max"] = max;
1213
}
1314
}

‎DataAnnotationsExtensions.ClientValidation/Rules/ModelClientValidationMinRule.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ public ModelClientValidationMinRule(string errorMessage, object min)
99
ErrorMessage = errorMessage;
1010
ValidationType = "range";
1111
ValidationParameters["min"] = min;
12+
ValidationParameters["max"] = double.MaxValue;
1213
}
1314
}
1415
}

‎DataAnnotationsExtensions.ClientValidation/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.Mvc" version="3.0.50813.1" targetFramework="net4" />
4-
<package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net4" />
5-
<package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net4" />
3+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
4+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
5+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
66
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net4" />
77
</packages>

0 commit comments

Comments
 (0)