From 609cd614f82cad73b160d757256d5a2043bc4983 Mon Sep 17 00:00:00 2001
From: Michael Schwarz <michael.schwarz@epssw.com>
Date: Thu, 10 Oct 2024 09:43:32 +0200
Subject: [PATCH] changed to have original assembly being compiled against .NET
 3.5 added new assembly for .NET 4.8 #19

---
 AjaxPro/AjaxPro.csproj      |   4 +-
 AjaxPro/AjaxPro.net2.csproj | 316 ++++++++++++++++++++++++++++++++++++
 AjaxPro/AjaxPro.sln         |   9 +-
 AjaxPro/AssemblyInfo.cs     |  44 ++---
 4 files changed, 347 insertions(+), 26 deletions(-)
 create mode 100644 AjaxPro/AjaxPro.net2.csproj

diff --git a/AjaxPro/AjaxPro.csproj b/AjaxPro/AjaxPro.csproj
index ccfc53f..9b0f2ae 100644
--- a/AjaxPro/AjaxPro.csproj
+++ b/AjaxPro/AjaxPro.csproj
@@ -11,7 +11,7 @@
     </ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
-    <AssemblyName>AjaxPro.2</AssemblyName>
+    <AssemblyName>AjaxPro.2.net48</AssemblyName>
     <AssemblyOriginatorKeyFile>
     </AssemblyOriginatorKeyFile>
     <DefaultClientScript>JScript</DefaultClientScript>
