NewLife/X

输出主要组件的版本信息和源码位置
大石头 authored at 2017-05-26 09:38:08
384cf5c
Tree
1 Parent(s) c2a907e
Summary: 18 changed files with 31 additions and 75 deletions.
Modified +0 -39
Modified +6 -1
Modified +0 -2
Deleted +0 -10
NewLife.Core/Properties/AssemblyInfo_.cs
Modified +4 -1
Modified +1 -0
Modified +2 -2
Modified +0 -3
Modified +4 -1
Modified +0 -3
Modified +3 -0
Modified +0 -2
Modified +4 -1
Modified +0 -3
Modified +4 -1
Modified +0 -3
Modified +3 -0
Modified +0 -3
Modified +0 -39
diff --git a/NewLife.Core/Log/TextFileLog.cs b/NewLife.Core/Log/TextFileLog.cs
index fca9464..083fe12 100644
--- a/NewLife.Core/Log/TextFileLog.cs
+++ b/NewLife.Core/Log/TextFileLog.cs
@@ -207,45 +207,6 @@ namespace NewLife.Log
             else
                 PerformWriteLog(e.Set(Format(format, args), null));
         }
-
-        ///// <summary>输出日志</summary>
-        ///// <param name="msg">信息</param>
-        //public void Write(String msg)
-        //{
-        //    PerformWriteLog(WriteLogEventArgs.Current.Set(msg, null, false));
-        //}
-
-        ///// <summary>写日志</summary>
-        ///// <param name="format"></param>
-        ///// <param name="args"></param>
-        //public void Write(String format, params Object[] args)
-        //{
-        //    Write(Format(format, args));
-        //}
-
-        ///// <summary>输出日志</summary>
-        ///// <param name="msg">信息</param>
-        //public void WriteLine(String msg)
-        //{
-        //    // 小对象,采用对象池的成本太高了
-        //    PerformWriteLog(WriteLogEventArgs.Current.Set(msg, null, true));
-        //}
-
-        ///// <summary>写日志</summary>
-        ///// <param name="level"></param>
-        ///// <param name="format"></param>
-        ///// <param name="args"></param>
-        //public void WriteLine(LogLevel level, String format, params Object[] args)
-        //{
-        //    WriteLine(Format(format, args));
-        //}
-
-        ///// <summary>输出异常日志</summary>
-        ///// <param name="ex">异常信息</param>
-        //public void WriteException(Exception ex)
-        //{
-        //    PerformWriteLog(WriteLogEventArgs.Current.Set(null, ex, false));
-        //}
         #endregion
 
         #region 辅助
Modified +6 -1
diff --git a/NewLife.Core/Log/XTrace.cs b/NewLife.Core/Log/XTrace.cs
index f414dfa..025bf05 100644
--- a/NewLife.Core/Log/XTrace.cs
+++ b/NewLife.Core/Log/XTrace.cs
@@ -529,7 +529,12 @@ namespace NewLife.Log
             if (asm == null) return;
 
             var asmx = AssemblyX.Create(asm);
-            if (asmx != null) WriteLine("{0,-12} v{1,-13} Build {2:yyyy-MM-dd HH:mm:ss}", asmx.Name, asmx.FileVersion, asmx.Compile);
+            if (asmx != null)
+            {
+                WriteLine("{0} v{1} Build {2:yyyy-MM-dd HH:mm:ss}", asmx.Name, asmx.FileVersion, asmx.Compile);
+                var att = asmx.Asm.GetCustomAttribute<AssemblyCopyrightAttribute>();
+                WriteLine("{0} {1}", asmx.Title, att?.Copyright);
+            }
         }
         #endregion
     }
Modified +0 -2
diff --git a/NewLife.Core/NewLife.Core.csproj b/NewLife.Core/NewLife.Core.csproj
index 975c595..acfd249 100644
--- a/NewLife.Core/NewLife.Core.csproj
+++ b/NewLife.Core/NewLife.Core.csproj
@@ -161,7 +161,6 @@
     <Compile Include="Net\Upgrade.cs" />
     <Compile Include="Net\SessionBase.cs" />
     <Compile Include="Net\ISocketSession.cs" />
-    <Compile Include="Properties\AssemblyInfo_.cs" />
     <Compile Include="Extension\EnumHelper.cs" />
     <Compile Include="Extension\StringHelper.cs" />
     <Compile Include="Configuration\Config.cs" />
