Merge pull request #660 from Endures/vs-debugger

Debugger增加支持vs2022的工程。提取公共代码至共享工程。
Ourpalm · Mar 15, 2022 · dab342e · dab342e
2 parents b699328 + e6837cf
commit dab342e
Show file tree

Hide file tree

Showing 59 changed files with 1,111 additions and 168 deletions.
diff --git a/...timeDebugEngine/AD7/AD7BoundBreakpoint.cs → ...ng/SharedEngine/AD7/AD7BoundBreakpoint.cs b/...timeDebugEngine/AD7/AD7BoundBreakpoint.cs → ...ng/SharedEngine/AD7/AD7BoundBreakpoint.cs
diff --git a/...timeDebugEngine/AD7/AD7DocumentContext.cs → ...ng/SharedEngine/AD7/AD7DocumentContext.cs b/...timeDebugEngine/AD7/AD7DocumentContext.cs → ...ng/SharedEngine/AD7/AD7DocumentContext.cs
diff --git a/...ing/ILRuntimeDebugEngine/AD7/AD7Engine.cs → Debugging/SharedEngine/AD7/AD7Engine.cs b/...ing/ILRuntimeDebugEngine/AD7/AD7Engine.cs → Debugging/SharedEngine/AD7/AD7Engine.cs
diff --git a/...ging/ILRuntimeDebugEngine/AD7/AD7Enums.cs → Debugging/SharedEngine/AD7/AD7Enums.cs b/...ging/ILRuntimeDebugEngine/AD7/AD7Enums.cs → Debugging/SharedEngine/AD7/AD7Enums.cs
diff --git a/...timeDebugEngine/AD7/AD7ErrorBreakpoint.cs → ...ng/SharedEngine/AD7/AD7ErrorBreakpoint.cs b/...timeDebugEngine/AD7/AD7ErrorBreakpoint.cs → ...ng/SharedEngine/AD7/AD7ErrorBreakpoint.cs
diff --git a/...ing/ILRuntimeDebugEngine/AD7/AD7Events.cs → Debugging/SharedEngine/AD7/AD7Events.cs b/...ing/ILRuntimeDebugEngine/AD7/AD7Events.cs → Debugging/SharedEngine/AD7/AD7Events.cs
diff --git a/...ILRuntimeDebugEngine/AD7/AD7Expression.cs → Debugging/SharedEngine/AD7/AD7Expression.cs b/...ILRuntimeDebugEngine/AD7/AD7Expression.cs → Debugging/SharedEngine/AD7/AD7Expression.cs
diff --git a/...ing/ILRuntimeDebugEngine/AD7/AD7Module.cs → Debugging/SharedEngine/AD7/AD7Module.cs b/...ing/ILRuntimeDebugEngine/AD7/AD7Module.cs → Debugging/SharedEngine/AD7/AD7Module.cs
diff --git a/...meDebugEngine/AD7/AD7PendingBreakPoint.cs → .../SharedEngine/AD7/AD7PendingBreakPoint.cs b/...meDebugEngine/AD7/AD7PendingBreakPoint.cs → .../SharedEngine/AD7/AD7PendingBreakPoint.cs
diff --git a/...gging/ILRuntimeDebugEngine/AD7/AD7Port.cs → Debugging/SharedEngine/AD7/AD7Port.cs b/...gging/ILRuntimeDebugEngine/AD7/AD7Port.cs → Debugging/SharedEngine/AD7/AD7Port.cs
diff --git a/...RuntimeDebugEngine/AD7/AD7PortSupplier.cs → ...gging/SharedEngine/AD7/AD7PortSupplier.cs b/...RuntimeDebugEngine/AD7/AD7PortSupplier.cs → ...gging/SharedEngine/AD7/AD7PortSupplier.cs
diff --git a/...ng/ILRuntimeDebugEngine/AD7/AD7Process.cs → Debugging/SharedEngine/AD7/AD7Process.cs b/...ng/ILRuntimeDebugEngine/AD7/AD7Process.cs → Debugging/SharedEngine/AD7/AD7Process.cs
diff --git a/...LRuntimeDebugEngine/AD7/AD7ProgramNode.cs → Debugging/SharedEngine/AD7/AD7ProgramNode.cs b/...LRuntimeDebugEngine/AD7/AD7ProgramNode.cs → Debugging/SharedEngine/AD7/AD7ProgramNode.cs
diff --git a/...timeDebugEngine/AD7/AD7ProgramProvider.cs → ...ng/SharedEngine/AD7/AD7ProgramProvider.cs b/...timeDebugEngine/AD7/AD7ProgramProvider.cs → ...ng/SharedEngine/AD7/AD7ProgramProvider.cs
diff --git a/...ILRuntimeDebugEngine/AD7/AD7StackFrame.cs → Debugging/SharedEngine/AD7/AD7StackFrame.cs b/...ILRuntimeDebugEngine/AD7/AD7StackFrame.cs → Debugging/SharedEngine/AD7/AD7StackFrame.cs
diff --git a/...ing/ILRuntimeDebugEngine/AD7/AD7Thread.cs → Debugging/SharedEngine/AD7/AD7Thread.cs b/...ing/ILRuntimeDebugEngine/AD7/AD7Thread.cs → Debugging/SharedEngine/AD7/AD7Thread.cs
diff --git a/...ing/ILRuntimeDebugEngine/AD7/Constants.cs → Debugging/SharedEngine/AD7/Constants.cs b/...ing/ILRuntimeDebugEngine/AD7/Constants.cs → Debugging/SharedEngine/AD7/Constants.cs
diff --git a/...RuntimeDebugEngine/AD7/DebuggedProcess.cs → ...gging/SharedEngine/AD7/DebuggedProcess.cs b/...RuntimeDebugEngine/AD7/DebuggedProcess.cs → ...gging/SharedEngine/AD7/DebuggedProcess.cs
diff --git a/...LRuntimeDebugEngine/AD7/EngineCallback.cs → Debugging/SharedEngine/AD7/EngineCallback.cs b/...LRuntimeDebugEngine/AD7/EngineCallback.cs → Debugging/SharedEngine/AD7/EngineCallback.cs
diff --git a/...ng/ILRuntimeDebugEngine/AD7/ILProperty.cs → Debugging/SharedEngine/AD7/ILProperty.cs b/...ng/ILRuntimeDebugEngine/AD7/ILProperty.cs → Debugging/SharedEngine/AD7/ILProperty.cs
diff --git a/...g/ILRuntimeDebugEngine/EngineConstants.cs → Debugging/SharedEngine/EngineConstants.cs b/...g/ILRuntimeDebugEngine/EngineConstants.cs → Debugging/SharedEngine/EngineConstants.cs
diff --git a/...timeDebugEngine/EngineRegistration.pkgdef → ...ng/SharedEngine/EngineRegistration.pkgdef b/...timeDebugEngine/EngineRegistration.pkgdef → ...ng/SharedEngine/EngineRegistration.pkgdef
diff --git a/...DebugEngine/Expressions/EvalExpression.cs → ...haredEngine/Expressions/EvalExpression.cs b/...DebugEngine/Expressions/EvalExpression.cs → ...haredEngine/Expressions/EvalExpression.cs
diff --git a/...ILRuntimeDebugEngine/Expressions/Lexer.cs → Debugging/SharedEngine/Expressions/Lexer.cs b/...ILRuntimeDebugEngine/Expressions/Lexer.cs → Debugging/SharedEngine/Expressions/Lexer.cs
diff --git a/...LRuntimeDebugEngine/Expressions/Parser.cs → Debugging/SharedEngine/Expressions/Parser.cs b/...LRuntimeDebugEngine/Expressions/Parser.cs → Debugging/SharedEngine/Expressions/Parser.cs
diff --git a/...ILRuntimeDebugEngine/Expressions/Token.cs → Debugging/SharedEngine/Expressions/Token.cs b/...ILRuntimeDebugEngine/Expressions/Token.cs → Debugging/SharedEngine/Expressions/Token.cs
diff --git a/Debugging/SharedEngine/SharedEngine.projitems b/Debugging/SharedEngine/SharedEngine.projitems
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>164587ca-78d9-4aec-82c2-acbabba26626</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>SharedEngine</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\AD7BoundBreakpoint.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\AD7DocumentContext.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\AD7Engine.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\AD7Enums.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\AD7ErrorBreakpoint.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\AD7Events.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\AD7Expression.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\AD7Module.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\AD7PendingBreakPoint.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\AD7Port.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\AD7PortSupplier.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\AD7Process.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\AD7ProgramNode.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\AD7ProgramProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\AD7StackFrame.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\AD7Thread.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\Constants.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\DebuggedProcess.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\EngineCallback.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)AD7\ILProperty.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)EngineConstants.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Expressions\EvalExpression.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Expressions\Lexer.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Expressions\Parser.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Expressions\Token.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Utils\EngineUtils.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="$(MSBuildThisFileDirectory)EngineRegistration.pkgdef">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+</Project>
diff --git a/Debugging/SharedEngine/SharedEngine.shproj b/Debugging/SharedEngine/SharedEngine.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>164587ca-78d9-4aec-82c2-acbabba26626</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="SharedEngine.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/...ILRuntimeDebugEngine/Utils/EngineUtils.cs → Debugging/SharedEngine/Utils/EngineUtils.cs b/...ILRuntimeDebugEngine/Utils/EngineUtils.cs → Debugging/SharedEngine/Utils/EngineUtils.cs
diff --git a/...timeDebuggerLauncher/AttachToILRuntime.cs → ...gging/SharedLauncher/AttachToILRuntime.cs b/...timeDebuggerLauncher/AttachToILRuntime.cs → ...gging/SharedLauncher/AttachToILRuntime.cs
@@ -100,6 +100,7 @@ private void MenuItemCallback(object sender, EventArgs e)
             }
         }
 
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD010:Invoke single-threaded types on Main thread", Justification = "<挂起>")]
         private void LaunchDebugTarget(string filePath)
         {
             var debugger = (IVsDebugger4)this.ServiceProvider.GetService(typeof(IVsDebugger));
@@ -114,7 +115,7 @@ private void LaunchDebugTarget(string filePath)
             {
                 debugger.LaunchDebugTargets4(1, debugTargets, processInfo);
             }
-            catch (Exception ex)
+            catch /*(Exception ex)*/
             {
                 var shell = (IVsUIShell)this.ServiceProvider.GetService(typeof(SVsUIShell));
                 string msg;

diff --git a/...gerLauncher/AttachToILRuntimePackage.vsct → ...redLauncher/AttachToILRuntimePackage.vsct b/...gerLauncher/AttachToILRuntimePackage.vsct → ...redLauncher/AttachToILRuntimePackage.vsct
diff --git a/...eDebuggerLauncher/FrmLauncher.Designer.cs → ...ng/SharedLauncher/FrmLauncher.Designer.cs b/...eDebuggerLauncher/FrmLauncher.Designer.cs → ...ng/SharedLauncher/FrmLauncher.Designer.cs
diff --git a/.../ILRuntimeDebuggerLauncher/FrmLauncher.cs → Debugging/SharedLauncher/FrmLauncher.cs b/.../ILRuntimeDebuggerLauncher/FrmLauncher.cs → Debugging/SharedLauncher/FrmLauncher.cs
diff --git a/...LRuntimeDebuggerLauncher/FrmLauncher.resx → Debugging/SharedLauncher/FrmLauncher.resx b/...LRuntimeDebuggerLauncher/FrmLauncher.resx → Debugging/SharedLauncher/FrmLauncher.resx
diff --git a/...ing/ILRuntimeDebuggerLauncher/LICENSE.TXT → Debugging/SharedLauncher/LICENSE.TXT b/...ing/ILRuntimeDebuggerLauncher/LICENSE.TXT → Debugging/SharedLauncher/LICENSE.TXT
diff --git a/...rLauncher/Resources/AttachToILRuntime.png → ...dLauncher/Resources/AttachToILRuntime.png b/...rLauncher/Resources/AttachToILRuntime.png → ...dLauncher/Resources/AttachToILRuntime.png
diff --git a/...er/Resources/AttachToILRuntimePackage.ico → ...er/Resources/AttachToILRuntimePackage.ico b/...er/Resources/AttachToILRuntimePackage.ico → ...er/Resources/AttachToILRuntimePackage.ico
diff --git a/Debugging/SharedLauncher/SharedLauncher.projitems b/Debugging/SharedLauncher/SharedLauncher.projitems
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>e10fdbd8-f948-41f9-a99f-3c50ccbba145</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>SharedLauncher</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)AttachToILRuntime.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)FrmLauncher.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)FrmLauncher.Designer.cs">
+      <DependentUpon>FrmLauncher.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)FrmLauncher.resx">
+      <DependentUpon>FrmLauncher.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="$(MSBuildThisFileDirectory)Resources\AttachToILRuntime.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Resources\AttachToILRuntimePackage.ico" />
+  </ItemGroup>
+</Project>
diff --git a/Debugging/SharedLauncher/SharedLauncher.shproj b/Debugging/SharedLauncher/SharedLauncher.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>e10fdbd8-f948-41f9-a99f-3c50ccbba145</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="SharedLauncher.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/.../ILRuntimeDebuggerLauncher/VSPackage.resx → Debugging/SharedLauncher/VSPackage.resx b/.../ILRuntimeDebuggerLauncher/VSPackage.resx → Debugging/SharedLauncher/VSPackage.resx
diff --git a/...meDebugEngine/ILRuntimeDebugEngine.csproj → ...meDebugEngine/ILRuntimeDebugEngine.csproj b/...meDebugEngine/ILRuntimeDebugEngine.csproj → ...meDebugEngine/ILRuntimeDebugEngine.csproj
@@ -32,19 +32,19 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CodeAnalysis, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CodeAnalysis.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CodeAnalysis.CSharp.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.CSharp.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Debugger.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -55,32 +55,32 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Collections.Immutable, Version=1.1.37.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Collections.Immutable.1.1.37\lib\dotnet\System.Collections.Immutable.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Collections.Immutable.1.1.37\lib\dotnet\System.Collections.Immutable.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Composition.AttributedModel, Version=1.0.27.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Composition.Convention, Version=1.0.27.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Composition.Hosting, Version=1.0.27.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Composition.Runtime, Version=1.0.27.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Composition.TypedParts, Version=1.0.27.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Reflection.Metadata, Version=1.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <HintPath>..\..\..\packages\System.Reflection.Metadata.1.2.0\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Windows.Forms" />
@@ -92,52 +92,22 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AD7\AD7DocumentContext.cs" />
-    <Compile Include="AD7\AD7ErrorBreakpoint.cs" />
-    <Compile Include="AD7\AD7BoundBreakpoint.cs" />
-    <Compile Include="AD7\AD7Engine.cs" />
-    <Compile Include="AD7\AD7Enums.cs" />
-    <Compile Include="AD7\AD7Events.cs" />
-    <Compile Include="AD7\AD7Expression.cs" />
-    <Compile Include="AD7\AD7PendingBreakPoint.cs" />
-    <Compile Include="AD7\AD7Port.cs" />
-    <Compile Include="AD7\AD7PortSupplier.cs" />
-    <Compile Include="AD7\AD7Module.cs" />
-    <Compile Include="AD7\AD7Process.cs" />
-    <Compile Include="AD7\AD7ProgramNode.cs" />
-    <Compile Include="AD7\AD7ProgramProvider.cs" />
-    <Compile Include="AD7\AD7StackFrame.cs" />
-    <Compile Include="AD7\AD7Thread.cs" />
-    <Compile Include="AD7\Constants.cs" />
-    <Compile Include="AD7\DebuggedProcess.cs" />
-    <Compile Include="AD7\EngineCallback.cs" />
-    <Compile Include="AD7\ILProperty.cs" />
-    <Compile Include="EngineConstants.cs" />
-    <Compile Include="Expressions\EvalExpression.cs" />
-    <Compile Include="Expressions\Lexer.cs" />
-    <Compile Include="Expressions\Parser.cs" />
-    <Compile Include="Expressions\Token.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Utils\EngineUtils.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="EngineRegistration.pkgdef">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
-    <Analyzer Include="..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
+    <Analyzer Include="..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
+    <Analyzer Include="..\..\..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\ILRuntime\ILRuntime.csproj">
+    <ProjectReference Include="..\..\..\ILRuntime\ILRuntime.csproj">
       <Project>{79ef2f29-89d1-4097-986c-5e4eefe0fa33}</Project>
       <Name>ILRuntime</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="..\..\SharedEngine\SharedEngine.projitems" Label="Shared" />
   <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.

diff --git a/...imeDebugEngine/Properties/AssemblyInfo.cs → ...imeDebugEngine/Properties/AssemblyInfo.cs b/...imeDebugEngine/Properties/AssemblyInfo.cs → ...imeDebugEngine/Properties/AssemblyInfo.cs
diff --git a/...ging/ILRuntimeDebugEngine/packages.config → ...lier/ILRuntimeDebugEngine/packages.config b/...ging/ILRuntimeDebugEngine/packages.config → ...lier/ILRuntimeDebugEngine/packages.config
diff --git a/...uggerLauncher/AttachToILRuntimePackage.cs → ...uggerLauncher/AttachToILRuntimePackage.cs b/...uggerLauncher/AttachToILRuntimePackage.cs → ...uggerLauncher/AttachToILRuntimePackage.cs