explicitly set VSNaClSDKRoot in vcxproj rather than

visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.cs

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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;
+
   /// <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_;
 
     /// <summary>
@@ skipping 143 matching lines @@
     {
       string naclAddInVersion = GetAddInVersionFromDescription();
 
       var configs = Utility.GetPlatformVCConfigurations(dte_, Strings.PepperPlatformName);
       configs.AddRange(Utility.GetPlatformVCConfigurations(dte_, Strings.NaClPlatformName));
 
       var properties = new PropertyManager();
       foreach (VCConfiguration config in configs)
       {
         properties.SetTarget(config);
-        if (string.IsNullOrEmpty(properties.NaClAddInVersion))
+        if (properties.NaClAddInVersion != naclAddInVersion)
         {
+          Debug.WriteLine("Modifying Config: " + config.Name);
+
           // Set the NaCl add-in version so that it is stored in the project file.
           properties.SetProperty("ConfigurationGeneral", "NaClAddInVersion", naclAddInVersion);
-          
+
           // Expand the CHROME_PATH variable to its full path.
           string expandedChrome = properties.GetProperty(
               "WindowsLocalDebugger", "LocalDebuggerCommand");
           properties.SetProperty("WindowsLocalDebugger", "LocalDebuggerCommand", expandedChrome);
 
           // Change the library includes to have the appropriate extension.
           string libs = properties.GetProperty("Link", "AdditionalDependencies");
           if (properties.ProjectPlatform == PropertyManager.ProjectPlatformType.NaCl)
           {
             libs = libs.Replace(".lib", string.Empty);
@@ skipping 24 matching lines @@
     /// 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);
 
+      // NaCl Platform Specific:
+      if (config.Platform.Name == Strings.NaClPlatformName)
+      {
+        IVCRulePropertyStorage general = config.Rules.Item("ConfigurationGeneral");
+        string[] keys = {"VSNaClSDKRoot", "OutDir", "IntDir"};
+        Dictionary<string, string> values = new Dictionary<string, string>();
+        foreach (var key in keys)
+        {
+          values[key] = general.GetUnevaluatedPropertyValue(key);
+          general.DeleteProperty(key);
+        }
+
+        foreach (var key in keys)
+        {
+          general.SetPropertyValue(key, values[key]);
+        }
+      }
+
       IVCRulePropertyStorage directories = config.Rules.Item("ConfigurationDirectories");
       string includePath = directories.GetUnevaluatedPropertyValue("IncludePath");
       string libraryPath = directories.GetUnevaluatedPropertyValue("LibraryPath");
+      directories.DeleteProperty("IncludePath");
+      directories.DeleteProperty("LibraryPath");
       directories.SetPropertyValue("IncludePath", includePath);
       directories.SetPropertyValue("LibraryPath", libraryPath);
 
       // Pepper specific:
       if (config.Platform.Name == Strings.PepperPlatformName)
       {
         string executablePath = directories.GetUnevaluatedPropertyValue("ExecutablePath");
         directories.SetPropertyValue("ExecutablePath", executablePath);
       }
 
@@ skipping 74 matching lines @@
         }
         else if (properties.ProjectPlatform == PropertyManager.ProjectPlatformType.Pepper)
         {
           debugger_ = new PluginDebuggerVS(dte_, properties);
           webServer_ = new WebServer(webServerOutputPane_, properties);
         }
       }
     }
   }
 }