refactor

ElderJames · Sep 2, 2018 · a0bd418 · a0bd418
1 parent f3a2082
commit a0bd418
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 10 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,19 +1,17 @@
 {
-    // Use IntelliSense to find out which attributes exist for C# debugging
-    // Use hover for the description of the existing attributes
-    // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+    // 使用 IntelliSense 了解相关属性。 
+    // 悬停以查看现有属性的描述。
+    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
         {
             "name": ".NET Core Launch (console)",
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/src/bin/Debug/netcoreapp2.1/CoreProxy.dll",
+            "program": "${workspaceFolder}/src/ConsoleApp/bin/Debug/netcoreapp2.1/ConsoleApp.dll",
             "args": [],
-            "cwd": "${workspaceFolder}",
-            // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
+            "cwd": "${workspaceFolder}/src/ConsoleApp",
             "console": "internalConsole",
             "stopAtEntry": false,
             "internalConsoleOptions": "openOnSessionStart"
@@ -23,6 +21,6 @@
             "type": "coreclr",
             "request": "attach",
             "processId": "${command:pickProcess}"
-        },
+        }
     ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -7,7 +7,7 @@
             "type": "process",
             "args": [
                 "build",
-                "${workspaceFolder}/src/CoreProxy.csproj"
+                "${workspaceFolder}/src/ConsoleApp/ConsoleApp.csproj"
             ],
             "problemMatcher": "$msCompile"
         }

diff --git a/src/CoreProxy.csproj → src/ConsoleApp/ConsoleApp.csproj b/src/CoreProxy.csproj → src/ConsoleApp/ConsoleApp.csproj
@@ -5,4 +5,7 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\CoreProxy\CoreProxy.csproj" />	  
+  </ItemGroup>
 </Project>
diff --git a/src/Program.cs → src/ConsoleApp/Program.cs b/src/Program.cs → src/ConsoleApp/Program.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Reflection;
+using CoreProxy;
 
-namespace CoreProxy
+namespace ConsoleApp
 {
     class Program
     {

diff --git a/src/CoreProxy/CoreProxy.csproj b/src/CoreProxy/CoreProxy.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Reflection.DispatchProxy" Version="4.5.1" />
+  </ItemGroup>
+</Project>
diff --git a/src/IInterceptor.cs → src/CoreProxy/IInterceptor.cs b/src/IInterceptor.cs → src/CoreProxy/IInterceptor.cs
diff --git a/src/ProxyGenerator.cs → src/CoreProxy/ProxyGenerator.cs b/src/ProxyGenerator.cs → src/CoreProxy/ProxyGenerator.cs