利用插件整理代码，排序和移除不需要的引用。小心.Net2/.Net4的兼容问题

diff --git "a/NewLife.CommonEntity/\345\270\256\345\212\251/\346\211\213\345\206\214.cs" "b/NewLife.CommonEntity/\345\270\256\345\212\251/\346\211\213\345\206\214.cs"
index 6b84175..529404d 100644
--- "a/NewLife.CommonEntity/\345\270\256\345\212\251/\346\211\213\345\206\214.cs"
+++ "b/NewLife.CommonEntity/\345\270\256\345\212\251/\346\211\213\345\206\214.cs"
@@ -5,9 +5,7 @@
  * 版权：版权所有 (C) 新生命开发团队 2012
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Xml.Serialization;
 using XCode;
 using XCode.Configuration;
 using XCode.DataAccessLayer;

diff --git "a/NewLife.CommonEntity/\351\231\204\344\273\266/ShowPicture.cs" "b/NewLife.CommonEntity/\351\231\204\344\273\266/ShowPicture.cs"
index b51ea2f..0aef197 100644
--- "a/NewLife.CommonEntity/\351\231\204\344\273\266/ShowPicture.cs"
+++ "b/NewLife.CommonEntity/\351\231\204\344\273\266/ShowPicture.cs"
@@ -1,12 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Web;
-using System.IO;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
+using System.IO;
 using System.Reflection;