@@ -69,7 +69,7 @@
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;NET20</DefineConstants>
+    <DefineConstants>TRACE;NET20 NET48</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
diff --git a/AjaxPro/AjaxPro.net2.csproj b/AjaxPro/AjaxPro.net2.csproj
new file mode 100644
index 0000000..ffa0ad3
--- /dev/null
+++ b/AjaxPro/AjaxPro.net2.csproj
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0B9D4A5A-F2B1-493B-878C-D03BF3325401}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>AjaxPro.2</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>AjaxPro</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <SccProjectName>SAK</SccProjectName>
+    <SccLocalPath>SAK</SccLocalPath>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccProvider>SAK</SccProvider>
+    <SignAssembly>false</SignAssembly>
+    <ToolsVersion>3.5</ToolsVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;NET20</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;NET20</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseNET48|AnyCPU'">
+    <OutputPath>bin\ReleaseNET48\</OutputPath>
+    <DefineConstants>TRACE;NET20</DefineConstants>
+    <BaseAddress>285212672</BaseAddress>
+    <Optimize>true</Optimize>
+    <FileAlignment>4096</FileAlignment>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.configuration" />
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Design" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Web">
+      <Name>System.Web</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Attributes\AjaxCacheAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Attributes\AjaxMethodAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Attributes\AjaxNamespaceAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Attributes\AjaxNonSerializableAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Attributes\AjaxPropertyAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Attributes\HttpSessionStateRequirement.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Attributes\JavaScriptConverterAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Attributes\AjaxNoTypeUsageAttribute.cs" />
+    <Compile Include="Attributes\AjaxClassAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Attributes\AjaxEnumAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Configuration\AjaxSettingsSectionHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Handler\AjaxAsyncHttpHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Handler\AjaxHandlerFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Handler\AjaxProcessors\IFrameProcessor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Handler\AjaxProcessors\XmlHttpRequestProcessor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Handler\AjaxProcHelper.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Handler\AjaxSyncHttpHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Handler\ConverterJavaScriptHandler.cs" />
+    <Compile Include="Handler\EmbeddedJavaScriptHandler.cs" />
+    <Compile Include="Handler\HttpCompressionModule.cs" />
+    <Compile Include="Handler\AjaxRequestModule.cs" />
+    <Compile Include="Handler\Security\AjaxEncryption.cs" />
+    <Compile Include="Handler\TypeJavaScriptHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interfaces\AjaxSecurityProvider.cs" />
+    <Compile Include="Interfaces\IAjaxTokenProvider.cs" />
+    <Compile Include="Interfaces\IAjaxCryptProvider.cs" />
+    <Compile Include="Interfaces\IAjaxKeyProvider.cs" />
+    <Compile Include="Interfaces\IAjaxProcessor.cs" />
+    <Compile Include="Interfaces\IContextInitializer.cs" />
+    <Compile Include="Handler\TypeJavaScriptProvider.cs" />
+    <Compile Include="JSON\Converters\DataRowConverter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="JSON\Converters\DataRowViewConverter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="JSON\Converters\DataSetConverter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="JSON\Converters\DataTableConverter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="JSON\Converters\DataViewConverter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="JSON\Converters\DateTimeConverter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="JSON\Converters\HashtableConverter.cs" />
+    <Compile Include="JSON\Converters\HtmlControlConverter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="JSON\Converters\IDictionaryConverter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="JSON\Converters\IEnumerableConverter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="JSON\Converters\IListConverter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="JSON\Converters\JavaScriptObjectConverter.cs" />
+    <Compile Include="JSON\Converters\DecimalConverter.cs" />
+    <Compile Include="JSON\Converters\ExceptionConverter.cs" />
+    <Compile Include="JSON\Converters\EnumConverter.cs" />
+    <Compile Include="JSON\Converters\GuidConverter.cs" />
+    <Compile Include="JSON\Converters\BitmapConverter.cs" />
+    <Compile Include="JSON\Converters\PrimitiveConverter.cs" />
+    <Compile Include="JSON\Converters\StringConverter.cs" />
+    <Compile Include="JSON\Converters\NameValueCollectionConverter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="JSON\Converters\ProfileBaseConverter.cs" />
+    <Compile Include="JSON\Interfaces\IJavaScriptConverter.cs" />
+    <Compile Include="JSON\Interfaces\IJavaScriptObject.cs" />
+    <Compile Include="JSON\JavaScriptConverterList.cs" />
+    <Compile Include="JSON\JavaScriptDeserializer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="JSON\JavaScriptObjects\JavaScriptArray.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="JSON\JavaScriptObjects\JavaScriptBoolean.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="JSON\JavaScriptObjects\JavaScriptNumber.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="JSON\JavaScriptObjects\JavaScriptObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="JSON\JavaScriptObjects\JavaScriptString.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="JSON\JavaScriptObjects\JavaScriptSource.cs" />
+    <Compile Include="JSON\JavaScriptSerializer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="JSON\JavaScriptUtil.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="JSON\JSONParser.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Security\Decryptor.cs" />
+    <Compile Include="Security\DecryptTransformer.cs" />
+    <Compile Include="Security\Encryptor.cs" />
+    <Compile Include="Security\EncryptTransformer.cs" />
+    <Compile Include="Utilities\AjaxSettings.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Utilities\CacheInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Utilities\ClientMethod.cs" />
+    <Compile Include="Utilities\Constant.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Utilities\HashHelper.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Utilities\Utility.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Managment\WebAjaxErrorEvent.cs" />
+    <Compile Include="Web\UI\AjaxBasePage.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <EmbeddedResource Include="prototype.js" />
+    <EmbeddedResource Include="core.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="bundleconfig.json" />
+    <None Include="web.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ms.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="core.min.js">
+      <DependentUpon>core.js</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ms.min.js">
+      <DependentUpon>ms.js</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="prototype.min.js">
+      <DependentUpon>prototype.js</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/AjaxPro/AjaxPro.sln b/AjaxPro/AjaxPro.sln
index 32eda1c..b72149b 100644
--- a/AjaxPro/AjaxPro.sln
+++ b/AjaxPro/AjaxPro.sln
@@ -13,19 +13,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\SECURITY.md = ..\SECURITY.md
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AjaxPro.net2", "AjaxPro.net2.csproj", "{0B9D4A5A-F2B1-493B-878C-D03BF3325401}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
-		ReleaseNET48|Any CPU = ReleaseNET48|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
-		{9AD42568-07A4-4D8B-9C6D-1FD54683EF4B}.ReleaseNET48|Any CPU.ActiveCfg = ReleaseNET48|Any CPU
-		{9AD42568-07A4-4D8B-9C6D-1FD54683EF4B}.ReleaseNET48|Any CPU.Build.0 = ReleaseNET48|Any CPU
+		{0B9D4A5A-F2B1-493B-878C-D03BF3325401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B9D4A5A-F2B1-493B-878C-D03BF3325401}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B9D4A5A-F2B1-493B-878C-D03BF3325401}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B9D4A5A-F2B1-493B-878C-D03BF3325401}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/AjaxPro/AssemblyInfo.cs b/AjaxPro/AssemblyInfo.cs
index ffd4654..914d181 100644
--- a/AjaxPro/AssemblyInfo.cs
+++ b/AjaxPro/AssemblyInfo.cs
@@ -23,7 +23,7 @@
  * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* Developers of Ajax.NET Professional (AjaxPro)
