Merge branch 'master' of https://github.com/dbroudy/Castle.Core into …

…dbroudy-master

Conflicts:
	src/Castle.Core.Tests/Castle.Core.Tests.csproj

src/Castle.Core.Tests/BugsReported/DynProxy159.cs

@@ -0,0 +1,81 @@
+// Copyright 2004-2011 Castle Project - http://www.castleproject.org/
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace Castle.DynamicProxy.Tests.BugsReported
+{
+	using System;
+	using System.IO;
+	using System.Reflection;
+	using System.Runtime.Serialization;
+	using System.Runtime.Serialization.Formatters.Binary;
+
+	using NUnit.Framework;
+
+	[TestFixture]
+	public class DynProxy159 : BasePEVerifyTestCase
+	{
+		// this test will only fail the first time it is run in a given VM
+
+		private void FakeSerialize(object o)
+		{
+			using (var ms = new MemoryStream())
+			{
+				var formatter = new BinaryFormatter();
+				formatter.Serialize(ms, o);
+			}
+		}
+
+		[Test]
+		public void ShouldNotChangeOrderOfSerializeableMembers()
+		{
+			var fromSystem = FormatterServices.GetSerializableMembers(typeof(MySerialClass));
+			var beforeProxySerialization = new MemberInfo[fromSystem.Length];
+			Array.Copy(fromSystem, beforeProxySerialization, fromSystem.Length);
+			fromSystem = null;
+
+			FakeSerialize(generator.CreateClassProxy(typeof(MySerialClass)));
+
+			fromSystem = FormatterServices.GetSerializableMembers(typeof(MySerialClass));
+
+			Assert.AreEqual(beforeProxySerialization, fromSystem);
+		}
+
+		[Test]
+		public void ShouldSerializedMixofProxiedAndUnproxiedInstances()
+		{
+			var o = new[]
+			{
+				new MySerialClass(),
+				(MySerialClass)generator.CreateClassProxy(typeof(MySerialClass)),
+				new MySerialClass(),
+			};
+
+			o[2].yyy = 3.1415;
+			o[2].zzz = 100;
+
+			FakeSerialize(o);
+
+			Assert.AreEqual(3.1415, o[2].yyy);
+			Assert.AreEqual(100, o[2].zzz);
+		}
+	}
+
+	[Serializable]
+	public class MySerialClass
+	{
+		public string xxx { get; set; }
+		public double? yyy { get; set; }
+		public int? zzz { get; set; }
+	}
+}

src/Castle.Core.Tests/Castle.Core.Tests.csproj

@@ -200,6 +200,7 @@
     <Compile Include="BasicInterfaceProxyTestCase.cs" />
     <Compile Include="BugAttribute.cs" />
     <Compile Include="BugsReported\Core40.cs" />
+    <Compile Include="BugsReported\DynProxy159.cs" />
     <Compile Include="BugsReported\DynProxy145_SynchronizationContext.cs" />
     <Compile Include="Components.DictionaryAdapter.Tests\AdaptingGenericDictionaryTestCase.cs" />
     <Compile Include="Components.DictionaryAdapter.Tests\Address.cs" />
@@ -543,4 +544,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

src/Castle.Core/DynamicProxy/Generators/Emitters/TypeUtil.cs

@@ -162,8 +162,10 @@ public static void SetStaticField(this Type type, string fieldName, BindingFlags
 
 		public static MemberInfo[] Sort(MemberInfo[] members)
 		{
-			Array.Sort(members, (l, r) => string.Compare(l.Name, r.Name));
-			return members;
+			var sortedMembers = new MemberInfo[members.Length];
+			Array.Copy(members, sortedMembers, members.Length);
+			Array.Sort(sortedMembers, (l, r) => string.Compare(l.Name, r.Name));
+			return sortedMembers;
 		}
 
 		private static bool CloseGenericParametersIfAny(AbstractTypeEmitter emitter, Type[] arguments)