bzr commit into connector-net-trunk branch (reggie.burnett:850) Bug#51407

[Reggie Burnett]

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

  850 Reggie Burnett	2010-03-08
      - fixed installer problem when .NET 1.1 was present (bug #51407)

    modified:
      MySql.Data/Provider/Source/Installer.cs
      MySql.Web/Providers/Source/Install.cs
=== modified file 'MySql.Data/Provider/Source/Installer.cs'
=== modified file 'MySql.Data/Provider/Source/Installer.cs'
--- a/MySql.Data/Provider/Source/Installer.cs	2010-02-13 04:34:16 +0000
+++ b/MySql.Data/Provider/Source/Installer.cs	2010-03-08 21:29:19 +0000
@@ -75,6 +75,10 @@
             string[] dirs = Directory.GetDirectories(rootPath);
             foreach (string frameworkDir in dirs)
             {
+                string[] pathElements = frameworkDir.Split(Path.DirectorySeparatorChar);
+                if (pathElements[pathElements.Length - 1].StartsWith("v1")) continue;
+                if (pathElements[pathElements.Length - 1].StartsWith("v3")) continue;
+
                 string configPath = String.Format(@"{0}\CONFIG", frameworkDir);
                 if (Directory.Exists(configPath))
                 {

=== modified file 'MySql.Web/Providers/Source/Install.cs'
--- a/MySql.Web/Providers/Source/Install.cs	2010-02-13 04:34:16 +0000
+++ b/MySql.Web/Providers/Source/Install.cs	2010-03-08 21:29:19 +0000
@@ -93,6 +93,10 @@
             string[] dirs = Directory.GetDirectories(rootPath);
             foreach (string frameworkDir in dirs)
             {
+                string[] pathElements = frameworkDir.Split(Path.DirectorySeparatorChar);
+                if (pathElements[pathElements.Length-1].StartsWith("v1")) continue;
+                if (pathElements[pathElements.Length - 1].StartsWith("v3")) continue;
+
                 string configPath = String.Format(@"{0}\CONFIG", frameworkDir);
                 if (Directory.Exists(configPath))
                 {


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