@@ -276,7 +275,6 @@
     <Compile Include="Threading\TaskHelper.cs" />
     <Compile Include="Threading\TimerX.cs" />
     <Compile Include="Threading\TimerScheduler.cs" />
-    <Compile Include="Web\Css.cs" />
     <Compile Include="Web\Js.cs" />
     <Compile Include="Web\Link.cs" />
     <Compile Include="Web\Modules\ErrorModule.cs" />
Deleted +0 -10
NewLife.Core/Properties/AssemblyInfo_.cs
Modified +4 -1
diff --git a/NewLife.Core/Properties/AssemblyInfo.cs b/NewLife.Core/Properties/AssemblyInfo.cs
index c42d937..48cefc6 100644
--- a/NewLife.Core/Properties/AssemblyInfo.cs
+++ b/NewLife.Core/Properties/AssemblyInfo.cs
@@ -9,6 +9,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("日常开发中的各种基础功能")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("NewLife.Core")]
+[assembly: AssemblyCompany("新生命开发团队")]
+[assembly: AssemblyCopyright("©2002-2017 新生命开发团队 http://git.newlifex.com/NewLife/X")]
+[assembly: AssemblyTrademark("四叶草")]
 [assembly: AssemblyCulture("")]
 
 // 将 ComVisible 设置为 false 使此程序集中的类型
