V1.6

.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

.travis.yml

@@ -0,0 +1,5 @@
+language: csharp
+script:
+  - xbuild SuperSocket.2013.sln
+  - xbuild SuperSocket.2013.NET40.sln
+  - xbuild SuperSocket.2010.NET35.sln

Agent/Program.cs

@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Reflection;
 using System.Runtime.Remoting;
 using System.Runtime.Remoting.Channels;
 using System.Runtime.Remoting.Channels.Ipc;
-using System.Reflection;
+using System.Runtime.Serialization.Formatters;
 using System.Text;
 using System.Threading;
 using SuperSocket.SocketBase;
@@ -65,7 +66,7 @@ static void Main(string[] args)
 
             try
             {
-                var serverChannel = new IpcServerChannel("IpcAgent", channelPort);
+                var serverChannel = new IpcServerChannel("IpcAgent", channelPort, new BinaryServerFormatterSinkProvider { TypeFilterLevel = TypeFilterLevel.Full });
                 var clientChannel = new IpcClientChannel();
                 ChannelServices.RegisterChannel(serverChannel, false);
                 ChannelServices.RegisterChannel(clientChannel, false);

Agent/WorkItemAgent.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Runtime.Remoting.Lifetime;
 using System.Text;
+using SuperSocket.Common;
 using SuperSocket.SocketBase;
 using SuperSocket.SocketBase.Config;
 using SuperSocket.SocketBase.Logging;
@@ -33,10 +34,15 @@ public WorkItemAgent()
 
         }
 
-        public bool Setup(string serverType, string bootstrapUri, string assemblyImportRoot, IServerConfig config, ProviderFactoryInfo[] factories)
+        public bool Setup(string serverType, string bootstrapUri, string assemblyImportRoot, IServerConfig config, ProviderFactoryInfo[] factories, string startupConfigFile)
         {
             m_AssemblyImporter = new AssemblyImport(assemblyImportRoot);
 
+            if (!string.IsNullOrEmpty(startupConfigFile))
+            {
+                AppDomain.CurrentDomain.ResetConfiguration(startupConfigFile);
+            }
+
             var serviceType = Type.GetType(serverType);
             m_AppServer = (IWorkItem)Activator.CreateInstance(serviceType);
 
@@ -78,6 +84,15 @@ public void Stop()
             m_AppServer.Stop();
         }
 
+        /// <summary>
+        /// Reports the potential configuration change.
+        /// </summary>
+        /// <param name="config">The server config which may be changed.</param>
+        public void ReportPotentialConfigChange(IServerConfig config)
+        {
+            m_AppServer.ReportPotentialConfigChange(config);
+        }
+
         /// <summary>
         /// Gets the session count.
         /// </summary>
@@ -131,5 +146,17 @@ public void TransferSystemMessage(string messageType, object messageData)
         {
             m_AppServer.TransferSystemMessage(messageType, messageData);
         }
+
+
+        /// <summary>
+        /// Gets the server's config.
+        /// </summary>
+        /// <value>
+        /// The server's config.
+        /// </value>
+        public IServerConfig Config
+        {
+            get { return m_AppServer.Config; }
+        }
     }
 }

Build.bat

@@ -20,4 +20,13 @@ FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
 %msbuild% SuperSocket.2010.NET35.sln /p:Configuration=Release /t:Clean;Rebuild /p:OutputPath=..\bin\Net35\Release
 FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
 
+reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework\v4.0.30319\SKUs\.NETFramework,Version=v4.5" 2>nul
+if errorlevel 0 (
+    %msbuild% SuperSocket.2013.sln /p:Configuration=Debug /t:Clean;Rebuild /p:OutputPath=..\bin\Net45\Debug
+	FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
+
+	%msbuild% SuperSocket.2013.sln /p:Configuration=Release /t:Clean;Rebuild /p:OutputPath=..\bin\Net45\Release
+	FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
+)
+
 pause

