支持dotnetcore的小调整。

banxia · Dec 3, 2017 · 819358e · 819358e
1 parent 05cb480
commit 819358e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/Action/MProc.cs b/Action/MProc.cs
@@ -214,10 +214,9 @@ private void SetDbBase(DbBase dbBase)
             //}
         }
         /// <summary>
-
-
         /// <param name="isClearPara">IsClearParameters
         /// <para>是否清除参数</para></param>
+        /// </summary>
         public void ResetProc(object procNameOrSql, bool isClearPara)
         {
             _procName = procNameOrSql.ToString().Trim();
@@ -235,7 +234,8 @@ public void ResetProc(object procNameOrSql, bool isClearPara)
                     break;
             }
         }
-
+
+        ///<summary>
         /// Toggle tProc Action: To switch between other sql/procedure, use this method
         /// <para>切换操作：如需操作其它语句或存储过程，通过此方法切换</para>
         /// </summary>

diff --git a/Cache/MemRedis/ServerPool.cs b/Cache/MemRedis/ServerPool.cs
@@ -63,7 +63,7 @@ internal class ServerPool
         internal uint MinPoolSize { get { return minPoolSize; } set { minPoolSize = value; } }
         internal TimeSpan SocketRecycleAge { get { return socketRecycleAge; } set { socketRecycleAge = value; } }
 
-        private string clientName;
+        //private string clientName;
         /// <summary>
         /// Internal constructor. This method takes the array of hosts and sets up an internal list of socketpools.
         /// </summary>

diff --git a/Orm/OrmAop.cs b/Orm/OrmAop.cs
@@ -4,6 +4,7 @@
 using System.Runtime.Remoting;
 using System;
 using System.Reflection;
+using System.Runtime.Remoting.Services;
 
 namespace CYQ.Data.Orm
 {
@@ -45,7 +46,7 @@ public override IMessage Invoke(IMessage msg)
                     defaultProxy.InitializeServerObject(constructCallMsg);
 
                     //本类是一个RealProxy，它可通过GetTransparentProxy函数得到透明代理
-                    return System.Runtime.Remoting.Services.EnterpriseServicesHelper.CreateConstructionReturnMessage(constructCallMsg, (MarshalByRefObject)GetTransparentProxy());
+                    return EnterpriseServicesHelper.CreateConstructionReturnMessage(constructCallMsg, (MarshalByRefObject)GetTransparentProxy());
 
                 }
                 else if (msg is IMethodCallMessage)

diff --git a/Table/MDataColumn.cs b/Table/MDataColumn.cs
@@ -63,7 +63,7 @@ public static implicit operator MDataColumn(DataColumnCollection columns)
             return mColumns;
         }
 
-        public new MCellStruct this[string key]
+        public MCellStruct this[string key]
         {
             get
             {
@@ -546,7 +546,7 @@ public void Insert(int index, MCellStruct item)
             }
 
         }
-        public new void InsertRange(int index, MDataColumn mdc)
+        public void InsertRange(int index, MDataColumn mdc)
         {
             for (int i = mdc.Count; i >= 0; i--)
             {

diff --git a/Table/MDataRowCollection.cs b/Table/MDataRowCollection.cs
@@ -213,7 +213,7 @@ bool ICollection<MDataRow>.IsReadOnly
         {
             get { return false; }
         }
-        internal new List<MDataRow> FindAll(Predicate<MDataRow> match)
+        internal List<MDataRow> FindAll(Predicate<MDataRow> match)
         {
             return RowList.FindAll(match);
         }

diff --git a/Tool/MDictionary.cs b/Tool/MDictionary.cs
@@ -213,7 +213,7 @@ public void Set(K key, V value)
             }
         }
 
-        public bool ContainsKey(K key)
+        public new bool ContainsKey(K key)
         {
             lock (lockObj)
             {
-Original file line number
+Diff line change
@@ Expand Up / @@ -213,7 +213,7 @@ public void Set(K key, V value) @@
                 }
             }
-            public bool ContainsKey(K key)
+            public new bool ContainsKey(K key)
             {
                 lock (lockObj)
                 {
@@ Expand Down @@