+/* Contributors of Ajax.NET Professional (AjaxPro)
  * MS	Michael Schwarz
  * TB	Tim Byng			
  * MR	Matthew Raymer
@@ -41,39 +41,41 @@
  * MS	21-11-22	changed default behavior of passing types during deserialization to deny
  * MS	21-11-29	added check for custom type deserialization
  * MS	21-11-30	changed error message for unsupported deserialization types in debug mode
+ * MS	24-10-10	changed to have different titles for each binary
  * 
  */
-using System;
-using System.Security.Permissions;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 
 //
 // 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.
 //
-#if(JSONLIB)
-	#if(NET20)
-	[assembly: AssemblyTitle("Ajax.NET Professional JSON library for Microsoft.NET 2.0")]
-	#else
-	[assembly: AssemblyTitle("Ajax.NET Professional JSON library for Microsoft.NET 1.1")]
-	#endif
+#if (JSONLIB)
+#if (NET48)
+	[assembly: AssemblyTitle("Ajax.NET Professional JSON library for Microsoft .NET Framework 4.8")]
+#elif (NET20)
+	[assembly: AssemblyTitle("Ajax.NET Professional JSON library for Microsoft .NET Framework 3.5")]
 #else
-	#if(NET20)
-	[assembly: AssemblyTitle("Ajax.NET Professional for Microsoft.NET 2.0")]
-	#else
-	[assembly: AssemblyTitle("Ajax.NET Professional for Microsoft.NET 1.1")]
-	#endif
+	[assembly: AssemblyTitle("Ajax.NET Professional JSON library for Microsoft .NET Framework 1.1")]
+#endif
+#else
+#if (NET48)
+	[assembly: AssemblyTitle("Ajax.NET Professional for Microsoft .NET Framework 4.8")]
+#elif (NET20)
+	[assembly: AssemblyTitle("Ajax.NET Professional for Microsoft .NET Framework 3.5")]
+#else
+	[assembly: AssemblyTitle("Ajax.NET Professional for Microsoft .NET Framework 1.1")]
+#endif
 #endif
 
 [assembly: AssemblyDescription(".NET Library that provides AJAX related methods to simplify the communication between server and client.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Michael Schwarz")]
 [assembly: AssemblyProduct("Ajax.NET Professional")]
-[assembly: AssemblyCopyright("2023, Michael Schwarz")]
+[assembly: AssemblyCopyright("2024, Michael Schwarz")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]	
+[assembly: AssemblyCulture("")]
 [assembly: System.Security.AllowPartiallyTrustedCallersAttribute()]
 [assembly: System.Runtime.InteropServices.ComVisible(false)]
 [assembly: System.CLSCompliant(true)]
@@ -122,10 +124,10 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyName("")]
 
-#if(STRONGNAME)
-	#if(NET20)
+#if (STRONGNAME)
+#if (NET20)
 	[assembly: AssemblyKeyFile("michael.schwarz.snk")]
-	#else
+#else
 	[assembly: AssemblyKeyFile("michael.schwarz.snk")]
-	#endif
+#endif
 #endif