BuildServerManager.bat

@@ -0,0 +1,32 @@
+@echo off
+
+set fdir=%WINDIR%\Microsoft.NET\Framework64
+
+if not exist %fdir% (
+	set fdir=%WINDIR%\Microsoft.NET\Framework
+)
+
+set msbuild=%fdir%\v4.0.30319\msbuild.exe
+
+%msbuild% Management\Server\SuperSocket.ServerManager.Net40.csproj /p:Configuration=Debug /t:Clean;Rebuild /p:OutputPath=..\..\bin\Net40\Debug
+FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
+
+%msbuild% Management\Server\SuperSocket.ServerManager.Net40.csproj /p:Configuration=Release /t:Clean;Rebuild /p:OutputPath=..\..\bin\Net40\Release
+FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
+
+%msbuild% Management\Server\SuperSocket.ServerManager.Net35.csproj /p:Configuration=Debug /t:Clean;Rebuild /p:OutputPath=..\..\bin\Net35\Debug
+FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
+
+%msbuild% Management\Server\SuperSocket.ServerManager.Net35.csproj /p:Configuration=Release /t:Clean;Rebuild /p:OutputPath=..\..\bin\Net35\Release
+FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
+
+reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework\v4.0.30319\SKUs\.NETFramework,Version=v4.5" 2>nul
+if errorlevel 0 (
+    %msbuild% Management\Server\SuperSocket.ServerManager.Net45.csproj /p:Configuration=Debug /t:Clean;Rebuild /p:OutputPath=..\..\bin\Net45\Debug
+	FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
+
+	%msbuild% Management\Server\SuperSocket.ServerManager.Net45.csproj /p:Configuration=Release /t:Clean;Rebuild /p:OutputPath=..\..\bin\Net45\Release
+	FOR /F "tokens=*" %%G IN ('DIR /B /AD /S obj') DO RMDIR /S /Q "%%G"
+)
+
+pause

Common/AssemblyUtil.cs

@@ -187,19 +187,38 @@ public static T BinaryClone<T>(this T target)
         }
 #endif
 
-        private static object[] m_EmptyObjectArray = new object[] { };
 
         /// <summary>
         /// Copies the properties of one object to another object.
         /// </summary>
+        /// <typeparam name="T"></typeparam>
         /// <param name="source">The source.</param>
         /// <param name="target">The target.</param>
+        /// <returns></returns>
         public static T CopyPropertiesTo<T>(this T source, T target)
         {
-            PropertyInfo[] properties = source.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.GetProperty);
+            return source.CopyPropertiesTo(p => true, target);
+        }
+
+        /// <summary>
+        /// Copies the properties of one object to another object.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="source">The source.</param>
+        /// <param name="predict">The properties predict.</param>
+        /// <param name="target">The target.</param>
+        /// <returns></returns>
+        public static T CopyPropertiesTo<T>(this T source, Predicate<PropertyInfo> predict, T target)
+        {
+            PropertyInfo[] properties = source.GetType()
+                .GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.GetProperty);
+
             Dictionary<string, PropertyInfo> sourcePropertiesDict = properties.ToDictionary(p => p.Name);
 
-            PropertyInfo[] targetProperties = target.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.GetProperty);
+            PropertyInfo[] targetProperties = target.GetType()
+                .GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.SetProperty)
+                .Where(p => predict(p)).ToArray();
+
             for (int i = 0; i < targetProperties.Length; i++)
             {
                 var p = targetProperties[i];
@@ -213,7 +232,7 @@ public static T CopyPropertiesTo<T>(this T source, T target)
                     if (!sourceProperty.PropertyType.IsSerializable)
                         continue;
 
-                    p.SetValue(target, sourceProperty.GetValue(source, m_EmptyObjectArray), m_EmptyObjectArray);
+                    p.SetValue(target, sourceProperty.GetValue(source, null), null);
                 }
             }