diff --git a/SimpleHoneypot.sln b/SimpleHoneypot.sln index b3aa4a4..ef1447b 100644 --- a/SimpleHoneypot.sln +++ b/SimpleHoneypot.sln @@ -1,12 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleHoneypot", "src\SimpleHoneypot\SimpleHoneypot.csproj", "{3E27554A-AF9A-4979-92AC-1C1B0B4BD225}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleHoneypot.NET4.MVC3", "src\SimpleHoneypot\SimpleHoneypot.NET4.MVC3.csproj", "{3E27554A-AF9A-4979-92AC-1C1B0B4BD225}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleHoneypot.Tests", "src\SimpleHoneypot.Tests\SimpleHoneypot.Tests.csproj", "{58FEC57A-EB7D-4681-A024-68FF8A9AE54A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleHoneypot.Web.Tests", "src\SimpleHoneypot.Web.Tests\SimpleHoneypot.Web.Tests.csproj", "{04738723-C466-474D-85F5-879816A1DAA9}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleHoneypot.NET4.MVC2", "src\SimpleHoneypot.NET4.MVC2\SimpleHoneypot.NET4.MVC2.csproj", "{FEC824EF-381B-42C0-B704-AFFAA6D4DAF6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -25,6 +27,10 @@ Global {04738723-C466-474D-85F5-879816A1DAA9}.Debug|Any CPU.Build.0 = Debug|Any CPU {04738723-C466-474D-85F5-879816A1DAA9}.Release|Any CPU.ActiveCfg = Release|Any CPU {04738723-C466-474D-85F5-879816A1DAA9}.Release|Any CPU.Build.0 = Release|Any CPU + {FEC824EF-381B-42C0-B704-AFFAA6D4DAF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FEC824EF-381B-42C0-B704-AFFAA6D4DAF6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FEC824EF-381B-42C0-B704-AFFAA6D4DAF6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FEC824EF-381B-42C0-B704-AFFAA6D4DAF6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/buildscripts/App_Start/SimpleHoneypot.cs.pp b/buildscripts/App_Start/SimpleHoneypot.cs.pp index 86c89da..0593bbd 100644 --- a/buildscripts/App_Start/SimpleHoneypot.cs.pp +++ b/buildscripts/App_Start/SimpleHoneypot.cs.pp @@ -2,7 +2,7 @@ using System.Web.Mvc; using SimpleHoneypot.Core; -[assembly: WebActivator.PreApplicationStartMethod(typeof($rootnamespace$.App_Start.SimpleHoneypot), "Start")] +[assembly: WebActivator.PostApplicationStartMethod(typeof($rootnamespace$.App_Start.SimpleHoneypot), "Start")] namespace $rootnamespace$.App_Start { public static class SimpleHoneypot { diff --git a/buildscripts/Build.proj b/buildscripts/Build.proj index f50c172..98552de 100644 --- a/buildscripts/Build.proj +++ b/buildscripts/Build.proj @@ -29,6 +29,7 @@ + @@ -50,11 +51,11 @@ - + - + diff --git a/buildscripts/SimpleHoneypot.nuspec b/buildscripts/SimpleHoneypot.nuspec index 411d713..a6edb97 100644 --- a/buildscripts/SimpleHoneypot.nuspec +++ b/buildscripts/SimpleHoneypot.nuspec @@ -11,11 +11,11 @@ A simple honeypot to replace your standard reCAPTCHA for ASP.NET MVC2+. en-US - + - \ No newline at end of file + diff --git a/src/SimpleHoneypot.NET4.MVC2/Properties/AssemblyInfo.cs b/src/SimpleHoneypot.NET4.MVC2/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..904d326 --- /dev/null +++ b/src/SimpleHoneypot.NET4.MVC2/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("SimpleHoneypot.NET4.MVC2")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("SimpleHoneypot.NET4.MVC2")] +[assembly: AssemblyCopyright("Copyright © 2012")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("148315c9-aab5-4677-a7ee-db05bcf63210")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/SimpleHoneypot.NET4.MVC2/SimpleHoneypot.NET4.MVC2.csproj b/src/SimpleHoneypot.NET4.MVC2/SimpleHoneypot.NET4.MVC2.csproj new file mode 100644 index 0000000..94981f4 --- /dev/null +++ b/src/SimpleHoneypot.NET4.MVC2/SimpleHoneypot.NET4.MVC2.csproj @@ -0,0 +1,82 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {FEC824EF-381B-42C0-B704-AFFAA6D4DAF6} + Library + Properties + SimpleHoneypot + SimpleHoneypot.NET4.MVC2 + v4.0 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + ActionFilters\HoneypotAttribute.cs + + + Core\Common\Check.cs + + + Core\GlobalText.Designer.cs + + + Core\Honeypot.cs + + + Core\HoneypotInputNameCollection.cs + + + Core\Services\HoneypotService.cs + + + Core\Services\IHoneypotService.cs + + + Extensions\HttpRequestBaseExtensions.cs + + + HtmlHelpers\HoneypotHelper.cs + + + + + + Core\GlobalText.resx + + + + + \ No newline at end of file diff --git a/src/SimpleHoneypot.Tests/SimpleHoneypot.Tests.csproj b/src/SimpleHoneypot.Tests/SimpleHoneypot.Tests.csproj index ea51f10..0f646ae 100644 --- a/src/SimpleHoneypot.Tests/SimpleHoneypot.Tests.csproj +++ b/src/SimpleHoneypot.Tests/SimpleHoneypot.Tests.csproj @@ -59,9 +59,9 @@ - + {3E27554A-AF9A-4979-92AC-1C1B0B4BD225} - SimpleHoneypot + SimpleHoneypot.NET4.MVC3 diff --git a/src/SimpleHoneypot.Web.Tests/SimpleHoneypot.Web.Tests.csproj b/src/SimpleHoneypot.Web.Tests/SimpleHoneypot.Web.Tests.csproj index 332cc0a..00a2aab 100644 --- a/src/SimpleHoneypot.Web.Tests/SimpleHoneypot.Web.Tests.csproj +++ b/src/SimpleHoneypot.Web.Tests/SimpleHoneypot.Web.Tests.csproj @@ -144,9 +144,9 @@ - + {3E27554A-AF9A-4979-92AC-1C1B0B4BD225} - SimpleHoneypot + SimpleHoneypot.NET4.MVC3 diff --git a/src/SimpleHoneypot/Core/Common/Check.cs b/src/SimpleHoneypot/Core/Common/Check.cs index aa78dad..e91bfb6 100644 --- a/src/SimpleHoneypot/Core/Common/Check.cs +++ b/src/SimpleHoneypot/Core/Common/Check.cs @@ -14,7 +14,7 @@ public static class Argument { [DebuggerStepThrough] public static void IsNotNullOrEmpty(string parameter, string parameterName) { - if (string.IsNullOrWhiteSpace(parameter)) { + if (string.IsNullOrEmpty(parameter)) { throw new ArgumentException(String.Format(GlobalText.ArgumentCannotBeNullOrEmpty, parameterName), parameterName); } } diff --git a/src/SimpleHoneypot/Properties/AssemblyInfo.cs b/src/SimpleHoneypot/Properties/AssemblyInfo.cs index 8de08ce..5e4ceb3 100644 --- a/src/SimpleHoneypot/Properties/AssemblyInfo.cs +++ b/src/SimpleHoneypot/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.2.*")] +[assembly: AssemblyVersion("1.3.*")] //[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/SimpleHoneypot/SimpleHoneypot.NET4.MVC3.csproj b/src/SimpleHoneypot/SimpleHoneypot.NET4.MVC3.csproj new file mode 100644 index 0000000..a359a00 --- /dev/null +++ b/src/SimpleHoneypot/SimpleHoneypot.NET4.MVC3.csproj @@ -0,0 +1,68 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {3E27554A-AF9A-4979-92AC-1C1B0B4BD225} + Library + Properties + SimpleHoneypot + SimpleHoneypot.NET4.MVC3 + v4.0 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + True + True + GlobalText.resx + + + + + + + + + + + + ResXFileCodeGenerator + GlobalText.Designer.cs + + + + + \ No newline at end of file