VS Add-in more properties and improvements

visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.cs

Index: visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.cs
diff --git a/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.cs b/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.cs
index be02185b32cee6995158ca4834abe4f29b7abf62..476bd8b515d4cdd1a419b0cde94348071cdde345 100644
--- a/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.cs
+++ b/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.cs
@@ -9,6 +9,8 @@ namespace NativeClientVSAddIn
   using EnvDTE;
   using EnvDTE80;
   using Extensibility;
+  using Microsoft.VisualStudio;
+  using Microsoft.VisualStudio.VCProjectEngine;
 
   /// <summary>The object for implementing an Add-in.</summary>
   /// <seealso class='IDTExtensibility2' />
@@ -20,6 +22,16 @@ namespace NativeClientVSAddIn
     private DebuggerEvents debuggerEvents_;
 
     /// <summary>
+    /// Receives all generic events from Visual Studio.
+    /// </summary>
+    private CommandEvents commandEvents_;
+
+    /// <summary>
+    /// The main Visual Studio interface.
+    /// </summary>
+    private DTE2 dte_;
+
+    /// <summary>
     /// Holds methods related to running the plug-in and debugging.
     /// </summary>
     private PluginDebuggerHelper debuggerHelper_;
@@ -42,36 +54,15 @@ namespace NativeClientVSAddIn
         object addInInst,
         ref Array custom)
     {
-      DTE2 dte = (DTE2)application;
-      debuggerHelper_ = new PluginDebuggerHelper(dte);
+      dte_ = (DTE2)application;
+      debuggerHelper_ = new PluginDebuggerHelper(dte_);
 
-      debuggerEvents_ = dte.Events.DebuggerEvents;
+      debuggerEvents_ = dte_.Events.DebuggerEvents;
       debuggerEvents_.OnEnterDesignMode += DebuggerOnEnterDesignMode;
       debuggerEvents_.OnEnterRunMode += DebuggerOnEnterRunMode;
-    }
-
-    /// <summary>
-    /// Called when Visual Studio ends a debugging session.
-    /// </summary>
-    /// <param name="reason">The parameter is not used.</param>
-    public void DebuggerOnEnterDesignMode(dbgEventReason reason)
-    {
-      debuggerHelper_.StopDebugging();
-    }
 
-    /// <summary>
-    /// Called when Visual Studio starts a debugging session.
-    /// </summary>
-    /// <param name="reason">Indicates how we are entering run mode (breakpoint or launch).</param>
-    public void DebuggerOnEnterRunMode(dbgEventReason reason)
-    {
-      // If we are starting debugging (not re-entering from a breakpoint)
-      // then load project settings and start the debugger-helper.
-      if (reason == dbgEventReason.dbgEventReasonLaunchProgram &&
-          debuggerHelper_.LoadProjectSettings())
-      {
-        debuggerHelper_.StartDebugging();
-      }
+      commandEvents_ = dte_.Events.CommandEvents;
+      commandEvents_.AfterExecute += CommandEventsAfterExecute;
     }
 
     /// <summary>
@@ -114,5 +105,127 @@ namespace NativeClientVSAddIn
     public void OnBeginShutdown(ref Array custom)
     {
     }