+using System.Web;
 
 namespace NewLife.CommonEntity.Web
 {

diff --git "a/NewLife.CommonEntity/\347\256\241\347\220\206\345\222\214\346\216\210\346\235\203/\347\224\250\346\210\267.cs" "b/NewLife.CommonEntity/\347\256\241\347\220\206\345\222\214\346\216\210\346\235\203/\347\224\250\346\210\267.cs"
index 64ae8ac..8afad33 100644
--- "a/NewLife.CommonEntity/\347\256\241\347\220\206\345\222\214\346\216\210\346\235\203/\347\224\250\346\210\267.cs"
+++ "b/NewLife.CommonEntity/\347\256\241\347\220\206\345\222\214\346\216\210\346\235\203/\347\224\250\346\210\267.cs"
@@ -5,9 +5,7 @@
  * 版权：版权所有 (C) 新生命开发团队 2012
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Xml.Serialization;
 using XCode;
 using XCode.Configuration;
 using XCode.DataAccessLayer;

diff --git "a/NewLife.CommonEntity/\346\250\241\347\211\210/\346\250\241\347\211\210.Biz.cs" "b/NewLife.CommonEntity/\346\250\241\347\211\210/\346\250\241\347\211\210.Biz.cs"
index 2fd4cda..060a012 100644
--- "a/NewLife.CommonEntity/\346\250\241\347\211\210/\346\250\241\347\211\210.Biz.cs"
+++ "b/NewLife.CommonEntity/\346\250\241\347\211\210/\346\250\241\347\211\210.Biz.cs"
@@ -11,9 +11,9 @@ using System.IO;
 using System.Reflection;
 using System.Text;
 using System.Xml.Serialization;
+using NewLife.Exceptions;
 using XCode;
 using XCode.DataAccessLayer;
-using NewLife.Exceptions;
 
 namespace NewLife.CommonEntity
 {

diff --git "a/NewLife.CommonEntity/\346\250\241\347\211\210/\346\250\241\347\211\210.cs" "b/NewLife.CommonEntity/\346\250\241\347\211\210/\346\250\241\347\211\210.cs"
index 26d47e8..218f0c5 100644
--- "a/NewLife.CommonEntity/\346\250\241\347\211\210/\346\250\241\347\211\210.cs"
+++ "b/NewLife.CommonEntity/\346\250\241\347\211\210/\346\250\241\347\211\210.cs"
@@ -5,10 +5,8 @@
  * 版权：版权所有 (C) 新生命开发团队 2011
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using XCode;
-using System.Xml.Serialization;
 using XCode.Configuration;
 using XCode.DataAccessLayer;
 

diff --git "a/NewLife.CommonEntity/\346\250\241\347\211\210/\346\250\241\347\211\210\345\206\205\345\256\271.cs" "b/NewLife.CommonEntity/\346\250\241\347\211\210/\346\250\241\347\211\210\345\206\205\345\256\271.cs"
index 875c232..73ed1f0 100644
--- "a/NewLife.CommonEntity/\346\250\241\347\211\210/\346\250\241\347\211\210\345\206\205\345\256\271.cs"
+++ "b/NewLife.CommonEntity/\346\250\241\347\211\210/\346\250\241\347\211\210\345\206\205\345\256\271.cs"
@@ -5,10 +5,8 @@
  * 版权：版权所有 (C) 新生命开发团队 2011
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using XCode;
-using System.Xml.Serialization;
 using XCode.Configuration;
 using XCode.DataAccessLayer;
 

diff --git "a/NewLife.CommonEntity/\346\250\241\347\211\210/\346\250\241\347\211\210\351\241\271.cs" "b/NewLife.CommonEntity/\346\250\241\347\211\210/\346\250\241\347\211\210\351\241\271.cs"
index 4db3616..e847ba8 100644
--- "a/NewLife.CommonEntity/\346\250\241\347\211\210/\346\250\241\347\211\210\351\241\271.cs"
+++ "b/NewLife.CommonEntity/\346\250\241\347\211\210/\346\250\241\347\211\210\351\241\271.cs"
@@ -5,10 +5,8 @@
  * 版权：版权所有 (C) 新生命开发团队 2011
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using XCode;
-using System.Xml.Serialization;
 using XCode.Configuration;
 using XCode.DataAccessLayer;
 

diff --git "a/NewLife.CommonEntity/\345\256\236\344\275\223/\345\234\260\345\214\272.cs" "b/NewLife.CommonEntity/\345\256\236\344\275\223/\345\234\260\345\214\272.cs"
index e9eeabf..ac97248 100644
--- "a/NewLife.CommonEntity/\345\256\236\344\275\223/\345\234\260\345\214\272.cs"
+++ "b/NewLife.CommonEntity/\345\256\236\344\275\223/\345\234\260\345\214\272.cs"
@@ -5,9 +5,7 @@
  * 版权：版权所有 (C) 新生命开发团队 2011
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Xml.Serialization;
 using XCode;
 using XCode.Configuration;
 using XCode.DataAccessLayer;

diff --git "a/NewLife.CommonEntity/\345\256\236\344\275\223/\345\210\206\347\261\273.Biz.cs" "b/NewLife.CommonEntity/\345\256\236\344\275\223/\345\210\206\347\261\273.Biz.cs"
index a97077b..01c7b13 100644
--- "a/NewLife.CommonEntity/\345\256\236\344\275\223/\345\210\206\347\261\273.Biz.cs"
+++ "b/NewLife.CommonEntity/\345\256\236\344\275\223/\345\210\206\347\261\273.Biz.cs"
@@ -5,12 +5,8 @@
  * 版权：版权所有 (C) 新生命开发团队 2011
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Text;
-using System.Xml.Serialization;
 using XCode;
-using XCode.Configuration;
 
 namespace NewLife.CommonEntity
 {

diff --git "a/NewLife.CommonEntity/\345\256\236\344\275\223/\345\210\206\347\261\273.cs" "b/NewLife.CommonEntity/\345\256\236\344\275\223/\345\210\206\347\261\273.cs"
index 949900a..58853a4 100644
--- "a/NewLife.CommonEntity/\345\256\236\344\275\223/\345\210\206\347\261\273.cs"
+++ "b/NewLife.CommonEntity/\345\256\236\344\275\223/\345\210\206\347\261\273.cs"
@@ -5,7 +5,6 @@
  * 版权：版权所有 (C) 新生命开发团队 2011
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using XCode;
 using XCode.Configuration;

diff --git "a/NewLife.CommonEntity/\345\256\236\344\275\223/\347\256\200\345\215\225\345\210\206\347\261\273.Biz.cs" "b/NewLife.CommonEntity/\345\256\236\344\275\223/\347\256\200\345\215\225\345\210\206\347\261\273.Biz.cs"
index ded8097..1825a91 100644
--- "a/NewLife.CommonEntity/\345\256\236\344\275\223/\347\256\200\345\215\225\345\210\206\347\261\273.Biz.cs"
+++ "b/NewLife.CommonEntity/\345\256\236\344\275\223/\347\256\200\345\215\225\345\210\206\347\261\273.Biz.cs"
@@ -5,12 +5,8 @@
  * 版权：版权所有 (C) 新生命开发团队 2011
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Text;
-using System.Xml.Serialization;
 using XCode;
-using XCode.Configuration;
 
 namespace NewLife.CommonEntity
 {

diff --git "a/NewLife.CommonEntity/\345\256\236\344\275\223/\347\256\200\345\215\225\345\210\206\347\261\273.cs" "b/NewLife.CommonEntity/\345\256\236\344\275\223/\347\256\200\345\215\225\345\210\206\347\261\273.cs"
index fe32354..9c3fbd3 100644
--- "a/NewLife.CommonEntity/\345\256\236\344\275\223/\347\256\200\345\215\225\345\210\206\347\261\273.cs"
+++ "b/NewLife.CommonEntity/\345\256\236\344\275\223/\347\256\200\345\215\225\345\210\206\347\261\273.cs"
@@ -5,9 +5,7 @@
  * 版权：版权所有 (C) 新生命开发团队 2012
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Xml.Serialization;
 using XCode;
 using XCode.Configuration;
 using XCode.DataAccessLayer;

diff --git "a/NewLife.CommonEntity/\345\256\236\344\275\223/\347\256\200\345\215\225\344\277\241\346\201\257.Biz.cs" "b/NewLife.CommonEntity/\345\256\236\344\275\223/\347\256\200\345\215\225\344\277\241\346\201\257.Biz.cs"
index cdbc926..cb47e18 100644
--- "a/NewLife.CommonEntity/\345\256\236\344\275\223/\347\256\200\345\215\225\344\277\241\346\201\257.Biz.cs"
+++ "b/NewLife.CommonEntity/\345\256\236\344\275\223/\347\256\200\345\215\225\344\277\241\346\201\257.Biz.cs"
@@ -5,12 +5,8 @@
  * 版权：版权所有 (C) 新生命开发团队 2011
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Text;
-using System.Xml.Serialization;
 using XCode;
-using XCode.Configuration;
 
 namespace NewLife.CommonEntity
 {

diff --git "a/NewLife.CommonEntity/\345\256\236\344\275\223/\347\256\200\345\215\225\344\277\241\346\201\257.cs" "b/NewLife.CommonEntity/\345\256\236\344\275\223/\347\256\200\345\215\225\344\277\241\346\201\257.cs"
index a005f8d..9640114 100644
--- "a/NewLife.CommonEntity/\345\256\236\344\275\223/\347\256\200\345\215\225\344\277\241\346\201\257.cs"
+++ "b/NewLife.CommonEntity/\345\256\236\344\275\223/\347\256\200\345\215\225\344\277\241\346\201\257.cs"
@@ -5,9 +5,7 @@
  * 版权：版权所有 (C) 新生命开发团队 2012
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Xml.Serialization;
 using XCode;
 using XCode.Configuration;
 using XCode.DataAccessLayer;

diff --git "a/NewLife.CommonEntity/\345\256\236\344\275\223/\350\256\276\347\275\256.Biz.cs" "b/NewLife.CommonEntity/\345\256\236\344\275\223/\350\256\276\347\275\256.Biz.cs"
index 02b34e1..6110f77 100644
--- "a/NewLife.CommonEntity/\345\256\236\344\275\223/\350\256\276\347\275\256.Biz.cs"
+++ "b/NewLife.CommonEntity/\345\256\236\344\275\223/\350\256\276\347\275\256.Biz.cs"
@@ -8,7 +8,6 @@ using System;
 using System.ComponentModel;
 using System.Xml.Serialization;
 using NewLife.Exceptions;
-using NewLife.Log;
 using XCode;
 
 #if NET4

diff --git "a/NewLife.CommonEntity/\345\256\236\344\275\223/\350\256\276\347\275\256.cs" "b/NewLife.CommonEntity/\345\256\236\344\275\223/\350\256\276\347\275\256.cs"
index 2205b2d..43b2264 100644
--- "a/NewLife.CommonEntity/\345\256\236\344\275\223/\350\256\276\347\275\256.cs"
+++ "b/NewLife.CommonEntity/\345\256\236\344\275\223/\350\256\276\347\275\256.cs"
@@ -5,9 +5,7 @@
  * 版权：版权所有 (C) 新生命开发团队 2012
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Xml.Serialization;
 using XCode;
 using XCode.Configuration;
 using XCode.DataAccessLayer;

diff --git "a/NewLife.CommonEntity/\345\256\236\344\275\223/\347\273\237\350\256\241.cs" "b/NewLife.CommonEntity/\345\256\236\344\275\223/\347\273\237\350\256\241.cs"
index f72d927..d3e4239 100644
--- "a/NewLife.CommonEntity/\345\256\236\344\275\223/\347\273\237\350\256\241.cs"
+++ "b/NewLife.CommonEntity/\345\256\236\344\275\223/\347\273\237\350\256\241.cs"
@@ -5,11 +5,10 @@
  * 版权：版权所有 (C) 新生命开发团队 2010
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using XCode;
-using XCode.DataAccessLayer;
 using XCode.Configuration;
+using XCode.DataAccessLayer;
 
 namespace NewLife.CommonEntity
 {

diff --git "a/NewLife.CommonEntity/\345\256\236\344\275\223/\347\224\250\346\210\267\351\205\215\347\275\256.cs" "b/NewLife.CommonEntity/\345\256\236\344\275\223/\347\224\250\346\210\267\351\205\215\347\275\256.cs"
index 86f2afd..8893cf0 100644
--- "a/NewLife.CommonEntity/\345\256\236\344\275\223/\347\224\250\346\210\267\351\205\215\347\275\256.cs"
+++ "b/NewLife.CommonEntity/\345\256\236\344\275\223/\347\224\250\346\210\267\351\205\215\347\275\256.cs"
@@ -5,9 +5,7 @@
  * 版权：版权所有 (C) 新生命开发团队 2012
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Xml.Serialization;
 using XCode;
 using XCode.Configuration;
 using XCode.DataAccessLayer;

diff --git "a/NewLife.CommonEntity/\345\256\236\344\275\223/Guid\345\210\206\347\261\273.Biz.cs" "b/NewLife.CommonEntity/\345\256\236\344\275\223/Guid\345\210\206\347\261\273.Biz.cs"
index 952058a..305e4fc 100644
--- "a/NewLife.CommonEntity/\345\256\236\344\275\223/Guid\345\210\206\347\261\273.Biz.cs"
+++ "b/NewLife.CommonEntity/\345\256\236\344\275\223/Guid\345\210\206\347\261\273.Biz.cs"
@@ -5,12 +5,8 @@
  * 版权：版权所有 (C) 新生命开发团队 2011
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Text;
-using System.Xml.Serialization;
 using XCode;
-using XCode.Configuration;
 
 namespace NewLife.CommonEntity
 {

diff --git "a/NewLife.CommonEntity/\345\256\236\344\275\223/Guid\345\210\206\347\261\273.cs" "b/NewLife.CommonEntity/\345\256\236\344\275\223/Guid\345\210\206\347\261\273.cs"
index b626425..2c23c2d 100644
--- "a/NewLife.CommonEntity/\345\256\236\344\275\223/Guid\345\210\206\347\261\273.cs"
+++ "b/NewLife.CommonEntity/\345\256\236\344\275\223/Guid\345\210\206\347\261\273.cs"
@@ -5,7 +5,6 @@
  * 版权：版权所有 (C) 新生命开发团队 2011
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using XCode;
 using XCode.Configuration;

diff --git "a/NewLife.CommonEntity/\345\256\236\344\275\223/SysSetting.cs" "b/NewLife.CommonEntity/\345\256\236\344\275\223/SysSetting.cs"
index 0076a71..4a3d4f1 100644
--- "a/NewLife.CommonEntity/\345\256\236\344\275\223/SysSetting.cs"
+++ "b/NewLife.CommonEntity/\345\256\236\344\275\223/SysSetting.cs"
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using NewLife.Reflection;
 using XCode;
 

diff --git a/NewLife.CommonEntity/Common/CommonEntityBase.cs b/NewLife.CommonEntity/Common/CommonEntityBase.cs
index 2e5ca14..95e75ff 100644
--- a/NewLife.CommonEntity/Common/CommonEntityBase.cs
+++ b/NewLife.CommonEntity/Common/CommonEntityBase.cs
@@ -1,6 +1,4 @@
 using System;
-using NewLife.Configuration;
-using NewLife.Web;
 using XCode;
 
 namespace NewLife.CommonEntity

diff --git a/NewLife.CommonEntity/Interfaces/IManageProvider.cs b/NewLife.CommonEntity/Interfaces/IManageProvider.cs
index 561694d..60c69b3 100644
--- a/NewLife.CommonEntity/Interfaces/IManageProvider.cs
+++ b/NewLife.CommonEntity/Interfaces/IManageProvider.cs
@@ -1,8 +1,8 @@
 using System;
+using System.Text;
 using System.Web;
 using NewLife.Reflection;
 using NewLife.Web;
-using System.Text;
 
 namespace NewLife.CommonEntity
 {

diff --git a/NewLife.Core.Test/Properties/AssemblyInfo.cs b/NewLife.Core.Test/Properties/AssemblyInfo.cs
index 1a7a79b..dfc983c 100644
--- a/NewLife.Core.Test/Properties/AssemblyInfo.cs
+++ b/NewLife.Core.Test/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // 有关程序集的常规信息通过下列特性集

diff --git a/NewLife.Core.Test/Serialization/AbstractObj.cs b/NewLife.Core.Test/Serialization/AbstractObj.cs
index 49cf60f..08c4289 100644
--- a/NewLife.Core.Test/Serialization/AbstractObj.cs
+++ b/NewLife.Core.Test/Serialization/AbstractObj.cs
@@ -1,7 +1,5 @@
 using System;
 using System.IO;
-using System.Linq;
-using System.Net;
 using NewLife.Serialization;
 
 namespace NewLife.Core.Test.Serialization

diff --git a/NewLife.Core.Test/Serialization/ArrayObj.cs b/NewLife.Core.Test/Serialization/ArrayObj.cs
index 18e5d19..6ecd46f 100644
--- a/NewLife.Core.Test/Serialization/ArrayObj.cs
+++ b/NewLife.Core.Test/Serialization/ArrayObj.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
 using NewLife.Serialization;
 

diff --git a/NewLife.Core.Test/Serialization/DictionaryObj.cs b/NewLife.Core.Test/Serialization/DictionaryObj.cs
index c7feb32..c772692 100644
--- a/NewLife.Core.Test/Serialization/DictionaryObj.cs
+++ b/NewLife.Core.Test/Serialization/DictionaryObj.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
 using NewLife.Serialization;
 using NewLife.Xml;

diff --git a/NewLife.Core.Test/Serialization/ListObj.cs b/NewLife.Core.Test/Serialization/ListObj.cs
index f085842..2bfef22 100644
--- a/NewLife.Core.Test/Serialization/ListObj.cs
+++ b/NewLife.Core.Test/Serialization/ListObj.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
 using NewLife.Serialization;
 

diff --git a/NewLife.Core.Test/Serialization/SimpleObj.cs b/NewLife.Core.Test/Serialization/SimpleObj.cs
index 29f7dfe..758422a 100644
--- a/NewLife.Core.Test/Serialization/SimpleObj.cs
+++ b/NewLife.Core.Test/Serialization/SimpleObj.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
 using NewLife.Serialization;
 

diff --git a/NewLife.Core.Test/Serialization/WriterHelper.cs b/NewLife.Core.Test/Serialization/WriterHelper.cs
index 41b9031..ce50f98 100644
--- a/NewLife.Core.Test/Serialization/WriterHelper.cs
+++ b/NewLife.Core.Test/Serialization/WriterHelper.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
+using System.Text;
 
 namespace NewLife.Core.Test.Serialization
 {

diff --git a/NewLife.Core.Test/Serialization/XmlTest.cs b/NewLife.Core.Test/Serialization/XmlTest.cs
index 4f12b73..68e6836 100644
--- a/NewLife.Core.Test/Serialization/XmlTest.cs
+++ b/NewLife.Core.Test/Serialization/XmlTest.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Text;
+using System.Xml;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using NewLife.Serialization;
 using NewLife.Xml;
-using System.Xml.Serialization;
-using System.Xml;
-using System.IO;
 
 namespace NewLife.Core.Test.Serialization
 {

diff --git a/NewLife.Core.Test/Xml/UserConfig.cs b/NewLife.Core.Test/Xml/UserConfig.cs
index 31dae37..9ae0011 100644
--- a/NewLife.Core.Test/Xml/UserConfig.cs
+++ b/NewLife.Core.Test/Xml/UserConfig.cs
@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using NewLife.Xml;
-using System.Xml.Serialization;
 using System.ComponentModel;
+using NewLife.Xml;
 
 namespace NewLife.Core.Test.Xml
 {

diff --git a/NewLife.Core/Cctor.cs b/NewLife.Core/Cctor.cs
index d546ceb..816d647 100644
--- a/NewLife.Core/Cctor.cs
+++ b/NewLife.Core/Cctor.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife
 {
     //class Cctor

diff --git a/NewLife.Core/Collections/HashSet.cs b/NewLife.Core/Collections/HashSet.cs
index 4d949ee..5eb54f7 100644
--- a/NewLife.Core/Collections/HashSet.cs
+++ b/NewLife.Core/Collections/HashSet.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using NewLife.Exceptions;
 

diff --git a/NewLife.Core/Collections/InterlockedStack.cs b/NewLife.Core/Collections/InterlockedStack.cs
index 702431c..fcc3e93 100644
--- a/NewLife.Core/Collections/InterlockedStack.cs
+++ b/NewLife.Core/Collections/InterlockedStack.cs
@@ -3,7 +3,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
-using NewLife.Threading;
 
 namespace NewLife.Collections
 {

diff --git a/NewLife.Core/Collections/IStack.cs b/NewLife.Core/Collections/IStack.cs
index da99381..28d97f2 100644
--- a/NewLife.Core/Collections/IStack.cs
+++ b/NewLife.Core/Collections/IStack.cs
@@ -1,7 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Collections;
+using System.Collections.Generic;
 
 namespace NewLife.Collections
 {

diff --git a/NewLife.Core/Collections/LockStack.cs b/NewLife.Core/Collections/LockStack.cs
index 934f26e..e2f9d42 100644
--- a/NewLife.Core/Collections/LockStack.cs
+++ b/NewLife.Core/Collections/LockStack.cs
@@ -1,7 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Collections;
+using System.Collections.Generic;
 
 namespace NewLife.Collections
 {

diff --git a/NewLife.Core/Collections/SafeStack.cs b/NewLife.Core/Collections/SafeStack.cs
index 1f3cef4..9ddb661 100644
--- a/NewLife.Core/Collections/SafeStack.cs
+++ b/NewLife.Core/Collections/SafeStack.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading;
-using NewLife.Threading;
 
 namespace NewLife.Collections
 {

diff --git a/NewLife.Core/Common/SysConfig.cs b/NewLife.Core/Common/SysConfig.cs
index 6e92722..9d7d920 100644
--- a/NewLife.Core/Common/SysConfig.cs
+++ b/NewLife.Core/Common/SysConfig.cs
@@ -1,9 +1,14 @@
 using System;
 using System.ComponentModel;
-using NewLife.Linq;
 using NewLife.Reflection;
 using NewLife.Xml;
 
+#if NET4
+using System.Linq;
+#else
+using NewLife.Linq;
+#endif
+
 namespace NewLife.Common
 {
     /// <summary>系统设置。提供系统名称、版本等基本设置。</summary>

diff --git a/NewLife.Core/Compression/ZipConstants.cs b/NewLife.Core/Compression/ZipConstants.cs
index 3c6550a..497b6d7 100644
--- a/NewLife.Core/Compression/ZipConstants.cs
+++ b/NewLife.Core/Compression/ZipConstants.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Text;
-using System.Threading;
 
 namespace NewLife.Compression
 {

diff --git a/NewLife.Core/Compression/ZipEntry.cs b/NewLife.Core/Compression/ZipEntry.cs
index 5802624..2daa1bb 100644
--- a/NewLife.Core/Compression/ZipEntry.cs
+++ b/NewLife.Core/Compression/ZipEntry.cs
@@ -4,7 +4,6 @@ using System.IO;
 using System.IO.Compression;
 using NewLife.Collections;
 using NewLife.Exceptions;
-using NewLife.IO;
 using NewLife.Reflection;
 using NewLife.Security;
 using NewLife.Serialization;

diff --git a/NewLife.Core/Extension/BitHelper.cs b/NewLife.Core/Extension/BitHelper.cs
index 4915dcf..810b13b 100644
--- a/NewLife.Core/Extension/BitHelper.cs
+++ b/NewLife.Core/Extension/BitHelper.cs
@@ -1,5 +1,4 @@
-using System;
-
+
 namespace System
 {
     /// <summary>数据位助手</summary>

diff --git a/NewLife.Core/Extension/EnumHelper.cs b/NewLife.Core/Extension/EnumHelper.cs
index 0eaaaa0..28fc8ff 100644
--- a/NewLife.Core/Extension/EnumHelper.cs
+++ b/NewLife.Core/Extension/EnumHelper.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Reflection;
-using NewLife.Reflection;
-using NewLife.Linq;
 
 namespace System
 {

diff --git a/NewLife.Core/Extension/Linq/EmptyEnumerable.cs b/NewLife.Core/Extension/Linq/EmptyEnumerable.cs
index 7af2c2c..b6271fc 100644
--- a/NewLife.Core/Extension/Linq/EmptyEnumerable.cs
+++ b/NewLife.Core/Extension/Linq/EmptyEnumerable.cs
@@ -1,6 +1,7 @@
-using System;
+#if !NET4
 using System.Collections.Generic;
 using System.Runtime;
+
 namespace NewLife.Linq
 {
     internal class EmptyEnumerable<TElement>
@@ -18,4 +19,5 @@ namespace NewLife.Linq
         [TargetedPatchingOptOut("Performance critical to inline this type of method across NGen image boundaries")]
         public EmptyEnumerable() { }
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file

diff --git a/NewLife.Core/Extension/Linq/Enumerable_2.cs b/NewLife.Core/Extension/Linq/Enumerable_2.cs
index ffa9ecc..ae8fb86 100644
--- a/NewLife.Core/Extension/Linq/Enumerable_2.cs
+++ b/NewLife.Core/Extension/Linq/Enumerable_2.cs
@@ -1,56 +1,56 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using NewLife.Reflection;
+//using System;
+//using System.Collections.Generic;
+//using System.ComponentModel;
+//using NewLife.Reflection;
 
-namespace NewLife.Linq
-{
-#if NET4
-    /// <summary>提供一组用于查询实现 <see cref="T:System.Collections.Generic.IEnumerable`1" /> 的对象的 static（在 Visual Basic 中为 Shared）方法。</summary>
-#endif
-    public static partial class Enumerable
-    {
-        /// <summary>遍历序列中的所有元素。</summary>
-        /// <param name="source">包含要应用谓词的元素的 <see cref="T:System.Collections.Generic.IEnumerable`1" />。</param>
-        /// <param name="predicate">用于测试每个元素是否满足条件的函数。</param>
-        /// <typeparam name="TSource">
-        ///   <paramref name="source" /> 中的元素的类型。</typeparam>
-        /// <exception cref="T:System.ArgumentNullException">
-        ///   <paramref name="source" /> 或 <paramref name="predicate" /> 为 null。</exception>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("因为.Net4.0不支持，有点鸡肋，将来不支持！")]
-        public static IEnumerable<TSource> ForEach<TSource>(this IEnumerable<TSource> source, Action<TSource> predicate)
-        {
-            if (source == null) throw new ArgumentNullException("source");
-            if (predicate == null) throw new ArgumentNullException("predicate");
+//namespace NewLife.Linq
+//{
+//#if NET4
+//    /// <summary>提供一组用于查询实现 <see cref="T:System.Collections.Generic.IEnumerable`1" /> 的对象的 static（在 Visual Basic 中为 Shared）方法。</summary>
+//#endif
+//    public static partial class Enumerable
+//    {
+//        /// <summary>遍历序列中的所有元素。</summary>
+//        /// <param name="source">包含要应用谓词的元素的 <see cref="T:System.Collections.Generic.IEnumerable`1" />。</param>
+//        /// <param name="predicate">用于测试每个元素是否满足条件的函数。</param>
+//        /// <typeparam name="TSource">
+//        ///   <paramref name="source" /> 中的元素的类型。</typeparam>
+//        /// <exception cref="T:System.ArgumentNullException">
+//        ///   <paramref name="source" /> 或 <paramref name="predicate" /> 为 null。</exception>
+//        [EditorBrowsable(EditorBrowsableState.Never)]
+//        [Obsolete("因为.Net4.0不支持，有点鸡肋，将来不支持！")]
+//        public static IEnumerable<TSource> ForEach<TSource>(this IEnumerable<TSource> source, Action<TSource> predicate)
+//        {
+//            if (source == null) throw new ArgumentNullException("source");
+//            if (predicate == null) throw new ArgumentNullException("predicate");
 
-            foreach (TSource current in source)
-            {
-                predicate(current);
-            }
-            return source;
-        }
+//            foreach (TSource current in source)
+//            {
+//                predicate(current);
+//            }
+//            return source;
+//        }
 
-        /// <summary>遍历序列中的所有元素。</summary>
-        /// <param name="source">包含要应用谓词的元素的 <see cref="T:System.Collections.Generic.IEnumerable`1" />。</param>
-        /// <param name="predicate">用于测试每个元素是否满足条件的函数。</param>
-        /// <typeparam name="TSource">
-        ///   <paramref name="source" /> 中的元素的类型。</typeparam>
-        /// <exception cref="T:System.ArgumentNullException">
-        ///   <paramref name="source" /> 或 <paramref name="predicate" /> 为 null。</exception>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        [Obsolete("因为.Net4.0不支持，有点鸡肋，将来不支持！")]
-        public static IEnumerable<TSource> ForEach<TSource>(this IEnumerable<TSource> source, Action<TSource, int> predicate)
-        {
-            if (source == null) throw new ArgumentNullException("source");
-            if (predicate == null) throw new ArgumentNullException("predicate");
+//        /// <summary>遍历序列中的所有元素。</summary>
+//        /// <param name="source">包含要应用谓词的元素的 <see cref="T:System.Collections.Generic.IEnumerable`1" />。</param>
+//        /// <param name="predicate">用于测试每个元素是否满足条件的函数。</param>
+//        /// <typeparam name="TSource">
+//        ///   <paramref name="source" /> 中的元素的类型。</typeparam>
+//        /// <exception cref="T:System.ArgumentNullException">
+//        ///   <paramref name="source" /> 或 <paramref name="predicate" /> 为 null。</exception>
+//        [EditorBrowsable(EditorBrowsableState.Never)]
+//        [Obsolete("因为.Net4.0不支持，有点鸡肋，将来不支持！")]
+//        public static IEnumerable<TSource> ForEach<TSource>(this IEnumerable<TSource> source, Action<TSource, int> predicate)
+//        {
+//            if (source == null) throw new ArgumentNullException("source");
+//            if (predicate == null) throw new ArgumentNullException("predicate");
 
-            Int32 i = 0;
-            foreach (TSource current in source)
-            {
-                predicate(current, i++);
-            }
-            return source;
-        }
-    }
-}
\ No newline at end of file
+//            Int32 i = 0;
+//            foreach (TSource current in source)
+//            {
+//                predicate(current, i++);
+//            }
+//            return source;
+//        }
+//    }
+//}
\ No newline at end of file

diff --git a/NewLife.Core/Extension/Linq/Enumerable.cs b/NewLife.Core/Extension/Linq/Enumerable.cs
index b6fa585..202bca8 100644
--- a/NewLife.Core/Extension/Linq/Enumerable.cs
+++ b/NewLife.Core/Extension/Linq/Enumerable.cs
@@ -1,18 +1,18 @@
-using System;
+#if !NET4
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime;
 using System.Threading;
 using NewLife.Reflection;
 
-#if !NET4
 #pragma warning disable 1734
 namespace NewLife.Linq
 {
     /// <summary>提供一组用于查询实现 <see cref="T:System.Collections.Generic.IEnumerable`1" /> 的对象的 static（在 Visual Basic 中为 Shared）方法。</summary>
     public static partial class Enumerable
     {
-        #region 内部类
+#region 内部类
         private abstract class Iterator<TSource> : IEnumerable<TSource>, IEnumerable, IEnumerator<TSource>, IDisposable, IEnumerator
         {
             private int threadId;
@@ -397,7 +397,7 @@ namespace NewLife.Linq
         }
         #endregion
 
-        #region 集合查找
+#region 集合查找
         /// <summary>基于谓词筛选值序列。</summary>
         /// <returns>一个 <see cref="T:System.Collections.Generic.IEnumerable`1" />，包含输入序列中满足条件的元素。</returns>
         /// <param name="source">要筛选的 <see cref="T:System.Collections.Generic.IEnumerable`1" />。</param>
@@ -915,7 +915,7 @@ namespace NewLife.Linq
         }
         #endregion
 
-        #region 分组排序
+#region 分组排序
         /// <summary>基于匹配键对两个序列的元素进行关联。使用默认的相等比较器对键进行比较。</summary>
         /// <returns>一个具有 <paramref name="TResult" /> 类型元素的 <see cref="T:System.Collections.Generic.IEnumerable`1" />，这些元素是通过对两个序列执行内部联接得来的。</returns>
         /// <param name="outer">要联接的第一个序列。</param>
@@ -1720,7 +1720,7 @@ namespace NewLife.Linq
         }
         #endregion
 
-        #region 集合转换
+#region 集合转换
         /// <summary>返回类型为 <see cref="T:System.Collections.Generic.IEnumerable`1" /> 的输入。</summary>
         /// <returns>类型为 <see cref="T:System.Collections.Generic.IEnumerable`1" /> 的输入序列。</returns>
         /// <param name="source">类型为 <see cref="T:System.Collections.Generic.IEnumerable`1" /> 的序列。</param>
@@ -1916,7 +1916,7 @@ namespace NewLife.Linq
         }
         #endregion
 
-        #region 集合元素转换
+#region 集合元素转换
         /// <summary>返回指定序列的元素；如果序列为空，则返回单一实例集合中的类型参数的默认值。</summary>
         /// <returns>如果 <paramref name="source" /> 为空，则为包含 <paramref name="TSource" /> 类型的默认值的 <see cref="T:System.Collections.Generic.IEnumerable`1" /> 对象；否则为 <paramref name="source" />。</returns>
         /// <param name="source">序列为空时返回默认值的序列。</param>
@@ -2018,7 +2018,7 @@ namespace NewLife.Linq
         }
         #endregion
 
-        #region 元素定位
+#region 元素定位
         /// <summary>返回序列中的第一个元素。</summary>
         /// <returns>返回指定序列中的第一个元素。</returns>
         /// <param name="source">要返回其第一个元素的 <see cref="T:System.Collections.Generic.IEnumerable`1" />。</param>
@@ -2557,7 +2557,7 @@ namespace NewLife.Linq
         }
         #endregion
 
-        #region 产生集合
+#region 产生集合
         /// <summary>生成指定范围内的整数的序列。</summary>
         /// <returns>C# 中的 IEnumerable&lt;Int32&gt; 或 Visual Basic 中包含某个范围内的顺序整数的 IEnumerable(Of Int32)。</returns>
         /// <param name="start">序列中第一个整数的值。</param>
@@ -2613,7 +2613,7 @@ namespace NewLife.Linq
         }
         #endregion
 
-        #region 集合统计
+#region 集合统计
         /// <summary>确定序列是否包含任何元素。</summary>
         /// <returns>如果源序列包含任何元素，则为 true；否则为 false。</returns>
         /// <param name="source">要检查是否为空的 <see cref="T:System.Collections.Generic.IEnumerable`1" />。</param>
@@ -2865,7 +2865,7 @@ namespace NewLife.Linq
         }
         #endregion
 
-        #region 累加、求和、最大、最小、平均
+#region 累加、求和、最大、最小、平均
         /// <summary>对序列应用累加器函数。</summary>
         /// <returns>累加器的最终值。</returns>
         /// <param name="source">要聚合的 <see cref="T:System.Collections.Generic.IEnumerable`1" />。</param>

diff --git a/NewLife.Core/Extension/Linq/EnumerableSorter.cs b/NewLife.Core/Extension/Linq/EnumerableSorter.cs
index 5c5f830..94e2ae4 100644
--- a/NewLife.Core/Extension/Linq/EnumerableSorter.cs
+++ b/NewLife.Core/Extension/Linq/EnumerableSorter.cs
@@ -1,7 +1,9 @@
-using System;
+#if !NET4
+using System;
 using System.Collections.Generic;
 using System.Runtime;
 using NewLife.Reflection;
+
 namespace NewLife.Linq
 {
     internal abstract class EnumerableSorter<TElement>
@@ -127,4 +129,5 @@ namespace NewLife.Linq
             }
         }
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file

diff --git a/NewLife.Core/Extension/Linq/ExtensionAttribute.cs b/NewLife.Core/Extension/Linq/ExtensionAttribute.cs
index e01e849..ac8b905 100644
--- a/NewLife.Core/Extension/Linq/ExtensionAttribute.cs
+++ b/NewLife.Core/Extension/Linq/ExtensionAttribute.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+#if !NET4
 namespace System.Runtime.CompilerServices
 {
-#if !NET4
     /// <summary>支持使用扩展方法的特性</summary>
     /// <remarks>
     /// 为了能在vs2010+.Net 2.0中使用扩展方法，添加该特性。
@@ -15,5 +11,5 @@ namespace System.Runtime.CompilerServices
     /// 在@Aimeast和@小董 的帮助下，决定枚举器扩展的命名空间从System.Linq改为NewLife.Linq。
     /// </remarks>
     public sealed class ExtensionAttribute : Attribute { }
-#endif
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file

diff --git a/NewLife.Core/Extension/Linq/GroupedEnumerable.cs b/NewLife.Core/Extension/Linq/GroupedEnumerable.cs
index 682e92e..7c002be 100644
--- a/NewLife.Core/Extension/Linq/GroupedEnumerable.cs
+++ b/NewLife.Core/Extension/Linq/GroupedEnumerable.cs
@@ -1,8 +1,10 @@
-using System;
+#if !NET4
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime;
 using NewLife.Reflection;
+
 namespace NewLife.Linq
 {
     internal class GroupedEnumerable<TSource, TKey, TElement> : IEnumerable<IGrouping<TKey, TElement>>, IEnumerable
@@ -83,4 +85,5 @@ namespace NewLife.Linq
             return this.GetEnumerator();
         }
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file

diff --git a/NewLife.Core/Extension/Linq/IdentityFunction.cs b/NewLife.Core/Extension/Linq/IdentityFunction.cs
index e000bfb..e5ac34b 100644
--- a/NewLife.Core/Extension/Linq/IdentityFunction.cs
+++ b/NewLife.Core/Extension/Linq/IdentityFunction.cs
@@ -1,6 +1,8 @@
-using System;
+#if !NET4
+using System;
 using System.Runtime;
 using NewLife.Reflection;
+
 namespace NewLife.Linq
 {
     internal class IdentityFunction<TElement>
@@ -13,8 +15,7 @@ namespace NewLife.Linq
             }
         }
         [TargetedPatchingOptOut("Performance critical to inline this type of method across NGen image boundaries")]
-        public IdentityFunction()
-        {
-        }
+        public IdentityFunction() { }
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file

diff --git a/NewLife.Core/Extension/Linq/IGrouping.cs b/NewLife.Core/Extension/Linq/IGrouping.cs
index ea74da8..e5c4132 100644
--- a/NewLife.Core/Extension/Linq/IGrouping.cs
+++ b/NewLife.Core/Extension/Linq/IGrouping.cs
@@ -1,4 +1,5 @@
-using System;
+#if !NET4
+using System;
 using System.Collections;
 using System.Collections.Generic;
 
@@ -20,4 +21,5 @@ namespace NewLife.Linq
             get;
         }
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file

diff --git a/NewLife.Core/Extension/Linq/ILookup.cs b/NewLife.Core/Extension/Linq/ILookup.cs
index be2d456..6778403 100644
--- a/NewLife.Core/Extension/Linq/ILookup.cs
+++ b/NewLife.Core/Extension/Linq/ILookup.cs
@@ -1,4 +1,5 @@
-using System;
+#if !NET4
+using System;
 using System.Collections;
 using System.Collections.Generic;
 
@@ -29,4 +30,5 @@ namespace NewLife.Linq
         /// <param name="key">要在 <see cref="T:NewLife.Linq.ILookup`2" /> 中搜索的键。</param>
         bool Contains(TKey key);
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file

diff --git a/NewLife.Core/Extension/Linq/IOrderedEnumerable.cs b/NewLife.Core/Extension/Linq/IOrderedEnumerable.cs
index 0781ef8..c1b62bf 100644
--- a/NewLife.Core/Extension/Linq/IOrderedEnumerable.cs
+++ b/NewLife.Core/Extension/Linq/IOrderedEnumerable.cs
@@ -1,4 +1,5 @@
-using System;
+#if !NET4
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using NewLife.Reflection;
@@ -20,4 +21,5 @@ namespace NewLife.Linq
         /// <filterpriority>2</filterpriority>
         IOrderedEnumerable<TElement> CreateOrderedEnumerable<TKey>(Func<TElement, TKey> keySelector, IComparer<TKey> comparer, bool descending);
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file

diff --git a/NewLife.Core/Extension/Linq/Lookup.cs b/NewLife.Core/Extension/Linq/Lookup.cs
index 7e56eaf..d7f45f4 100644
--- a/NewLife.Core/Extension/Linq/Lookup.cs
+++ b/NewLife.Core/Extension/Linq/Lookup.cs
@@ -1,4 +1,5 @@
-using System;
+#if !NET4
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime;
@@ -305,4 +306,5 @@ namespace NewLife.Linq
             this.groupings = array;
         }
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file

diff --git a/NewLife.Core/Extension/Linq/OrderedEnumerable.cs b/NewLife.Core/Extension/Linq/OrderedEnumerable.cs
index 5709633..9dcfb0d 100644
--- a/NewLife.Core/Extension/Linq/OrderedEnumerable.cs
+++ b/NewLife.Core/Extension/Linq/OrderedEnumerable.cs
@@ -1,6 +1,7 @@
-using System;
-using System.Collections.Generic;
+#if !NET4
+using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Runtime;
 using NewLife.Reflection;
 
@@ -75,4 +76,5 @@ namespace NewLife.Linq
             return enumerableSorter;
         }
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file

diff --git a/NewLife.Core/Extension/Linq/Set.cs b/NewLife.Core/Extension/Linq/Set.cs
index 591339a..7bcd9fd 100644
--- a/NewLife.Core/Extension/Linq/Set.cs
+++ b/NewLife.Core/Extension/Linq/Set.cs
@@ -1,6 +1,8 @@
-using System;
+#if !NET4
+using System;
 using System.Collections.Generic;
 using System.Runtime;
+
 namespace NewLife.Linq
 {
     internal class Set<TElement>
@@ -118,4 +120,5 @@ namespace NewLife.Linq
             return 0;
         }
     }
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file

diff --git a/NewLife.Core/Extension/Linq/TargetedPatchingOptOutAttribute.cs b/NewLife.Core/Extension/Linq/TargetedPatchingOptOutAttribute.cs
index ba95d4a..bae09e5 100644
--- a/NewLife.Core/Extension/Linq/TargetedPatchingOptOutAttribute.cs
+++ b/NewLife.Core/Extension/Linq/TargetedPatchingOptOutAttribute.cs
@@ -1,7 +1,7 @@
-using System;
+#if !NET4
+using System;
 namespace System.Runtime
 {
-#if !NET4
     /// <summary>指示此特性应用于的 .NET Framework 类库方法不可能受服务版本的影响，因此它可以在本机映像生成器 (NGen) 格式的映像间内联。</summary>
     [AttributeUsage(AttributeTargets.Constructor | AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
     sealed class TargetedPatchingOptOutAttribute : Attribute
@@ -27,5 +27,5 @@ namespace System.Runtime
         {
         }
     }
-#endif
-}
\ No newline at end of file
+}
+#endif
\ No newline at end of file

diff --git a/NewLife.Core/InlineIL.cs b/NewLife.Core/InlineIL.cs
index 0ce9ea0..fd8fcd5 100644
--- a/NewLife.Core/InlineIL.cs
+++ b/NewLife.Core/InlineIL.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife
 {

diff --git a/NewLife.Core/IO/IOHelper.cs b/NewLife.Core/IO/IOHelper.cs
index 48efc82..82229aa 100644
--- a/NewLife.Core/IO/IOHelper.cs
+++ b/NewLife.Core/IO/IOHelper.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.IO;
+using System.IO;
 using System.IO.Compression;
 using System.Text;
 

diff --git a/NewLife.Core/IO/PathHelper.cs b/NewLife.Core/IO/PathHelper.cs
index ec66a2e..8473ea0 100644
--- a/NewLife.Core/IO/PathHelper.cs
+++ b/NewLife.Core/IO/PathHelper.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace System.IO
 {
     /// <summary>路径操作帮助</summary>

diff --git a/NewLife.Core/IOModel/StreamClient.cs b/NewLife.Core/IOModel/StreamClient.cs
index 07c2ec9..c2606ad 100644
--- a/NewLife.Core/IOModel/StreamClient.cs
+++ b/NewLife.Core/IOModel/StreamClient.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using NewLife.Exceptions;
 

diff --git a/NewLife.Core/IOModel/StreamHttpHandler.cs b/NewLife.Core/IOModel/StreamHttpHandler.cs
index 33e2b95..e7c0914 100644
--- a/NewLife.Core/IOModel/StreamHttpHandler.cs
+++ b/NewLife.Core/IOModel/StreamHttpHandler.cs
@@ -1,8 +1,8 @@
 using System;
 using System.IO;
+using System.Text;
 using System.Web;
 using NewLife.Web;
-using System.Text;
 
 namespace NewLife.IO
 {

diff --git a/NewLife.Core/Log/CodeTimer.cs b/NewLife.Core/Log/CodeTimer.cs
index 26bf006..114c4d4 100644
--- a/NewLife.Core/Log/CodeTimer.cs
+++ b/NewLife.Core/Log/CodeTimer.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
+using System.Text;
 using System.Threading;
 using NewLife.Exceptions;
-using System.Text;
 
 namespace NewLife.Log
 {

diff --git a/NewLife.Core/Messaging/MessageKind.cs b/NewLife.Core/Messaging/MessageKind.cs
index 34f2596..5523190 100644
--- a/NewLife.Core/Messaging/MessageKind.cs
+++ b/NewLife.Core/Messaging/MessageKind.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Messaging
 {
     /// <summary>消息类型</summary>

diff --git a/NewLife.Core/Messaging/StringMessage.cs b/NewLife.Core/Messaging/StringMessage.cs
index 1828edc..a8a0cab 100644
--- a/NewLife.Core/Messaging/StringMessage.cs
+++ b/NewLife.Core/Messaging/StringMessage.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Xml.Serialization;
 
 namespace NewLife.Messaging

diff --git a/NewLife.Core/Model/IPlugin.cs b/NewLife.Core/Model/IPlugin.cs
index 167d883..dfae7d6 100644
--- a/NewLife.Core/Model/IPlugin.cs
+++ b/NewLife.Core/Model/IPlugin.cs
@@ -1,12 +1,14 @@
 using System;
-#if NET4
-using System.Linq;
-#endif
 using System.Collections.Generic;
-using NewLife.Linq;
 using NewLife.Log;
 using NewLife.Reflection;
 
+#if NET4
+using System.Linq;
+#else
+using NewLife.Linq;
+#endif
+
 namespace NewLife.Model
 {
     /// <summary>通用插件接口</summary>

diff --git a/NewLife.Core/Model/IServer.cs b/NewLife.Core/Model/IServer.cs
index 63da2e6..d4b13ac 100644
--- a/NewLife.Core/Model/IServer.cs
+++ b/NewLife.Core/Model/IServer.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Model
 {
     /// <summary>服务接口。</summary>

diff --git a/NewLife.Core/Model/ModelExtension.cs b/NewLife.Core/Model/ModelExtension.cs
index 218a81a..f982330 100644
--- a/NewLife.Core/Model/ModelExtension.cs
+++ b/NewLife.Core/Model/ModelExtension.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Model
 {

diff --git a/NewLife.Core/Reflection/Action.cs b/NewLife.Core/Reflection/Action.cs
index a710edc..5cce61a 100644
--- a/NewLife.Core/Reflection/Action.cs
+++ b/NewLife.Core/Reflection/Action.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Reflection
 {
     ///// <summary>

diff --git a/NewLife.Core/Reflection/DuckTyping.cs b/NewLife.Core/Reflection/DuckTyping.cs
index 31ca4a0..48b91f6 100644
--- a/NewLife.Core/Reflection/DuckTyping.cs
+++ b/NewLife.Core/Reflection/DuckTyping.cs
@@ -1,9 +1,6 @@
 using System;
-using System.IO;
-using System.Reflection;
 using System.Collections.Generic;
-using System.Collections;
-using System.Text;
+using System.IO;
 using NewLife.Collections;
 
 namespace NewLife.Reflection

diff --git a/NewLife.Core/Reflection/DynamicAssembly.cs b/NewLife.Core/Reflection/DynamicAssembly.cs
index c84d41e..5f7aa50 100644
--- a/NewLife.Core/Reflection/DynamicAssembly.cs
+++ b/NewLife.Core/Reflection/DynamicAssembly.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Reflection.Emit;
 using System.Reflection;
-using NewLife.Collections;
+
 #if NET4
 using System.Linq;
 #else

diff --git a/NewLife.Core/Reflection/IIndexAccessor.cs b/NewLife.Core/Reflection/IIndexAccessor.cs
index 4ee1694..2c2d13a 100644
--- a/NewLife.Core/Reflection/IIndexAccessor.cs
+++ b/NewLife.Core/Reflection/IIndexAccessor.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Reflection
 {

diff --git a/NewLife.Core/Reflection/IL/ILInstruction.cs b/NewLife.Core/Reflection/IL/ILInstruction.cs
index 6bd3e7f..c56e03e 100644
--- a/NewLife.Core/Reflection/IL/ILInstruction.cs
+++ b/NewLife.Core/Reflection/IL/ILInstruction.cs
@@ -1,7 +1,7 @@
+using System;
 using System.Reflection;
 using System.Reflection.Emit;
 using System.Text;
-using System;
 
 namespace NewLife.Reflection
 {

diff --git a/NewLife.Core/Security/Certificate.cs b/NewLife.Core/Security/Certificate.cs
index 8a41377..8b5d4b1 100644
--- a/NewLife.Core/Security/Certificate.cs
+++ b/NewLife.Core/Security/Certificate.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography.X509Certificates;
-using SecureString = System.Security.SecureString;
 using RuntimeHelpers = System.Runtime.CompilerServices.RuntimeHelpers;
+using SecureString = System.Security.SecureString;
 
 namespace NewLife.Security
 {

diff --git a/NewLife.Core/Security/Crc16.cs b/NewLife.Core/Security/Crc16.cs
index 222a122..11a0fb9 100644
--- a/NewLife.Core/Security/Crc16.cs
+++ b/NewLife.Core/Security/Crc16.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 
 namespace NewLife.Security

diff --git a/NewLife.Core/Serialization/Base/TextReaderWriterSetting.cs b/NewLife.Core/Serialization/Base/TextReaderWriterSetting.cs
index 1c59bc1..fcbd2a9 100644
--- a/NewLife.Core/Serialization/Base/TextReaderWriterSetting.cs
+++ b/NewLife.Core/Serialization/Base/TextReaderWriterSetting.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Serialization
 {

diff --git a/NewLife.Core/Serialization/Base/TextWriterBase.cs b/NewLife.Core/Serialization/Base/TextWriterBase.cs
index 348b48d..4932b5d 100644
--- a/NewLife.Core/Serialization/Base/TextWriterBase.cs
+++ b/NewLife.Core/Serialization/Base/TextWriterBase.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Net;
-using NewLife.IO;
 
 namespace NewLife.Serialization
 {

diff --git a/NewLife.Core/Serialization/Binary/BinaryReaderX.cs b/NewLife.Core/Serialization/Binary/BinaryReaderX.cs
index e0e995a..c99b421 100644
--- a/NewLife.Core/Serialization/Binary/BinaryReaderX.cs
+++ b/NewLife.Core/Serialization/Binary/BinaryReaderX.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using NewLife.Exceptions;
-using NewLife.IO;
 using NewLife.Log;
 using NewLife.Reflection;
 

diff --git a/NewLife.Core/Serialization/Event/ReaderEventArgs.cs b/NewLife.Core/Serialization/Event/ReaderEventArgs.cs
index 817a65b..ecc2812 100644
--- a/NewLife.Core/Serialization/Event/ReaderEventArgs.cs
+++ b/NewLife.Core/Serialization/Event/ReaderEventArgs.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Serialization
 {
     /// <summary>读取器事件参数</summary>

diff --git a/NewLife.Core/Serialization/Event/ReaderWriterEventArgs.cs b/NewLife.Core/Serialization/Event/ReaderWriterEventArgs.cs
index f40de03..cddaecc 100644
--- a/NewLife.Core/Serialization/Event/ReaderWriterEventArgs.cs
+++ b/NewLife.Core/Serialization/Event/ReaderWriterEventArgs.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Serialization
 {

diff --git a/NewLife.Core/Serialization/Event/ReadMemberEventArgs.cs b/NewLife.Core/Serialization/Event/ReadMemberEventArgs.cs
index 405af91..6cd46aa 100644
--- a/NewLife.Core/Serialization/Event/ReadMemberEventArgs.cs
+++ b/NewLife.Core/Serialization/Event/ReadMemberEventArgs.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Serialization
 {

diff --git a/NewLife.Core/Serialization/Event/ReadObjectEventArgs.cs b/NewLife.Core/Serialization/Event/ReadObjectEventArgs.cs
index 8bbdd04..512474e 100644
--- a/NewLife.Core/Serialization/Event/ReadObjectEventArgs.cs
+++ b/NewLife.Core/Serialization/Event/ReadObjectEventArgs.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Serialization
 {

diff --git a/NewLife.Core/Serialization/Event/WriteMemberEventArgs.cs b/NewLife.Core/Serialization/Event/WriteMemberEventArgs.cs
index 529f8b3..b531e36 100644
--- a/NewLife.Core/Serialization/Event/WriteMemberEventArgs.cs
+++ b/NewLife.Core/Serialization/Event/WriteMemberEventArgs.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Serialization
 {

diff --git a/NewLife.Core/Serialization/Event/WriteObjectEventArgs.cs b/NewLife.Core/Serialization/Event/WriteObjectEventArgs.cs
index 47ef6b2..01d2f47 100644
--- a/NewLife.Core/Serialization/Event/WriteObjectEventArgs.cs
+++ b/NewLife.Core/Serialization/Event/WriteObjectEventArgs.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Serialization
 {

diff --git a/NewLife.Core/Serialization/Event/WriterEventArgs.cs b/NewLife.Core/Serialization/Event/WriterEventArgs.cs
index 5c0f305..d13f1b2 100644
--- a/NewLife.Core/Serialization/Event/WriterEventArgs.cs
+++ b/NewLife.Core/Serialization/Event/WriterEventArgs.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Serialization
 {
     /// <summary>写入器时间参数</summary>

diff --git a/NewLife.Core/Serialization/Interface/IAccessor.cs b/NewLife.Core/Serialization/Interface/IAccessor.cs
index 0a24f8c..13a8b17 100644
--- a/NewLife.Core/Serialization/Interface/IAccessor.cs
+++ b/NewLife.Core/Serialization/Interface/IAccessor.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Serialization
 {

diff --git a/NewLife.Core/Serialization/Interface/IReader.cs b/NewLife.Core/Serialization/Interface/IReader.cs
index 6633edd..6ddbe42 100644
--- a/NewLife.Core/Serialization/Interface/IReader.cs
+++ b/NewLife.Core/Serialization/Interface/IReader.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 
 namespace NewLife.Serialization
 {

diff --git a/NewLife.Core/Serialization/Interface/IReader2.cs b/NewLife.Core/Serialization/Interface/IReader2.cs
index e33197a..c571878 100644
--- a/NewLife.Core/Serialization/Interface/IReader2.cs
+++ b/NewLife.Core/Serialization/Interface/IReader2.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Net;
 
 namespace NewLife.Serialization

diff --git a/NewLife.Core/Serialization/Interface/IReaderWriter.cs b/NewLife.Core/Serialization/Interface/IReaderWriter.cs
index d991e95..6edc71c 100644
--- a/NewLife.Core/Serialization/Interface/IReaderWriter.cs
+++ b/NewLife.Core/Serialization/Interface/IReaderWriter.cs
@@ -1,7 +1,7 @@
 using System;
-using System.IO;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 
 namespace NewLife.Serialization
 {

diff --git a/NewLife.Core/Serialization/Interface/IWriter.cs b/NewLife.Core/Serialization/Interface/IWriter.cs
index 1e69dc7..4fd68d9 100644
--- a/NewLife.Core/Serialization/Interface/IWriter.cs
+++ b/NewLife.Core/Serialization/Interface/IWriter.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections;
-using System.Net;
 
 namespace NewLife.Serialization
 {

diff --git a/NewLife.Core/Serialization/Interface/IWriter2.cs b/NewLife.Core/Serialization/Interface/IWriter2.cs
index b83184f..6e08c10 100644
--- a/NewLife.Core/Serialization/Interface/IWriter2.cs
+++ b/NewLife.Core/Serialization/Interface/IWriter2.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Net;
 
 namespace NewLife.Serialization

diff --git a/NewLife.Core/Serialization/Json/JsonSettings.cs b/NewLife.Core/Serialization/Json/JsonSettings.cs
index feabff3..0398934 100644
--- a/NewLife.Core/Serialization/Json/JsonSettings.cs
+++ b/NewLife.Core/Serialization/Json/JsonSettings.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Serialization
 {

diff --git a/NewLife.Core/Serialization/NameValue/NameValueSetting.cs b/NewLife.Core/Serialization/NameValue/NameValueSetting.cs
index 6bdd88c..04f8987 100644
--- a/NewLife.Core/Serialization/NameValue/NameValueSetting.cs
+++ b/NewLife.Core/Serialization/NameValue/NameValueSetting.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Serialization
 {

diff --git a/NewLife.Core/Serialization/RWKinds.cs b/NewLife.Core/Serialization/RWKinds.cs
index d686314..de26a2b 100644
--- a/NewLife.Core/Serialization/RWKinds.cs
+++ b/NewLife.Core/Serialization/RWKinds.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Serialization
 {
     /// <summary>序列化种类</summary>

diff --git a/NewLife.Core/Serialization/RWService.cs b/NewLife.Core/Serialization/RWService.cs
index aef6d97..4731342 100644
--- a/NewLife.Core/Serialization/RWService.cs
+++ b/NewLife.Core/Serialization/RWService.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using NewLife.Exceptions;
 using NewLife.Xml;
-using NewLife.Exceptions;
 
 namespace NewLife.Serialization
 {

diff --git a/NewLife.Core/Threading/ThreadX.cs b/NewLife.Core/Threading/ThreadX.cs
index af648f2..9496fdb 100644
--- a/NewLife.Core/Threading/ThreadX.cs
+++ b/NewLife.Core/Threading/ThreadX.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Configuration;
 using System.Threading;
 using NewLife.Log;
-using NewLife.Configuration;
 
 namespace NewLife.Threading
 {

diff --git a/NewLife.Core/Web/Modules/ErrorModule.cs b/NewLife.Core/Web/Modules/ErrorModule.cs
index 6f7121a..7ef0f21 100644
--- a/NewLife.Core/Web/Modules/ErrorModule.cs
+++ b/NewLife.Core/Web/Modules/ErrorModule.cs
@@ -6,7 +6,6 @@ using System.Threading;
 using System.Web;
 using NewLife.Collections;
 using NewLife.Log;
-using NewLife.Reflection;
 using NewLife.Model;
 
 namespace NewLife.Web

diff --git a/NewLife.Core/Xml/XmlConfig.cs b/NewLife.Core/Xml/XmlConfig.cs
index 1e372a0..f0cb9ac 100644
--- a/NewLife.Core/Xml/XmlConfig.cs
+++ b/NewLife.Core/Xml/XmlConfig.cs
@@ -1,10 +1,7 @@
 using System;
 using System.IO;
-using System.Text;
-using System.Xml.Serialization;
-using NewLife.Log;
-using NewLife.Threading;
 using NewLife.Exceptions;
+using NewLife.Log;
 
 namespace NewLife.Xml
 {

diff --git a/NewLife.Core/Xml/XmlConfigFileAttribute.cs b/NewLife.Core/Xml/XmlConfigFileAttribute.cs
index 2f0b356..6829407 100644
--- a/NewLife.Core/Xml/XmlConfigFileAttribute.cs
+++ b/NewLife.Core/Xml/XmlConfigFileAttribute.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Xml
 {

diff --git a/NewLife.Core/Xml/XmlEntity.cs b/NewLife.Core/Xml/XmlEntity.cs
index 7c8b4b9..93d1ebf 100644
--- a/NewLife.Core/Xml/XmlEntity.cs
+++ b/NewLife.Core/Xml/XmlEntity.cs
@@ -1,8 +1,4 @@
 using System;
-using System.IO;
-using System.Text;
-using System.Xml;
-using System.Xml.Serialization;
 
 namespace NewLife.Xml
 {

diff --git a/NewLife.Core/Xml/XmlReaderWriterSettings.cs b/NewLife.Core/Xml/XmlReaderWriterSettings.cs
index e1a9714..0f12539 100644
--- a/NewLife.Core/Xml/XmlReaderWriterSettings.cs
+++ b/NewLife.Core/Xml/XmlReaderWriterSettings.cs
@@ -1,6 +1,6 @@
 using System;
-using NewLife.Serialization;
 using System.Xml;
+using NewLife.Serialization;
 
 namespace NewLife.Xml
 {

diff --git a/NewLife.Core/Xml/XmlWriterX.cs b/NewLife.Core/Xml/XmlWriterX.cs
index d3e5a73..3395570 100644
--- a/NewLife.Core/Xml/XmlWriterX.cs
+++ b/NewLife.Core/Xml/XmlWriterX.cs
@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
 using NewLife.Reflection;

diff --git a/NewLife.Mvc/Generic/RedirectRoute.cs b/NewLife.Mvc/Generic/RedirectRoute.cs
index fce724e..fa5b743 100644
--- a/NewLife.Mvc/Generic/RedirectRoute.cs
+++ b/NewLife.Mvc/Generic/RedirectRoute.cs
@@ -1,6 +1,6 @@
-using System.Web;
+using System;
+using System.Web;
 using NewLife.Reflection;
-using System;
 
 namespace NewLife.Mvc
 {

diff --git a/NewLife.Mvc/Generic/StaticRoute.cs b/NewLife.Mvc/Generic/StaticRoute.cs
index 2ce69a3..25d8dc1 100644
--- a/NewLife.Mvc/Generic/StaticRoute.cs
+++ b/NewLife.Mvc/Generic/StaticRoute.cs
@@ -1,6 +1,11 @@
 using System;
 using System.Web;
+
+#if NET4
+using System.Collections.Generic;
+#else
 using NewLife.Reflection;
+#endif
 
 namespace NewLife.Mvc
 {

diff --git a/NewLife.Net.Test/DNS/EntityTest.cs b/NewLife.Net.Test/DNS/EntityTest.cs
index cb86386..5349e60 100644
--- a/NewLife.Net.Test/DNS/EntityTest.cs
+++ b/NewLife.Net.Test/DNS/EntityTest.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using NewLife.Net.DNS;
 
 namespace NewLife.Net.Test.DNS

diff --git a/NewLife.Net.Test/Properties/AssemblyInfo.cs b/NewLife.Net.Test/Properties/AssemblyInfo.cs
index b3d2f5c..a6732bb 100644
--- a/NewLife.Net.Test/Properties/AssemblyInfo.cs
+++ b/NewLife.Net.Test/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // 有关程序集的常规信息通过下列特性集

diff --git a/NewLife.Net/Application/AppTest.cs b/NewLife.Net/Application/AppTest.cs
index e31e026..144b6de 100644
--- a/NewLife.Net/Application/AppTest.cs
+++ b/NewLife.Net/Application/AppTest.cs
@@ -4,11 +4,10 @@ using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
-using NewLife.Linq;
 using NewLife.Net.Common;
 using NewLife.Net.Sockets;
-using NewLife.Threading;
 using NewLife.Net.Tcp;
+using NewLife.Threading;
 
 namespace NewLife.Net.Application
 {

diff --git a/NewLife.Net/Application/ChargenServer.cs b/NewLife.Net/Application/ChargenServer.cs
index b203fe1..978ff38 100644
--- a/NewLife.Net/Application/ChargenServer.cs
+++ b/NewLife.Net/Application/ChargenServer.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using System.Net.Sockets;
 using System.Threading;
 using NewLife.Net.Sockets;

diff --git a/NewLife.Net/Application/DaytimeServer.cs b/NewLife.Net/Application/DaytimeServer.cs
index 1769c15..4a1ecf8 100644
--- a/NewLife.Net/Application/DaytimeServer.cs
+++ b/NewLife.Net/Application/DaytimeServer.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Text;
-using System.Threading;
 using NewLife.Net.Sockets;
 
 namespace NewLife.Net.Application

diff --git a/NewLife.Net/Application/DiscardServer.cs b/NewLife.Net/Application/DiscardServer.cs
index 4fe1493..e04d208 100644
--- a/NewLife.Net/Application/DiscardServer.cs
+++ b/NewLife.Net/Application/DiscardServer.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Net.Sockets;
-using NewLife.Net.Sockets;
+using NewLife.Net.Sockets;
 
 namespace NewLife.Net.Application
 {

diff --git a/NewLife.Net/Application/EchoServer.cs b/NewLife.Net/Application/EchoServer.cs
index b8dbf49..dbc8d37 100644
--- a/NewLife.Net/Application/EchoServer.cs
+++ b/NewLife.Net/Application/EchoServer.cs
@@ -1,5 +1,4 @@
-using System.Threading;
-using NewLife.Net.Sockets;
+using NewLife.Net.Sockets;
 
 namespace NewLife.Net.Application
 {

diff --git a/NewLife.Net/Application/SerialServer.cs b/NewLife.Net/Application/SerialServer.cs
index 7f839b8..662f993 100644
--- a/NewLife.Net/Application/SerialServer.cs
+++ b/NewLife.Net/Application/SerialServer.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using System.IO.Ports;
 using System.Threading;
-using NewLife.IO;
 using NewLife.Net.Sockets;
 using NewLife.Security;
 

diff --git a/NewLife.Net/Application/StreamServer.cs b/NewLife.Net/Application/StreamServer.cs
index e6d4e1b..f10a541 100644
--- a/NewLife.Net/Application/StreamServer.cs
+++ b/NewLife.Net/Application/StreamServer.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Net.Sockets;
 using NewLife.IO;
 using NewLife.Net.Sockets;
 

diff --git a/NewLife.Net/Application/TimeServer.cs b/NewLife.Net/Application/TimeServer.cs
index 285a317..112eba0 100644
--- a/NewLife.Net/Application/TimeServer.cs
+++ b/NewLife.Net/Application/TimeServer.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Net;
-using System.Threading;
 using NewLife.Net.Sockets;
 
 namespace NewLife.Net.Application

diff --git a/NewLife.Net/Common/IStatistics.cs b/NewLife.Net/Common/IStatistics.cs
index 94e9104..98bf79d 100644
--- a/NewLife.Net/Common/IStatistics.cs
+++ b/NewLife.Net/Common/IStatistics.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.Common
 {

diff --git a/NewLife.Net/Dhcp/DhcpEntity.cs b/NewLife.Net/Dhcp/DhcpEntity.cs
index adfdc0d..d8a3f27 100644
--- a/NewLife.Net/Dhcp/DhcpEntity.cs
+++ b/NewLife.Net/Dhcp/DhcpEntity.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using NewLife.Serialization;
 
 namespace NewLife.Net.Dhcp

diff --git a/NewLife.Net/DNS/DNS_NB.cs b/NewLife.Net/DNS/DNS_NB.cs
index 389cde3..959d7e9 100644
--- a/NewLife.Net/DNS/DNS_NB.cs
+++ b/NewLife.Net/DNS/DNS_NB.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Net;
-using NewLife.Serialization;
 
 namespace NewLife.Net.DNS
 {

diff --git a/NewLife.Net/DNS/DNSHeader.cs b/NewLife.Net/DNS/DNSHeader.cs
index 976db81..6e1f3cb 100644
--- a/NewLife.Net/DNS/DNSHeader.cs
+++ b/NewLife.Net/DNS/DNSHeader.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using NewLife.Serialization;
 
 namespace NewLife.Net.DNS
 {

diff --git a/NewLife.Net/DNS/DNSNameAccessor.cs b/NewLife.Net/DNS/DNSNameAccessor.cs
index 1b5cf74..486b5ed 100644
--- a/NewLife.Net/DNS/DNSNameAccessor.cs
+++ b/NewLife.Net/DNS/DNSNameAccessor.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using NewLife.Exceptions;
-using NewLife.IO;
 
 namespace NewLife.Net.DNS
 {

diff --git a/NewLife.Net/DNS/DNSOpcodeType.cs b/NewLife.Net/DNS/DNSOpcodeType.cs
index d983088..21da921 100644
--- a/NewLife.Net/DNS/DNSOpcodeType.cs
+++ b/NewLife.Net/DNS/DNSOpcodeType.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.DNS
 {

diff --git a/NewLife.Net/DNS/DNSQueryType.cs b/NewLife.Net/DNS/DNSQueryType.cs
index 5e7bf71..410e579 100644
--- a/NewLife.Net/DNS/DNSQueryType.cs
+++ b/NewLife.Net/DNS/DNSQueryType.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Net.DNS
 {
     /// <summary>查询的资源记录类型</summary>

diff --git a/NewLife.Net/DNS/DNSRcodeType.cs b/NewLife.Net/DNS/DNSRcodeType.cs
index cc719ec..731afde 100644
--- a/NewLife.Net/DNS/DNSRcodeType.cs
+++ b/NewLife.Net/DNS/DNSRcodeType.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Net.DNS
 {
     /// <summary>These are the return codes (RCODE) the server can send back. (RFC 1035 4.1.1)</summary>

diff --git a/NewLife.Net/DNS/NetBIOS.cs b/NewLife.Net/DNS/NetBIOS.cs
index 51b1ea6..4681ed6 100644
--- a/NewLife.Net/DNS/NetBIOS.cs
+++ b/NewLife.Net/DNS/NetBIOS.cs
@@ -2,7 +2,6 @@
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
-using NewLife.IO;
 
 namespace NewLife.Net.DNS
 {

diff --git a/NewLife.Net/FTP/FTPClient.cs b/NewLife.Net/FTP/FTPClient.cs
index b8e16e4..eaaa179 100644
--- a/NewLife.Net/FTP/FTPClient.cs
+++ b/NewLife.Net/FTP/FTPClient.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Net.FTP
 {
     /// <summary>FTP客户端</summary>

diff --git a/NewLife.Net/FTP/FTPItem.cs b/NewLife.Net/FTP/FTPItem.cs
index 8c59025..5273ad9 100644
--- a/NewLife.Net/FTP/FTPItem.cs
+++ b/NewLife.Net/FTP/FTPItem.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.FTP
 {

diff --git a/NewLife.Net/FTP/FTPServer.cs b/NewLife.Net/FTP/FTPServer.cs
index fe327cd..1d5d9f1 100644
--- a/NewLife.Net/FTP/FTPServer.cs
+++ b/NewLife.Net/FTP/FTPServer.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Net.Sockets;
 using NewLife.Net.Sockets;
-using System.Net.Sockets;
 
 namespace NewLife.Net.FTP
 {

diff --git a/NewLife.Net/FTP/FTPSession.cs b/NewLife.Net/FTP/FTPSession.cs
index 03f948a..750f218 100644
--- a/NewLife.Net/FTP/FTPSession.cs
+++ b/NewLife.Net/FTP/FTPSession.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NewLife.Net.Sockets;
+using NewLife.Net.Sockets;
 
 namespace NewLife.Net.FTP
 {

diff --git a/NewLife.Net/FTP/FTPTransferMode.cs b/NewLife.Net/FTP/FTPTransferMode.cs
index 9e088e5..5a9db36 100644
--- a/NewLife.Net/FTP/FTPTransferMode.cs
+++ b/NewLife.Net/FTP/FTPTransferMode.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Net.FTP
 {
     /// <summary>传输模式</summary>

diff --git a/NewLife.Net/Http/ByteParser.cs b/NewLife.Net/Http/ByteParser.cs
index b28c79f..23b6f32 100644
--- a/NewLife.Net/Http/ByteParser.cs
+++ b/NewLife.Net/Http/ByteParser.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Net.Http
 {
     sealed class ByteParser

diff --git a/NewLife.Net/Http/ByteString.cs b/NewLife.Net/Http/ByteString.cs
index ccc2620..bb81c06 100644
--- a/NewLife.Net/Http/ByteString.cs
+++ b/NewLife.Net/Http/ByteString.cs
@@ -1,7 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Collections;
+using System.Text;
 
 namespace NewLife.Net.Http
 {

diff --git a/NewLife.Net/Http/HttpServer.cs b/NewLife.Net/Http/HttpServer.cs
index a69c359..62be46b 100644
--- a/NewLife.Net/Http/HttpServer.cs
+++ b/NewLife.Net/Http/HttpServer.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Net.Sockets;
 using NewLife.Net.Sockets;
-using System.Net.Sockets;
 
 namespace NewLife.Net.Http
 {

diff --git a/NewLife.Net/Http/HttpSession.cs b/NewLife.Net/Http/HttpSession.cs
index cf12106..8069ecc 100644
--- a/NewLife.Net/Http/HttpSession.cs
+++ b/NewLife.Net/Http/HttpSession.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NewLife.Net.Sockets;
+using NewLife.Net.Sockets;
 
 namespace NewLife.Net.Http
 {

diff --git a/NewLife.Net/Http/Messages.cs b/NewLife.Net/Http/Messages.cs
index 2e09ab6..dd28702 100644
--- a/NewLife.Net/Http/Messages.cs
+++ b/NewLife.Net/Http/Messages.cs
@@ -1,11 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Web;
 using System.Globalization;
 using System.IO;
-using NewLife.Reflection;
 using System.Reflection;
+using System.Text;
+using System.Web;
+using NewLife.Reflection;
 
 namespace NewLife.Net.Http
 {

diff --git a/NewLife.Net/Http/NtlmAuth.cs b/NewLife.Net/Http/NtlmAuth.cs
index 940fe7a..6042070 100644
--- a/NewLife.Net/Http/NtlmAuth.cs
+++ b/NewLife.Net/Http/NtlmAuth.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 using System.Security;
 using System.Security.Principal;

diff --git a/NewLife.Net/IO/FileFormat.cs b/NewLife.Net/IO/FileFormat.cs
index 4b6c201..a387091 100644
--- a/NewLife.Net/IO/FileFormat.cs
+++ b/NewLife.Net/IO/FileFormat.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 
 namespace NewLife.Net.IO

diff --git a/NewLife.Net/IO/FileServer.cs b/NewLife.Net/IO/FileServer.cs
index 7164d27..cf3b140 100644
--- a/NewLife.Net/IO/FileServer.cs
+++ b/NewLife.Net/IO/FileServer.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using NewLife.Net.Sockets;
 using NewLife.Net.Tcp;
-using NewLife.Net.Udp;
 
 namespace NewLife.Net.IO
 {

diff --git a/NewLife.Net/ModBus/Diagnostics.cs b/NewLife.Net/ModBus/Diagnostics.cs
index 5971aac..e6185b3 100644
--- a/NewLife.Net/ModBus/Diagnostics.cs
+++ b/NewLife.Net/ModBus/Diagnostics.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.ModBus
 {

diff --git a/NewLife.Net/ModBus/Interface.cs b/NewLife.Net/ModBus/Interface.cs
index 4c6082f..6c69946 100644
--- a/NewLife.Net/ModBus/Interface.cs
+++ b/NewLife.Net/ModBus/Interface.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Net.ModBus
 {
     /// <summary>请求接口</summary>

diff --git a/NewLife.Net/ModBus/MBFunction.cs b/NewLife.Net/ModBus/MBFunction.cs
index 0ffe0c4..9d738f7 100644
--- a/NewLife.Net/ModBus/MBFunction.cs
+++ b/NewLife.Net/ModBus/MBFunction.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Net.ModBus
 {
     /// <summary>Modbus支持的功能码</summary>

diff --git a/NewLife.Net/NTP/NTP.cs b/NewLife.Net/NTP/NTP.cs
index a6d37ac..1c7e451 100644
--- a/NewLife.Net/NTP/NTP.cs
+++ b/NewLife.Net/NTP/NTP.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.NTP
 {

diff --git a/NewLife.Net/NTP/NTPEnum.cs b/NewLife.Net/NTP/NTPEnum.cs
index f6c0731..f64f42d 100644
--- a/NewLife.Net/NTP/NTPEnum.cs
+++ b/NewLife.Net/NTP/NTPEnum.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Net.NTP
 {
     /// <summary>Leap indicator</summary>

diff --git a/NewLife.Net/P2P/P2PClient.cs b/NewLife.Net/P2P/P2PClient.cs
index 5e40023..ea33f18 100644
--- a/NewLife.Net/P2P/P2PClient.cs
+++ b/NewLife.Net/P2P/P2PClient.cs
@@ -1,6 +1,4 @@
 using System;
-using NewLife.IO;
-using NewLife.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;

diff --git a/NewLife.Net/P2P/P2PTest.cs b/NewLife.Net/P2P/P2PTest.cs
index b838b4a..b177aa4 100644
--- a/NewLife.Net/P2P/P2PTest.cs
+++ b/NewLife.Net/P2P/P2PTest.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Net;
-using NewLife.Net.Udp;
 using System.Net.Sockets;
 
 namespace NewLife.Net.P2P

diff --git a/NewLife.Net/Pop3/Pop3Client.cs b/NewLife.Net/Pop3/Pop3Client.cs
index 8c35482..318f913 100644
--- a/NewLife.Net/Pop3/Pop3Client.cs
+++ b/NewLife.Net/Pop3/Pop3Client.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Net.Pop3
 {
     /// <summary>Pop3客户端</summary>

diff --git a/NewLife.Net/Pop3/Pop3Server.cs b/NewLife.Net/Pop3/Pop3Server.cs
index aba832a..cb203b6 100644
--- a/NewLife.Net/Pop3/Pop3Server.cs
+++ b/NewLife.Net/Pop3/Pop3Server.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Net.Sockets;
 using NewLife.Net.Sockets;
-using System.Net.Sockets;
 
 namespace NewLife.Net.Pop3
 {

diff --git a/NewLife.Net/Pop3/Pop3Session.cs b/NewLife.Net/Pop3/Pop3Session.cs
index 94c7a4c..2843dd8 100644
--- a/NewLife.Net/Pop3/Pop3Session.cs
+++ b/NewLife.Net/Pop3/Pop3Session.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NewLife.Net.Sockets;
+using NewLife.Net.Sockets;
 
 namespace NewLife.Net.Pop3
 {

diff --git a/NewLife.Net/Properties/AssemblyInfo.cs b/NewLife.Net/Properties/AssemblyInfo.cs
index 73775dc..a2808fe 100644
--- a/NewLife.Net/Properties/AssemblyInfo.cs
+++ b/NewLife.Net/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // 有关程序集的常规信息通过以下

diff --git a/NewLife.Net/Proxy/HttpProxy.cs b/NewLife.Net/Proxy/HttpProxy.cs
index a9d3fce..07fcd28 100644
--- a/NewLife.Net/Proxy/HttpProxy.cs
+++ b/NewLife.Net/Proxy/HttpProxy.cs
@@ -8,7 +8,10 @@ using NewLife.Collections;
 using NewLife.Net.Http;
 using NewLife.Net.Sockets;
 using NewLife.Serialization;
+
+#if NET4
 using System.Collections.Generic;
+#endif
 
 namespace NewLife.Net.Proxy
 {

diff --git a/NewLife.Net/Proxy/HttpReverseProxy.cs b/NewLife.Net/Proxy/HttpReverseProxy.cs
index b66b8b3..2078a31 100644
--- a/NewLife.Net/Proxy/HttpReverseProxy.cs
+++ b/NewLife.Net/Proxy/HttpReverseProxy.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using NewLife.IO;
 using NewLife.Net.Http;
 using NewLife.Net.Sockets;
 

diff --git a/NewLife.Net/Proxy/IProxySession.cs b/NewLife.Net/Proxy/IProxySession.cs
index 44d111b..96fc2a2 100644
--- a/NewLife.Net/Proxy/IProxySession.cs
+++ b/NewLife.Net/Proxy/IProxySession.cs
@@ -1,9 +1,7 @@
 using System.IO;
-using System.Net;
-using System.Net.Sockets;
 using System.Text;
-using NewLife.Net.Sockets;
 using NewLife.Net.Common;
+using NewLife.Net.Sockets;
 
 namespace NewLife.Net.Proxy
 {

diff --git a/NewLife.Net/Proxy/ProxySession.cs b/NewLife.Net/Proxy/ProxySession.cs
index c00724a..9c6eebf 100644
--- a/NewLife.Net/Proxy/ProxySession.cs
+++ b/NewLife.Net/Proxy/ProxySession.cs
@@ -1,9 +1,6 @@
 using System;
 using System.IO;
-using System.Net;
-using System.Net.Sockets;
 using System.Text;
-using NewLife.Exceptions;
 using NewLife.Net.Common;
 using NewLife.Net.Sockets;
 

diff --git a/NewLife.Net/Proxy/Socks5/Socks5Client.cs b/NewLife.Net/Proxy/Socks5/Socks5Client.cs
index 1af2f0a..c93237f 100644
--- a/NewLife.Net/Proxy/Socks5/Socks5Client.cs
+++ b/NewLife.Net/Proxy/Socks5/Socks5Client.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Net.Proxy
 {
     class Socks5Client

diff --git a/NewLife.Net/Proxy/Socks5/Socks5Entity.cs b/NewLife.Net/Proxy/Socks5/Socks5Entity.cs
index 3be6930..72494b1 100644
--- a/NewLife.Net/Proxy/Socks5/Socks5Entity.cs
+++ b/NewLife.Net/Proxy/Socks5/Socks5Entity.cs
@@ -1,6 +1,6 @@
 using System;
-using NewLife.Serialization;
 using System.Net;
+using NewLife.Serialization;
 
 namespace NewLife.Net.Proxy
 {

diff --git a/NewLife.Net/Proxy/Socks5/Socks5Server.cs b/NewLife.Net/Proxy/Socks5/Socks5Server.cs
index 6bd7858..d1d6deb 100644
--- a/NewLife.Net/Proxy/Socks5/Socks5Server.cs
+++ b/NewLife.Net/Proxy/Socks5/Socks5Server.cs
@@ -1,6 +1,4 @@
-using System.IO;
-using NewLife.Net.Sockets;
-
+
 namespace NewLife.Net.Proxy
 {
     /// <summary>Socks5代理</summary>

diff --git a/NewLife.Net/Sdp/SdpAttribute.cs b/NewLife.Net/Sdp/SdpAttribute.cs
index 7ecda9b..8dcf9c7 100644
--- a/NewLife.Net/Sdp/SdpAttribute.cs
+++ b/NewLife.Net/Sdp/SdpAttribute.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.Sdp
 {

diff --git a/NewLife.Net/Sdp/SdpConnection.cs b/NewLife.Net/Sdp/SdpConnection.cs
index bfcd10a..0b4649c 100644
--- a/NewLife.Net/Sdp/SdpConnection.cs
+++ b/NewLife.Net/Sdp/SdpConnection.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.Sdp
 {

diff --git a/NewLife.Net/Sdp/SdpMessage.cs b/NewLife.Net/Sdp/SdpMessage.cs
index 5e1d60c..9ac40ad 100644
--- a/NewLife.Net/Sdp/SdpMessage.cs
+++ b/NewLife.Net/Sdp/SdpMessage.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.Sdp
 {

diff --git a/NewLife.Net/Sdp/SdpOrigin.cs b/NewLife.Net/Sdp/SdpOrigin.cs
index 0c05dbe..81a1e3d 100644
--- a/NewLife.Net/Sdp/SdpOrigin.cs
+++ b/NewLife.Net/Sdp/SdpOrigin.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.Sdp
 {

diff --git a/NewLife.Net/Sdp/SdpTime.cs b/NewLife.Net/Sdp/SdpTime.cs
index d1dbcad..6c8e64c 100644
--- a/NewLife.Net/Sdp/SdpTime.cs
+++ b/NewLife.Net/Sdp/SdpTime.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.Sdp
 {

diff --git a/NewLife.Net/SGIP/SGIPBind.cs b/NewLife.Net/SGIP/SGIPBind.cs
index 5e66993..48d0fcd 100644
--- a/NewLife.Net/SGIP/SGIPBind.cs
+++ b/NewLife.Net/SGIP/SGIPBind.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using NewLife.Serialization;
 
 namespace NewLife.Net.SGIP

diff --git a/NewLife.Net/SGIP/SGIPClient.cs b/NewLife.Net/SGIP/SGIPClient.cs
index 9ad5fa8..51325dc 100644
--- a/NewLife.Net/SGIP/SGIPClient.cs
+++ b/NewLife.Net/SGIP/SGIPClient.cs
@@ -1,7 +1,5 @@
 using System;
 using System.IO;
-using System.Net.Sockets;
-using System.Threading;
 using NewLife.Net.Sockets;
 using NewLife.Net.Tcp;
 

diff --git a/NewLife.Net/SGIP/SGIPDeliver.cs b/NewLife.Net/SGIP/SGIPDeliver.cs
index 7a19bde..feaeeca 100644
--- a/NewLife.Net/SGIP/SGIPDeliver.cs
+++ b/NewLife.Net/SGIP/SGIPDeliver.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using NewLife.Serialization;
 
 namespace NewLife.Net.SGIP

diff --git a/NewLife.Net/SGIP/SGIPEntity.cs b/NewLife.Net/SGIP/SGIPEntity.cs
index 3c4fcdf..9ba315f 100644
--- a/NewLife.Net/SGIP/SGIPEntity.cs
+++ b/NewLife.Net/SGIP/SGIPEntity.cs
@@ -1,7 +1,7 @@
 using System;
+using System.ComponentModel;
 using System.IO;
 using NewLife.Serialization;
-using System.ComponentModel;
 
 namespace NewLife.Net.SGIP
 {

diff --git a/NewLife.Net/SGIP/SGIPReport.cs b/NewLife.Net/SGIP/SGIPReport.cs
index 2adb368..6b2755c 100644
--- a/NewLife.Net/SGIP/SGIPReport.cs
+++ b/NewLife.Net/SGIP/SGIPReport.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using NewLife.Serialization;
 
 namespace NewLife.Net.SGIP

diff --git a/NewLife.Net/SGIP/SGIPServer.cs b/NewLife.Net/SGIP/SGIPServer.cs
index c1d9a1e..239bb7f 100644
--- a/NewLife.Net/SGIP/SGIPServer.cs
+++ b/NewLife.Net/SGIP/SGIPServer.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Net.Sockets;
 using NewLife.Net.Sockets;
-using System.Net.Sockets;
 
 namespace NewLife.Net.SGIP
 {

diff --git a/NewLife.Net/SGIP/SGIPSubmit.cs b/NewLife.Net/SGIP/SGIPSubmit.cs
index 4854cea..8e7bf4a 100644
--- a/NewLife.Net/SGIP/SGIPSubmit.cs
+++ b/NewLife.Net/SGIP/SGIPSubmit.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using NewLife.Serialization;
 
 namespace NewLife.Net.SGIP

diff --git a/NewLife.Net/SGIP/SGIPUnbind.cs b/NewLife.Net/SGIP/SGIPUnbind.cs
index d9527f9..6e865e2 100644
--- a/NewLife.Net/SGIP/SGIPUnbind.cs
+++ b/NewLife.Net/SGIP/SGIPUnbind.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Net.SGIP
 {
     /// <summary>Unbind操作由Unbind命令和Unbind_Resp应答组成。通信连接建立以后，客户端如果要停止通信，需要发送Unbind命令；服务器端收到Unbind命令后，向客户端发送Unbind_Resp相应，然后双方断开连接</summary>

diff --git a/NewLife.Net/Sip/Message/Sip.cs b/NewLife.Net/Sip/Message/Sip.cs
index 5fb58a8..d3ac1f1 100644
--- a/NewLife.Net/Sip/Message/Sip.cs
+++ b/NewLife.Net/Sip/Message/Sip.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Net.Sip.Message
 {
     /// <summary></summary>

diff --git a/NewLife.Net/Sip/Message/SipACValue.cs b/NewLife.Net/Sip/Message/SipACValue.cs
index 87f25d1..a772411 100644
--- a/NewLife.Net/Sip/Message/SipACValue.cs
+++ b/NewLife.Net/Sip/Message/SipACValue.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.Sip.Message
 {

diff --git a/NewLife.Net/Sip/Message/SipAddressParam.cs b/NewLife.Net/Sip/Message/SipAddressParam.cs
index c5923e5..cd8dc31 100644
--- a/NewLife.Net/Sip/Message/SipAddressParam.cs
+++ b/NewLife.Net/Sip/Message/SipAddressParam.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Net.Sip.Message
 {
     /// <summary></summary>

diff --git a/NewLife.Net/Sip/Message/SipAlertParam.cs b/NewLife.Net/Sip/Message/SipAlertParam.cs
index aa45056..7b8444b 100644
--- a/NewLife.Net/Sip/Message/SipAlertParam.cs
+++ b/NewLife.Net/Sip/Message/SipAlertParam.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.Sip.Message
 {

diff --git a/NewLife.Net/Sip/Message/SipContactParam.cs b/NewLife.Net/Sip/Message/SipContactParam.cs
index 0658d2c..1dabb23 100644
--- a/NewLife.Net/Sip/Message/SipContactParam.cs
+++ b/NewLife.Net/Sip/Message/SipContactParam.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.Sip.Message
 {

diff --git a/NewLife.Net/Sip/Message/SipContentDisposition.cs b/NewLife.Net/Sip/Message/SipContentDisposition.cs
index 96448d4..ba92c01 100644
--- a/NewLife.Net/Sip/Message/SipContentDisposition.cs
+++ b/NewLife.Net/Sip/Message/SipContentDisposition.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.Sip.Message
 {

diff --git a/NewLife.Net/Sip/Message/SipEncoding.cs b/NewLife.Net/Sip/Message/SipEncoding.cs
index b88ef91..8d57eb1 100644
--- a/NewLife.Net/Sip/Message/SipEncoding.cs
+++ b/NewLife.Net/Sip/Message/SipEncoding.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.Sip.Message
 {

diff --git a/NewLife.Net/Sip/Message/SipErrorUri.cs b/NewLife.Net/Sip/Message/SipErrorUri.cs
index 6c5809d..e46edd6 100644
--- a/NewLife.Net/Sip/Message/SipErrorUri.cs
+++ b/NewLife.Net/Sip/Message/SipErrorUri.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.Sip.Message
 {

diff --git a/NewLife.Net/Sip/Message/SipEvent.cs b/NewLife.Net/Sip/Message/SipEvent.cs
index 318cbd9..aee68ef 100644
--- a/NewLife.Net/Sip/Message/SipEvent.cs
+++ b/NewLife.Net/Sip/Message/SipEvent.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.Sip.Message
 {

diff --git a/NewLife.Net/Sip/Message/SipFrom.cs b/NewLife.Net/Sip/Message/SipFrom.cs
index 1047475..edea24e 100644
--- a/NewLife.Net/Sip/Message/SipFrom.cs
+++ b/NewLife.Net/Sip/Message/SipFrom.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.Sip.Message
 {

diff --git a/NewLife.Net/Sip/Message/SipHiEntry.cs b/NewLife.Net/Sip/Message/SipHiEntry.cs
index b3d598d..59a3dda 100644
--- a/NewLife.Net/Sip/Message/SipHiEntry.cs
+++ b/NewLife.Net/Sip/Message/SipHiEntry.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.Sip.Message
 {

diff --git a/NewLife.Net/Sip/Message/SipIdentityInfo.cs b/NewLife.Net/Sip/Message/SipIdentityInfo.cs
index 4f24cb8..cfa0597 100644
--- a/NewLife.Net/Sip/Message/SipIdentityInfo.cs
+++ b/NewLife.Net/Sip/Message/SipIdentityInfo.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.Sip.Message
 {

diff --git a/NewLife.Net/Sip/Message/SipInfo.cs b/NewLife.Net/Sip/Message/SipInfo.cs
index 04c0439..a834952 100644
--- a/NewLife.Net/Sip/Message/SipInfo.cs
+++ b/NewLife.Net/Sip/Message/SipInfo.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.Sip.Message
 {

diff --git a/NewLife.Net/Sip/Message/SipJoin.cs b/NewLife.Net/Sip/Message/SipJoin.cs
index 764b5d7..dd498e3 100644
--- a/NewLife.Net/Sip/Message/SipJoin.cs
+++ b/NewLife.Net/Sip/Message/SipJoin.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Net.Sip.Message
 {
     /// <summary></summary>

diff --git a/NewLife.Net/Sip/Message/SipNameAddress.cs b/NewLife.Net/Sip/Message/SipNameAddress.cs
index a8bea6a..31e8f1d 100644
--- a/NewLife.Net/Sip/Message/SipNameAddress.cs
+++ b/NewLife.Net/Sip/Message/SipNameAddress.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.Sip.Message
 {

diff --git a/NewLife.Net/Sip/Message/SipValue.cs b/NewLife.Net/Sip/Message/SipValue.cs
index 3de9a87..bcf9659 100644
--- a/NewLife.Net/Sip/Message/SipValue.cs
+++ b/NewLife.Net/Sip/Message/SipValue.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Net.Sip.Message
 {
     /// <summary>Sip实体基类</summary>

diff --git a/NewLife.Net/Sip/Message/SipValueWithParams.cs b/NewLife.Net/Sip/Message/SipValueWithParams.cs
index 79daf27..eb801b1 100644
--- a/NewLife.Net/Sip/Message/SipValueWithParams.cs
+++ b/NewLife.Net/Sip/Message/SipValueWithParams.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.Sip.Message
 {

diff --git a/NewLife.Net/Smtp/RelayServer.cs b/NewLife.Net/Smtp/RelayServer.cs
index a1c321c..6c4b6ff 100644
--- a/NewLife.Net/Smtp/RelayServer.cs
+++ b/NewLife.Net/Smtp/RelayServer.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Net.Sockets;
 using NewLife.Net.Sockets;
-using System.Net.Sockets;
 
 namespace NewLife.Net.Smtp
 {

diff --git a/NewLife.Net/Smtp/RelaySession.cs b/NewLife.Net/Smtp/RelaySession.cs
index 026bf20..c8ed980 100644
--- a/NewLife.Net/Smtp/RelaySession.cs
+++ b/NewLife.Net/Smtp/RelaySession.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NewLife.Net.Sockets;
+using NewLife.Net.Sockets;
 
 namespace NewLife.Net.Smtp
 {

diff --git a/NewLife.Net/Smtp/SmtpClient.cs b/NewLife.Net/Smtp/SmtpClient.cs
index d2b0b3c..5936d89 100644
--- a/NewLife.Net/Smtp/SmtpClient.cs
+++ b/NewLife.Net/Smtp/SmtpClient.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Net.Smtp
 {
     /// <summary>Smtp客户端</summary>

diff --git a/NewLife.Net/Smtp/SmtpServer.cs b/NewLife.Net/Smtp/SmtpServer.cs
index 1c4b9c1..aeac1d3 100644
--- a/NewLife.Net/Smtp/SmtpServer.cs
+++ b/NewLife.Net/Smtp/SmtpServer.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Net.Sockets;
 using NewLife.Net.Sockets;
-using System.Net.Sockets;
 
 namespace NewLife.Net.Smtp
 {

diff --git a/NewLife.Net/Smtp/SmtpSession.cs b/NewLife.Net/Smtp/SmtpSession.cs
index 590e119..5a20dcb 100644
--- a/NewLife.Net/Smtp/SmtpSession.cs
+++ b/NewLife.Net/Smtp/SmtpSession.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NewLife.Net.Sockets;
+using NewLife.Net.Sockets;
 
 namespace NewLife.Net.Smtp
 {

diff --git a/NewLife.Net/Sockets/INetSession.cs b/NewLife.Net/Sockets/INetSession.cs
index 34211a8..de67bd4 100644
--- a/NewLife.Net/Sockets/INetSession.cs
+++ b/NewLife.Net/Sockets/INetSession.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using System.Net;
 using System.Text;
-using NewLife.Messaging;
 using NewLife.Net.Common;
 
 namespace NewLife.Net.Sockets

diff --git a/NewLife.Net/Sockets/ISocketAddress.cs b/NewLife.Net/Sockets/ISocketAddress.cs
index b7e68db..7e337c4 100644
--- a/NewLife.Net/Sockets/ISocketAddress.cs
+++ b/NewLife.Net/Sockets/ISocketAddress.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Net;
+using System.Net;
 using System.Net.Sockets;
 using NewLife.Net.Common;
 

diff --git a/NewLife.Net/Sockets/ISocketClient.cs b/NewLife.Net/Sockets/ISocketClient.cs
index bf941ff..cc61555 100644
--- a/NewLife.Net/Sockets/ISocketClient.cs
+++ b/NewLife.Net/Sockets/ISocketClient.cs
@@ -1,9 +1,7 @@
 using System;
-using System.IO;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
-using NewLife.Messaging;
 
 namespace NewLife.Net.Sockets
 {

diff --git a/NewLife.Net/Sockets/NetEventArgs.cs b/NewLife.Net/Sockets/NetEventArgs.cs
index 74d0b28..7384b49 100644
--- a/NewLife.Net/Sockets/NetEventArgs.cs
+++ b/NewLife.Net/Sockets/NetEventArgs.cs
@@ -3,9 +3,7 @@ using System.IO;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
-using NewLife.Log;
 using NewLife.Collections;
-using System.Reflection;
 
 namespace NewLife.Net.Sockets
 {

diff --git a/NewLife.Net/Sockets/ReceivedEventArgs.cs b/NewLife.Net/Sockets/ReceivedEventArgs.cs
index 6a5ca32..7afc3c7 100644
--- a/NewLife.Net/Sockets/ReceivedEventArgs.cs
+++ b/NewLife.Net/Sockets/ReceivedEventArgs.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 
 namespace NewLife.Net.Sockets

diff --git a/NewLife.Net/Sockets/SocketPool.cs b/NewLife.Net/Sockets/SocketPool.cs
index 76f60a6..f284eb2 100644
--- a/NewLife.Net/Sockets/SocketPool.cs
+++ b/NewLife.Net/Sockets/SocketPool.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Net.Sockets
 {
     class SocketPool

diff --git a/NewLife.Net/Stun/StunAttribute.cs b/NewLife.Net/Stun/StunAttribute.cs
index 970a75c..cf13ccf 100644
--- a/NewLife.Net/Stun/StunAttribute.cs
+++ b/NewLife.Net/Stun/StunAttribute.cs
@@ -1,8 +1,7 @@
 using System;
-using System.Collections.Generic;
+using System.Net;
 using System.Text;
 using NewLife.Serialization;
-using System.Net;
 
 namespace NewLife.Net.Stun
 {

diff --git a/NewLife.Net/TDP/TDPClient.cs b/NewLife.Net/TDP/TDPClient.cs
index c640d78..d6124ab 100644
--- a/NewLife.Net/TDP/TDPClient.cs
+++ b/NewLife.Net/TDP/TDPClient.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NewLife.Net.Udp;
+using NewLife.Net.Udp;
 
 namespace NewLife.Net.TDP
 {

diff --git a/NewLife.Net/TDP/TDPFlags.cs b/NewLife.Net/TDP/TDPFlags.cs
index 2f154d1..30c30da 100644
--- a/NewLife.Net/TDP/TDPFlags.cs
+++ b/NewLife.Net/TDP/TDPFlags.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.TDP
 {

diff --git a/NewLife.Net/TDP/TDPPacket.cs b/NewLife.Net/TDP/TDPPacket.cs
index e55732a..65d1769 100644
--- a/NewLife.Net/TDP/TDPPacket.cs
+++ b/NewLife.Net/TDP/TDPPacket.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.TDP
 {

diff --git a/NewLife.Net/Telnet/TelnetClient.cs b/NewLife.Net/Telnet/TelnetClient.cs
index ad350bd..2b5e51e 100644
--- a/NewLife.Net/Telnet/TelnetClient.cs
+++ b/NewLife.Net/Telnet/TelnetClient.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace NewLife.Net.Telnet
 {
     /// <summary>Telnet客户端</summary>

diff --git a/NewLife.Net/Telnet/TelnetServer.cs b/NewLife.Net/Telnet/TelnetServer.cs
index 966b765..617c43f 100644
--- a/NewLife.Net/Telnet/TelnetServer.cs
+++ b/NewLife.Net/Telnet/TelnetServer.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Net.Sockets;
 using NewLife.Net.Sockets;
-using System.Net.Sockets;
 
 namespace NewLife.Net.Telnet
 {

diff --git a/NewLife.Net/Telnet/TelnetSession.cs b/NewLife.Net/Telnet/TelnetSession.cs
index 9ebe344..29c2eeb 100644
--- a/NewLife.Net/Telnet/TelnetSession.cs
+++ b/NewLife.Net/Telnet/TelnetSession.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NewLife.Net.Sockets;
+using NewLife.Net.Sockets;
 
 namespace NewLife.Net.Telnet
 {

diff --git a/NewLife.Net/UPnP/Entities/Device.cs b/NewLife.Net/UPnP/Entities/Device.cs
index b7a10ed..2d9e33f 100644
--- a/NewLife.Net/UPnP/Entities/Device.cs
+++ b/NewLife.Net/UPnP/Entities/Device.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Xml.Serialization;
 
 namespace NewLife.Net.UPnP

diff --git a/NewLife.Net/UPnP/Entities/Envelope.cs b/NewLife.Net/UPnP/Entities/Envelope.cs
index ca5b160..86bcd4c 100644
--- a/NewLife.Net/UPnP/Entities/Envelope.cs
+++ b/NewLife.Net/UPnP/Entities/Envelope.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml.Serialization;
-using System.Xml.Schema;
 using System.Xml;
+using System.Xml.Schema;
+using System.Xml.Serialization;
 using NewLife.Exceptions;
 
 namespace NewLife.Net.UPnP

diff --git a/NewLife.Net/UPnP/Entities/PortMappingEntry.cs b/NewLife.Net/UPnP/Entities/PortMappingEntry.cs
index 2d65304..250b975 100644
--- a/NewLife.Net/UPnP/Entities/PortMappingEntry.cs
+++ b/NewLife.Net/UPnP/Entities/PortMappingEntry.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Xml.Serialization;
 
 namespace NewLife.Net.UPnP

diff --git a/NewLife.Net/UPnP/Entities/Service.cs b/NewLife.Net/UPnP/Entities/Service.cs
index dd31bc3..34000d8 100644
--- a/NewLife.Net/UPnP/Entities/Service.cs
+++ b/NewLife.Net/UPnP/Entities/Service.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.UPnP
 {

diff --git a/NewLife.Net/UPnP/Entities/SpecVersion.cs b/NewLife.Net/UPnP/Entities/SpecVersion.cs
index 647a1f8..233cd1e 100644
--- a/NewLife.Net/UPnP/Entities/SpecVersion.cs
+++ b/NewLife.Net/UPnP/Entities/SpecVersion.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace NewLife.Net.UPnP
 {

diff --git a/NewLife.Net/UPnP/UPnPClient.cs b/NewLife.Net/UPnP/UPnPClient.cs
index 6824757..dca7adc 100644
--- a/NewLife.Net/UPnP/UPnPClient.cs
+++ b/NewLife.Net/UPnP/UPnPClient.cs
@@ -1,16 +1,14 @@
 using System;
-using NewLife.Xml;
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Text;
 using System.Threading;
-using System.Xml.Serialization;
 using NewLife.Configuration;
 using NewLife.Log;
 using NewLife.Net.Sockets;
 using NewLife.Net.Udp;
-using System.Net.Sockets;
+using NewLife.Xml;
 
 namespace NewLife.Net.UPnP
 {

diff --git a/Test/Program.cs b/Test/Program.cs
index 14cc75e..031acde 100644
--- a/Test/Program.cs
+++ b/Test/Program.cs
@@ -1,5 +1,5 @@
 using System;
-using System.Collections.Generic;
+using NewLife.Xml;
 using System.Diagnostics;
 using System.IO;
 using System.IO.Ports;
@@ -17,16 +17,16 @@ using XCode.DataAccessLayer;
 using XCode.Transform;
 using System.Reflection;
 using NewLife.CommonEntity;
+using NewLife.Common;
+using XCode.Sync;
+using NewLife.Model;
+
+
 #if NET4
 using System.Linq;
 #else
 using NewLife.Linq;
 #endif
-using XCode;
-using NewLife.Common;
-using XCode.Sync;
-using NewLife.Model;
-using NewLife.Compression;
 
 namespace Test
 {
@@ -43,7 +43,7 @@ namespace Test
                 try
                 {
 #endif
-                Test8();
+                    Test8();
 #if !DEBUG
                 }
                 catch (Exception ex)
@@ -342,16 +342,47 @@ namespace Test
 
         static void Test8()
         {
-            var p = "Log".GetFullPath();
-            //File.Copy("XCode.dll", p.CombinePath("XCode.dll"), true);
-            //AssemblyX.AssemblyPaths.Add(p);
-            var f = p.CombinePath("XCode.dll");
-            Assembly.Load(File.ReadAllBytes(f));
+            Console.WriteLine("Starting");
+
+            //var config = new SysConfig();
+            //var config = SysConfig.Current;
+            var config = SysConfig._.ConfigFile.GetFullPath().ToXmlFileEntity<SysConfig>();
+            Console.WriteLine(config.InstallTime);
+
+            config.InstallTime = DateTime.Now;
+            config.Save();
 
-            foreach (var item in AssemblyX.FindAllPlugins(typeof(IEntityPersistence), true))
+            Console.WriteLine(config.InstallTime);
+
+            //config = SysConfig.Current;
+            //config = Load();
+            //config = SysConfig.Load();
+            //Console.WriteLine(config.InstallTime);
+
+            config = SysConfig.Current;
+            Console.WriteLine(config.InstallTime);
+        }
+
+        static SysConfig Load()
+        {
+            var filename = SysConfig._.ConfigFile;
+            if (filename.IsNullOrWhiteSpace()) return null;
+            filename = filename.GetFullPath();
+            if (!File.Exists(filename)) return null;
+
+            try
             {
-                Console.WriteLine(item);
+                var config = filename.ToXmlFileEntity<SysConfig>();
+                if (config == null) return null;
+
+                //config.OnLoaded();
+
+                //// 第一次加载，建立定时重载定时器
+                //if (timer == null && _.ReloadTime > 0) timer = new TimerX(s => Current = null, null, _.ReloadTime * 1000, _.ReloadTime * 1000);
+
+                return config;
             }
+            catch (Exception ex) { XTrace.WriteException(ex); return null; }
         }
 
         static void Test9()

diff --git a/Test/Properties/AssemblyInfo.cs b/Test/Properties/AssemblyInfo.cs
index 81cc30d..b61ef33 100644
--- a/Test/Properties/AssemblyInfo.cs
+++ b/Test/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // 有关程序集的常规信息通过以下

diff --git a/Test2/Program.cs b/Test2/Program.cs
index 4c3eebc..d4c0729 100644
--- a/Test2/Program.cs
+++ b/Test2/Program.cs
@@ -1,17 +1,13 @@
 using System;
-using System.Diagnostics;
+using System.IO.Ports;
 using System.Threading;
-using NewLife.Linq;
 using NewLife.Log;
+using NewLife.Net.Application;
+using NewLife.Net.ModBus;
 using NewLife.Net.Proxy;
 using NewLife.Net.Sockets;
-using NewLife.Threading;
-using System.Net.Sockets;
-using NewLife.Net.Application;
 using NewLife.Net.Udp;
 using NewLife.Security;
-using System.IO.Ports;
-using NewLife.Net.ModBus;
 
 namespace Test2
 {

diff --git a/Test2/Properties/AssemblyInfo.cs b/Test2/Properties/AssemblyInfo.cs
index d416aa5..4d0ef2b 100644
--- a/Test2/Properties/AssemblyInfo.cs
+++ b/Test2/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // 有关程序集的常规信息通过以下

diff --git "a/X\347\273\204\344\273\266.sln" "b/X\347\273\204\344\273\266.sln"
index 47a45f1..ac93426 100644
--- "a/X\347\273\204\344\273\266.sln"
+++ "b/X\347\273\204\344\273\266.sln"
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XControl", "XControl\XControl.csproj", "{A82E3AA8-6181-460D-A6EE-CC453B83D340}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XCoder", "XCoder\XCoder.csproj", "{3EB3A5F1-F785-4672-A21D-A3117FC12129}"
@@ -61,6 +61,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NewLife.Net.Test", "NewLife.Net.Test\NewLife.Net.Test.csproj", "{6D5EA117-7DC7-4390-935A-97C36F0BB29C}"
 EndProject
 Global
+	GlobalSection(TestCaseManagementSettings) = postSolution
+		CategoryFile = X组件.vsmdi
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Net4Debug|Any CPU = Net4Debug|Any CPU
@@ -163,32 +166,19 @@ Global
 		{AAC0A525-4C8D-4D30-B145-288E8CB5CF8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AAC0A525-4C8D-4D30-B145-288E8CB5CF8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AAC0A525-4C8D-4D30-B145-288E8CB5CF8A}.Net4Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AAC0A525-4C8D-4D30-B145-288E8CB5CF8A}.Net4Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AAC0A525-4C8D-4D30-B145-288E8CB5CF8A}.Net4Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{AAC0A525-4C8D-4D30-B145-288E8CB5CF8A}.Net4Release|Any CPU.Build.0 = Debug|Any CPU
 		{AAC0A525-4C8D-4D30-B145-288E8CB5CF8A}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{AAC0A525-4C8D-4D30-B145-288E8CB5CF8A}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{ADC0BECC-C59A-4A82-BFCE-02EBD2966204}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADC0BECC-C59A-4A82-BFCE-02EBD2966204}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ADC0BECC-C59A-4A82-BFCE-02EBD2966204}.Net4Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADC0BECC-C59A-4A82-BFCE-02EBD2966204}.Net4Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ADC0BECC-C59A-4A82-BFCE-02EBD2966204}.Net4Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ADC0BECC-C59A-4A82-BFCE-02EBD2966204}.Net4Release|Any CPU.Build.0 = Release|Any CPU
 		{ADC0BECC-C59A-4A82-BFCE-02EBD2966204}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ADC0BECC-C59A-4A82-BFCE-02EBD2966204}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6D5EA117-7DC7-4390-935A-97C36F0BB29C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D5EA117-7DC7-4390-935A-97C36F0BB29C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6D5EA117-7DC7-4390-935A-97C36F0BB29C}.Net4Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D5EA117-7DC7-4390-935A-97C36F0BB29C}.Net4Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6D5EA117-7DC7-4390-935A-97C36F0BB29C}.Net4Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6D5EA117-7DC7-4390-935A-97C36F0BB29C}.Net4Release|Any CPU.Build.0 = Release|Any CPU
 		{6D5EA117-7DC7-4390-935A-97C36F0BB29C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6D5EA117-7DC7-4390-935A-97C36F0BB29C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(TestCaseManagementSettings) = postSolution
-		CategoryFile = X组件.vsmdi
-	EndGlobalSection
 EndGlobal

diff --git a/XAgent/AgentService.cs b/XAgent/AgentService.cs
index f3173f9..c9b96d0 100644
--- a/XAgent/AgentService.cs
+++ b/XAgent/AgentService.cs
@@ -1,7 +1,4 @@
-using XAgent;
-using System.Diagnostics;
-using System;
-
+
 namespace XAgent
 {
     /// <summary>代理服务例子。自定义服务程序可参照该类实现。</summary>

diff --git a/XAgent/FrmMain.cs b/XAgent/FrmMain.cs
index 41efb06..611cf74 100644
--- a/XAgent/FrmMain.cs
+++ b/XAgent/FrmMain.cs
@@ -1,11 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
 using System.Reflection;
+using System.Windows.Forms;
 using NewLife.Reflection;
 
 namespace XAgent

diff --git a/XAgent/IAgentService.cs b/XAgent/IAgentService.cs
index 8d922b2..c455c10 100644
--- a/XAgent/IAgentService.cs
+++ b/XAgent/IAgentService.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace XAgent
 {
     interface IAgentService

diff --git a/XAgent/Program.cs b/XAgent/Program.cs
index ae93a6a..0acc9ea 100644
--- a/XAgent/Program.cs
+++ b/XAgent/Program.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace XAgent
 {
     class Program

diff --git a/XAgent/Properties/AssemblyInfo.cs b/XAgent/Properties/AssemblyInfo.cs
index 243faac..b7a1aaf 100644
--- a/XAgent/Properties/AssemblyInfo.cs
+++ b/XAgent/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // 有关程序集的常规信息通过下列属性集

diff --git a/XCode/Accessors/EntityAccessorEventArgs.cs b/XCode/Accessors/EntityAccessorEventArgs.cs
index b34625c..064cd1c 100644
--- a/XCode/Accessors/EntityAccessorEventArgs.cs
+++ b/XCode/Accessors/EntityAccessorEventArgs.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using XCode.Configuration;
 
 namespace XCode.Accessors

diff --git a/XCode/Accessors/EntityAccessorFactory.cs b/XCode/Accessors/EntityAccessorFactory.cs
index de4b8d4..abd0a8a 100644
--- a/XCode/Accessors/EntityAccessorFactory.cs
+++ b/XCode/Accessors/EntityAccessorFactory.cs
@@ -1,7 +1,7 @@
 using System;
 using NewLife.Model;
-using XCode.Model;
 using NewLife.Reflection;
+using XCode.Model;
 
 namespace XCode.Accessors
 {

diff --git a/XCode/Accessors/EntityAccessorOptions.cs b/XCode/Accessors/EntityAccessorOptions.cs
index 1ade8c9..659da47 100644
--- a/XCode/Accessors/EntityAccessorOptions.cs
+++ b/XCode/Accessors/EntityAccessorOptions.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace XCode.Accessors
 {
     /// <summary>实体访问器设置选项</summary>

diff --git a/XCode/Accessors/EntityAccessorTypes.cs b/XCode/Accessors/EntityAccessorTypes.cs
index 9a64fd6..ed811cd 100644
--- a/XCode/Accessors/EntityAccessorTypes.cs
+++ b/XCode/Accessors/EntityAccessorTypes.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace XCode.Accessors
 {
     /// <summary>实体访问器种类</summary>

diff --git a/XCode/Accessors/HttpEntityAccessor.cs b/XCode/Accessors/HttpEntityAccessor.cs
index 0af0108..ad8dc74 100644
--- a/XCode/Accessors/HttpEntityAccessor.cs
+++ b/XCode/Accessors/HttpEntityAccessor.cs
@@ -2,7 +2,6 @@
 using System.Web;
 using XCode.Configuration;
 using XCode.Exceptions;
-using XCode.Common;
 
 namespace XCode.Accessors
 {

diff --git a/XCode/Accessors/SerializationEntityAccessorBase.cs b/XCode/Accessors/SerializationEntityAccessorBase.cs
index f91a2c3..3ec911b 100644
--- a/XCode/Accessors/SerializationEntityAccessorBase.cs
+++ b/XCode/Accessors/SerializationEntityAccessorBase.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Text;
-using NewLife;
 using NewLife.Serialization;
 using XCode.Configuration;
 

diff --git a/XCode/Attributes/BindIndexAttribute.cs b/XCode/Attributes/BindIndexAttribute.cs
index 657b9a2..38f2f7a 100644
--- a/XCode/Attributes/BindIndexAttribute.cs
+++ b/XCode/Attributes/BindIndexAttribute.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Reflection;
 using XCode.DataAccessLayer;
 
 namespace XCode

diff --git a/XCode/Attributes/BindRelationAttribute.cs b/XCode/Attributes/BindRelationAttribute.cs
index 0d08183..a972255 100644
--- a/XCode/Attributes/BindRelationAttribute.cs
+++ b/XCode/Attributes/BindRelationAttribute.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Reflection;
 using XCode.DataAccessLayer;
 
 namespace XCode

diff --git a/XCode/Attributes/BindTableAttribute.cs b/XCode/Attributes/BindTableAttribute.cs
index a1e048d..3de3581 100644
--- a/XCode/Attributes/BindTableAttribute.cs
+++ b/XCode/Attributes/BindTableAttribute.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 using XCode.DataAccessLayer;
 
 namespace XCode

diff --git a/XCode/Cache/EntityDependency.cs b/XCode/Cache/EntityDependency.cs
index 6d1d1e2..bdb2f06 100644
--- a/XCode/Cache/EntityDependency.cs
+++ b/XCode/Cache/EntityDependency.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Web.Caching;
 using NewLife.Threading;
 

diff --git a/XCode/Cctor.cs b/XCode/Cctor.cs
index b2f4363..f9c5b8b 100644
--- a/XCode/Cctor.cs
+++ b/XCode/Cctor.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NewLife.Model;
-using XCode.DataAccessLayer;
-
+
 namespace XCode
 {
     class Cctor

diff --git a/XCode/Code/EntityClassBiz.cs b/XCode/Code/EntityClassBiz.cs
index c84db68..e71d7bd 100644
--- a/XCode/Code/EntityClassBiz.cs
+++ b/XCode/Code/EntityClassBiz.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace XCode.Code
 {
     /// <summary>实体类，业务部分</summary>

diff --git a/XCode/Common/Helper.cs b/XCode/Common/Helper.cs
index 0127f28..970713e 100644
--- a/XCode/Common/Helper.cs
+++ b/XCode/Common/Helper.cs
@@ -1,12 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Reflection;
-using System.Text;
-using NewLife.Linq;
-using NewLife.Reflection;
-using XCode.Configuration;
-using NewLife.Log;
 
 namespace XCode.Common
 {

diff --git a/XCode/Configuration/TableItem.cs b/XCode/Configuration/TableItem.cs
index 3ab5b4a..e6185a7 100644
--- a/XCode/Configuration/TableItem.cs
+++ b/XCode/Configuration/TableItem.cs
@@ -1,17 +1,18 @@
 using System;
-#if NET4
-using System.Linq;
-#endif
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Data.Common;
 using System.Xml.Serialization;
 using NewLife.Collections;
 using NewLife.Configuration;
-using NewLife.Linq;
 using XCode.DataAccessLayer;
 
+#if NET4
+using System.Linq;
+#else
+using NewLife.Linq;
+#endif
+
 namespace XCode.Configuration
 {
     /// <summary>数据表元数据</summary>

diff --git a/XCode/DataAccessLayer/Common/DatabaseType.cs b/XCode/DataAccessLayer/Common/DatabaseType.cs
index fe4e2a4..2e9106e 100644
--- a/XCode/DataAccessLayer/Common/DatabaseType.cs
+++ b/XCode/DataAccessLayer/Common/DatabaseType.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.ComponentModel;
+using System.ComponentModel;
 
 namespace XCode.DataAccessLayer
 {

diff --git a/XCode/DataAccessLayer/Common/RemoteDb.cs b/XCode/DataAccessLayer/Common/RemoteDb.cs
index a0ea9cb..cab44f0 100644
--- a/XCode/DataAccessLayer/Common/RemoteDb.cs
+++ b/XCode/DataAccessLayer/Common/RemoteDb.cs
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Data;
-using System.Data.Common;
-using System.IO;
 using System.Threading;
 
 namespace XCode.DataAccessLayer

diff --git a/XCode/DataAccessLayer/DAL.cs b/XCode/DataAccessLayer/DAL.cs
index 7eef285..972b185 100644
--- a/XCode/DataAccessLayer/DAL.cs
+++ b/XCode/DataAccessLayer/DAL.cs
@@ -2,12 +2,8 @@ using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Diagnostics;
-using System.IO;
-using System.Reflection;
 using System.Text;
 using System.Threading;
-using System.Xml;
-using System.Xml.Serialization;
 using NewLife.Log;
 using NewLife.Reflection;
 using NewLife.Threading;

diff --git a/XCode/DataAccessLayer/Database/Distributed.cs b/XCode/DataAccessLayer/Database/Distributed.cs
index 6f0632c..006199a 100644
--- a/XCode/DataAccessLayer/Database/Distributed.cs
+++ b/XCode/DataAccessLayer/Database/Distributed.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Data.Common;
 using XCode.Exceptions;
 

diff --git a/XCode/DataAccessLayer/Database/Firebird.cs b/XCode/DataAccessLayer/Database/Firebird.cs
index 8a4ef6a..786303a 100644
--- a/XCode/DataAccessLayer/Database/Firebird.cs
+++ b/XCode/DataAccessLayer/Database/Firebird.cs
@@ -5,7 +5,6 @@ using System.Data.Common;
 using System.IO;
 using System.Text.RegularExpressions;
 using NewLife.Reflection;
-using XCode.Exceptions;
 
 namespace XCode.DataAccessLayer
 {

diff --git a/XCode/DataAccessLayer/Database/Network.cs b/XCode/DataAccessLayer/Database/Network.cs
index ec642a1..d91c4ba 100644
--- a/XCode/DataAccessLayer/Database/Network.cs
+++ b/XCode/DataAccessLayer/Database/Network.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Data.Common;
 using System.Data;
+using System.Data.Common;
 
 namespace XCode.DataAccessLayer
 {

diff --git a/XCode/DataAccessLayer/Database/SqlCe.cs b/XCode/DataAccessLayer/Database/SqlCe.cs
index 5dbdb11..09adc66 100644
--- a/XCode/DataAccessLayer/Database/SqlCe.cs
+++ b/XCode/DataAccessLayer/Database/SqlCe.cs
@@ -7,9 +7,9 @@ using System.Data.SqlTypes;
 using System.IO;
 using System.Reflection;
 using System.Text;
-using NewLife.Log;
-using NewLife.IO;
 using NewLife;
+using NewLife.IO;
+using NewLife.Log;
 using NewLife.Reflection;
 
 namespace XCode.DataAccessLayer

diff --git a/XCode/DataAccessLayer/Database/SQLite.cs b/XCode/DataAccessLayer/Database/SQLite.cs
index e820496..3ca1b04 100644
--- a/XCode/DataAccessLayer/Database/SQLite.cs
+++ b/XCode/DataAccessLayer/Database/SQLite.cs
@@ -5,7 +5,7 @@ using System.Data.Common;
 using System.Text;
 using System.Threading;
 using NewLife.Reflection;
-using NewLife.Collections;
+
 
 #if NET4
 using System.Linq;

diff --git a/XCode/DataAccessLayer/MetaData/DDLSchema.cs b/XCode/DataAccessLayer/MetaData/DDLSchema.cs
index d974ec6..3b4e371 100644
--- a/XCode/DataAccessLayer/MetaData/DDLSchema.cs
+++ b/XCode/DataAccessLayer/MetaData/DDLSchema.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace XCode.DataAccessLayer
 {
     /// <summary>数据定义模式</summary>

diff --git a/XCode/DataAccessLayer/MetaData/NegativeSetting.cs b/XCode/DataAccessLayer/MetaData/NegativeSetting.cs
index 89d1107..c3afc8f 100644
--- a/XCode/DataAccessLayer/MetaData/NegativeSetting.cs
+++ b/XCode/DataAccessLayer/MetaData/NegativeSetting.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace XCode.DataAccessLayer
 {

diff --git a/XCode/DataAccessLayer/Model/IModelResolver.cs b/XCode/DataAccessLayer/Model/IModelResolver.cs
index 857307d..99bbe2f 100644
--- a/XCode/DataAccessLayer/Model/IModelResolver.cs
+++ b/XCode/DataAccessLayer/Model/IModelResolver.cs
@@ -1,16 +1,17 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 using Microsoft.CSharp;
+using XCode.Model;
+using NewLife.Reflection;
+using NewLife.Configuration;
+using NewLife.Collections;
+
 #if NET4
+using System.Collections.Generic;
 using System.Linq;
 #else
 using NewLife.Linq;
 #endif
-using XCode.Model;
-using NewLife.Reflection;
-using NewLife.Configuration;
-using NewLife.Collections;
 
 namespace XCode.DataAccessLayer.Model
 {

diff --git a/XCode/Entity/EntityBase.cs b/XCode/Entity/EntityBase.cs
index 096bab6..1dde73c 100644
--- a/XCode/Entity/EntityBase.cs
+++ b/XCode/Entity/EntityBase.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;

diff --git a/XCode/Entity/EntityList.cs b/XCode/Entity/EntityList.cs
index 8031358..1a3224b 100644
--- a/XCode/Entity/EntityList.cs
+++ b/XCode/Entity/EntityList.cs
@@ -14,7 +14,7 @@ using XCode.Configuration;
 #if NET4
 using System.Linq;
 #else
-using NewLife.Linq;
+
 #endif
 
 namespace XCode

diff --git a/XCode/Exceptions/XDbException.cs b/XCode/Exceptions/XDbException.cs
index 12db435..bd9c3a5 100644
--- a/XCode/Exceptions/XDbException.cs
+++ b/XCode/Exceptions/XDbException.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using XCode.DataAccessLayer;
 
 namespace XCode.Exceptions

diff --git a/XCode/Exceptions/XDbMetaDataException.cs b/XCode/Exceptions/XDbMetaDataException.cs
index c1fcb64..c1d79f2 100644
--- a/XCode/Exceptions/XDbMetaDataException.cs
+++ b/XCode/Exceptions/XDbMetaDataException.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using XCode.DataAccessLayer;
 
 namespace XCode.Exceptions

diff --git a/XCode/Exceptions/XDbSessionException.cs b/XCode/Exceptions/XDbSessionException.cs
index 0ea9f81..d138c74 100644
--- a/XCode/Exceptions/XDbSessionException.cs
+++ b/XCode/Exceptions/XDbSessionException.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using XCode.DataAccessLayer;
 
 namespace XCode.Exceptions

diff --git a/XCode/Exceptions/XSqlException.cs b/XCode/Exceptions/XSqlException.cs
index 0467e85..707ee67 100644
--- a/XCode/Exceptions/XSqlException.cs
+++ b/XCode/Exceptions/XSqlException.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.Serialization;
 using System.Security.Permissions;
 using XCode.DataAccessLayer;

diff --git a/XCode/Model/OrderExpression.cs b/XCode/Model/OrderExpression.cs
index f53e148..fabac12 100644
--- a/XCode/Model/OrderExpression.cs
+++ b/XCode/Model/OrderExpression.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 
 namespace XCode

diff --git a/XCode/Sync/ISyncMaster.cs b/XCode/Sync/ISyncMaster.cs
index dfabf33..0b7eb8a 100644
--- a/XCode/Sync/ISyncMaster.cs
+++ b/XCode/Sync/ISyncMaster.cs
@@ -1,10 +1,12 @@
 using System;
+using NewLife.Reflection;
+using XCode.Configuration;
+
 #if NET4
 using System.Linq;
-#endif
+#else
 using NewLife.Linq;
-using NewLife.Reflection;
-using XCode.Configuration;
+#endif
 
 namespace XCode.Sync
 {

diff --git a/XCode/Sync/ISyncSlave.cs b/XCode/Sync/ISyncSlave.cs
index 12b2daf..095bec8 100644
--- a/XCode/Sync/ISyncSlave.cs
+++ b/XCode/Sync/ISyncSlave.cs
@@ -1,12 +1,14 @@
 using System;
-#if NET4
-using System.Linq;
-#endif
-using NewLife.Linq;
 using NewLife.Reflection;
 using XCode.Configuration;
 using XCode.DataAccessLayer;
 
+#if NET4
+using System.Linq;
+#else
+using NewLife.Linq;
+#endif
+
 namespace XCode.Sync
 {
     /// <summary>同步框架从方接口</summary>

diff --git a/XCode/Tree/IEntityTree.cs b/XCode/Tree/IEntityTree.cs
index 74a3542..0dfcd75 100644
--- a/XCode/Tree/IEntityTree.cs
+++ b/XCode/Tree/IEntityTree.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace XCode
 {

diff --git a/XCoder/Network/BingTranslate.cs b/XCoder/Network/BingTranslate.cs
index 80729a8..47cf09e 100644
--- a/XCoder/Network/BingTranslate.cs
+++ b/XCoder/Network/BingTranslate.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-//using XCoder.com.microsofttranslator.api;
-using NewLife.Collections;
+//using XCoder.com.microsofttranslator.api;
 
 namespace XCoder
 {

diff --git a/XCoder/Properties/AssemblyInfo.cs b/XCoder/Properties/AssemblyInfo.cs
index 085834a..08ce7b1 100644
--- a/XCoder/Properties/AssemblyInfo.cs
+++ b/XCoder/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // 有关程序集的常规信息通过下列属性集

diff --git a/XCoder/Windows/FrmFix.cs b/XCoder/Windows/FrmFix.cs
index 956b79b..5989567 100644
--- a/XCoder/Windows/FrmFix.cs
+++ b/XCoder/Windows/FrmFix.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
+using System.Windows.Forms;
 
 namespace XCoder
 {

diff --git a/XCoder/Windows/FrmItems.cs b/XCoder/Windows/FrmItems.cs
index d209aa9..38a7089 100644
--- a/XCoder/Windows/FrmItems.cs
+++ b/XCoder/Windows/FrmItems.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
-using NewLife.Xml;
 
 namespace XCoder
 {

diff --git "a/XControl/\345\214\205\350\243\205/SR.cs" "b/XControl/\345\214\205\350\243\205/SR.cs"
index dbe96c7..bab32bc 100644
--- "a/XControl/\345\214\205\350\243\205/SR.cs"
+++ "b/XControl/\345\214\205\350\243\205/SR.cs"
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.ComponentModel;
 using System.Reflection;
 using NewLife.Reflection;
 

diff --git "a/XControl/\345\214\205\350\243\205/StringUtil.cs" "b/XControl/\345\214\205\350\243\205/StringUtil.cs"
index 85e366d..9b04c73 100644
--- "a/XControl/\345\214\205\350\243\205/StringUtil.cs"
+++ "b/XControl/\345\214\205\350\243\205/StringUtil.cs"
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Globalization;
 using System.Runtime.InteropServices;
 

diff --git "a/XControl/\345\214\205\350\243\205/WebCategoryAttribute.cs" "b/XControl/\345\214\205\350\243\205/WebCategoryAttribute.cs"
index b02e37f..70d2107 100644
--- "a/XControl/\345\214\205\350\243\205/WebCategoryAttribute.cs"
+++ "b/XControl/\345\214\205\350\243\205/WebCategoryAttribute.cs"
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.ComponentModel;
 
 namespace XControl

diff --git "a/XControl/\345\214\205\350\243\205/WebSysDefaultValueAttribute.cs" "b/XControl/\345\214\205\350\243\205/WebSysDefaultValueAttribute.cs"
index 2923fe3..b2f74a2 100644
--- "a/XControl/\345\214\205\350\243\205/WebSysDefaultValueAttribute.cs"
+++ "b/XControl/\345\214\205\350\243\205/WebSysDefaultValueAttribute.cs"
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.ComponentModel;
 
 namespace XControl

diff --git "a/XControl/\345\214\205\350\243\205/WebSysDescriptionAttribute.cs" "b/XControl/\345\214\205\350\243\205/WebSysDescriptionAttribute.cs"
index 9c21a91..a253da3 100644
--- "a/XControl/\345\214\205\350\243\205/WebSysDescriptionAttribute.cs"
+++ "b/XControl/\345\214\205\350\243\205/WebSysDescriptionAttribute.cs"
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.ComponentModel;
 
 namespace XControl

diff --git "a/XControl/\345\214\205\350\243\205/WebSysDisplayNameAttribute.cs" "b/XControl/\345\214\205\350\243\205/WebSysDisplayNameAttribute.cs"
index 140e47e..ffb1a79 100644
--- "a/XControl/\345\214\205\350\243\205/WebSysDisplayNameAttribute.cs"
+++ "b/XControl/\345\214\205\350\243\205/WebSysDisplayNameAttribute.cs"
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.ComponentModel;
 
 namespace XControl

diff --git "a/XControl/\345\210\206\351\241\265/DataPager.cs" "b/XControl/\345\210\206\351\241\265/DataPager.cs"
index c06369f..6d090c9 100644
--- "a/XControl/\345\210\206\351\241\265/DataPager.cs"
+++ "b/XControl/\345\210\206\351\241\265/DataPager.cs"
@@ -1,8 +1,5 @@
 using System;
-using System.Collections;
 using System.ComponentModel;
-using System.Drawing;
-using System.Drawing.Design;
 using System.Globalization;
 using System.Web;
 using System.Web.UI;

diff --git "a/XControl/\345\210\206\351\241\265/DataPagerActionList.cs" "b/XControl/\345\210\206\351\241\265/DataPagerActionList.cs"
index a81a62f..ab297c4 100644
--- "a/XControl/\345\210\206\351\241\265/DataPagerActionList.cs"
+++ "b/XControl/\345\210\206\351\241\265/DataPagerActionList.cs"
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.ComponentModel.Design;
+using System.ComponentModel.Design;
 using System.Windows.Forms;
-using System.Web.UI.Design;
-using System.Web.UI.Design.WebControls;
-using System.ComponentModel;
 
 namespace XControl
 {

diff --git "a/XControl/\345\210\206\351\241\265/DataPagerDesigner.cs" "b/XControl/\345\210\206\351\241\265/DataPagerDesigner.cs"
index df1dfab..292e427 100644
--- "a/XControl/\345\210\206\351\241\265/DataPagerDesigner.cs"
+++ "b/XControl/\345\210\206\351\241\265/DataPagerDesigner.cs"
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.ComponentModel;
 using System.ComponentModel.Design;
 using System.IO;
@@ -7,9 +6,6 @@ using System.Web.UI;
 using System.Web.UI.Design;
 using System.Web.UI.Design.WebControls;
 using System.Web.UI.WebControls;
-using System.Windows.Forms;
-using AttributeCollection = System.ComponentModel.AttributeCollection;
-using Control = System.Web.UI.Control;
 
 namespace XControl
 {

diff --git "a/XControl/\345\210\206\351\241\265/DataPagerItem.cs" "b/XControl/\345\210\206\351\241\265/DataPagerItem.cs"
index 7d2f2bb..39fb917 100644
--- "a/XControl/\345\210\206\351\241\265/DataPagerItem.cs"
+++ "b/XControl/\345\210\206\351\241\265/DataPagerItem.cs"
@@ -1,10 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Web.UI;
 using System.ComponentModel;
-using System.Web;
 using System.Security.Permissions;
+using System.Web;
+using System.Web.UI;
 
 namespace XControl
 {

diff --git "a/XControl/\345\210\206\351\241\265/IPagedDataSource.cs" "b/XControl/\345\210\206\351\241\265/IPagedDataSource.cs"
index 5911d46..cba2b93 100644
--- "a/XControl/\345\210\206\351\241\265/IPagedDataSource.cs"
+++ "b/XControl/\345\210\206\351\241\265/IPagedDataSource.cs"
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace XControl
 {

diff --git "a/XControl/\346\211\251\345\261\225/ExtenderControl.cs" "b/XControl/\346\211\251\345\261\225/ExtenderControl.cs"
index acf1149..ec8497b 100644
--- "a/XControl/\346\211\251\345\261\225/ExtenderControl.cs"
+++ "b/XControl/\346\211\251\345\261\225/ExtenderControl.cs"
@@ -1,12 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Web.UI;
 using System.ComponentModel;
-using NewLife.Web;
-using NewLife.Configuration;
 using System.Drawing;
+using System.Web.UI;
 using System.Web.UI.WebControls;
+using NewLife.Configuration;
+using NewLife.Web;
 
 namespace XControl
 {

diff --git "a/XControl/\346\211\251\345\261\225/ExtenderControlDesigner.cs" "b/XControl/\346\211\251\345\261\225/ExtenderControlDesigner.cs"
index 28d3d8a..4654f64 100644
--- "a/XControl/\346\211\251\345\261\225/ExtenderControlDesigner.cs"
+++ "b/XControl/\346\211\251\345\261\225/ExtenderControlDesigner.cs"
@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
+using System.ComponentModel.Design;
 using System.Web.UI.Design;
-using System.Web.UI;
 using System.Windows.Forms;
-using System.ComponentModel.Design;
 using Control = System.Web.UI.Control;
 
 namespace XControl

diff --git "a/XControl/\346\211\251\345\261\225/TargetControlTypeAttribute.cs" "b/XControl/\346\211\251\345\261\225/TargetControlTypeAttribute.cs"
index 7c4feee..6d27246 100644
--- "a/XControl/\346\211\251\345\261\225/TargetControlTypeAttribute.cs"
+++ "b/XControl/\346\211\251\345\261\225/TargetControlTypeAttribute.cs"
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace XControl
 {

diff --git "a/XControl/\346\225\260\346\215\256\346\272\220/ObjectDataSourceExtender.cs" "b/XControl/\346\225\260\346\215\256\346\272\220/ObjectDataSourceExtender.cs"
index a56b234..a99492b 100644
--- "a/XControl/\346\225\260\346\215\256\346\272\220/ObjectDataSourceExtender.cs"
+++ "b/XControl/\346\225\260\346\215\256\346\272\220/ObjectDataSourceExtender.cs"
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Web.UI.WebControls;
+using System.Web.UI.WebControls;
 
 namespace XControl
 {

diff --git a/XControl/Box/BoxControl.cs b/XControl/Box/BoxControl.cs
index e41d215..f801380 100644
--- a/XControl/Box/BoxControl.cs
+++ b/XControl/Box/BoxControl.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Web.UI;
 using System.ComponentModel;
 using System.Drawing;
+using System.Web.UI;
 
 namespace XControl
 {

diff --git a/XControl/Button/ChooseButton.cs b/XControl/Button/ChooseButton.cs
index 228326a..86e1d88 100644
--- a/XControl/Button/ChooseButton.cs
+++ b/XControl/Button/ChooseButton.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Drawing;
 using System.Web.UI;

diff --git a/XControl/Button/LinkButtonField.cs b/XControl/Button/LinkButtonField.cs
index be12e89..4090c16 100644
--- a/XControl/Button/LinkButtonField.cs
+++ b/XControl/Button/LinkButtonField.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Web.UI.WebControls;
-using System.Web.UI;
 using System.ComponentModel;
+using System.Web.UI;
+using System.Web.UI.WebControls;
 
 namespace XControl
 {

diff --git a/XControl/Menu/TreeMenu.cs b/XControl/Menu/TreeMenu.cs
index f29c0d7..f7f7e95 100644
--- a/XControl/Menu/TreeMenu.cs
+++ b/XControl/Menu/TreeMenu.cs
@@ -1,5 +1,4 @@
 using System;
-using NewLife.Xml;
 using System.Collections.Generic;
 using System.IO;
 using System.Web;
@@ -8,6 +7,7 @@ using System.Xml;
 using System.Xml.Serialization;
 using System.Xml.Xsl;
 using NewLife.Reflection;
+using NewLife.Xml;
 
 [assembly: WebResource("XControl.Menu.RS.tree.js", "text/javascript", PerformSubstitution = true)]
 [assembly: WebResource("XControl.Menu.RS.XSL.xsl", "text/xml", PerformSubstitution = true)]

diff --git a/XControl/MenuField/XLiteral.cs b/XControl/MenuField/XLiteral.cs
index 01a08d0..55081c6 100644
--- a/XControl/MenuField/XLiteral.cs
+++ b/XControl/MenuField/XLiteral.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Web.UI.WebControls;
-
+
 namespace XControl
 {
     ///// <summary>

diff --git a/XControl/Properties/AssemblyInfo.cs b/XControl/Properties/AssemblyInfo.cs
index 9efa6b2..9e6591c 100644
--- a/XControl/Properties/AssemblyInfo.cs
+++ b/XControl/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Web.UI;
 

diff --git a/XControl/ScriptHelper.cs b/XControl/ScriptHelper.cs
index 4f9314b..fa7de87 100644
--- a/XControl/ScriptHelper.cs
+++ b/XControl/ScriptHelper.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using System.Web;
 using System.Web.UI;

diff --git a/XControl/TextBox/DateBox/DateBox.cs b/XControl/TextBox/DateBox/DateBox.cs
index 1206899..faff6e9 100644
--- a/XControl/TextBox/DateBox/DateBox.cs
+++ b/XControl/TextBox/DateBox/DateBox.cs
@@ -1,14 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
 using System.ComponentModel;
-using System.IO;
 using System.Drawing;
+using System.Web.UI;
+using System.Web.UI.WebControls;
 
 // �ر�Ҫע�⣬����ü���Ĭ�������ռ��Ŀ¼������Ϊvs2005�����ʱ����js�ļ�������Щ������
 [assembly: WebResource("XControl.TextBox.DateBox.SelectDate.js", "application/x-javascript")]

diff --git a/XControl/TextBox/DateTime.cs b/XControl/TextBox/DateTime.cs
index 6217a8c..fbea738 100644
--- a/XControl/TextBox/DateTime.cs
+++ b/XControl/TextBox/DateTime.cs
@@ -1,11 +1,9 @@
 using System;
 using System.ComponentModel;
-using System.IO;
 using System.Text;
-using System.Web;
 using System.Web.UI;
-using System.Web.UI.WebControls;
 using System.Web.UI.HtmlControls;
+using System.Web.UI.WebControls;
 #region 资源引用
 [assembly: WebResource("XControl.TextBox.DateTime.lhgcore.min.js", "text/javascript", PerformSubstitution = true)]
 [assembly: WebResource("XControl.TextBox.DateTime.lhgcalendar.min.js", "text/javascript", PerformSubstitution = true)]

diff --git a/XControl/TextBox/DateTimePicker.cs b/XControl/TextBox/DateTimePicker.cs
index 08f35a7..d8f78be 100644
--- a/XControl/TextBox/DateTimePicker.cs
+++ b/XControl/TextBox/DateTimePicker.cs
@@ -1,8 +1,6 @@
 using System;
 using System.ComponentModel;
-using System.IO;
 using System.Text;
-using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 

diff --git a/XControl/TextBox/IPBox.cs b/XControl/TextBox/IPBox.cs
index e5eefad..fe53af1 100644
--- a/XControl/TextBox/IPBox.cs
+++ b/XControl/TextBox/IPBox.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-
-using System.Web.UI.WebControls;
-using System.Drawing;
 using System.ComponentModel;
+using System.Drawing;
 using System.Web.UI;
+using System.Web.UI.WebControls;
 
 namespace XControl
 {

diff --git a/XControl/TextBox/VerifyCodeBox.cs b/XControl/TextBox/VerifyCodeBox.cs
index 0810292..9ef90c6 100644
--- a/XControl/TextBox/VerifyCodeBox.cs
+++ b/XControl/TextBox/VerifyCodeBox.cs
@@ -1,9 +1,7 @@
 using System;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Drawing;
 using System.IO;
-using System.Reflection;
 using System.Web.UI;
 using System.Web.UI.HtmlControls;
 using System.Web.UI.WebControls;

diff --git a/XControl/View/GridViewExtender.cs b/XControl/View/GridViewExtender.cs
index c99fba1..b866a25 100644
--- a/XControl/View/GridViewExtender.cs
+++ b/XControl/View/GridViewExtender.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
@@ -9,11 +10,10 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using NewLife.Reflection;
 using NewLife.Web;
-using System.Collections;
 #if NET4
 using System.Linq;
 #else
-using NewLife.Linq;
+
 #endif
 
 [assembly: WebResource("XControl.View.GridViewExtender.js", "text/javascript")]

diff --git a/XControl/View/GridViewExtenderDesigner.cs b/XControl/View/GridViewExtenderDesigner.cs
index 7327d74..9f86402 100644
--- a/XControl/View/GridViewExtenderDesigner.cs
+++ b/XControl/View/GridViewExtenderDesigner.cs
@@ -1,9 +1,9 @@
 using System;
 using System.ComponentModel.Design;
 using System.Web.UI.Design;
+using System.Web.UI.Design.WebControls;
 using System.Web.UI.WebControls;
 using System.Windows.Forms;
-using System.Web.UI.Design.WebControls;
 
 namespace XControl
 {

diff --git a/XTemplate/Templating/Block.cs b/XTemplate/Templating/Block.cs
index 3ec3d62..fc1831a 100644
--- a/XTemplate/Templating/Block.cs
+++ b/XTemplate/Templating/Block.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 
 namespace XTemplate.Templating
 {

diff --git a/XTemplate/Templating/BlockType.cs b/XTemplate/Templating/BlockType.cs
index 4aef135..920f6d2 100644
--- a/XTemplate/Templating/BlockType.cs
+++ b/XTemplate/Templating/BlockType.cs
@@ -1,5 +1,4 @@
-using System;
-
+
 namespace XTemplate.Templating
 {
     /// <summary>代码块类型</summary>

diff --git a/XTemplate/Templating/Directive.cs b/XTemplate/Templating/Directive.cs
index 3bc78ec..6904f60 100644
--- a/XTemplate/Templating/Directive.cs
+++ b/XTemplate/Templating/Directive.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections;
 
 namespace XTemplate.Templating
 {

diff --git a/XTemplate/Templating/TemplateException.cs b/XTemplate/Templating/TemplateException.cs
index c4769c1..4683fc3 100644
--- a/XTemplate/Templating/TemplateException.cs
+++ b/XTemplate/Templating/TemplateException.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.CodeDom.Compiler;
 using NewLife.Exceptions;
 

diff --git a/XTemplate/Templating/TemplateExecuteException.cs b/XTemplate/Templating/TemplateExecuteException.cs
index d1c61c7..d9a673a 100644
--- a/XTemplate/Templating/TemplateExecuteException.cs
+++ b/XTemplate/Templating/TemplateExecuteException.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using NewLife.Exceptions;
 using System.Runtime.Serialization;
+using NewLife.Exceptions;
 
 namespace XTemplate.Templating
 {

diff --git a/XTemplate/Templating/TemplateStatus.cs b/XTemplate/Templating/TemplateStatus.cs
index 38accc6..27be3c0 100644
--- a/XTemplate/Templating/TemplateStatus.cs
+++ b/XTemplate/Templating/TemplateStatus.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+
 namespace XTemplate.Templating
 {
     /// <summary>模版引擎状态</summary>

diff --git a/YWS/BLL/YWSEntityBase.cs b/YWS/BLL/YWSEntityBase.cs
index 908a8d7..51d1c93 100644
--- a/YWS/BLL/YWSEntityBase.cs
+++ b/YWS/BLL/YWSEntityBase.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
-using NewLife.Web;
-using XCode;
 using NewLife.CommonEntity;
+using XCode;
 
 namespace NewLife.YWS.Entities
 {

diff --git "a/YWS/Entities/\346\234\272\345\231\250\351\233\266\344\273\266\350\247\204\346\240\274.Biz.cs" "b/YWS/Entities/\346\234\272\345\231\250\351\233\266\344\273\266\350\247\204\346\240\274.Biz.cs"
index 6ca5faf..cd2aae0 100644
--- "a/YWS/Entities/\346\234\272\345\231\250\351\233\266\344\273\266\350\247\204\346\240\274.Biz.cs"
+++ "b/YWS/Entities/\346\234\272\345\231\250\351\233\266\344\273\266\350\247\204\346\240\274.Biz.cs"
@@ -8,9 +8,8 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text;
-using XCode;
-using XCode.Configuration;
 using System.Xml.Serialization;
+using XCode;
 
 namespace NewLife.YWS.Entities
 {

diff --git "a/YWS/Entities/\346\234\272\345\231\250\351\233\266\344\273\266\350\247\204\346\240\274.cs" "b/YWS/Entities/\346\234\272\345\231\250\351\233\266\344\273\266\350\247\204\346\240\274.cs"
index c35ab30..5b24e57 100644
--- "a/YWS/Entities/\346\234\272\345\231\250\351\233\266\344\273\266\350\247\204\346\240\274.cs"
+++ "b/YWS/Entities/\346\234\272\345\231\250\351\233\266\344\273\266\350\247\204\346\240\274.cs"
@@ -5,10 +5,8 @@
  * 版权：版权所有 (C) 新生命开发团队 2011
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using XCode;
-using System.Xml.Serialization;
 using XCode.Configuration;
 using XCode.DataAccessLayer;
 

diff --git "a/YWS/Entities/\344\272\244\346\230\223\350\256\260\345\275\225.Biz.cs" "b/YWS/Entities/\344\272\244\346\230\223\350\256\260\345\275\225.Biz.cs"
index 8939c9b..621a4de 100644
--- "a/YWS/Entities/\344\272\244\346\230\223\350\256\260\345\275\225.Biz.cs"
+++ "b/YWS/Entities/\344\272\244\346\230\223\350\256\260\345\275\225.Biz.cs"
@@ -10,7 +10,6 @@ using System.ComponentModel;
 using System.Text;
 using System.Xml.Serialization;
 using XCode;
-using XCode.Configuration;
 
 namespace NewLife.YWS.Entities
 {

diff --git "a/YWS/Entities/\344\272\244\346\230\223\350\256\260\345\275\225.cs" "b/YWS/Entities/\344\272\244\346\230\223\350\256\260\345\275\225.cs"
index 3c29560..0fe6e0a 100644
--- "a/YWS/Entities/\344\272\244\346\230\223\350\256\260\345\275\225.cs"
+++ "b/YWS/Entities/\344\272\244\346\230\223\350\256\260\345\275\225.cs"
@@ -5,10 +5,8 @@
  * 版权：版权所有 (C) 新生命开发团队 2011
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using XCode;
-using System.Xml.Serialization;
 using XCode.Configuration;
 using XCode.DataAccessLayer;
 

diff --git "a/YWS/Entities/\345\256\242\346\210\267.Biz.cs" "b/YWS/Entities/\345\256\242\346\210\267.Biz.cs"
index e97bbea..3835a27 100644
--- "a/YWS/Entities/\345\256\242\346\210\267.Biz.cs"
+++ "b/YWS/Entities/\345\256\242\346\210\267.Biz.cs"
@@ -5,12 +5,10 @@
  * 版权：版权所有 (C) 新生命开发团队 2011
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text;
 using System.Xml.Serialization;
 using XCode;
-using XCode.Configuration;
 
 namespace NewLife.YWS.Entities
 {

diff --git "a/YWS/Entities/\345\256\242\346\210\267.cs" "b/YWS/Entities/\345\256\242\346\210\267.cs"
index e8a8f97..e997ff8 100644
--- "a/YWS/Entities/\345\256\242\346\210\267.cs"
+++ "b/YWS/Entities/\345\256\242\346\210\267.cs"
@@ -5,7 +5,6 @@
  * 版权：版权所有 (C) 新生命开发团队 2011
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using XCode;
 using XCode.Configuration;

diff --git "a/YWS/Entities/\345\256\242\346\210\267\347\261\273\345\236\213.Biz.cs" "b/YWS/Entities/\345\256\242\346\210\267\347\261\273\345\236\213.Biz.cs"
index 811c793..0a6fa40 100644
--- "a/YWS/Entities/\345\256\242\346\210\267\347\261\273\345\236\213.Biz.cs"
+++ "b/YWS/Entities/\345\256\242\346\210\267\347\261\273\345\236\213.Biz.cs"
@@ -5,12 +5,8 @@
  * 版权：版权所有 (C) 新生命开发团队 2011
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Text;
-using System.Xml.Serialization;
 using XCode;
-using XCode.Configuration;
 
 namespace NewLife.YWS.Entities
 {

diff --git "a/YWS/Entities/\345\256\242\346\210\267\347\261\273\345\236\213.cs" "b/YWS/Entities/\345\256\242\346\210\267\347\261\273\345\236\213.cs"
index b60872d..968886a 100644
--- "a/YWS/Entities/\345\256\242\346\210\267\347\261\273\345\236\213.cs"
+++ "b/YWS/Entities/\345\256\242\346\210\267\347\261\273\345\236\213.cs"
@@ -5,7 +5,6 @@
  * 版权：版权所有 (C) 新生命开发团队 2011
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using XCode;
 using XCode.Configuration;

diff --git "a/YWS/Entities/\347\273\264\344\277\256\344\277\235\345\205\273\350\256\260\345\275\225.Biz.cs" "b/YWS/Entities/\347\273\264\344\277\256\344\277\235\345\205\273\350\256\260\345\275\225.Biz.cs"
index 640b972..71cd246 100644
--- "a/YWS/Entities/\347\273\264\344\277\256\344\277\235\345\205\273\350\256\260\345\275\225.Biz.cs"
+++ "b/YWS/Entities/\347\273\264\344\277\256\344\277\235\345\205\273\350\256\260\345\275\225.Biz.cs"
@@ -10,7 +10,6 @@ using System.ComponentModel;
 using System.Text;
 using System.Xml.Serialization;
 using XCode;
-using XCode.Configuration;
 
 namespace NewLife.YWS.Entities
 {

diff --git "a/YWS/Entities/\347\273\264\344\277\256\344\277\235\345\205\273\350\256\260\345\275\225.cs" "b/YWS/Entities/\347\273\264\344\277\256\344\277\235\345\205\273\350\256\260\345\275\225.cs"
index abe92f0..3769a06 100644
--- "a/YWS/Entities/\347\273\264\344\277\256\344\277\235\345\205\273\350\256\260\345\275\225.cs"
+++ "b/YWS/Entities/\347\273\264\344\277\256\344\277\235\345\205\273\350\256\260\345\275\225.cs"
@@ -5,7 +5,6 @@
  * 版权：版权所有 (C) 新生命开发团队 2011
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using XCode;
 using XCode.Configuration;

diff --git "a/YWS/Entities/\346\266\262\346\226\231\350\247\204\346\240\274.Biz.cs" "b/YWS/Entities/\346\266\262\346\226\231\350\247\204\346\240\274.Biz.cs"
index b73af4f..cc0ac12 100644
--- "a/YWS/Entities/\346\266\262\346\226\231\350\247\204\346\240\274.Biz.cs"
+++ "b/YWS/Entities/\346\266\262\346\226\231\350\247\204\346\240\274.Biz.cs"
@@ -10,7 +10,6 @@ using System.ComponentModel;
 using System.Text;
 using System.Xml.Serialization;
 using XCode;
-using XCode.Configuration;
 
 namespace NewLife.YWS.Entities
 {

diff --git "a/YWS/Entities/\346\266\262\346\226\231\350\247\204\346\240\274.cs" "b/YWS/Entities/\346\266\262\346\226\231\350\247\204\346\240\274.cs"
index 01515b6..ceaf8ee 100644
--- "a/YWS/Entities/\346\266\262\346\226\231\350\247\204\346\240\274.cs"
+++ "b/YWS/Entities/\346\266\262\346\226\231\350\247\204\346\240\274.cs"
@@ -5,7 +5,6 @@
  * 版权：版权所有 (C) 新生命开发团队 2011
 */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using XCode;
 using XCode.Configuration;

diff --git a/YWS/Properties/AssemblyInfo.cs b/YWS/Properties/AssemblyInfo.cs
index 517c18d..17eeb8f 100644
--- a/YWS/Properties/AssemblyInfo.cs
+++ b/YWS/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // 有关程序集的常规信息通过以下

diff --git a/YWS/YWSManageProvider.cs b/YWS/YWSManageProvider.cs
index 081e1cc..5ce4e8c 100644
--- a/YWS/YWSManageProvider.cs
+++ b/YWS/YWSManageProvider.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NewLife.CommonEntity;
+using NewLife.CommonEntity;
 
 namespace NewLife.YWS.Entities
 {