diff --git a/source/Cosmos.VS.DebugEngine/Cosmos.DebugEngine.pkgdef b/source/Cosmos.VS.DebugEngine/Cosmos.DebugEngine.pkgdef
new file mode 100644
index 000000000..ef0d10c78
--- /dev/null
+++ b/source/Cosmos.VS.DebugEngine/Cosmos.DebugEngine.pkgdef
@@ -0,0 +1,19 @@
+[$RootKey$\AD7Metrics\Engine\{fa1da3a6-66ff-4c65-b077-e65f7164ef83}]
+@="Cosmos Debug Engine"
+; "AddressBP"=dword:00000001
+"AlwaysLoadLocal"=dword:00000001
+"AlwaysLoadProgramProviderLocal"=dword:00000001
+; "CallStackBP"=dword:00000001
+; "ConditionalBP"=dword:00000001
+"DataBP"=dword:00000001
+"Disassembly"=dword:00000001
+"EnginePriority"=dword:00000050
+"Exceptions"=dword:00000001
+; "FunctionBP"=dword:00000001
+; "HitCountBP"=dword:00000001
+; "JustMyCodeStepping"=dword:00000001
+"Name"="Cosmos Debug"
+"SetNextStatement"=dword:00000001
+; "SuspendThread"=dword:00000001
+"CLSID"="{dc8503ab-7ee6-456c-a209-66c690d9f6f4}"
+"GlobalVisualizersDirectory"="$PackageFolder$"
diff --git a/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj b/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj
index c67244d6b..237376eb6 100644
--- a/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj
+++ b/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.csproj
@@ -29,6 +29,7 @@
Cosmos.VS.DebugEngine
Cosmos.VS.DebugEngine
v4.7.1
+ true
true
true
true
@@ -114,9 +115,8 @@
-
+
Always
- true
true
diff --git a/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.pkgdef b/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.pkgdef
deleted file mode 100644
index 2dab083a2..000000000
--- a/source/Cosmos.VS.DebugEngine/Cosmos.VS.DebugEngine.pkgdef
+++ /dev/null
@@ -1,39 +0,0 @@
-[$RootKey$\InstalledProducts\CosmosDebugEnginePackage]
-@="#110"
-"Package"="{a82b45e9-2a89-43bd-925d-c7f0edd212aa}"
-"PID"="1.0"
-"ProductDetails"="#112"
-"LogoID"="#400"
-[$RootKey$\Packages\{a82b45e9-2a89-43bd-925d-c7f0edd212aa}]
-@="CosmosDebugEnginePackage"
-"InprocServer32"="$WinDir$\SYSTEM32\MSCOREE.DLL"
-"Class"="Cosmos.VS.DebugEngine.CosmosDebugEnginePackage"
-"CodeBase"="$PackageFolder$\Cosmos.VS.DebugEngine.dll"
-[$RootKey$\Menus]
-"{a82b45e9-2a89-43bd-925d-c7f0edd212aa}"=", Menus.ctmenu, 1"
-
-[$RootKey$\AD7Metrics\Engine\{fa1da3a6-66ff-4c65-b077-e65f7164ef83}]
-@="Cosmos Debug Engine"
-; "AddressBP"=dword:00000001
-"AlwaysLoadLocal"=dword:00000001
-"AlwaysLoadProgramProviderLocal"=dword:00000001
-; "CallStackBP"=dword:00000001
-; "ConditionalBP"=dword:00000001
-"DataBP"=dword:00000001
-"Disassembly"=dword:00000001
-"EnginePriority"=dword:00000050
-"Exceptions"=dword:00000001
-; "FunctionBP"=dword:00000001
-; "HitCountBP"=dword:00000001
-; "JustMyCodeStepping"=dword:00000001
-"Name"="Cosmos Debug"
-"SetNextStatement"=dword:00000001
-; "SuspendThread"=dword:00000001
-"CLSID"="{dc8503ab-7ee6-456c-a209-66c690d9f6f4}"
-"GlobalVisualizersDirectory"="$PackageFolder$"
-
-[$RootKey$\CLSID\{dc8503ab-7ee6-456c-a209-66c690d9f6f4}]
-"Assembly"="Cosmos.VS.DebugEngine"
-"Class"="Cosmos.VS.DebugEngine.AD7.Impl.AD7Engine"
-"InprocServer32"="$WinDir$\SYSTEM32\MSCOREE.DLL"
-"CodeBase"="$PackageFolder$\Cosmos.VS.DebugEngine.dll"
diff --git a/source/Cosmos.VS.DebugEngine/CosmosDebugEnginePackage.cs b/source/Cosmos.VS.DebugEngine/CosmosDebugEnginePackage.cs
index 390ae668c..c8b291a9a 100644
--- a/source/Cosmos.VS.DebugEngine/CosmosDebugEnginePackage.cs
+++ b/source/Cosmos.VS.DebugEngine/CosmosDebugEnginePackage.cs
@@ -3,14 +3,16 @@ using System.Runtime.InteropServices;
using Microsoft.VisualStudio.OLE.Interop;
using Microsoft.VisualStudio.Shell;
+using Cosmos.VS.DebugEngine.AD7.Impl;
using Cosmos.VS.DebugEngine.Commands;
namespace Cosmos.VS.DebugEngine
{
+ [Guid(Guids.guidPackageString)]
[PackageRegistration(UseManagedResourcesOnly = true)]
[InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)]
[ProvideMenuResource("Menus.ctmenu", 1)]
- [Guid(Guids.guidPackageString)]
+ [ProvideObject(typeof(AD7Engine))]
public sealed class CosmosDebugEnginePackage : Package, IOleCommandTarget
{
private IOleCommandTarget packageCommandTarget;
@@ -52,4 +54,4 @@ namespace Cosmos.VS.DebugEngine
return packageCommandTarget.QueryStatus(ref cmdGroup, cCmds, prgCmds, pCmdText);
}
}
-}
\ No newline at end of file
+}
diff --git a/source/Cosmos.VS.DebugEngine/VSPackage.vsct b/source/Cosmos.VS.DebugEngine/VSPackage.vsct
index 9a8809912..9af45275d 100644
--- a/source/Cosmos.VS.DebugEngine/VSPackage.vsct
+++ b/source/Cosmos.VS.DebugEngine/VSPackage.vsct
@@ -33,9 +33,9 @@
-
+
-
+
diff --git a/source/Cosmos.VS.DebugEngine/source.extension.vsixmanifest b/source/Cosmos.VS.DebugEngine/source.extension.vsixmanifest
index 48f084fff..799604e61 100644
--- a/source/Cosmos.VS.DebugEngine/source.extension.vsixmanifest
+++ b/source/Cosmos.VS.DebugEngine/source.extension.vsixmanifest
@@ -1,22 +1,23 @@
-
-
- Cosmos Visual Studio Debug Engine
- Visual Studio Debug Engine for Cosmos
- Resources\Cosmos.ico
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ Cosmos Visual Studio Debug Engine
+ Visual Studio Debug Engine for Cosmos
+ Resources\Cosmos.ico
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/source/Cosmos.VS.ProjectSystem/source.extension.vsixmanifest b/source/Cosmos.VS.ProjectSystem/source.extension.vsixmanifest
index f882afeed..28fd96fb1 100644
--- a/source/Cosmos.VS.ProjectSystem/source.extension.vsixmanifest
+++ b/source/Cosmos.VS.ProjectSystem/source.extension.vsixmanifest
@@ -1,31 +1,32 @@
-
-
- Cosmos Visual Studio Project System
- The Visual Studio project system for the Cosmos Operating System.
- Resources\Cosmos.ico
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ Cosmos Visual Studio Project System
+ The Visual Studio project system for the Cosmos Operating System.
+ Resources\Cosmos.ico
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+