Merge pull request #110 from glennblock/107

glennblock · glennblock · commit 16782074c5fd · 2014-11-29T20:07:26.000-08:00
Refactoring to use DynamicUtils.ExtensilbeObject. Fix for #107
diff --git a/samples/friendapi/FriendApi.csproj b/samples/friendapi/FriendApi.csproj
@@ -45,6 +45,9 @@
       <HintPath>packages\Autofac.WebApi2.3.3.3\lib\net45\Autofac.Integration.WebApi.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="DynamicUtils">
+      <HintPath>packages\DynamicUtils.1.0.1\lib\portable-net45+sl50+win+wp80\DynamicUtils.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
diff --git a/samples/friendapi/packages.config b/samples/friendapi/packages.config
@@ -2,6 +2,7 @@
 <packages>
   <package id="Autofac" version="3.5.0" targetFramework="net45" />
   <package id="Autofac.WebApi2" version="3.3.3" targetFramework="net45" />
+  <package id="DynamicUtils" version="1.0.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.SelfHost" version="5.2.0" targetFramework="net45" />
diff --git a/src/CollectionJson.Client/CollectionJson.Client.csproj b/src/CollectionJson.Client/CollectionJson.Client.csproj
@@ -37,6 +37,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DynamicUtils">
+      <HintPath>..\packages\DynamicUtils.1.0.1\lib\portable-net40+sl50+win8+wpa81+wp8+monotouch+monoandroid\DynamicUtils.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.6.0.3\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
     </Reference>
diff --git a/src/CollectionJson.Client/CollectionJson.Client.nuspec b/src/CollectionJson.Client/CollectionJson.Client.nuspec
@@ -19,6 +19,6 @@
         </dependencies>
     </metadata>
     <files>
-        <file src="bin\Release\CollectionJson.Client.dll" target="lib\portable-net45+win8+wp8+monotouch+monoandroid" />
+        <file src="bin\Release\CollectionJson.Client.dll" target="lib\portable-net40+sl50+win8+wpa81+wp8+monotouch+monoandroid" />
     </files>
 </package>
diff --git a/src/CollectionJson.Client/packages.config b/src/CollectionJson.Client/packages.config
@@ -1,5 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="DynamicUtils" version="1.0.1" targetFramework="portable-net45+win+wpa81+wp80" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.0" targetFramework="portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10" />
diff --git a/src/CollectionJson/Collection.cs b/src/CollectionJson/Collection.cs
@@ -4,6 +4,7 @@
 using System.Runtime.Serialization;
 using System.Text;
 using System.Xml;
