diff --git a/.gitignore b/.gitignore index e915029..436b019 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,6 @@ ################################################################################ /.vs +/AjaxPro/.vs/AjaxPro +/AjaxPro/bin +/AjaxPro/obj diff --git a/AjaxPro/AjaxPro.csproj b/AjaxPro/AjaxPro.csproj index af78ce1..5546101 100644 --- a/AjaxPro/AjaxPro.csproj +++ b/AjaxPro/AjaxPro.csproj @@ -127,10 +127,10 @@ Code - + Code - + Code diff --git a/AjaxPro/AjaxPro.sln b/AjaxPro/AjaxPro.sln new file mode 100644 index 0000000..7e07790 --- /dev/null +++ b/AjaxPro/AjaxPro.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.1705 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AjaxPro", "AjaxPro.csproj", "{9AD42568-07A4-4D8B-9C6D-1FD54683EF4B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9AD42568-07A4-4D8B-9C6D-1FD54683EF4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9AD42568-07A4-4D8B-9C6D-1FD54683EF4B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9AD42568-07A4-4D8B-9C6D-1FD54683EF4B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9AD42568-07A4-4D8B-9C6D-1FD54683EF4B}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DCFBFD41-C31A-4F6E-92FC-D451B4918EA5} + EndGlobalSection +EndGlobal diff --git a/AjaxPro/Attributes/__AjaxClassAttribute.cs b/AjaxPro/Attributes/AjaxClassAttribute.cs similarity index 95% rename from AjaxPro/Attributes/__AjaxClassAttribute.cs rename to AjaxPro/Attributes/AjaxClassAttribute.cs index 5a16d2b..788a39a 100644 --- a/AjaxPro/Attributes/__AjaxClassAttribute.cs +++ b/AjaxPro/Attributes/AjaxClassAttribute.cs @@ -1,45 +1,45 @@ -/* - * __AjaxClassAttribute.cs - * - * Copyright © 2007 Michael Schwarz (http://www.ajaxpro.info). - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR - * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ -using System; - -namespace AjaxPro -{ - /// - /// Class Attribute Class - /// - [AttributeUsage(AttributeTargets.Class)] - [Obsolete("The recommended alternative is AjaxPro.AjaxNamespaceAttribute.", true)] - public class AjaxClassAttribute : Attribute - { - /// - /// Initializes a new instance of the class. - /// - /// The names. - public AjaxClassAttribute(string names) - { - } - } -} +/* + * AjaxClassAttribute.cs + * + * Copyright © 2007 Michael Schwarz (http://www.ajaxpro.info). + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR + * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +using System; + +namespace AjaxPro +{ + /// + /// Class Attribute Class + /// + [AttributeUsage(AttributeTargets.Class)] + [Obsolete("The recommended alternative is AjaxPro.AjaxNamespaceAttribute.", true)] + public class AjaxClassAttribute : Attribute + { + /// + /// Initializes a new instance of the class. + /// + /// The names. + public AjaxClassAttribute(string names) + { + } + } +} diff --git a/AjaxPro/Attributes/__AjaxEnumAttribute.cs b/AjaxPro/Attributes/AjaxEnumAttribute.cs similarity index 95% rename from AjaxPro/Attributes/__AjaxEnumAttribute.cs rename to AjaxPro/Attributes/AjaxEnumAttribute.cs index 65c6124..6419220 100644 --- a/AjaxPro/Attributes/__AjaxEnumAttribute.cs +++ b/AjaxPro/Attributes/AjaxEnumAttribute.cs @@ -1,44 +1,44 @@ -/* - * __AjaxEnumAttribute.cs - * - * Copyright © 2007 Michael Schwarz (http://www.ajaxpro.info). - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR - * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ -using System; - -namespace AjaxPro -{ - /// - /// AJAX Enumeration Attribute class - /// - [AttributeUsage(AttributeTargets.Class)] - [Obsolete("The recommended alternative is AjaxPro.AjaxNamespaceAttribute.", true)] - public class AjaxEnumAttribute : Attribute - { - /// - /// Initializes a new instance of the class. - /// - public AjaxEnumAttribute() - { - } - } -} +/* + * AjaxEnumAttribute.cs + * + * Copyright © 2007 Michael Schwarz (http://www.ajaxpro.info). + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR + * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +using System; + +namespace AjaxPro +{ + /// + /// AJAX Enumeration Attribute class + /// + [AttributeUsage(AttributeTargets.Class)] + [Obsolete("The recommended alternative is AjaxPro.AjaxNamespaceAttribute.", true)] + public class AjaxEnumAttribute : Attribute + { + /// + /// Initializes a new instance of the class. + /// + public AjaxEnumAttribute() + { + } + } +} diff --git a/AjaxPro/Utilities/Constant.cs b/AjaxPro/Utilities/Constant.cs index 0212b2b..cefabd8 100644 --- a/AjaxPro/Utilities/Constant.cs +++ b/AjaxPro/Utilities/Constant.cs @@ -52,6 +52,6 @@ public sealed class Constant /// /// The assembly version. /// - public const string AssemblyVersion = "9.2.17.1"; + public const string AssemblyVersion = "21.10.26.1"; } } diff --git a/AjaxPro/build.bat b/AjaxPro/build.bat deleted file mode 100644 index 114749c..0000000 --- a/AjaxPro/build.bat +++ /dev/null @@ -1,47 +0,0 @@ -set NET11="%WINDIR%\Microsoft.NET\Framework\v1.1.4322" -set NET20="%WINDIR%\Microsoft.NET\Framework\v2.0.50727" -set ZIP=Z:\Documents\Visual Studio 2005\Projects\AjaxPro\ -set ARG= -set DEFINE= -set VERSION=7.7.31.1 - -call build_1.1.bat -call build_2.0.bat -call build_json.bat - -cd Release - -"%ZIP%7za.exe" a -tZIP "%VERSION%(no strong name)_DLL.zip" *.dll -copy "%VERSION%(no strong name)_DLL.zip" "..\%VERSION%(no strong name)_DLL.zip" - -pause - -del *.dll -cd .. - - -set DEFINE=STRONGNAME; - -call build_1.1.bat -call build_2.0.bat -call build_json.bat - - -REM cd .. -REN cd AjaxProTemplate -REM call createpackage.bat -REM cd .. -REM cd AjaxPro - -del "%VERSION%_DLL.zip" - -REM "%ZIP%7za.exe" a -tZIP "%VERSION%_DLL.zip" AjaxProVSTemplate.vsi -"%ZIP%7za.exe" a -tZIP "%VERSION%_DLL.zip" web.config - -cd Release - -"%ZIP%7za.exe" a -tZIP "..\%VERSION%_DLL.zip" *.dll - -cd .. - -pause \ No newline at end of file diff --git a/AjaxPro/build_1.1.bat b/AjaxPro/build_1.1.bat deleted file mode 100644 index bcba43d..0000000 --- a/AjaxPro/build_1.1.bat +++ /dev/null @@ -1,3 +0,0 @@ -del release\AjaxPro.dll - -"%NET11%\csc.exe" %ARG% /out:"release\AjaxPro.dll" /target:library /define:"TRACE;%DEFINE%" /r:"System.dll" /r:"System.Data.dll" /r:"System.Drawing.dll" /r:"System.Web.dll" /r:"System.Web.Services.dll" /r:"System.Xml.dll" "AssemblyInfo.cs" "Attributes\*.cs" "Configuration\*.cs" "Handler\*.cs" "Handler\AjaxProcessors\*.cs" "Handler\Security\*.cs" "Interfaces\*.cs" "JSON\Converters\*.cs" "JSON\Interfaces\*.cs" "JSON\*.cs" "JSON\JavaScriptObjects\*.cs" "Managment\*.cs" "Security\*.cs" "Services\*.cs" "Utilities\*.cs" /res:prototype.js,AjaxPro.prototype.js /res:core.js,AjaxPro.core.js /res:ms.js,AjaxPro.ms.js diff --git a/AjaxPro/build_2.0.bat b/AjaxPro/build_2.0.bat deleted file mode 100644 index ef16606..0000000 --- a/AjaxPro/build_2.0.bat +++ /dev/null @@ -1,6 +0,0 @@ -REM del "release\AjaxPro.2(including webevent).dll" -REM /define:"TRACE;NET20;NET20external;WEBEVENT;%DEFINE%" -REM ren "release\AjaxPro.2.dll" "release\AjaxPro.2(including webevent).dll" - -del release\AjaxPro.2.dll -"%NET20%\csc.exe" %ARG% /out:"release\AjaxPro.2.dll" /target:library /define:"TRACE;NET20;NET20external;%DEFINE%" /r:"System.dll" /r:"System.Data.dll" /r:"System.Drawing.dll" /r:"System.Web.dll" /r:"System.Web.Services.dll" /r:"System.Xml.dll" /r:"System.Configuration.dll" "AssemblyInfo.cs" "Attributes\*.cs" "Configuration\*.cs" "Handler\*.cs" "Handler\AjaxProcessors\*.cs" "Handler\Security\*.cs" "Interfaces\*.cs" "JSON\Converters\*.cs" "JSON\Interfaces\*.cs" "JSON\*.cs" "JSON\JavaScriptObjects\*.cs" "Managment\*.cs" "Security\*.cs" "Services\*.cs" "Utilities\*.cs" /res:prototype.js,AjaxPro.2.prototype.js /res:core.js,AjaxPro.2.core.js /res:ms.js,AjaxPro.2.ms.js diff --git a/AjaxPro/build_json.bat b/AjaxPro/build_json.bat deleted file mode 100644 index abdda75..0000000 --- a/AjaxPro/build_json.bat +++ /dev/null @@ -1,6 +0,0 @@ -del release\AjaxPro.JSON.dll -del release\AjaxPro.JSON.2.dll - -"%NET20%\csc.exe" %ARG% /out:"release\AjaxPro.JSON.2.dll" /target:library /define:"TRACE;NET20;NET20external;JSONLIB;%DEFINE%" /r:"System.dll" /r:"System.Data.dll" /r:"System.Drawing.dll" /r:"System.Web.dll" /r:"System.Web.Services.dll" /r:"System.Xml.dll" /r:"System.Configuration.dll" "AssemblyInfo.cs" "Attributes\AjaxNoTypeUsageAttribute.cs" "Attributes\AjaxNonSerializableAttribute.cs" "Attributes\AjaxPropertyAttribute.cs" "Attributes\JavaScriptConverterAttribute.cs" "Attributes\__AjaxClassAttribute.cs" "Attributes\__AjaxEnumAttribute.cs" "Configuration\AjaxSettingsSectionHandler.cs" "JSON\Converters\BitmapConverter.cs" "JSON\Converters\DecimalConverter.cs" "JSON\Converters\EnumConverter.cs" "JSON\Converters\ExceptionConverter.cs" "JSON\Converters\GuidConverter.cs" "JSON\Converters\PrimitiveConverter.cs" "JSON\Converters\StringConverter.cs" "JSON\Converters\DataRowConverter.cs" "JSON\Converters\DataRowViewConverter.cs" "JSON\Converters\DataSetConverter.cs" "JSON\Converters\DataTableConverter.cs" "JSON\Converters\DataViewConverter.cs" "JSON\Converters\DateTimeConverter.cs" "JSON\Converters\HashtableConverter.cs" "JSON\Converters\HtmlControlConverter.cs" "JSON\Converters\JavaScriptObjectConverter.cs" "JSON\Converters\IDictionaryConverter.cs" "JSON\Converters\IEnumerableConverter.cs" "JSON\Converters\IListConverter.cs" "JSON\Converters\NameValueCollectionConverter.cs" "JSON\Converters\ProfileBaseConverter.cs" "JSON\Interfaces\IJavaScriptConverter.cs" "JSON\Interfaces\IJavaScriptObject.cs" "JSON\JavaScriptDeserializer.cs" "JSON\JavaScriptObjects\JavaScriptArray.cs" "JSON\JavaScriptObjects\JavaScriptBoolean.cs" "JSON\JavaScriptObjects\JavaScriptNumber.cs" "JSON\JavaScriptObjects\JavaScriptObject.cs" "JSON\JavaScriptObjects\JavaScriptString.cs" "JSON\JavaScriptObjects\JavaScriptSource.cs" "JSON\JavaScriptSerializer.cs" "JSON\JavaScriptUtil.cs" "JSON\JSONParser.cs" "Utilities\AjaxSettings.cs" "Utilities\Constant.cs" "Utilities\MD5Helper.cs" "Utilities\Utility.cs" - -"%NET11%\csc.exe" %ARG% /out:"release\AjaxPro.JSON.dll" /target:library /define:"TRACE;JSONLIB;%DEFINE%" /r:"System.dll" /r:"System.Data.dll" /r:"System.Drawing.dll" /r:"System.Web.dll" /r:"System.Web.Services.dll" /r:"System.Xml.dll" "AssemblyInfo.cs" "Attributes\AjaxNoTypeUsageAttribute.cs" "Attributes\AjaxNonSerializableAttribute.cs" "Attributes\AjaxPropertyAttribute.cs" "Attributes\JavaScriptConverterAttribute.cs" "Attributes\__AjaxClassAttribute.cs" "Attributes\__AjaxEnumAttribute.cs" "Configuration\AjaxSettingsSectionHandler.cs" "JSON\Converters\BitmapConverter.cs" "JSON\Converters\DecimalConverter.cs" "JSON\Converters\EnumConverter.cs" "JSON\Converters\ExceptionConverter.cs" "JSON\Converters\GuidConverter.cs" "JSON\Converters\PrimitiveConverter.cs" "JSON\Converters\StringConverter.cs" "JSON\Converters\DataRowConverter.cs" "JSON\Converters\DataRowViewConverter.cs" "JSON\Converters\DataSetConverter.cs" "JSON\Converters\DataTableConverter.cs" "JSON\Converters\DataViewConverter.cs" "JSON\Converters\DateTimeConverter.cs" "JSON\Converters\HashtableConverter.cs" "JSON\Converters\HtmlControlConverter.cs" "JSON\Converters\JavaScriptObjectConverter.cs" "JSON\Converters\IDictionaryConverter.cs" "JSON\Converters\IEnumerableConverter.cs" "JSON\Converters\IListConverter.cs" "JSON\Converters\NameValueCollectionConverter.cs" "JSON\Interfaces\IJavaScriptConverter.cs" "JSON\Interfaces\IJavaScriptObject.cs" "JSON\JavaScriptConverterList.cs" "JSON\JavaScriptDeserializer.cs" "JSON\JavaScriptObjects\JavaScriptArray.cs" "JSON\JavaScriptObjects\JavaScriptBoolean.cs" "JSON\JavaScriptObjects\JavaScriptNumber.cs" "JSON\JavaScriptObjects\JavaScriptObject.cs" "JSON\JavaScriptObjects\JavaScriptString.cs" "JSON\JavaScriptObjects\JavaScriptSource.cs" "JSON\JavaScriptSerializer.cs" "JSON\JavaScriptUtil.cs" "JSON\JSONParser.cs" "Utilities\AjaxSettings.cs" "Utilities\Constant.cs" "Utilities\MD5Helper.cs" "Utilities\Utility.cs" \ No newline at end of file diff --git a/README.md b/README.md index 109fca9..57c8361 100644 --- a/README.md +++ b/README.md @@ -67,3 +67,10 @@ function getServerTime_callback(res) { alert(res.value); } ``` + +# Compiler Options + +- `NET20` compiles .NET 2.0 assemblies AjaxPro.2.dll (otherwise original it was .NET 1.1, AjaxPro.dll) +- `JSONLIB` compiles JSON parser only (AjaxPro.JSON.2.dll or AjaxPro.JSON.dll) +- `NET20external` is setting the assembly name to AjaxPro.2.dll, compatibility +- `TRACE` is no longer used