[NaCl SDK] move VSNaClSDKRoot into ConfigurationGeneral section

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;
@@ skipping 201 matching lines @@
             {
               string baseLibName = lib.Replace(".lib", string.Empty);
               if (!string.IsNullOrWhiteSpace(lib))
               {
                 libs = string.Concat(libs, baseLibName, ".lib;");
               }
             }
           }
 
           properties.SetProperty("Link", "AdditionalDependencies", libs);
-
-          // 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)
-    {
-      // 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);
-        }
-
-        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);
-      }
-    }
-
-    /// <summary>
     /// Get the major version of the AddIn.
     /// </summary>
     /// <returns>The add-in major version number.</returns>
     private int GetAddInMajorVersion()
     {
       Assembly assem = Assembly.GetExecutingAssembly();
       AssemblyName assemName = assem.GetName();
       return assemName.Version.Major;
     }
 
@@ skipping 37 matching lines @@
         }
         else if (properties.ProjectPlatform == PropertyManager.ProjectPlatformType.Pepper)
         {
           debugger_ = new PluginDebuggerVS(dte_, properties);
           webServer_ = new WebServer(webServerOutputPane_, properties);
         }
       }
     }
   }
 }