Profile.exe在linux跑通.不能直接执行,需要用mono命令执行

1d9f5187 · tanghai · 102cea68 · 1d9f5187 · 1d9f5187 · 1d9f5187
8 changed file
--- a/CSharp/CSharp-Mono.sln
+++ b/CSharp/CSharp-Mono.sln

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Game", "Game", "{BEA22CC3-9FA8-4663-82DC-6B2119A8E35E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "Game\Model\Model.csproj", "{0608C0C1-F584-4092-AAF9-1E99A78E3703}"
@@ -23,6 +25,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TNetTest", "Tests\TNetTest\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UNetTest", "Tests\UNetTest\UNetTest.csproj", "{47A7404D-F501-43C5-8183-4B4E9E8C24B2}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{C6DA219F-E1FD-4F0D-8A61-47419D7543B7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profile", "Exe\Profile\Profile.csproj", "{EA0D6994-A254-4DFE-9ADC-A29B7005419F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,18 +39,14 @@ Global
 		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Any CPU.Build.0 = Release|Any CPU
-		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F06B995E-6508-4C5C-A396-554316C9215D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B1B78524-3F75-40D7-BF12-10B25A00C590}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B1B78524-3F75-40D7-BF12-10B25A00C590}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -57,10 +59,21 @@ Global
 		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F06B995E-6508-4C5C-A396-554316C9215D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F06B995E-6508-4C5C-A396-554316C9215D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F06B995E-6508-4C5C-A396-554316C9215D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{0608C0C1-F584-4092-AAF9-1E99A78E3703} = {BEA22CC3-9FA8-4663-82DC-6B2119A8E35E}
@@ -71,5 +84,6 @@ Global
 		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35} = {C69F1D82-6684-49D1-B388-CA4AECD6AD0D}
 		{1888D319-0495-43F3-BA8D-163EC20D9437} = {C69F1D82-6684-49D1-B388-CA4AECD6AD0D}
 		{47A7404D-F501-43C5-8183-4B4E9E8C24B2} = {C69F1D82-6684-49D1-B388-CA4AECD6AD0D}
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F} = {C6DA219F-E1FD-4F0D-8A61-47419D7543B7}
 	EndGlobalSection
 EndGlobal
--- a/CSharp/CSharp-Mono.userprefs
+++ b/CSharp/CSharp-Mono.userprefs
@@ -2,8 +2,8 @@
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Game\Model\Component\NetworkComponent.cs">
    <Files>
-      <File FileName="Game\Model\BehaviorTree\BlackBoard.cs" Line="7" Column="7" />
-      <File FileName="Game\Model\Component\NetworkComponent.cs" Line="19" Column="19" />
+      <File FileName="Game\Model\BehaviorTree\BlackBoard.cs" Line="1" Column="1" />
+      <File FileName="Game\Model\Component\NetworkComponent.cs" Line="20" Column="20" />
    </Files>
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.DebuggingService.Breakpoints>

--- a/CSharp/CSharp.sln
+++ b/CSharp/CSharp.sln
@@ -44,6 +44,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UNetTest", "Tests\UNetTest\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelTest", "Tests\ModelTest\ModelTest.csproj", "{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{6A76F49C-07DC-4A7E-954F-7A7D3D900ED5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profile", "Exe\Profile\Profile.csproj", "{EA0D6994-A254-4DFE-9ADC-A29B7005419F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -204,6 +208,18 @@ Global
 		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|Win32.ActiveCfg = Release|Any CPU
 		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|x86.ActiveCfg = Release|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|Win32.ActiveCfg = Release|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -222,5 +238,6 @@ Global
 		{1888D319-0495-43F3-BA8D-163EC20D9437} = {A455F8EB-008D-4534-BE6F-702175666215}
 		{47A7404D-F501-43C5-8183-4B4E9E8C24B2} = {A455F8EB-008D-4534-BE6F-702175666215}
 		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35} = {A455F8EB-008D-4534-BE6F-702175666215}
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F} = {6A76F49C-07DC-4A7E-954F-7A7D3D900ED5}
 	EndGlobalSection
 EndGlobal
--- a/CSharp/Platform/ProfileExe/App.config
+++ b/CSharp/Platform/ProfileExe/App.config
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
    </startup>
-</configuration>
+</configuration>
\ No newline at end of file
--- a/CSharp/Platform/ProfileExe/ProfileExe.csproj
+++ b/CSharp/Platform/ProfileExe/ProfileExe.csproj
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{CBA52DC8-1C80-4A79-9AC5-73514EBBD749}</ProjectGuid>
+    <ProjectGuid>{EA0D6994-A254-4DFE-9ADC-A29B7005419F}</ProjectGuid>
    <OutputType>Exe</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ENetExe</RootNamespace>
-    <AssemblyName>ENetExe</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <RootNamespace>Profile</RootNamespace>
+    <AssemblyName>Profile</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -35,32 +34,35 @@
  <ItemGroup>
    <Reference Include="System" />
    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
  <ItemGroup>
    <None Include="App.config" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\TNetTest\TNetTest.csproj">
-      <Project>{f176d1fa-63e5-4b89-9a03-d44ccccc069a}</Project>
-      <Name>TNetTest</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\UNetTest\UNetTest.csproj">
-      <Project>{901a8e5c-c4c6-4c3c-8e18-068d75119f5d}</Project>
+    <ProjectReference Include="..\..\Tests\UNetTest\UNetTest.csproj">
+      <Project>{47A7404D-F501-43C5-8183-4B4E9E8C24B2}</Project>
      <Name>UNetTest</Name>
    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
+    <ProjectReference Include="..\..\Platform\Common\Common.csproj">
+      <Project>{F06B995E-6508-4C5C-A396-554316C9215D}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
  -->
 </Project>
\ No newline at end of file
--- a/CSharp/Platform/ProfileExe/Program.cs
+++ b/CSharp/Platform/ProfileExe/Program.cs
-using UNetTest;
+using Common.Logger;
+using UNetTest;

-namespace ENetExe
+namespace Profile
 {
 	internal static class Program
 	{
 		private static void Main(string[] args)
 		{
-			var test = new UServiceTest();
+			UServiceTest test = new UServiceTest();
+			Log.Debug("Profile start");
 			test.ClientSendToServer();
+			Log.Debug("Profile stop");
 		}
 	}
 }
\ No newline at end of file
--- a/CSharp/Exe/Profile/Properties/AssemblyInfo.cs
+++ b/CSharp/Exe/Profile/Properties/AssemblyInfo.cs
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的常规信息通过以下
+// 特性集控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("Profile")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Profile")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 使此程序集中的类型
+// 对 COM 组件不可见。  如果需要从 COM 访问此程序集中的类型，
+// 则将该类型上的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("784e44fc-7993-457c-ab57-28b174b9bca5")]
+
+// 程序集的版本信息由下面四个值组成: 
+//
+//      主版本
+//      次版本 
+//      生成号
+//      修订号
+//
+// 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
+// 方法是按如下所示使用“*”: 
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/CSharp/Platform/UNet/UPacket.cs
+++ b/CSharp/Platform/UNet/UPacket.cs
@@ -78,7 +78,6 @@ namespace UNet
 			get
 			{
 				ENetPacket enetPacket = this.Struct;
-				Log.Debug("111111111111111111111: " + enetPacket.DataLength);
 				var bytes = new byte[(long)enetPacket.DataLength];
 				Marshal.Copy(enetPacket.Data, bytes, 0, (int) enetPacket.DataLength);
 				return bytes;