VS Add-in more properties and improvements

visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Properties/nacl_general.xml

Index: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Properties/nacl_general.xml
diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Properties/nacl_general.xml b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Properties/nacl_general.xml
index 24c654d716130eee85a94a88272aa193563ddb52..c15e9ad7e12b725f3c5daa103704191f738a28ae 100644
--- a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Properties/nacl_general.xml
+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Properties/nacl_general.xml
@@ -15,6 +15,13 @@
     <DataSource Persistence="ProjectFile" Label="Configuration" />
   </Rule.DataSource>
   
+  <StringProperty Name="NaClAddInVersion" Visible="false"
+                  Category="NativeClient" Default="">
+    <StringProperty.DataSource>
+      <DataSource Persistence="ProjectFile" Label=""/>
+    </StringProperty.DataSource>
+  </StringProperty>
+  
   <StringProperty Name="VSNaClSDKRoot" DisplayName="NaCl SDK Root"
                   Description="Specifies the path to the Native Client SDK root directory."
                   Category="NativeClient" Default=""
@@ -42,6 +49,29 @@
     </StringProperty.DataSource>
   </StringProperty>
   
+  <StringProperty Name="NaClWebServerPort" DisplayName="Web Server Port"
+                  Description="Specifies the port number to use while hosting the nexe"
+                  Category="NativeClient" Default=""
+                  F1Keyword="VC.Project.VCConfiguration.NaClWebServerPort">
+    <StringProperty.DataSource>
+      <DataSource Persistence="ProjectFile" Label="" />
+    </StringProperty.DataSource>
+  </StringProperty>
+  
+  <EnumProperty Name="ToolchainName" DisplayName="Toolchain" Category="NativeClient">
+    <EnumValue Name="newlib" DisplayName="newlib" />
+    <EnumValue Name="glibc" DisplayName="glibc" />
+  </EnumProperty>
+  
+  <!-- PlatformToolset is constructed in Microsoft.Cpp.NaCl.default.props to be win_x86_$(ToolchainName) -->
+  <StringProperty Name="PlatformToolset" DisplayName="Platform Toolset" Visible="false"
+                  Description="The 'hidden' property which constructs the toolchain name from current settings."
+                  Category="NativeClient">
+                  <StringProperty.DataSource>
+                     <DataSource Persistence="ProjectFile" Label="" />
+                  </StringProperty.DataSource>
+  </StringProperty>
+  
   <StringProperty Name="OutDir" DisplayName="Output Directory"
                   Description="Specifies a relative path to the output file directory; can include environment variables."
                   Category="General" Default="$(SolutionDir)$(Configuration)\"
@@ -101,20 +131,6 @@
                   </StringProperty.DataSource>
   </StringProperty>
   
-  <EnumProperty Name="ToolchainName" DisplayName="Toolchain" Category="General">
-    <EnumValue Name="newlib" DisplayName="newlib" />
-    <EnumValue Name="glibc" DisplayName="glibc" />
-  </EnumProperty>
-  
-  <!-- PlatformToolset is constructed in Microsoft.Cpp.NaCl.default.props to be win_x86_$(ToolchainName) -->
-  <StringProperty Name="PlatformToolset" DisplayName="Platform Toolset" Visible="false"
-                  Description="The 'hidden' property which constructs the toolchain name from current settings."
-                  Category="General">
-                  <StringProperty.DataSource>
-                     <DataSource Persistence="ProjectFile" Label="" />
-                  </StringProperty.DataSource>
-  </StringProperty>
-  
   <EnumProperty Name="ConfigurationType" DisplayName="Configuration Type"
                 Description="Specifies the type of output this configuration generates."
                 Category="ProjectDefaults"