Closes #28 - Auto Attach Debugger

dazinator · Dec 13, 2015 · e7460d7 · e7460d7 · dazinator · Dec 13, 2015
1 parent a5476a3
commit e7460d7
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 30 deletions.
diff --git a/src/DnnPackager/DnnPackager.csproj.user b/src/DnnPackager/DnnPackager.csproj.user
@@ -4,6 +4,6 @@
     <ProjectView>ShowAllFiles</ProjectView>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartArguments>build --envdteversion "14.0" --processid 1008--configuration "Debug" --name "DnnPackager.TestModule" --websitename "DotNetNuke"</StartArguments>
+    <StartArguments>build --envdteversion "14.0" --processid 5712 --configuration "Debug" --name "DnnPackager.TestModule" --websitename "DotNetNuke" --attach</StartArguments>
   </PropertyGroup>
 </Project>
diff --git a/src/DnnPackager/DotNetNukeWebAppInfo.cs b/src/DnnPackager/DotNetNukeWebAppInfo.cs
@@ -158,7 +158,7 @@ public bool DeployPackages(FileInfo[] installZips, int retryAttempts, Action<str
                 // find the worker process.             
                 foreach (WorkerProcess proc in serverManager.WorkerProcesses)
                 {
-                    if (proc.AppPoolName == AppPoolName)
+                    if (proc.AppPoolName == AppPoolName.ToLowerInvariant())
                     {
 
                         return proc.ProcessId;

diff --git a/src/DnnPackager/Options.cs b/src/DnnPackager/Options.cs
@@ -12,6 +12,7 @@ public class CommonOptions
     {
         [Option('w', "websitename", Required = true, HelpText = "The name of the dnn website in IIS to deploy to.")]
         public string WebsiteName { get; set; }
+
     }
 
     public class DeployOptions : CommonOptions
@@ -35,6 +36,9 @@ public class BuildOptions : CommonOptions
         [Option('p', "processid", Required = true, HelpText = "The process id for the running visual studio instance.")]
         public int ProcessId { get; set; }
 
+        [Option('a', "attach", Required = false, HelpText = "Whether to attach the debugger after the deployment is complete.")]
+        public bool Attach { get; set; }
+
 
     }
 
@@ -48,6 +52,8 @@ public class Options
         [VerbOption("build", HelpText = "Build a visual studio project and deploy the packages to a local DNN website in IIS.")]
         public BuildOptions BuildVerb { get; set; }
 
+
+
         [HelpOption]
         public string GetUsage()
         {

diff --git a/src/DnnPackager/ProcessExtensions.cs b/src/DnnPackager/ProcessExtensions.cs
@@ -10,28 +10,42 @@ namespace DnnPackager
     public static class ProcessExtensions
     {
         public static bool Attach(int processId, EnvDTE.DTE dte, Action<string> logger)
-        {           
+        {
             // Try loop - Visual Studio may not respond the first time.
             int tryCount = 5;
             while (tryCount-- > 0)
             {
                 try
                 {
                     Processes processes = dte.Debugger.LocalProcesses;
-                    var targetProcess = processes.Cast<Process>().FirstOrDefault(proc => proc.ProcessID == processId);
-                    if (targetProcess == null)
+                    Process targetProcess = null;
+                    foreach (Process process in processes)
                     {
-                        return false;
+
+                        if (process.ProcessID == processId)
+                        {
+                            targetProcess = process;
+                        }
+                        else
+                        {
+                            logger(String.Format("Skipped process named: {0} with Id {1}.", process.Name, process.ProcessID));
+                        }
+                    }
+
+                    if (targetProcess != null)
+                    {
+                        logger(String.Format("Attaching to process {0}.", targetProcess.Name));
+                        targetProcess.Attach();
+                        logger(String.Format("Attached to process {0} successfully.", targetProcess.Name));
+                        return true;
                     }
 
-                    targetProcess.Attach();
-                    logger(String.Format("Attached to process {0} successfully.", targetProcess.Name));
-                    return true;
+                    return false;
 
                 }
                 catch (COMException)
                 {
-                    logger(String.Format("Trying to attach to processs.."));
+                    logger(String.Format("Will retry attaching to process in a second.."));
                     System.Threading.Thread.Sleep(1000);
                 }
             }

diff --git a/src/DnnPackager/Program.cs b/src/DnnPackager/Program.cs
@@ -28,47 +28,66 @@ static int Main(string[] args)
             if (!parsed)
             {
                 Console.Write(options.GetUsage());
-                Environment.Exit(-1);
+                return -1;
             }
 
             FileInfo[] installPackages = null;
+            DTE dte = null;
+            bool attachDebugger = false;
+            DotNetNukeWebAppInfo dnnWebsite = null;
 
             switch (invokedVerb)
             {
                 case "build":
-                    success = BuildProjectAndGetOutputZips((BuildOptions)invokedVerbInstance, out installPackages);
+                    var buildArgs = (BuildOptions)invokedVerbInstance;
+                    success = BuildProjectAndGetOutputZips(buildArgs, out installPackages, out dte);
+                    attachDebugger = buildArgs.Attach;
                     break;
                 case "deploy":
                     installPackages = GetInstallZipsFromDirectory(((DeployOptions)invokedVerbInstance).DirectoryPath);
                     break;
             }
 
+            dnnWebsite = GetDotNetNukeWebsiteInfo(invokedVerbInstance.WebsiteName);
+
             if (installPackages != null && installPackages.Any())
-            {
-                var dnnWebsite = GetDotNetNukeWebsiteInfo(invokedVerbInstance.WebsiteName);
+            {               
                 success = DeployToIISWebsite(installPackages, dnnWebsite);
             }
             else
             {
-
+                // no packages to install.
+                // log warning?
+                LogInfo("No packages to install.");
+                success = true;
             }
 
-            if (success)
+            if (!success)
             {
-                return 0;
+                return -1;
             }
-            else
+
+            if (dte != null && attachDebugger)
             {
-                return -1;
+
+                LogInfo("Hooking up your debugger!");
+                var processId = dnnWebsite.GetWorkerProcessId();
+                if (!processId.HasValue)
+                {
+                    LogInfo("Unable to find running worker process. Is your website running!?");
+                }
+                ProcessExtensions.Attach(processId.Value, dte, LogInfo);
             }
+
+            return 0;
         }
 
-        private static bool BuildProjectAndGetOutputZips(BuildOptions options, out FileInfo[] installPackages)
+        private static bool BuildProjectAndGetOutputZips(BuildOptions options, out FileInfo[] installPackages, out DTE dte)
         {
 
             // Get an instance of the currently running Visual Studio IDE.
             installPackages = null;
-            EnvDTE.DTE dte = null;
+            dte = null;
             string dteObjectString = string.Format("VisualStudio.DTE.{0}", options.EnvDteVersion);
             string runningObjectName = string.Format("!{0}:{1}", dteObjectString, options.ProcessId);
 
@@ -95,7 +114,6 @@ private static bool BuildProjectAndGetOutputZips(BuildOptions options, out FileI
                 configurationName = options.Configuration;
             }
 
-
             //  dte.Solution.SolutionBuild.Build(true);
             var projects = dte.Solution.Projects;
             var project = projects.OfType<EnvDTE.Project>().FirstOrDefault(p => p.Name == options.ProjectName);

diff --git a/src/DnnPackager/packages.config b/src/DnnPackager/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Clide.Resolver" version="2.3.33" targetFramework="net40" />
   <package id="CommandLineParser" version="1.9.71" targetFramework="net40" />
   <package id="GitVersion.CommandLine" version="3.3.0" targetFramework="net4" developmentDependency="true" />
   <package id="Microsoft.Web.Administration" version="7.0.0.0" targetFramework="net40" />

diff --git a/src/DnnPackager/tools/ModuleDeployment.psm1 b/src/DnnPackager/tools/ModuleDeployment.psm1
@@ -11,21 +11,21 @@
 
 	if (!$buildConfigName)
 	{
-	    $solution = Get-Interface $dte.Solution ([EnvDTE80.Solution2])
+	  $solution = Get-Interface $dte.Solution ([EnvDTE80.Solution2])
 		$solBuild = Get-Interface $solution.SolutionBuild ([EnvDTE.SolutionBuild])
 		$solActiveConfig = Get-Interface $solBuild.ActiveConfiguration ([EnvDTE.SolutionConfiguration])
 		$buildConfigName = [System.Convert]::ToString($solActiveConfig.Name) 
 	}    
 
 	if(!$attachFlag)
 	{
-			Write-Host "Executing $commandPath iiswebsite $installPackagesPath $websiteName"
-	& $commandPath "build --envdteversion " $dteVersion "--processid " $processId "--configuration " $buildConfigName "--name " $projectName "--websitename " $iisWebsiteName | Write-Host
+    Write-Host "Executing build --envdteversion $dteVersion --processid  $processId --configuration $buildConfigName --name $projectName --websitename $iisWebsiteName"
+	  & $commandPath "build --envdteversion " $dteVersion "--processid " $processId "--configuration " $buildConfigName "--name " $projectName "--websitename " $iisWebsiteName | Write-Host
 	}
 	else
 	{
-			Write-Host "Executing $commandPath iiswebsite $installPackagesPath $websiteName"
-	& $commandPath "build --envdteversion " $dteVersion "--processid " $processId "--configuration " $buildConfigName "--name " $projectName "--websitename " $iisWebsiteName " --attach" | Write-Host
+	  Write-Host "Executing build --envdteversion $dteVersion --processid  $processId --configuration $buildConfigName --name $projectName --websitename $iisWebsiteName --attach"
+	  & $commandPath "build --envdteversion " $dteVersion "--processid " $processId "--configuration " $buildConfigName "--name " $projectName "--websitename " $iisWebsiteName " --attach" | Write-Host
 	}	
 }
 
@@ -36,8 +36,8 @@ function Get-ScriptDirectory {
 
 function Get-Configurations()
 {
-    $solution = Get-Interface $dte.Solution ([EnvDTE80.Solution2])
-    $solBuild = Get-Interface $solution.SolutionBuild ([EnvDTE.SolutionBuild])
+  $solution = Get-Interface $dte.Solution ([EnvDTE80.Solution2])
+  $solBuild = Get-Interface $solution.SolutionBuild ([EnvDTE.SolutionBuild])
 	$configs = $solBuild.SolutionConfigurations
 	$configs = [EnvDTE.SolutionConfigurations]::$solBuild.SolutionConfigurations 
 	return $configs