@@ -31,7 +34,7 @@ using System.Runtime.InteropServices;
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("6.3.*")]
-[assembly: AssemblyFileVersion("6.3.2017.0320")]
+[assembly: AssemblyFileVersion("6.3.2017.0526")]
 
 /*
  * v6.3.2017.0320   增加7z扩展压缩与解压缩
Modified +1 -0
diff --git a/NewLife.Cube/Common/AreaRegistrationBase.cs b/NewLife.Cube/Common/AreaRegistrationBase.cs
index b845520..c796e2a 100644
--- a/NewLife.Cube/Common/AreaRegistrationBase.cs
+++ b/NewLife.Cube/Common/AreaRegistrationBase.cs
@@ -40,6 +40,7 @@ namespace NewLife.Cube
         static AreaRegistrationBase()
         {
             XTrace.WriteLine("{0} Start 初始化魔方 {0}", new String('=', 32));
+            Assembly.GetExecutingAssembly().WriteVersion();
 
             //// 注册视图引擎
             //RazorViewEngineX.Register(ViewEngines.Engines);
Modified +2 -2
diff --git a/NewLife.Cube/Properties/AssemblyInfo.cs b/NewLife.Cube/Properties/AssemblyInfo.cs
index 40e2518..d1d0746 100644
--- a/NewLife.Cube/Properties/AssemblyInfo.cs
+++ b/NewLife.Cube/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("NewLife.Admin")]
 [assembly: AssemblyCompany("新生命开发团队")]
-[assembly: AssemblyCopyright("©2002-2015 新生命开发团队 http://www.NewLifeX.com")]
+[assembly: AssemblyCopyright("©2002-2017 新生命开发团队 http://git.newlifex.com/NewLife/X/Tree/master/NewLife.Cube")]
 [assembly: AssemblyTrademark("四叶草")]
 [assembly: AssemblyCulture("")]
 
@@ -32,7 +32,7 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值,也可以使用“修订号”和“内部版本号”的默认值,
 // 方法是按如下所示使用“*”:
 [assembly: AssemblyVersion("1.3.*")]
-[assembly: AssemblyFileVersion("1.3.2016.1206")]
+[assembly: AssemblyFileVersion("1.3.2017.0526")]
 
 /*
  * v1.3.2016.1206   增加文件管理,增强数据字段映射
Modified +0 -3
diff --git a/NewLife.MQ/NewLife.MQ.csproj b/NewLife.MQ/NewLife.MQ.csproj
index fcbfbbb..383debf 100644
--- a/NewLife.MQ/NewLife.MQ.csproj
+++ b/NewLife.MQ/NewLife.MQ.csproj
@@ -53,9 +53,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\NewLife.Core\Properties\AssemblyInfo_.cs">
-      <Link>Properties\AssemblyInfo_.cs</Link>
-    </Compile>
     <Compile Include="Consumer.cs" />
     <Compile Include="Message.cs" />
     <Compile Include="MQHost.cs" />
Modified +4 -1
diff --git a/NewLife.MQ/Properties/AssemblyInfo.cs b/NewLife.MQ/Properties/AssemblyInfo.cs
index ebc9b32..9421f8b 100644
--- a/NewLife.MQ/Properties/AssemblyInfo.cs
+++ b/NewLife.MQ/Properties/AssemblyInfo.cs
@@ -9,6 +9,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("消息发布订阅持久化")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("NewLife.MQ")]
+[assembly: AssemblyCompany("新生命开发团队")]
+[assembly: AssemblyCopyright("©2002-2017 新生命开发团队 http://git.newlifex.com/NewLife/X/Tree/master/NewLife.MQ")]
+[assembly: AssemblyTrademark("四叶草")]
 [assembly: AssemblyCulture("")]
 
 // 将 ComVisible 设置为 false 使此程序集中的类型
@@ -30,7 +33,7 @@ using System.Runtime.InteropServices;
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.1.*")]
-[assembly: AssemblyFileVersion("1.1.2016.0424")]
+[assembly: AssemblyFileVersion("1.1.2017.0526")]
 
 /*
  * v1.1.2016.0424   消息队列主机解耦
Modified +0 -3
diff --git a/NewLife.Net/NewLife.Net.csproj b/NewLife.Net/NewLife.Net.csproj
index 88b9cd0..11d9842 100644
--- a/NewLife.Net/NewLife.Net.csproj
+++ b/NewLife.Net/NewLife.Net.csproj
@@ -56,9 +56,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\NewLife.Core\Properties\AssemblyInfo_.cs">
-      <Link>Properties\AssemblyInfo_.cs</Link>
-    </Compile>
     <Compile Include="Application\AppTest.cs" />
     <Compile Include="Application\ChargenServer.cs" />
     <Compile Include="Application\DaytimeServer.cs" />
Modified +3 -0
diff --git a/NewLife.Net/Properties/AssemblyInfo.cs b/NewLife.Net/Properties/AssemblyInfo.cs
index 6c918b4..cf3922b 100644
--- a/NewLife.Net/Properties/AssemblyInfo.cs
+++ b/NewLife.Net/Properties/AssemblyInfo.cs
@@ -8,6 +8,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("网络通讯基础框架及各种协议实现")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("NewLife.Net")]
+[assembly: AssemblyCompany("新生命开发团队")]
+[assembly: AssemblyCopyright("©2002-2017 新生命开发团队 http://www.NewLifeX.com")]
+[assembly: AssemblyTrademark("四叶草")]
 [assembly: AssemblyCulture("")]
 
 // 将 ComVisible 设置为 false 使此程序集中的类型
Modified +0 -2
diff --git a/NewLife.Net/Sockets/Netbase.cs b/NewLife.Net/Sockets/Netbase.cs
index 7e2214f..b02b034 100644
--- a/NewLife.Net/Sockets/Netbase.cs
+++ b/NewLife.Net/Sockets/Netbase.cs
@@ -12,8 +12,6 @@ namespace NewLife.Net.Sockets
         static Netbase()
         {
             // 输出网络库版本
-            //var asmx = AssemblyX.Create(Assembly.GetExecutingAssembly());
-            //XTrace.WriteLine("{0,-16} v{1} Build {2:yyyy-MM-dd HH:mm:ss}", asmx.Name, asmx.FileVersion, asmx.Compile);
             Assembly.GetExecutingAssembly().WriteVersion();
         }
 
Modified +4 -1
diff --git a/XCode/Properties/AssemblyInfo.cs b/XCode/Properties/AssemblyInfo.cs
index 806e07f..5bbd90e 100644
--- a/XCode/Properties/AssemblyInfo.cs
+++ b/XCode/Properties/AssemblyInfo.cs
@@ -10,6 +10,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("包括并大于Orm的数据映射框架")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("XCode")]
+[assembly: AssemblyCompany("新生命开发团队")]
+[assembly: AssemblyCopyright("©2002-2017 新生命开发团队 http://www.NewLifeX.com")]
+[assembly: AssemblyTrademark("四叶草")]
 [assembly: AssemblyCulture("")]
 
 // 将 ComVisible 设置为 false 使此程序集中的类型
@@ -32,7 +35,7 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值,也可以使用“修订号”和“内部版本号”的默认值,
 // 方法是按如下所示使用“*”:
 [assembly: AssemblyVersion("9.4.*")]
-[assembly: AssemblyFileVersion("9.4.2017.0207")]
+[assembly: AssemblyFileVersion("9.4.2017.0526")]
 
 /*
  * XCode的重大改进
Modified +0 -3
diff --git a/XCode/XCode.csproj b/XCode/XCode.csproj
index 0966b59..fda7d7c 100644
--- a/XCode/XCode.csproj
+++ b/XCode/XCode.csproj
@@ -62,9 +62,6 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\NewLife.Core\Properties\AssemblyInfo_.cs">
-      <Link>Properties\AssemblyInfo_.cs</Link>
-    </Compile>
     <Compile Include="Attributes\BindColumnAttribute.cs" />
     <Compile Include="Attributes\BindIndexAttribute.cs" />
     <Compile Include="Attributes\MapAttribute.cs" />
Modified +4 -1
diff --git a/XCoder/Properties/AssemblyInfo.cs b/XCoder/Properties/AssemblyInfo.cs
index 5038e5f..97fda8c 100644
--- a/XCoder/Properties/AssemblyInfo.cs
+++ b/XCoder/Properties/AssemblyInfo.cs
@@ -8,6 +8,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("基于编译型模版引擎的代码生成器,以及众多开发者工具")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("XCoder")]
+[assembly: AssemblyCompany("新生命开发团队")]
+[assembly: AssemblyCopyright("©2002-2017 新生命开发团队 http://www.NewLifeX.com")]
+[assembly: AssemblyTrademark("四叶草")]
 [assembly: AssemblyCulture("")]
 
 // 将 ComVisible 设置为 false 使此程序集中的类型
@@ -26,7 +29,7 @@ using System.Runtime.InteropServices;
 //      修订号
 //
 [assembly: AssemblyVersion("6.9.*")]
-[assembly: AssemblyFileVersion("6.9.2017.0101")]
+[assembly: AssemblyFileVersion("6.9.2017.0526")]
 
 /*
  * v6.9.2017.0101   增加消息调试工具,支持调试网络库的消息收发功能
Modified +0 -3
diff --git a/XCoder/XCoder.csproj b/XCoder/XCoder.csproj
index afdb752..1593b7f 100644
--- a/XCoder/XCoder.csproj
+++ b/XCoder/XCoder.csproj
@@ -57,9 +57,6 @@
     <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\NewLife.Core\Properties\AssemblyInfo_.cs">
-      <Link>Properties\AssemblyInfo_.cs</Link>
-    </Compile>
     <Compile Include="Engine\IcoHelper.cs" />
     <Compile Include="Engine\ModelConfig.cs" />
     <Compile Include="FileEncoding\FrmMain.cs">
Modified +3 -0
diff --git a/XTemplate/Properties/AssemblyInfo.cs b/XTemplate/Properties/AssemblyInfo.cs
index 3f5b414..2dcc564 100644
--- a/XTemplate/Properties/AssemblyInfo.cs
+++ b/XTemplate/Properties/AssemblyInfo.cs
@@ -9,6 +9,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("编译型模版引擎")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("XTemplate")]
+[assembly: AssemblyCompany("新生命开发团队")]
+[assembly: AssemblyCopyright("©2002-2017 新生命开发团队 http://www.NewLifeX.com")]
+[assembly: AssemblyTrademark("四叶草")]
 [assembly: AssemblyCulture("")]
 
 // 将 ComVisible 设置为 false 使此程序集中的类型
Modified +0 -3
diff --git a/XTemplate/XTemplate.csproj b/XTemplate/XTemplate.csproj
index 30522b1..6d4ff25 100644
--- a/XTemplate/XTemplate.csproj
+++ b/XTemplate/XTemplate.csproj
@@ -51,9 +51,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\NewLife.Core\Properties\AssemblyInfo_.cs">
-      <Link>Properties\AssemblyInfo_.cs</Link>
-    </Compile>
     <Compile Include="Setting.cs" />
     <Compile Include="Tags\TagTemplate.cs" />
     <Compile Include="Templating\Directive.cs" />