Only store major version of AddIn in VS project file

visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.cs

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 namespace NativeClientVSAddIn
 {
   using System;
 
   using EnvDTE;
   using EnvDTE80;
   using Extensibility;
   using Microsoft.VisualStudio;
   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' />
   public class Connect : IDTExtensibility2
   {
     /// <summary>
     /// The main Visual Studio interface.
     /// </summary>
     private DTE2 dte_;
 
@@ skipping 134 matching lines @@
 
     /// <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();
+      string naclAddInVersion = GetAddInMajorVersion().ToString();
 
       var configs = Utility.GetPlatformVCConfigurations(dte_, Strings.PepperPlatformName);
       configs.AddRange(Utility.GetPlatformVCConfigurations(dte_, Strings.NaCl64PlatformName));
       configs.AddRange(Utility.GetPlatformVCConfigurations(dte_, Strings.NaCl32PlatformName));
 
       var properties = new PropertyManager();
       foreach (VCConfiguration config in configs)
       {
         properties.SetTarget(config);
         if (properties.NaClAddInVersion != naclAddInVersion)
@@ skipping 37 matching lines @@
     }
 
     /// <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 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))
       {
         IVCRulePropertyStorage general = config.Rules.Item("ConfigurationGeneral");
         string[] keys = {"VSNaClSDKRoot"};
         Dictionary<string, string> values = new Dictionary<string, string>();
         foreach (var key in keys)
         {
           values[key] = general.GetUnevaluatedPropertyValue(key);
           general.DeleteProperty(key);
@@ skipping 15 matching lines @@
 
       // Pepper specific:
       if (config.Platform.Name == Strings.PepperPlatformName)
       {
         string executablePath = directories.GetUnevaluatedPropertyValue("ExecutablePath");
         directories.SetPropertyValue("ExecutablePath", executablePath);
       }
     }
 
     /// <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>
     /// Called when Visual Studio ends a debugging session.
     /// Shuts down the web server and debugger.
     /// </summary>
     /// <param name="reason">The parameter is not used.</param>
     private void DebuggerOnEnterDesignMode(dbgEventReason reason)
     {
       if (debugger_ != null)
@@ skipping 29 matching lines @@
         }
         else if (properties.ProjectPlatform == PropertyManager.ProjectPlatformType.Pepper)
         {
           debugger_ = new PluginDebuggerVS(dte_, properties);
           webServer_ = new WebServer(webServerOutputPane_, properties);
         }
       }
     }
   }
 }