[NaCl SDK] move VSNaClSDKRoot into ConfigurationGeneral section

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 f80d4390dd0a1076ad942b31cae83bce2c9f1b7a..186db0499cb1423f34f57552722285ebfc4ff55d 100644
--- a/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.cs
+++ b/visual_studio/NativeClientVSAddIn/NativeClientVSAddIn/Connect.cs
@@ -219,55 +219,11 @@ namespace NativeClientVSAddIn
           }
 
           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>