+using DynamicUtils;
 
 namespace CollectionJson
 {
diff --git a/src/CollectionJson/CollectionJson.csproj b/src/CollectionJson/CollectionJson.csproj
@@ -37,6 +37,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DynamicUtils">
+      <HintPath>..\packages\DynamicUtils.1.0.1\lib\portable-net40+sl50+win8+wpa81+wp8+monotouch+monoandroid\DynamicUtils.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
@@ -50,7 +53,6 @@
     <Compile Include="CollectionJsonDocumentWriterExtensions.cs" />
     <Compile Include="Data.cs" />
     <Compile Include="Error.cs" />
-    <Compile Include="ExtensibleObject.cs" />
     <Compile Include="ICollectionJsonDocumentReader_Of_T.cs" />
     <Compile Include="ICollectionJsonDocumentWriter_Of_T.cs" />
     <Compile Include="IEnumerable_Of_DataExtensions.cs" />
@@ -69,6 +71,7 @@
     <None Include="CollectionJson.nuspec">
       <SubType>Designer</SubType>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/CollectionJson/CollectionJson.nuspec b/src/CollectionJson/CollectionJson.nuspec
@@ -15,6 +15,6 @@
         <tags>collectionjson</tags>
     </metadata>
     <files>
-        <file src="bin\Release\CollectionJson.dll" target="lib\portable-net40+sl5+win8+wp8+monotouch+monoandroid" />
+        <file src="bin\Release\CollectionJson.dll" target="lib\portable-net40+sl50+win8+wpa81+wp8+monotouch+monoandroid" />
     </files>
 </package>
diff --git a/src/CollectionJson/CollectionJsonDocumentWriter_Of_T.cs b/src/CollectionJson/CollectionJsonDocumentWriter_Of_T.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using DynamicUtils;
 
 namespace CollectionJson
 {
diff --git a/src/CollectionJson/Data.cs b/src/CollectionJson/Data.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
+using DynamicUtils;
 
 namespace CollectionJson
 {
diff --git a/src/CollectionJson/Error.cs b/src/CollectionJson/Error.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
+using DynamicUtils;
 
 namespace CollectionJson
 {
diff --git a/src/CollectionJson/ExtensibleObject.cs b/src/CollectionJson/ExtensibleObject.cs
diff --git a/src/CollectionJson/Item.cs b/src/CollectionJson/Item.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
+using DynamicUtils;
 
 namespace CollectionJson
 {
diff --git a/src/CollectionJson/Link.cs b/src/CollectionJson/Link.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
+using DynamicUtils;
 
 namespace CollectionJson
 {
diff --git a/src/CollectionJson/Query.cs b/src/CollectionJson/Query.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
+using DynamicUtils;
 
 namespace CollectionJson
 {
diff --git a/src/CollectionJson/Template.cs b/src/CollectionJson/Template.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
+using DynamicUtils;
 
 namespace CollectionJson
 {
diff --git a/test/CollectionJson.Client.Tests/CollectionJson.Client.Tests.csproj b/test/CollectionJson.Client.Tests/CollectionJson.Client.Tests.csproj
@@ -35,6 +35,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DynamicUtils">
+      <HintPath>..\..\src\packages\DynamicUtils.1.0.1\lib\portable-net45+sl50+win+wp80\DynamicUtils.dll</HintPath>
+    </Reference>
     <Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\src\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
diff --git a/test/CollectionJson.Client.Tests/packages.config b/test/CollectionJson.Client.Tests/packages.config
@@ -1,5 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="DynamicUtils" version="1.0.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.0" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
diff --git a/test/CollectionJson.Server.Tests/CollectionJson.Server.Tests.csproj b/test/CollectionJson.Server.Tests/CollectionJson.Server.Tests.csproj
@@ -35,6 +35,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DynamicUtils">
+      <HintPath>..\..\src\packages\DynamicUtils.1.0.1\lib\portable-net45+sl50+win+wp80\DynamicUtils.dll</HintPath>
+    </Reference>
     <Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\src\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
diff --git a/test/CollectionJson.Server.Tests/packages.config b/test/CollectionJson.Server.Tests/packages.config
@@ -1,5 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="DynamicUtils" version="1.0.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.0" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
diff --git a/test/CollectionJson.Tests/CollectionJson.Tests.csproj b/test/CollectionJson.Tests/CollectionJson.Tests.csproj
@@ -35,6 +35,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DynamicUtils">
+      <HintPath>..\..\src\packages\DynamicUtils.1.0.1\lib\portable-net45+sl50+win+wp80\DynamicUtils.dll</HintPath>
+    </Reference>
     <Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\src\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
@@ -56,7 +59,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ExtensibleObjectTest.cs" />
     <Compile Include="ExtensionsTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
diff --git a/test/CollectionJson.Tests/ExtensibleObjectTest.cs b/test/CollectionJson.Tests/ExtensibleObjectTest.cs
diff --git a/test/CollectionJson.Tests/packages.config b/test/CollectionJson.Tests/packages.config

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System.Runtime.Serialization;`
`5`	`5`	`using System.Text;`
`6`	`6`	`using System.Xml;`
	`7`	`+using DynamicUtils;`
`7`	`8`
`8`	`9`	`namespace CollectionJson`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Text;`
	`5`	`+using DynamicUtils;`
`5`	`6`
`6`	`7`	`namespace CollectionJson`
`7`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Runtime.Serialization;`
`5`	`5`	`using System.Text;`
	`6`	`+using DynamicUtils;`
`6`	`7`
`7`	`8`	`namespace CollectionJson`
`8`	`9`	`{`