Fixed #46

Fixed #43 Fixed #42 Signed-off-by: rpgmaker <olamide.bakre@gmail.com>
rpgmaker · Mar 15, 2015 · a3ee9ff · a3ee9ff
1 parent 872c052
commit a3ee9ff
Show file tree

Hide file tree

Showing 11 changed files with 247 additions and 41 deletions.
diff --git a/NetJSON.V3_5/NetJSON.V3_5.csproj b/NetJSON.V3_5/NetJSON.V3_5.csproj
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{BF485716-70B1-43FB-A8CE-A4EEE1EA48FA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>NetJSON</RootNamespace>
+    <AssemblyName>NetJSON</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;NET_35</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\NetJSON\Properties\AssemblyInfo.cs" />
+    <Compile Include="..\NetJSON\AutomaticTypeConverter.cs" />
+    <Compile Include="..\NetJSON\IntUtility.cs" />
+    <Compile Include="..\NetJSON\NetJSON.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>copy "$(TargetPath)" "$(SolutionDir)NetJSON\lib\net35\$(TargetFileName)"</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
diff --git a/NetJSON.V3_5/Properties/AssemblyInfo.cs b/NetJSON.V3_5/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("NetJSON.V3_5")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Hewlett-Packard")]
+[assembly: AssemblyProduct("NetJSON.V3_5")]
+[assembly: AssemblyCopyright("Copyright © Hewlett-Packard 2015")]
+[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("f9557a51-98a7-401d-99f9-52a78034f19d")]
+
+// 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/NetJSON.sln b/NetJSON.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetJSON", "NetJSON\NetJSON.csproj", "{1308D326-02BB-45BD-8549-18F78A81F204}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetJSON.V3_5", "NetJSON.V3_5\NetJSON.V3_5.csproj", "{BF485716-70B1-43FB-A8CE-A4EEE1EA48FA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{1308D326-02BB-45BD-8549-18F78A81F204}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1308D326-02BB-45BD-8549-18F78A81F204}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1308D326-02BB-45BD-8549-18F78A81F204}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF485716-70B1-43FB-A8CE-A4EEE1EA48FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF485716-70B1-43FB-A8CE-A4EEE1EA48FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF485716-70B1-43FB-A8CE-A4EEE1EA48FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF485716-70B1-43FB-A8CE-A4EEE1EA48FA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/NetJSON.v12.suo b/NetJSON.v12.suo
diff --git a/NetJSON/AutomaticTypeConverter.cs b/NetJSON/AutomaticTypeConverter.cs
@@ -3,12 +3,16 @@
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 namespace NetJSON {
+
     public static class AutomaticTypeConverter {
         public static object ToExpectedType(string value) {
+#if NET_35
+      if(value.IsNullOrWhiteSpace()) return value;      
+#else
             if (String.IsNullOrWhiteSpace(value)) return value;
+#endif
             var typeRegExs = TypeRegExs;
             var typeRuleFuncs = TypeRuleFuncs;
             foreach (var regex in typeRegExs)

diff --git a/NetJSON/IntUtility.cs b/NetJSON/IntUtility.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace NetJSON {
     public unsafe static class IntUtility {