Merge branch 'markus101'

Conflicts:
	NzbDrone.Web/NzbDrone.Web.csproj
	NzbDrone.Web/Views/Log/Index.cshtml
This commit is contained in:
kay.one 2011-04-21 21:03:59 -07:00
commit 6f73260ab7
32 changed files with 1359 additions and 537 deletions

View file

@ -18,13 +18,25 @@ namespace NzbDrone
{
public static void Attach()
{
// Get an instance of the currently running Visual Studio IDE.
DTE2 dte2;
dte2 = (DTE2) Marshal.
GetActiveObject("VisualStudio.DTE.10.0");
for (int i = 0; i < 10; i++)
{
try
{
DTE2 dte2;
dte2 = (DTE2)Marshal.
GetActiveObject("VisualStudio.DTE.10.0");
var pa = new ProcessAttacher(dte2, "iisexpress", 10);
pa.PessimisticAttachManaged();
return;
}
catch
{
Thread.Sleep(500);
}
}
// Get an instance of the currently running Visual Studio IDE.
var pa = new ProcessAttacher(dte2, "iisexpress", 10);
pa.PessimisticAttachManaged();
}
#region private
@ -99,6 +111,8 @@ namespace NzbDrone
private bool IsBeingDebugged()
{
if (_dte.Debugger.DebuggedProcesses != null)
{
foreach (Process process in _dte.Debugger.DebuggedProcesses)