Kaynağa Gözat

取消跨平台库对nuget的依赖,增加一个Nuget程序集专门用来下载Nuget库

tanghai 11 yıl önce
ebeveyn
işleme
c4d5d8555a

+ 9 - 9
CSharp/CSharp-Mono.sln

@@ -17,17 +17,17 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TNet", "Platform\TNet\TNet.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UNet", "Platform\UNet\UNet.csproj", "{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{C69F1D82-6684-49D1-B388-CA4AECD6AD0D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{C6DA219F-E1FD-4F0D-8A61-47419D7543B7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelTest", "Tests\ModelTest\ModelTest.csproj", "{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profile", "Exe\Profile\Profile.csproj", "{EA0D6994-A254-4DFE-9ADC-A29B7005419F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TNetTest", "Tests\TNetTest\TNetTest.csproj", "{1888D319-0495-43F3-BA8D-163EC20D9437}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{5988E6F8-A989-4C3A-A80B-4DEF5D941300}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UNetTest", "Tests\UNetTest\UNetTest.csproj", "{47A7404D-F501-43C5-8183-4B4E9E8C24B2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelTest", "Test\ModelTest\ModelTest.csproj", "{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{C6DA219F-E1FD-4F0D-8A61-47419D7543B7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TNetTest", "Test\TNetTest\TNetTest.csproj", "{1888D319-0495-43F3-BA8D-163EC20D9437}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profile", "Exe\Profile\Profile.csproj", "{EA0D6994-A254-4DFE-9ADC-A29B7005419F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UNetTest", "Test\UNetTest\UNetTest.csproj", "{47A7404D-F501-43C5-8183-4B4E9E8C24B2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -78,10 +78,10 @@ Global
 		{F06B995E-6508-4C5C-A396-554316C9215D} = {0048704C-EEF3-4142-9E94-8A2D6A838D76}
 		{B1B78524-3F75-40D7-BF12-10B25A00C590} = {0048704C-EEF3-4142-9E94-8A2D6A838D76}
 		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E} = {0048704C-EEF3-4142-9E94-8A2D6A838D76}
-		{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}
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35} = {5988E6F8-A989-4C3A-A80B-4DEF5D941300}
+		{1888D319-0495-43F3-BA8D-163EC20D9437} = {5988E6F8-A989-4C3A-A80B-4DEF5D941300}
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2} = {5988E6F8-A989-4C3A-A80B-4DEF5D941300}
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 8 - 3
CSharp/CSharp-Mono.userprefs

@@ -1,10 +1,15 @@
 <Properties StartupItem="Exe\Profile\Profile.csproj">
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Game\Model\Component\NetworkComponent.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Exe\Profile\Program.cs">
     <Files>
-      <File FileName="Game\Model\BehaviorTree\BlackBoard.cs" Line="1" Column="1" />
-      <File FileName="Game\Model\Component\NetworkComponent.cs" Line="20" Column="20" />
+      <File FileName="Exe\Profile\App.config" Line="1" Column="1" />
+      <File FileName="Exe\Profile\Program.cs" Line="3" Column="3" />
     </Files>
+    <Pads>
+      <Pad Id="MonoDevelop.NUnit.TestPad">
+        <State expanded="True" selected="True" />
+      </Pad>
+    </Pads>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     <BreakpointStore />

+ 62 - 61
CSharp/CSharp.sln

@@ -36,17 +36,21 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controller", "Game\Controll
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "Game\Model\Model.csproj", "{0608C0C1-F584-4092-AAF9-1E99A78E3703}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{A455F8EB-008D-4534-BE6F-702175666215}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{6A76F49C-07DC-4A7E-954F-7A7D3D900ED5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TNetTest", "Tests\TNetTest\TNetTest.csproj", "{1888D319-0495-43F3-BA8D-163EC20D9437}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profile", "Exe\Profile\Profile.csproj", "{EA0D6994-A254-4DFE-9ADC-A29B7005419F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UNetTest", "Tests\UNetTest\UNetTest.csproj", "{47A7404D-F501-43C5-8183-4B4E9E8C24B2}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ThirdParty", "ThirdParty", "{C189FE4B-3358-4C11-B120-AEC5971E7331}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelTest", "Tests\ModelTest\ModelTest.csproj", "{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nuget", "ThirdParty\Nuget\Nuget.csproj", "{56936640-F541-4389-9A0C-D8F6EB48427D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{6A76F49C-07DC-4A7E-954F-7A7D3D900ED5}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{F13D0B3D-5B4F-452A-9378-0FD39555371D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profile", "Exe\Profile\Profile.csproj", "{EA0D6994-A254-4DFE-9ADC-A29B7005419F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelTest", "Test\ModelTest\ModelTest.csproj", "{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TNetTest", "Test\TNetTest\TNetTest.csproj", "{1888D319-0495-43F3-BA8D-163EC20D9437}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UNetTest", "Test\UNetTest\UNetTest.csproj", "{47A7404D-F501-43C5-8183-4B4E9E8C24B2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -243,86 +247,82 @@ Global
 		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|x64.Build.0 = Release|Any CPU
 		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|x86.ActiveCfg = Release|Any CPU
 		{0608C0C1-F584-4092-AAF9-1E99A78E3703}.Release|x86.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}.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|Win32.Build.0 = Debug|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|x64.Build.0 = Debug|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|x86.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
+		{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|Win32.Build.0 = Release|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|x64.ActiveCfg = Release|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|x64.Build.0 = Release|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|x86.ActiveCfg = Release|Any CPU
+		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|x86.Build.0 = Release|Any CPU
+		{56936640-F541-4389-9A0C-D8F6EB48427D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56936640-F541-4389-9A0C-D8F6EB48427D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56936640-F541-4389-9A0C-D8F6EB48427D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{56936640-F541-4389-9A0C-D8F6EB48427D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{56936640-F541-4389-9A0C-D8F6EB48427D}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{56936640-F541-4389-9A0C-D8F6EB48427D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{56936640-F541-4389-9A0C-D8F6EB48427D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{56936640-F541-4389-9A0C-D8F6EB48427D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56936640-F541-4389-9A0C-D8F6EB48427D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56936640-F541-4389-9A0C-D8F6EB48427D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{56936640-F541-4389-9A0C-D8F6EB48427D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{56936640-F541-4389-9A0C-D8F6EB48427D}.Release|Win32.ActiveCfg = Release|Any CPU
+		{56936640-F541-4389-9A0C-D8F6EB48427D}.Release|x64.ActiveCfg = Release|Any CPU
+		{56936640-F541-4389-9A0C-D8F6EB48427D}.Release|x86.ActiveCfg = Release|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|x86.ActiveCfg = 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
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{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|x64.ActiveCfg = Release|Any CPU
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|x86.ActiveCfg = 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}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|Win32.Build.0 = Debug|Any CPU
 		{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|x64.Build.0 = Debug|Any CPU
 		{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1888D319-0495-43F3-BA8D-163EC20D9437}.Debug|x86.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
 		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Win32.ActiveCfg = Release|Any CPU
-		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|Win32.Build.0 = Release|Any CPU
 		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|x64.ActiveCfg = Release|Any CPU
-		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|x64.Build.0 = Release|Any CPU
 		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|x86.ActiveCfg = Release|Any CPU
-		{1888D319-0495-43F3-BA8D-163EC20D9437}.Release|x86.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}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|Win32.Build.0 = Debug|Any CPU
 		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|x64.Build.0 = Debug|Any CPU
 		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Debug|x86.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
 		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Win32.ActiveCfg = Release|Any CPU
-		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|Win32.Build.0 = Release|Any CPU
 		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|x64.ActiveCfg = Release|Any CPU
-		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|x64.Build.0 = Release|Any CPU
 		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|x86.ActiveCfg = Release|Any CPU
-		{47A7404D-F501-43C5-8183-4B4E9E8C24B2}.Release|x86.Build.0 = Release|Any CPU
-		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|Win32.Build.0 = Debug|Any CPU
-		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|x64.Build.0 = Debug|Any CPU
-		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Debug|x86.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
-		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{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|Win32.Build.0 = Release|Any CPU
-		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|x64.ActiveCfg = Release|Any CPU
-		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|x64.Build.0 = Release|Any CPU
-		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|x86.ActiveCfg = Release|Any CPU
-		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35}.Release|x86.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}.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|Win32.Build.0 = Debug|Any CPU
-		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|x64.Build.0 = Debug|Any CPU
-		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Debug|x86.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
-		{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|Win32.Build.0 = Release|Any CPU
-		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|x64.ActiveCfg = Release|Any CPU
-		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|x64.Build.0 = Release|Any CPU
-		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|x86.ActiveCfg = Release|Any CPU
-		{EA0D6994-A254-4DFE-9ADC-A29B7005419F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -338,9 +338,10 @@ Global
 		{D3CEA64F-4D75-4DC9-B139-8D12EB4ACF8E} = {ADBF5F67-B480-4A93-9D50-C81856FC61A9}
 		{7D5B90DF-43AC-42B8-9A52-2B985BC42A5C} = {D0CC1FF4-2747-4278-A51F-BE9AA959175B}
 		{0608C0C1-F584-4092-AAF9-1E99A78E3703} = {D0CC1FF4-2747-4278-A51F-BE9AA959175B}
-		{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}
+		{56936640-F541-4389-9A0C-D8F6EB48427D} = {C189FE4B-3358-4C11-B120-AEC5971E7331}
+		{DEF89A61-8AC7-4CCD-80B8-FC6AA2571E35} = {F13D0B3D-5B4F-452A-9378-0FD39555371D}
+		{1888D319-0495-43F3-BA8D-163EC20D9437} = {F13D0B3D-5B4F-452A-9378-0FD39555371D}
+		{47A7404D-F501-43C5-8183-4B4E9E8C24B2} = {F13D0B3D-5B4F-452A-9378-0FD39555371D}
 	EndGlobalSection
 EndGlobal

+ 6 - 6
CSharp/Exe/Profile/Profile.csproj

@@ -48,18 +48,18 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Tests\TNetTest\TNetTest.csproj">
+    <ProjectReference Include="..\..\Platform\Common\Common.csproj">
+      <Project>{F06B995E-6508-4C5C-A396-554316C9215D}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Test\TNetTest\TNetTest.csproj">
       <Project>{1888D319-0495-43F3-BA8D-163EC20D9437}</Project>
       <Name>TNetTest</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Tests\UNetTest\UNetTest.csproj">
+    <ProjectReference Include="..\..\Test\UNetTest\UNetTest.csproj">
       <Project>{47A7404D-F501-43C5-8183-4B4E9E8C24B2}</Project>
       <Name>UNetTest</Name>
     </ProjectReference>
-    <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. 

+ 0 - 0
CSharp/Tests/ModelTest/ModelTest.csproj → CSharp/Test/ModelTest/ModelTest.csproj


+ 0 - 0
CSharp/Tests/ModelTest/MongoDBTest.cs → CSharp/Test/ModelTest/MongoDBTest.cs


+ 0 - 0
CSharp/Tests/ModelTest/Properties/AssemblyInfo.cs → CSharp/Test/ModelTest/Properties/AssemblyInfo.cs


+ 0 - 0
CSharp/Tests/TNetTest/Properties/AssemblyInfo.cs → CSharp/Test/TNetTest/Properties/AssemblyInfo.cs


+ 0 - 0
CSharp/Tests/TNetTest/TNetTest.csproj → CSharp/Test/TNetTest/TNetTest.csproj


+ 0 - 0
CSharp/Tests/TNetTest/TServiceTest.cs → CSharp/Test/TNetTest/TServiceTest.cs


+ 0 - 0
CSharp/Tests/UNetTest/Properties/AssemblyInfo.cs → CSharp/Test/UNetTest/Properties/AssemblyInfo.cs


+ 1 - 1
CSharp/Tests/UNetTest/UNetTest.csproj → CSharp/Test/UNetTest/UNetTest.csproj

@@ -20,7 +20,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

+ 0 - 0
CSharp/Tests/UNetTest/UServiceTest.cs → CSharp/Test/UNetTest/UServiceTest.cs


+ 104 - 0
CSharp/ThirdParty/Nuget/Nuget.csproj

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.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>{56936640-F541-4389-9A0C-D8F6EB48427D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Nuget</RootNamespace>
+    <AssemblyName>Nuget</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Practices.Prism.Composition">
+      <HintPath>..\..\packages\Prism.Composition.5.0.0\lib\NET45\Microsoft.Practices.Prism.Composition.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Prism.Interactivity">
+      <HintPath>..\..\packages\Prism.Interactivity.5.0.0\lib\NET45\Microsoft.Practices.Prism.Interactivity.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Prism.MefExtensions">
+      <HintPath>..\..\packages\Prism.MEFExtensions.5.0.0\lib\NET45\Microsoft.Practices.Prism.MefExtensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Prism.Mvvm">
+      <HintPath>..\..\packages\Prism.Mvvm.1.1.1\lib\net45\Microsoft.Practices.Prism.Mvvm.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Prism.Mvvm.Desktop">
+      <HintPath>..\..\packages\Prism.Mvvm.1.1.1\lib\net45\Microsoft.Practices.Prism.Mvvm.Desktop.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Prism.PubSubEvents">
+      <HintPath>..\..\packages\Prism.PubSubEvents.1.1.2\lib\portable-sl5+windowsphone8+windows8+net40+wpa81\Microsoft.Practices.Prism.PubSubEvents.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Prism.SharedInterfaces">
+      <HintPath>..\..\packages\Prism.Mvvm.1.1.1\lib\net45\Microsoft.Practices.Prism.SharedInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.ServiceLocation">
+      <HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
+    </Reference>
+    <Reference Include="MongoDB.Bson">
+      <HintPath>..\..\packages\mongocsharpdriver.1.10.0\lib\net35\MongoDB.Bson.dll</HintPath>
+    </Reference>
+    <Reference Include="MongoDB.Driver">
+      <HintPath>..\..\packages\mongocsharpdriver.1.10.0\lib\net35\MongoDB.Driver.dll</HintPath>
+    </Reference>
+    <Reference Include="NLog">
+      <HintPath>..\..\packages\NLog.3.2.0.0\lib\net45\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework">
+      <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net">
+      <HintPath>..\..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath>
+    </Reference>
+    <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="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息,请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </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>

+ 36 - 0
CSharp/ThirdParty/Nuget/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的常规信息通过以下
+// 特性集控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("Nuget")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Nuget")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 使此程序集中的类型
+// 对 COM 组件不可见。  如果需要从 COM 访问此程序集中的类型,
+// 则将该类型上的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("5101651d-5db1-4fd3-86ce-114561811256")]
+
+// 程序集的版本信息由下面四个值组成: 
+//
+//      主版本
+//      次版本 
+//      生成号
+//      修订号
+//
+// 可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
+// 方法是按如下所示使用“*”: 
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

+ 19 - 0
CSharp/ThirdParty/Nuget/app.config

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Practices.ServiceLocation" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Practices.Prism.PubSubEvents" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Practices.Prism.SharedInterfaces" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

+ 14 - 0
CSharp/ThirdParty/Nuget/packages.config

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="CommonServiceLocator" version="1.3" targetFramework="net45" />
+  <package id="mongocsharpdriver" version="1.10.0" targetFramework="net45" />
+  <package id="NLog" version="3.2.0.0" targetFramework="net45" />
+  <package id="NUnit" version="2.6.4" targetFramework="net45" />
+  <package id="Prism" version="5.0.0" targetFramework="net45" />
+  <package id="Prism.Composition" version="5.0.0" targetFramework="net45" />
+  <package id="Prism.Interactivity" version="5.0.0" targetFramework="net45" />
+  <package id="Prism.MEFExtensions" version="5.0.0" targetFramework="net45" />
+  <package id="Prism.Mvvm" version="1.1.1" targetFramework="net45" />
+  <package id="Prism.PubSubEvents" version="1.1.2" targetFramework="net45" />
+  <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
+</packages>