+
+    /// <summary>
+    /// Receives notification after any generic VS command has executed.
+    /// Here we capture the SolutionPlatform event which indicates the solution platform has
+    /// changed.  We use this event to trigger a modification of property settings since this
+    /// event happens immediately after the platforms are added. See PerformPropertyModifications()
+    /// for what sort of modifications we are doing.
+    /// </summary>
+    /// <param name="guid">Guid of the command grouping.</param>
+    /// <param name="id">ID of the command within its grouping.</param>
+    /// <param name="customIn">Command specific input.</param>
+    /// <param name="customOut">Command specific parameter.</param>
+    private void CommandEventsAfterExecute(string guid, int id, object customIn, object customOut)
+    {
+      const string VSStd2KCmdIDEnumGuid = "{1496A755-94DE-11D0-8C3F-00C04FC2AAE2}";
+      if (guid.Equals(VSStd2KCmdIDEnumGuid, StringComparison.OrdinalIgnoreCase))
+      {
+        // If loading a NaCl or Pepper platform, perform property modifications.
+        if (id == (int)VSConstants.VSStd2KCmdID.SolutionPlatform)
+        {
+          string platform = customOut as string;
+          if (Strings.NaClPlatformName.Equals(platform) ||
+              Strings.PepperPlatformName.Equals(platform))
+          {
+            PerformPropertyModifications();
+          }
+        }
+      }
+    }
+
+    /// <summary>
+    /// Goes through all projects in the solution and updates their properties with necessary
+    /// modifications if they are NaCl or Pepper configurations. We add the version information
+    /// here so that the version is stored directly in the project file. The call to
+    /// PerformPropertyFixes() performs a work around on the property pages to force Visual Studio
+    /// to save some specific properties into the project file to get around issue 140162.
+    /// </summary>
+    private void PerformPropertyModifications()
+    {
+      string naclAddInVersion = GetAddInVersionFromDescription();
+
+      var configs = Utility.GetPlatformVCConfigurations(dte_, Strings.PepperPlatformName);
+      configs.AddRange(Utility.GetPlatformVCConfigurations(dte_, Strings.NaClPlatformName));
+
+      foreach (VCConfiguration config in configs)
+      {
+        IVCRulePropertyStorage general = config.Rules.Item("ConfigurationGeneral");
+        string projectVersionSetting = general.GetEvaluatedPropertyValue("NaClAddInVersion");
+        if (string.IsNullOrEmpty(projectVersionSetting))
+        {
+          general.SetPropertyValue("NaClAddInVersion", naclAddInVersion);
+
+          // Work around for issue 140162. Forces some properties to save to the project file.
+          PerformPropertyFixes(config);
+        }
+      }
+    }
+
+    /// <summary>
+    /// Takes a project configuration and sets values in the project file to work around some
+    /// problems in Visual Studio. This is a work around for issue 140162.
+    /// </summary>
+    /// <param name="config">A configuration that needs modification.</param>
+    private void PerformPropertyFixes(VCConfiguration config)
+    {
+      IVCRulePropertyStorage debugger = config.Rules.Item("WindowsLocalDebugger");
+      string evaluatedCommand = debugger.GetEvaluatedPropertyValue("LocalDebuggerCommand");
+      debugger.SetPropertyValue("LocalDebuggerCommand", evaluatedCommand);
+
+      string arguments = debugger.GetUnevaluatedPropertyValue("LocalDebuggerCommandArguments");
+      debugger.SetPropertyValue("LocalDebuggerCommandArguments", arguments);
+    }
+
+    /// <summary>
+    /// During the build process we dynamically put the add-in version number into the add-in
+    /// description.  This function extracts that version number.
+    /// </summary>
+    /// <returns>The add-in version number.</returns>
+    private string GetAddInVersionFromDescription()
+    {
+      string naclAddinVersion = "missing";
+      foreach (AddIn addin in dte_.AddIns)
+      {
+        if (addin.Name.Equals(Strings.AddInName))
+        {
+          string identifier = "Version: [";
+          int start = addin.Description.IndexOf(identifier) + identifier.Length;
+          int end = addin.Description.LastIndexOf(']');
+          if (start >= 0 && end >= 0)
+          {
+            naclAddinVersion = addin.Description.Substring(start, end - start);
+            break;
+          }
+        }
+      }
+
+      return naclAddinVersion;
+    }
+
+    /// <summary>
+    /// Called when Visual Studio ends a debugging session.
+    /// </summary>
+    /// <param name="reason">The parameter is not used.</param>
+    private void DebuggerOnEnterDesignMode(dbgEventReason reason)
+    {
+      debuggerHelper_.StopDebugging();
+    }
+
+    /// <summary>
+    /// Called when Visual Studio starts a debugging session.
+    /// </summary>
+    /// <param name="reason">Indicates how we are entering run mode (breakpoint or launch).</param>
+    private void DebuggerOnEnterRunMode(dbgEventReason reason)
+    {
+      // If we are starting debugging (not re-entering from a breakpoint)
+      // then load project settings and start the debugger-helper.
+      if (reason == dbgEventReason.dbgEventReasonLaunchProgram &&
+          debuggerHelper_.LoadProjectSettings())
+      {
+        debuggerHelper_.StartDebugging();
+      }
+    }
   }
 }