From 6d4592a36f1ab8f949656f41846a7935086ef96f Mon Sep 17 00:00:00 2001
From: Gilles Meyer <gilles.meyer@inform-software.com>
Date: Mon, 28 Apr 2014 11:31:19 +0200
Subject: [PATCH 1/3] visual studio 2013 projects/solution migration

---
 HessianCSharp-VS2012.sln | 10 ++++++----
 SilverHessian.csproj     |  7 ++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/HessianCSharp-VS2012.sln b/HessianCSharp-VS2012.sln
index 3cb26e7..fef1f96 100644
--- a/HessianCSharp-VS2012.sln
+++ b/HessianCSharp-VS2012.sln
@@ -1,5 +1,7 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{66AB6076-9698-421F-9B79-9451637DF913}"
 	ProjectSection(SolutionItems) = preProject
 		HessianCSharp-VS2010.vsmdi = HessianCSharp-VS2010.vsmdi
@@ -20,9 +22,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HessianCSharpTests", "HessianCSharpTests\HessianCSharpTests.csproj", "{AFC6388D-9E04-481B-9E31-43C3D59F017A}"
 EndProject
 Global
-	GlobalSection(TestCaseManagementSettings) = postSolution
-		CategoryFile = HessianCSharp-VS2010.vsmdi
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -56,4 +55,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(TestCaseManagementSettings) = postSolution
+		CategoryFile = HessianCSharp-VS2010.vsmdi
+	EndGlobalSection
 EndGlobal
diff --git a/SilverHessian.csproj b/SilverHessian.csproj
index c470da9..dac75af 100644
--- a/SilverHessian.csproj
+++ b/SilverHessian.csproj
@@ -12,11 +12,16 @@
     <RootNamespace>SilverHessian</RootNamespace>
     <AssemblyName>SilverHessian</AssemblyName>
     <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
     <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
     <SilverlightApplication>false</SilverlightApplication>
     <ValidateXaml>true</ValidateXaml>
     <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>4.0</OldToolsVersion>
   </PropertyGroup>
   <!-- This property group is only here to support building this project using the 
        MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs 

From f721e57f771e42595938c6e3183c3a3d7fda7ca2 Mon Sep 17 00:00:00 2001
From: Gilles Meyer <gilles.meyer@inform-software.com>
Date: Mon, 28 Apr 2014 11:37:10 +0200
Subject: [PATCH 2/3] Object deserializer is now able to use non public noargs
 constructors

---
 hessiancsharp/io/CObjectDeserializer.cs | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/hessiancsharp/io/CObjectDeserializer.cs b/hessiancsharp/io/CObjectDeserializer.cs
index 11d86fb..3cd0586 100644
--- a/hessiancsharp/io/CObjectDeserializer.cs
+++ b/hessiancsharp/io/CObjectDeserializer.cs
@@ -53,7 +53,7 @@ public class CObjectDeserializer : AbstractDeserializer
 		/// <summary>
 		/// Object type
 		/// </summary>
-		private Type m_type;
+		private readonly Type m_type;
 		/// <summary>
 		/// Hashmap with class fields (&lt;field name&gt;&lt;field info instance&gt;)
 		/// </summary>
@@ -67,7 +67,7 @@ public class CObjectDeserializer : AbstractDeserializer
 		/// deserialized</param>
 		public CObjectDeserializer(Type type)
 		{
-			this.m_type = type;
+			m_type = type;
 			for (; type!=null; type = type.BaseType) 
 			{
 				FieldInfo [] fields = type.GetFields(
@@ -111,17 +111,22 @@ public override object ReadMap(AbstractHessianInput abstractHessianInput)
             #if COMPACT_FRAMEWORK
             object result = Activator.CreateInstance(this.m_type);				
             #else
-            object result = Activator.CreateInstance(this.m_type.Assembly.FullName, this.m_type.FullName).Unwrap();
-            //			object result = Activator.CreateInstance(this.m_type);
-            //			object result = null;
+            object result = Activator.CreateInstance(
+                m_type.Assembly.FullName,
+                m_type.FullName,
+                false,
+                BindingFlags.CreateInstance | BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public,
+                null,
+                null,
+                null,
+                null,
+                null)
+                .Unwrap();
             #endif
 
-
             return ReadMap(abstractHessianInput, result);
-   
         }
 
-
 		/// <summary>
 		/// Reads map
 		/// </summary>

From bd8a66d83403889eeb7c29b5c80f6c27e5a86aca Mon Sep 17 00:00:00 2001
From: Gilles Meyer <gillesmy@gmail.com>
Date: Mon, 28 Apr 2014 17:04:13 +0200
Subject: [PATCH 3/3] undoing vs2013 migration to comply with master branch

---
 HessianCSharp-VS2012.sln | 10 ++++------
 SilverHessian.csproj     |  7 +------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/HessianCSharp-VS2012.sln b/HessianCSharp-VS2012.sln
index fef1f96..3cb26e7 100644
--- a/HessianCSharp-VS2012.sln
+++ b/HessianCSharp-VS2012.sln
@@ -1,7 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1
+# Visual Studio 2012
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{66AB6076-9698-421F-9B79-9451637DF913}"
 	ProjectSection(SolutionItems) = preProject
 		HessianCSharp-VS2010.vsmdi = HessianCSharp-VS2010.vsmdi
@@ -22,6 +20,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HessianCSharpTests", "HessianCSharpTests\HessianCSharpTests.csproj", "{AFC6388D-9E04-481B-9E31-43C3D59F017A}"
 EndProject
 Global
+	GlobalSection(TestCaseManagementSettings) = postSolution
+		CategoryFile = HessianCSharp-VS2010.vsmdi
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -55,7 +56,4 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(TestCaseManagementSettings) = postSolution
-		CategoryFile = HessianCSharp-VS2010.vsmdi
-	EndGlobalSection
 EndGlobal
diff --git a/SilverHessian.csproj b/SilverHessian.csproj
index dac75af..c470da9 100644
--- a/SilverHessian.csproj
+++ b/SilverHessian.csproj
@@ -12,16 +12,11 @@
     <RootNamespace>SilverHessian</RootNamespace>
     <AssemblyName>SilverHessian</AssemblyName>
     <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
     <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
     <SilverlightApplication>false</SilverlightApplication>
     <ValidateXaml>true</ValidateXaml>
     <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
   </PropertyGroup>
   <!-- This property group is only here to support building this project using the 
        MSBuild 3.5 toolset. In order to work correctly with this older toolset, it needs