Only store major version of AddIn in VS project file

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 8b39386e60de7aff7c58587f511e4b7a482e04f4..1290d3b3d5af7b4e1953fead7d0b4fce31258b41 100644
--- a/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.cs
+++ b/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.cs
@@ -13,6 +13,7 @@ namespace NativeClientVSAddIn
   using Microsoft.VisualStudio.VCProjectEngine;
   using System.Collections.Generic;
   using System.Diagnostics;
+  using System.Reflection;
 
   /// <summary>The object for implementing an Add-in.</summary>
   /// <seealso class='IDTExtensibility2' />
@@ -167,7 +168,7 @@ namespace NativeClientVSAddIn
     /// </summary>
     private void PerformPropertyModifications()
     {
-      string naclAddInVersion = GetAddInVersionFromDescription();
+      string naclAddInVersion = GetAddInMajorVersion().ToString();
 
       var configs = Utility.GetPlatformVCConfigurations(dte_, Strings.PepperPlatformName);
       configs.AddRange(Utility.GetPlatformVCConfigurations(dte_, Strings.NaCl64PlatformName));
@@ -225,8 +226,6 @@ namespace NativeClientVSAddIn
     private void PerformPropertyFixes(VCConfiguration config)
     {
       IVCRulePropertyStorage debugger = config.Rules.Item("WindowsLocalDebugger");
-      string arguments = debugger.GetUnevaluatedPropertyValue("LocalDebuggerCommandArguments");
-      debugger.SetPropertyValue("LocalDebuggerCommandArguments", arguments);
 

[binji, 2012/10/15 20:00:59]

Why did you remove this?

[Sam Clegg, 2012/10/15 20:07:51]

This was here because the only way to get the args to work was to have them
stored in the .user file.

The default args didn't work because $(TargetPath) was not
defined.  I fixed this issue so it is no longer necessary
to copy this property.

       // NaCl Platform Specific:
       if (PropertyManager.IsNaClPlatform(config.Platform.Name))
@@ -263,29 +262,14 @@ namespace NativeClientVSAddIn
     }
 
     /// <summary>
-    /// During the build process we dynamically put the add-in version number into the add-in
-    /// description.  This function extracts that version number.
+    /// Get the major version of the AddIn

[binji, 2012/10/15 20:00:59]

nit: period at end of sentence.

[Sam Clegg, 2012/10/15 20:07:51]

Done.

     /// </summary>
     /// <returns>The add-in version number.</returns>
-    private string GetAddInVersionFromDescription()
+    private int GetAddInMajorVersion()
     {
-      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;
+      Assembly assem = Assembly.GetExecutingAssembly();
+      AssemblyName assemName = assem.GetName();
+      return assemName.Version.Major;
     }
 
     /// <summary>