bzr commit into connector-net-trunk branch (reggie.burnett:888)

[Reggie Burnett]

#At file:///C:/work/bzr-connector-net/clean-trunk/ based on revid:reggie.burnett@stripped

  888 Reggie Burnett	2010-06-30 [merge]
      merged

    modified:
      CHANGES
      MySql.VisualStudio/VsPkg.cs
=== modified file 'CHANGES'
=== modified file 'CHANGES'
--- a/CHANGES	2010-06-25 21:48:06 +0000
+++ b/CHANGES	2010-06-30 20:07:18 +0000
@@ -11,6 +11,8 @@
 - added public MySqlHelper.ExecuteDataReader method that takes an external connection (bug #54570)
 - applied patch from 5.x series that reset the connection to the base encoding when doing a 
   connection reset (bug #47153)
+- fixed bug that caused the web site config wizard to not appear when working with web applications
+  as opposed to websites (bug #54571)
 
 Version 6.3.2 (beta 1)
 - added feature where sql queries that are longer than 300 chars are normalized and a new

=== modified file 'MySql.VisualStudio/VsPkg.cs'
--- a/MySql.VisualStudio/VsPkg.cs	2010-04-02 19:24:57 +0000
+++ b/MySql.VisualStudio/VsPkg.cs	2010-06-30 20:07:18 +0000
@@ -136,7 +136,7 @@
             configButton.Visible = false;
             foreach (Property prop in p.Properties)
             {
-                if (prop.Name == "WebSiteType")
+                if (prop.Name == "WebSiteType" || prop.Name.StartsWith("WebApplication"))
                 {
                     configButton.Visible = true;
                     break;


Attachment: [text/bzr-bundle] bzr/[e-mail]