NewLife/X

Fx2/Fx4已经彻底分离,很多文件可以在Fx4里面忽略
nnhy authored at 2015-08-31 16:41:10
f98f331
Tree
1 Parent(s) a62cb82
Summary: 4 changed files with 3 additions and 14 deletions.
Modified +0 -5
Modified +1 -1
Modified +2 -5
Modified +0 -3
Modified +0 -5
diff --git a/NewLife.Core/NewLife.Core.csproj b/NewLife.Core/NewLife.Core.csproj
index a5a2200..e07dba3 100644
--- a/NewLife.Core/NewLife.Core.csproj
+++ b/NewLife.Core/NewLife.Core.csproj
@@ -47,10 +47,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Collections\CollectionHelper.cs" />
-    <Compile Include="Collections\ConcurrentDictionary.cs" />
-    <Compile Include="Collections\ConcurrentQueue.cs" />
     <Compile Include="Collections\DictionaryCache.cs" />
-    <Compile Include="Collections\HashSet.cs" />
     <Compile Include="Collections\IStack.cs" />
     <Compile Include="Collections\ListBase.cs" />
     <Compile Include="Collections\LockStack.cs" />
@@ -59,7 +56,6 @@
     <Compile Include="Collections\ObjectPoolTest.cs" />
     <Compile Include="Collections\SafeStack.cs" />
     <Compile Include="Collections\SingleListNode.cs" />
-    <Compile Include="Collections\ConcurrentStack.cs" />
     <Compile Include="Collections\WeakRefDictionary.cs" />
     <Compile Include="Common\CombGuid.cs" />
     <Compile Include="Common\PinYin.cs" />
@@ -132,7 +128,6 @@
     <Compile Include="Net\SessionBase.cs" />
     <Compile Include="Net\ISocketSession.cs" />
     <Compile Include="Properties\AssemblyInfo_.cs" />
-    <Compile Include="Reflection\Action.cs" />
     <Compile Include="Extension\EnumHelper.cs" />
     <Compile Include="Extension\StringHelper.cs" />
     <Compile Include="Configuration\Config.cs" />
Modified +1 -1
diff --git a/NewLife.Core/Reflection/Func.cs b/NewLife.Core/Reflection/Func.cs
index de3a688..1912ed0 100644
--- a/NewLife.Core/Reflection/Func.cs
+++ b/NewLife.Core/Reflection/Func.cs
@@ -1,5 +1,5 @@
 
-namespace NewLife.Reflection
+namespace System
 {
     /// <summary>没有参数和返回值的委托</summary>
     public delegate void Func();
Modified +2 -5
diff --git a/NewLife.Core/Xml/SerializableDictionary.cs b/NewLife.Core/Xml/SerializableDictionary.cs
index 29d6fb0..9df583c 100644
--- a/NewLife.Core/Xml/SerializableDictionary.cs
+++ b/NewLife.Core/Xml/SerializableDictionary.cs
@@ -1,13 +1,10 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Xml;
 using System.Xml.Schema;
 using System.Xml.Serialization;
 using NewLife.Reflection;
 
-#if NET4
-using System;
-#endif
-
 namespace NewLife.Xml
 {
     /// <summary>支持Xml序列化的泛型字典类 </summary>
Modified +0 -3
diff --git a/XCode/Transform/EntityTransform.cs b/XCode/Transform/EntityTransform.cs
index 6309787..a3316d4 100644
--- a/XCode/Transform/EntityTransform.cs
+++ b/XCode/Transform/EntityTransform.cs
@@ -2,9 +2,6 @@
 using System.Collections.Generic;
 using NewLife;
 using NewLife.Log;
-#if !NET4
-using NewLife.Reflection;
-#endif
 using XCode.DataAccessLayer;
 using NewLife.Configuration;