MySQL Lists: commits: Connector/NET commit: r693 - in trunk: . Driver Driver/Source Installer VisualStudio VisualStudio/Installer VisualStudio/Properties

List:	Commits	« Previous Message Next Message »
From:	rburnett	Date:	May 1 2007 8:07pm
Subject:	Connector/NET commit: r693 - in trunk: . Driver Driver/Source Installer VisualStudio VisualStudio/Installer VisualStudio/Properties
View as plain text
Modified:
   trunk/Driver/MySql.Data.CF.csproj
   trunk/Driver/Source/Crypt.cs
   trunk/Installer/visualstudio.wxs
   trunk/MySQLClient.sln
   trunk/VisualStudio/DataConnectionUIStub.cs
   trunk/VisualStudio/Installer/Register.reg
   trunk/VisualStudio/MySqlConnectionProperties.cs
   trunk/VisualStudio/MySqlDataConnectionPromptDialog.cs
   trunk/VisualStudio/MySqlDataProviderPackage.cs
   trunk/VisualStudio/Properties/AssemblyInfo.cs
Log:
visualstudio.wxs - Fixed codebase path
rest of files - resharper cleanups


Modified: trunk/Driver/MySql.Data.CF.csproj
===================================================================
--- trunk/Driver/MySql.Data.CF.csproj	2007-05-01 18:21:29 UTC (rev 692)
+++ trunk/Driver/MySql.Data.CF.csproj	2007-05-01 20:07:55 UTC (rev 693)
@@ -56,8 +56,10 @@
     <Compile Include="Source\base\DbException.cs" />
     <Compile Include="Source\CharSetMap.cs" />
     <Compile Include="Source\command.cs">
+      <SubType>Component</SubType>
     </Compile>
     <Compile Include="Source\CommandBuilder.cs">
+      <SubType>Component</SubType>
     </Compile>
     <Compile Include="Source\common\BufferedStream.cs" />
     <Compile Include="Source\common\ContextString.cs" />

Modified: trunk/Driver/Source/Crypt.cs
===================================================================
--- trunk/Driver/Source/Crypt.cs	2007-05-01 18:21:29 UTC (rev 692)
+++ trunk/Driver/Source/Crypt.cs	2007-05-01 20:07:55 UTC (rev 693)
@@ -19,7 +19,8 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
 using System;
-using System.IO;
+using System.Globalization;
+using System.Text;
 using MySql.Data.Common;
 //using System.Security.Cryptography;
 //#if CF
@@ -28,15 +29,15 @@
 
 namespace MySql.Data.MySqlClient
 {
-	/// <summary>
-	/// Summary description for Crypt.
-	/// </summary>
-	internal class Crypt
-	{
-		// private ctor to prevent creating a default one
-		private Crypt()
-		{
-		}
+    /// <summary>
+    /// Summary description for Crypt.
+    /// </summary>
+    internal class Crypt
+    {
+        // private ctor to prevent creating a default one
+        private Crypt()
+        {
+        }
 
 /*		private void Create41Password( string password )
 		{
@@ -61,275 +62,276 @@
 			SendPacket(packet);
 		}
 */
-		/// <summary>
-		/// Simple XOR scramble
-		/// </summary>
-		/// <param name="from">Source array</param>
-		/// <param name="fromIndex">Index inside source array</param>
-		/// <param name="to">Destination array</param>
-		/// <param name="toIndex">Index inside destination array</param>
-		/// <param name="password">Password used to xor the bits</param>
-		/// <param name="length">Number of bytes to scramble</param>
-		static void XorScramble(byte[] from, int fromIndex, byte[] to, int toIndex, 
-			byte[] password, int length) 
-		{
-			// make sure we were called properly
-			if (fromIndex < 0 || fromIndex >= from.Length)
-				throw new ArgumentException(Resources.IndexMustBeValid, "fromIndex");
-			if ((fromIndex + length) > from.Length)
-				throw new ArgumentException(Resources.FromAndLengthTooBig, "fromIndex" );
-			if (from == null) 
-				throw new ArgumentException(Resources.BufferCannotBeNull, "from");
-			if (to == null) 
-				throw new ArgumentException(Resources.BufferCannotBeNull, "to");
-			if (toIndex < 0 || toIndex >= to.Length)
-				throw new ArgumentException(Resources.IndexMustBeValid, "toIndex" );
-			if ((toIndex + length) > to.Length)
-				throw new ArgumentException(Resources.IndexAndLengthTooBig, "toIndex" );
-			if (password == null || password.Length < length) 
-				throw new ArgumentException(Resources.PasswordMustHaveLegalChars, "password");
-			if (length < 0) 
-				throw new ArgumentException(Resources.ParameterCannotBeNegative, "count");
 
-			// now perform the work
-			for (int i=0; i < length; i++)
-				to[toIndex++] = (byte)(from[fromIndex++] ^ password[i] );
-		}
+        /// <summary>
+        /// Simple XOR scramble
+        /// </summary>
+        /// <param name="from">Source array</param>
+        /// <param name="fromIndex">Index inside source array</param>
+        /// <param name="to">Destination array</param>
+        /// <param name="toIndex">Index inside destination array</param>
+        /// <param name="password">Password used to xor the bits</param>
+        /// <param name="length">Number of bytes to scramble</param>
+        private static void XorScramble(byte[] from, int fromIndex, byte[] to, int toIndex,
+                                        byte[] password, int length)
+        {
+            // make sure we were called properly
+            if (fromIndex < 0 || fromIndex >= from.Length)
+                throw new ArgumentException(Resources.IndexMustBeValid, "fromIndex");
+            if ((fromIndex + length) > from.Length)
+                throw new ArgumentException(Resources.FromAndLengthTooBig, "fromIndex");
+            if (from == null)
+                throw new ArgumentException(Resources.BufferCannotBeNull, "from");
+            if (to == null)
+                throw new ArgumentException(Resources.BufferCannotBeNull, "to");
+            if (toIndex < 0 || toIndex >= to.Length)
+                throw new ArgumentException(Resources.IndexMustBeValid, "toIndex");
+            if ((toIndex + length) > to.Length)
+                throw new ArgumentException(Resources.IndexAndLengthTooBig, "toIndex");
+            if (password == null || password.Length < length)
+                throw new ArgumentException(Resources.PasswordMustHaveLegalChars, "password");
+            if (length < 0)
+                throw new ArgumentException(Resources.ParameterCannotBeNegative, "count");
 
-		/// <summary>
-		/// Generate a scrambled password for 4.1.0 using new passwords
-		/// </summary>
-		/// <param name="password">The password to scramble</param>
-		/// <param name="seedBytes">The seedbytes used to scramble</param>
-		/// <returns>Array of bytes containing the scrambled password</returns>
-		public static byte[] Get410Password( string password, byte[] seedBytes )
-		{
-			SHA1Hash sha = new SHA1Hash();
-			//SHA1 sha = new SHA1CryptoServiceProvider(); 
+            // now perform the work
+            for (int i = 0; i < length; i++)
+                to[toIndex++] = (byte) (from[fromIndex++] ^ password[i]);
+        }
 
-			// clean it and then digest it
-			password = password.Replace(" ","").Replace("\t","");
-			byte[] passBytes = System.Text.Encoding.Default.GetBytes( password );
-			byte[] firstPass = sha.ComputeHash(passBytes);
+        /// <summary>
+        /// Generate a scrambled password for 4.1.0 using new passwords
+        /// </summary>
+        /// <param name="password">The password to scramble</param>
+        /// <param name="seedBytes">The seedbytes used to scramble</param>
+        /// <returns>Array of bytes containing the scrambled password</returns>
+        public static byte[] Get410Password(string password, byte[] seedBytes)
+        {
+            SHA1Hash sha = new SHA1Hash();
+            //SHA1 sha = new SHA1CryptoServiceProvider(); 
 
-			byte[] input = new byte[24];
-			Array.Copy(seedBytes, 0, input, 0, 4);
-			Array.Copy(firstPass, 0, input, 4, 20);
-			byte[] secondPass = sha.ComputeHash(input);
+            // clean it and then digest it
+            password = password.Replace(" ", "").Replace("\t", "");
+            byte[] passBytes = Encoding.Default.GetBytes(password);
+            byte[] firstPass = sha.ComputeHash(passBytes);
 
-			byte[] scrambledBuff = new byte[20];
-			XorScramble( seedBytes, 4, scrambledBuff, 0, secondPass, 20 );
+            byte[] input = new byte[24];
+            Array.Copy(seedBytes, 0, input, 0, 4);
+            Array.Copy(firstPass, 0, input, 4, 20);
+            byte[] secondPass = sha.ComputeHash(input);
 
-			byte[] finalBuff = new byte[20];
-			XorScramble( scrambledBuff, 0, finalBuff, 0, firstPass, 20 );
+            byte[] scrambledBuff = new byte[20];
+            XorScramble(seedBytes, 4, scrambledBuff, 0, secondPass, 20);
 
-			return finalBuff;
-		}
+            byte[] finalBuff = new byte[20];
+            XorScramble(scrambledBuff, 0, finalBuff, 0, firstPass, 20);
 
-		/// <summary>
-		/// Generates a proper hash for old style 4.1.0 passwords.  This would be used
-		/// if a 4.1.0 server contained old 16 byte hashes.
-		/// </summary>
-		/// <param name="password">The password to hash</param>
-		/// <param name="seedBytes">Seed bytes received from the server</param>
-		/// <returns>Byte array containing the password hash</returns>
-		public static byte[] GetOld410Password( string password, byte[] seedBytes )
-		{
-			long[] passwordHash = Hash(password);
-			string passHex = String.Format(System.Globalization.CultureInfo.InvariantCulture, 
-				"{0,8:X}{1,8:X}", passwordHash[0], passwordHash[1] );
+            return finalBuff;
+        }
 
-			int[] salt = getSaltFromPassword(passHex);
+        /// <summary>
+        /// Generates a proper hash for old style 4.1.0 passwords.  This would be used
+        /// if a 4.1.0 server contained old 16 byte hashes.
+        /// </summary>
+        /// <param name="password">The password to hash</param>
+        /// <param name="seedBytes">Seed bytes received from the server</param>
+        /// <returns>Byte array containing the password hash</returns>
+        public static byte[] GetOld410Password(string password, byte[] seedBytes)
+        {
+            long[] passwordHash = Hash(password);
+            string passHex = String.Format(CultureInfo.InvariantCulture,
+                                           "{0,8:X}{1,8:X}", passwordHash[0], passwordHash[1]);
 
-			// compute binary password
-			byte[] binaryPassword = new byte[20]; 
-			int offset = 0;
-			for (int i = 0; i < 2; i++) 
-			{
-				int val = salt[i];
+            int[] salt = getSaltFromPassword(passHex);
 
-				for (int t = 3; t >= 0; t--) 
-				{
-					binaryPassword[t + offset] = (byte) (val % 256);
-					val >>= 8; /* Scroll 8 bits to get next part*/
-				}
+            // compute binary password
+            byte[] binaryPassword = new byte[20];
+            int offset = 0;
+            for (int i = 0; i < 2; i++)
+            {
+                int val = salt[i];
 
-				offset += 4;
-			}
+                for (int t = 3; t >= 0; t--)
+                {
+                    binaryPassword[t + offset] = (byte) (val%256);
+                    val >>= 8; /* Scroll 8 bits to get next part*/
+                }
 
-			//SHA1 sha = new SHA1CryptoServiceProvider(); 
-			SHA1Hash sha = new SHA1Hash();
-			byte[] temp = new byte[8];
-			Buffer.BlockCopy(binaryPassword, 0, temp, 0, 8);
-			byte[] binaryHash = sha.ComputeHash(temp);
+                offset += 4;
+            }
 
-			byte[] scrambledBuff = new byte[20];
-			XorScramble(seedBytes, 4, scrambledBuff, 0, binaryHash, 20);
+            //SHA1 sha = new SHA1CryptoServiceProvider(); 
+            SHA1Hash sha = new SHA1Hash();
+            byte[] temp = new byte[8];
+            Buffer.BlockCopy(binaryPassword, 0, temp, 0, 8);
+            byte[] binaryHash = sha.ComputeHash(temp);
 
-			string scrambleString = System.Text.Encoding.Default.GetString(scrambledBuff, 0, scrambledBuff.Length).Substring(0,8);
+            byte[] scrambledBuff = new byte[20];
+            XorScramble(seedBytes, 4, scrambledBuff, 0, binaryHash, 20);
 
-			long[] hashPass = Hash(password);
-			long[] hashMessage = Hash(scrambleString);
+            string scrambleString = Encoding.Default.GetString(scrambledBuff, 0, scrambledBuff.Length).Substring(0, 8);
 
-			long max = 0x3FFFFFFFL;
-			byte[] to = new byte[20];
-			int msgPos = 0;
-			int msgLength = scrambleString.Length;
-			int toPos = 0;
-			long seed1 = (hashPass[0] ^ hashMessage[0]) % max;
-			long seed2 = (hashPass[1] ^ hashMessage[1]) % max;
+            long[] hashPass = Hash(password);
+            long[] hashMessage = Hash(scrambleString);
 
-			while (msgPos++ < msgLength) 
-				to[toPos++] = (byte) (Math.Floor(rand(ref seed1, ref seed2, max) * 31) + 64);
+            long max = 0x3FFFFFFFL;
+            byte[] to = new byte[20];
+            int msgPos = 0;
+            int msgLength = scrambleString.Length;
+            int toPos = 0;
+            long seed1 = (hashPass[0] ^ hashMessage[0])%max;
+            long seed2 = (hashPass[1] ^ hashMessage[1])%max;
 
-			/* Make it harder to break */
-			byte extra = (byte) (Math.Floor(rand(ref seed1, ref seed2, max) * 31));
+            while (msgPos++ < msgLength)
+                to[toPos++] = (byte) (Math.Floor(rand(ref seed1, ref seed2, max)*31) + 64);
 
-			for (int i = 0; i < 8; i++) 
-				to[i] ^= extra;
+            /* Make it harder to break */
+            byte extra = (byte) (Math.Floor(rand(ref seed1, ref seed2, max)*31));
 
-			return to;
-		}
+            for (int i = 0; i < 8; i++)
+                to[i] ^= extra;
 
-		/// <summary>
-		/// Returns a byte array containing the proper encryption of the 
-		/// given password/seed according to the new 4.1.1 authentication scheme.
-		/// </summary>
-		/// <param name="password"></param>
-		/// <param name="seed"></param>
-		/// <returns></returns>
-		public static byte[] Get411Password( string password, string seed )
-		{
-			// if we have no password, then we just return 1 zero byte
-			if (password.Length == 0) return new byte[1];
+            return to;
+        }
 
-			//SHA1 sha = new SHA1CryptoServiceProvider(); 
-			SHA1Hash sha = new SHA1Hash();
+        /// <summary>
+        /// Returns a byte array containing the proper encryption of the 
+        /// given password/seed according to the new 4.1.1 authentication scheme.
+        /// </summary>
+        /// <param name="password"></param>
+        /// <param name="seed"></param>
+        /// <returns></returns>
+        public static byte[] Get411Password(string password, string seed)
+        {
+            // if we have no password, then we just return 1 zero byte
+            if (password.Length == 0) return new byte[1];
 
-			byte[] firstHash = sha.ComputeHash( System.Text.Encoding.Default.GetBytes( password ) );
-			byte[] secondHash = sha.ComputeHash( firstHash );
-			byte[] seedBytes = System.Text.Encoding.Default.GetBytes( seed );
+            //SHA1 sha = new SHA1CryptoServiceProvider(); 
+            SHA1Hash sha = new SHA1Hash();
 
-			byte[] input = new byte[seedBytes.Length+secondHash.Length];
-			Array.Copy(seedBytes, 0, input, 0, seedBytes.Length);
-			Array.Copy(secondHash, 0, input, seedBytes.Length, secondHash.Length);
-			byte[] thirdHash = sha.ComputeHash(input);			
+            byte[] firstHash = sha.ComputeHash(Encoding.Default.GetBytes(password));
+            byte[] secondHash = sha.ComputeHash(firstHash);
+            byte[] seedBytes = Encoding.Default.GetBytes(seed);
 
-			byte[] finalHash = new byte[thirdHash.Length + 1];
-			finalHash[0] = 0x14;
-			Array.Copy(thirdHash, 0, finalHash, 1, thirdHash.Length);
+            byte[] input = new byte[seedBytes.Length + secondHash.Length];
+            Array.Copy(seedBytes, 0, input, 0, seedBytes.Length);
+            Array.Copy(secondHash, 0, input, seedBytes.Length, secondHash.Length);
+            byte[] thirdHash = sha.ComputeHash(input);
 
-			for (int i=1; i < finalHash.Length; i++)
-				finalHash[i] = (byte)(finalHash[i] ^ firstHash[i-1]);
-			return finalHash;
-		}
+            byte[] finalHash = new byte[thirdHash.Length + 1];
+            finalHash[0] = 0x14;
+            Array.Copy(thirdHash, 0, finalHash, 1, thirdHash.Length);
 
-		private static int[] getSaltFromPassword(String password) 
-		{
-			int[] result = new int[6];
+            for (int i = 1; i < finalHash.Length; i++)
+                finalHash[i] = (byte) (finalHash[i] ^ firstHash[i - 1]);
+            return finalHash;
+        }
 
-			if (password == null || password.Length == 0)
-				return result;
+        private static int[] getSaltFromPassword(String password)
+        {
+            int[] result = new int[6];
 
-			int resultPos = 0; 
-			int pos = 0;
+            if (password == null || password.Length == 0)
+                return result;
 
-			while (pos < password.Length)
-			{
-				int val = 0;
+            int resultPos = 0;
+            int pos = 0;
 
-				for (int i = 0; i < 8; i++) 
-					val = (val << 4) +  HexValue( password[pos++] );
+            while (pos < password.Length)
+            {
+                int val = 0;
 
-				result[resultPos++] = val;
-			}
+                for (int i = 0; i < 8; i++)
+                    val = (val << 4) + HexValue(password[pos++]);
 
-			return result;
-		}
+                result[resultPos++] = val;
+            }
 
-		private static int HexValue( char c )
-		{
-			if (c >= 'A' && c <= 'Z') return (c - 'A') + 10;
-			if (c >= 'a' && c <= 'z') return (c - 'a') + 10;
-			return c - '0';
-		}
+            return result;
+        }
 
+        private static int HexValue(char c)
+        {
+            if (c >= 'A' && c <= 'Z') return (c - 'A') + 10;
+            if (c >= 'a' && c <= 'z') return (c - 'a') + 10;
+            return c - '0';
+        }
 
-		private static double rand(ref long seed1, ref long seed2, long max)
-		{
-			seed1 = (seed1 * 3) + seed2;
-			seed1 %= max;
-			seed2 = (seed1 + seed2 + 33) % max;
-			return (seed1 / (double)max);
-		}
 
-		/// <summary>
-		/// Encrypts a password using the MySql encryption scheme
-		/// </summary>
-		/// <param name="password">The password to encrypt</param>
-		/// <param name="seed">The encryption seed the server gave us</param>
-		/// <param name="new_ver">Indicates if we should use the old or new encryption scheme</param>
-		/// <returns></returns>
-		public static String EncryptPassword(String password, String seed, bool new_ver)
-		{
-			long max = 0x3fffffff;
-			if (! new_ver)
-				max = 0x01FFFFFF;
-			if (password == null || password.Length == 0)
-				return password;
+        private static double rand(ref long seed1, ref long seed2, long max)
+        {
+            seed1 = (seed1*3) + seed2;
+            seed1 %= max;
+            seed2 = (seed1 + seed2 + 33)%max;
+            return (seed1/(double) max);
+        }
 
-			long[] hash_seed = Hash(seed);
-			long[] hash_pass = Hash(password);
+        /// <summary>
+        /// Encrypts a password using the MySql encryption scheme
+        /// </summary>
+        /// <param name="password">The password to encrypt</param>
+        /// <param name="seed">The encryption seed the server gave us</param>
+        /// <param name="new_ver">Indicates if we should use the old or new encryption scheme</param>
+        /// <returns></returns>
+        public static String EncryptPassword(String password, String seed, bool new_ver)
+        {
+            long max = 0x3fffffff;
+            if (! new_ver)
+                max = 0x01FFFFFF;
+            if (password == null || password.Length == 0)
+                return password;
 
-			long seed1 = (hash_seed[0]^hash_pass[0]) % max;
-			long seed2 = (hash_seed[1]^hash_pass[1]) % max;
-			if (! new_ver)
-				seed2 = seed1 / 2;
+            long[] hash_seed = Hash(seed);
+            long[] hash_pass = Hash(password);
 
-			char[] scrambled = new char[seed.Length];
-			for (int x=0; x < seed.Length; x++) 
-			{
-				double r = rand(ref seed1, ref seed2, max);
-				scrambled[x] = (char)(Math.Floor(r*31) + 64);
-			}
+            long seed1 = (hash_seed[0] ^ hash_pass[0])%max;
+            long seed2 = (hash_seed[1] ^ hash_pass[1])%max;
+            if (! new_ver)
+                seed2 = seed1/2;
 
-			if (new_ver)
-			{						/* Make it harder to break */
-				char extra = (char)Math.Floor( rand(ref seed1, ref seed2, max) * 31 );
-				for (int x=0; x < scrambled.Length; x++)
-					scrambled[x] ^= extra;
-			}
+            char[] scrambled = new char[seed.Length];
+            for (int x = 0; x < seed.Length; x++)
+            {
+                double r = rand(ref seed1, ref seed2, max);
+                scrambled[x] = (char) (Math.Floor(r*31) + 64);
+            }
 
-			return new string(scrambled);
-		}
+            if (new_ver)
+            {
+                /* Make it harder to break */
+                char extra = (char) Math.Floor(rand(ref seed1, ref seed2, max)*31);
+                for (int x = 0; x < scrambled.Length; x++)
+                    scrambled[x] ^= extra;
+            }
 
-		/// <summary>
-		/// Hashes a password using the algorithm from Monty's code.
-		/// The first element in the return is the result of the "old" hash.
-		/// The second element is the rest of the "new" hash.
-		/// </summary>
-		/// <param name="P">Password to be hashed</param>
-		/// <returns>Two element array containing the hashed values</returns>
-		static long[] Hash(String P) 
-		{
-			long val1 = 1345345333;
-			long val2 = 0x12345671;
-			long inc  = 7;
+            return new string(scrambled);
+        }
 
-			for (int i=0; i < P.Length; i++) 
-			{
-				if (P[i] == ' ' || P[i] == '\t') continue;
-				long temp = (long)(0xff & P[i]);
-				val1 ^= (((val1 & 63)+inc)*temp) + (val1 << 8);
-				val2 += (val2 << 8) ^ val1;
-				inc += temp;
-			}
+        /// <summary>
+        /// Hashes a password using the algorithm from Monty's code.
+        /// The first element in the return is the result of the "old" hash.
+        /// The second element is the rest of the "new" hash.
+        /// </summary>
+        /// <param name="P">Password to be hashed</param>
+        /// <returns>Two element array containing the hashed values</returns>
+        private static long[] Hash(String P)
+        {
+            long val1 = 1345345333;
+            long val2 = 0x12345671;
+            long inc = 7;
 
-			long[] hash = new long[2];
-			hash[0] = val1 & 0x7fffffff;
-			hash[1] = val2 & 0x7fffffff;
-			return hash;
-		}
+            for (int i = 0; i < P.Length; i++)
+            {
+                if (P[i] == ' ' || P[i] == '\t') continue;
+                long temp = (0xff & P[i]);
+                val1 ^= (((val1 & 63) + inc)*temp) + (val1 << 8);
+                val2 += (val2 << 8) ^ val1;
+                inc += temp;
+            }
 
-	}
-}
+            long[] hash = new long[2];
+            hash[0] = val1 & 0x7fffffff;
+            hash[1] = val2 & 0x7fffffff;
+            return hash;
+        }
+    }
+}
\ No newline at end of file

Modified: trunk/Installer/visualstudio.wxs
===================================================================
--- trunk/Installer/visualstudio.wxs	2007-05-01 18:21:29 UTC (rev 692)
+++ trunk/Installer/visualstudio.wxs	2007-05-01 20:07:55 UTC (rev 693)
@@ -74,7 +74,7 @@
             <RegistryValue Id='PackagesDefault' Value='[ProductName]' Type='string'/>
             <RegistryValue Id='PackInProc' Name='InprocServer32' Value='[WindowsFolder]system32\mscoree.dll' Type='string'/>
             <RegistryValue Id='PackClass' Name='Class' Value='MySql.Data.VisualStudio.MySqlDataProviderPackage' Type='string'/>
-            <RegistryValue Id='PackCodeBase' Name='CodeBase' Value='[INSTALLDIR]MySql.VisualStudio.dll' Type='string'/>
+            <RegistryValue Id='PackCodeBase' Name='CodeBase' Value='[INSTALLDIR]\Visual Studio Integration\MySql.VisualStudio.dll' Type='string'/>
             <RegistryValue Id='PackProdName' Name='ProductName' Value='MySQL Tools for Visual Studio' Type='string'/>
             <RegistryValue Id='PackVer' Name='ProductVersion' Value='1.1' Type='string'/>
             <RegistryValue Id='PackComp' Name='CompanyName' Value='MySQL AB c/o MySQL, Inc.' Type='string'/>

Modified: trunk/MySQLClient.sln
===================================================================
--- trunk/MySQLClient.sln	2007-05-01 18:21:29 UTC (rev 692)
+++ trunk/MySQLClient.sln	2007-05-01 20:07:55 UTC (rev 693)
@@ -1,40 +1,35 @@
+
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Web", "MySql.Web\MySql.Web.csproj", "{C28B1166-1380-445D-AEC1-8A18B990DD18}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data", "Driver\MySql.Data.csproj", "{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data", "Driver\MySql.Data.csproj", "{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.VisualStudio", "VisualStudio\MySql.VisualStudio.csproj", "{DC3517FF-AC26-4755-9B7A-EF658FF69593}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Tests", "TestSuite\MySql.Data.Tests.csproj", "{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Web", "MySql.Web\MySql.Web.csproj", "{C28B1166-1380-445D-AEC1-8A18B990DD18}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.VisualStudio", "VisualStudio\MySql.VisualStudio.csproj", "{DC3517FF-AC26-4755-9B7A-EF658FF69593}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Tests", "TestSuite\MySql.Data.Tests.csproj", "{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{F533FC43-6C05-4A64-8AF6-72B690EB06C3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Tests.CF", "TestSuite\MySql.Data.Tests.CF.csproj", "{710D9251-17A3-4429-9A91-63F03267F310}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-	ProjectSection(ProjectDependencies) = postProject
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4} = {F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}
-		{C28B1166-1380-445D-AEC1-8A18B990DD18} = {C28B1166-1380-445D-AEC1-8A18B990DD18}
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D} = {E9DF5ED1-4CBD-4226-B931-9A51610AC14D}
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593} = {DC3517FF-AC26-4755-9B7A-EF658FF69593}
-	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.CF", "Driver\MySql.Data.CF.csproj", "{587A47FB-C1CC-459D-93B6-179D95E41EFB}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -42,579 +37,183 @@
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Tests.CF", "TestSuite\MySql.Data.Tests.CF.csproj", "{710D9251-17A3-4429-9A91-63F03267F310}"
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{F533FC43-6C05-4A64-8AF6-72B690EB06C3}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
 Global
-	GlobalSection(TestCaseManagementSettings) = postSolution
-		CategoryFile = MySQLClient.2005.vsmdi
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Commercial|.NET 1.0 = Commercial|.NET 1.0
-		Commercial|.NET 1.1 = Commercial|.NET 1.1
-		Commercial|.NET 1.1 (Mono Libraries) = Commercial|.NET 1.1 (Mono Libraries)
 		Commercial|.NET 2.0 = Commercial|.NET 2.0
-		Commercial|.NET 2.0 (Mono Libraries) = Commercial|.NET 2.0 (Mono Libraries)
-		Commercial|.NET CF 1.0 (Pocket PC 2003) = Commercial|.NET CF 1.0 (Pocket PC 2003)
-		Commercial|.NET CF 1.0 (Smartphone 2003) = Commercial|.NET CF 1.0 (Smartphone 2003)
-		Commercial|.NET CF 2.0 (Pocket PC 2003) = Commercial|.NET CF 2.0 (Pocket PC 2003)
-		Commercial|.NET CF 2.0 (Windows CE 5.0) = Commercial|.NET CF 2.0 (Windows CE 5.0)
 		Commercial|Any CPU = Commercial|Any CPU
-		Commercial|Build All 2.0 Platforms Simultaneously = Commercial|Build All 2.0 Platforms Simultaneously
-		Commercial|Build All Platforms Simultaneously = Commercial|Build All Platforms Simultaneously
 		Commercial|x64 = Commercial|x64
 		Commercial|x86 = Commercial|x86
-		Debug|.NET 1.0 = Debug|.NET 1.0
-		Debug|.NET 1.1 = Debug|.NET 1.1
-		Debug|.NET 1.1 (Mono Libraries) = Debug|.NET 1.1 (Mono Libraries)
 		Debug|.NET 2.0 = Debug|.NET 2.0
-		Debug|.NET 2.0 (Mono Libraries) = Debug|.NET 2.0 (Mono Libraries)
-		Debug|.NET CF 1.0 (Pocket PC 2003) = Debug|.NET CF 1.0 (Pocket PC 2003)
-		Debug|.NET CF 1.0 (Smartphone 2003) = Debug|.NET CF 1.0 (Smartphone 2003)
-		Debug|.NET CF 2.0 (Pocket PC 2003) = Debug|.NET CF 2.0 (Pocket PC 2003)
-		Debug|.NET CF 2.0 (Windows CE 5.0) = Debug|.NET CF 2.0 (Windows CE 5.0)
 		Debug|Any CPU = Debug|Any CPU
-		Debug|Build All 2.0 Platforms Simultaneously = Debug|Build All 2.0 Platforms Simultaneously
-		Debug|Build All Platforms Simultaneously = Debug|Build All Platforms Simultaneously
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		GPL|.NET 1.0 = GPL|.NET 1.0
-		GPL|.NET 1.1 = GPL|.NET 1.1
-		GPL|.NET 1.1 (Mono Libraries) = GPL|.NET 1.1 (Mono Libraries)
 		GPL|.NET 2.0 = GPL|.NET 2.0
-		GPL|.NET 2.0 (Mono Libraries) = GPL|.NET 2.0 (Mono Libraries)
-		GPL|.NET CF 1.0 (Pocket PC 2003) = GPL|.NET CF 1.0 (Pocket PC 2003)
-		GPL|.NET CF 1.0 (Smartphone 2003) = GPL|.NET CF 1.0 (Smartphone 2003)
-		GPL|.NET CF 2.0 (Pocket PC 2003) = GPL|.NET CF 2.0 (Pocket PC 2003)
-		GPL|.NET CF 2.0 (Windows CE 5.0) = GPL|.NET CF 2.0 (Windows CE 5.0)
 		GPL|Any CPU = GPL|Any CPU
-		GPL|Build All 2.0 Platforms Simultaneously = GPL|Build All 2.0 Platforms Simultaneously
-		GPL|Build All Platforms Simultaneously = GPL|Build All Platforms Simultaneously
 		GPL|x64 = GPL|x64
 		GPL|x86 = GPL|x86
-		Release|.NET 1.0 = Release|.NET 1.0
-		Release|.NET 1.1 = Release|.NET 1.1
-		Release|.NET 1.1 (Mono Libraries) = Release|.NET 1.1 (Mono Libraries)
 		Release|.NET 2.0 = Release|.NET 2.0
-		Release|.NET 2.0 (Mono Libraries) = Release|.NET 2.0 (Mono Libraries)
-		Release|.NET CF 1.0 (Pocket PC 2003) = Release|.NET CF 1.0 (Pocket PC 2003)
-		Release|.NET CF 1.0 (Smartphone 2003) = Release|.NET CF 1.0 (Smartphone 2003)
-		Release|.NET CF 2.0 (Pocket PC 2003) = Release|.NET CF 2.0 (Pocket PC 2003)
-		Release|.NET CF 2.0 (Windows CE 5.0) = Release|.NET CF 2.0 (Windows CE 5.0)
 		Release|Any CPU = Release|Any CPU
-		Release|Build All 2.0 Platforms Simultaneously = Release|Build All 2.0 Platforms Simultaneously
-		Release|Build All Platforms Simultaneously = Release|Build All Platforms Simultaneously
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|.NET 1.0.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|.NET 1.1.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|.NET 1.1 (Mono Libraries).ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|.NET 2.0.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|.NET 2.0 (Mono Libraries).ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|Any CPU.Build.0 = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|Build All 2.0 Platforms Simultaneously.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|Build All Platforms Simultaneously.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|x64.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|x86.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|.NET 1.0.ActiveCfg = Debug|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|.NET 1.1 (Mono Libraries).ActiveCfg = Debug|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|.NET 2.0.ActiveCfg = Debug|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|.NET 2.0.Build.0 = Debug|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|.NET 2.0 (Mono Libraries).ActiveCfg = Debug|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Debug|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Debug|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Debug|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Debug|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|Build All 2.0 Platforms Simultaneously.ActiveCfg = Debug|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|Build All Platforms Simultaneously.ActiveCfg = Debug|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|.NET 1.0.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|.NET 1.1.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|.NET 1.1 (Mono Libraries).ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|.NET 2.0.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|.NET 2.0.Build.0 = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|.NET 2.0 (Mono Libraries).ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|Any CPU.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|Any CPU.Build.0 = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|Build All 2.0 Platforms Simultaneously.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|Build All Platforms Simultaneously.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|x64.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|x86.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|.NET 1.0.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|.NET 1.1.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|.NET 1.1 (Mono Libraries).ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|.NET 2.0.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|.NET 2.0.Build.0 = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|.NET 2.0 (Mono Libraries).ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|Build All 2.0 Platforms Simultaneously.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|Build All Platforms Simultaneously.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|x64.ActiveCfg = Release|Any CPU
-		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|x86.ActiveCfg = Release|Any CPU
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|.NET 1.0.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|.NET 1.1.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|.NET 1.1 (Mono Libraries).ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|.NET 2.0.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|.NET 2.0 (Mono Libraries).ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|Any CPU.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|Any CPU.Build.0 = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|Build All 2.0 Platforms Simultaneously.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|Build All 2.0 Platforms Simultaneously.Build.0 = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|Build All Platforms Simultaneously.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|x64.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|x86.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|.NET 1.0.ActiveCfg = Debug|.NET 1.0
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|.NET 1.0.Build.0 = Debug|.NET 1.0
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|.NET 1.1.ActiveCfg = Debug|.NET 1.1
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|.NET 1.1.Build.0 = Debug|.NET 1.1
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|.NET 1.1 (Mono Libraries).ActiveCfg = Debug|.NET 1.1 (Mono Libraries)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|.NET 1.1 (Mono Libraries).Build.0 = Debug|.NET 1.1 (Mono Libraries)
+		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|.NET 2.0.ActiveCfg = Release|.NET 2.0
+		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|.NET 2.0.Build.0 = Release|.NET 2.0
+		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
+		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|Any CPU.Build.0 = Release|Any CPU
+		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|x64.ActiveCfg = Release|.NET 2.0
+		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Commercial|x86.ActiveCfg = Release|.NET 2.0
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|.NET 2.0.ActiveCfg = Debug|Any CPU
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|.NET 2.0.Build.0 = Debug|Any CPU
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|.NET 2.0 (Mono Libraries).ActiveCfg = Debug|.NET 2.0 (Mono Libraries)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|.NET 2.0 (Mono Libraries).Build.0 = Debug|.NET 2.0 (Mono Libraries)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Debug|.NET CF 1.0 (Pocket PC 2003)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|.NET CF 1.0 (Pocket PC 2003).Build.0 = Debug|.NET CF 1.0 (Pocket PC 2003)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Debug|.NET CF 1.0 (Smartphone 2003)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|.NET CF 1.0 (Smartphone 2003).Build.0 = Debug|.NET CF 1.0 (Smartphone 2003)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Debug|.NET CF 2.0 (Pocket PC 2003)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|.NET CF 2.0 (Pocket PC 2003).Build.0 = Debug|.NET CF 2.0 (Pocket PC 2003)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Debug|.NET CF 2.0 (Windows CE 5.0)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|.NET CF 2.0 (Windows CE 5.0).Build.0 = Debug|.NET CF 2.0 (Windows CE 5.0)
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|Build All 2.0 Platforms Simultaneously.ActiveCfg = Debug|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|Build All 2.0 Platforms Simultaneously.Build.0 = Debug|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|Build All Platforms Simultaneously.ActiveCfg = Debug|Build All Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|Build All Platforms Simultaneously.Build.0 = Debug|Build All Platforms Simultaneously
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|x64.ActiveCfg = Debug|x86
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|x86.ActiveCfg = Debug|x86
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Debug|x86.Build.0 = Debug|x86
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET 1.0.ActiveCfg = Release|.NET 1.0
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET 1.0.Build.0 = Release|.NET 1.0
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET 1.1.ActiveCfg = Release|.NET 1.1
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET 1.1.Build.0 = Release|.NET 1.1
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET 1.1 (Mono Libraries).ActiveCfg = Release|.NET 1.1 (Mono Libraries)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET 1.1 (Mono Libraries).Build.0 = Release|.NET 1.1 (Mono Libraries)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET 2.0.ActiveCfg = Release|Any CPU
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET 2.0.Build.0 = Release|Any CPU
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET 2.0 (Mono Libraries).ActiveCfg = Release|.NET 2.0 (Mono Libraries)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET 2.0 (Mono Libraries).Build.0 = Release|.NET 2.0 (Mono Libraries)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Release|.NET CF 1.0 (Pocket PC 2003)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET CF 1.0 (Pocket PC 2003).Build.0 = Release|.NET CF 1.0 (Pocket PC 2003)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Release|.NET CF 1.0 (Smartphone 2003)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET CF 1.0 (Smartphone 2003).Build.0 = Release|.NET CF 1.0 (Smartphone 2003)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Release|.NET CF 2.0 (Pocket PC 2003)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET CF 2.0 (Pocket PC 2003).Build.0 = Release|.NET CF 2.0 (Pocket PC 2003)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Release|.NET CF 2.0 (Windows CE 5.0)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET CF 2.0 (Windows CE 5.0).Build.0 = Release|.NET CF 2.0 (Windows CE 5.0)
+		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET 2.0.ActiveCfg = Release|.NET 2.0
+		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|.NET 2.0.Build.0 = Release|.NET 2.0
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|Any CPU.ActiveCfg = Release|Any CPU
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|Any CPU.Build.0 = Release|Any CPU
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|Build All 2.0 Platforms Simultaneously.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|Build All 2.0 Platforms Simultaneously.Build.0 = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|Build All Platforms Simultaneously.ActiveCfg = Release|Build All Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|Build All Platforms Simultaneously.Build.0 = Release|Build All Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|x64.ActiveCfg = Release|x86
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|x86.ActiveCfg = Release|x86
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|x86.Build.0 = Release|x86
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|.NET 1.0.ActiveCfg = Release|.NET 1.0
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|.NET 1.0.Build.0 = Release|.NET 1.0
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|.NET 1.1.ActiveCfg = Release|.NET 1.1
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|.NET 1.1.Build.0 = Release|.NET 1.1
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|.NET 1.1 (Mono Libraries).ActiveCfg = Release|.NET 1.1 (Mono Libraries)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|.NET 1.1 (Mono Libraries).Build.0 = Release|.NET 1.1 (Mono Libraries)
+		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|x64.ActiveCfg = Release|.NET 2.0
+		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.GPL|x86.ActiveCfg = Release|.NET 2.0
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|.NET 2.0.ActiveCfg = Release|.NET 2.0
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|.NET 2.0.Build.0 = Release|.NET 2.0
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|.NET 2.0 (Mono Libraries).ActiveCfg = Release|.NET 2.0 (Mono Libraries)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|.NET 2.0 (Mono Libraries).Build.0 = Release|.NET 2.0 (Mono Libraries)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Release|.NET CF 1.0 (Pocket PC 2003)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|.NET CF 1.0 (Pocket PC 2003).Build.0 = Release|.NET CF 1.0 (Pocket PC 2003)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Release|.NET CF 1.0 (Smartphone 2003)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|.NET CF 1.0 (Smartphone 2003).Build.0 = Release|.NET CF 1.0 (Smartphone 2003)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Release|.NET CF 2.0 (Pocket PC 2003)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|.NET CF 2.0 (Pocket PC 2003).Build.0 = Release|.NET CF 2.0 (Pocket PC 2003)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Release|.NET CF 2.0 (Windows CE 5.0)
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|.NET CF 2.0 (Windows CE 5.0).Build.0 = Release|.NET CF 2.0 (Windows CE 5.0)
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|Build All 2.0 Platforms Simultaneously.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|Build All 2.0 Platforms Simultaneously.Build.0 = Release|Build All 2.0 Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|Build All Platforms Simultaneously.ActiveCfg = Release|Build All Platforms Simultaneously
-		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|Build All Platforms Simultaneously.Build.0 = Release|Build All Platforms Simultaneously
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|x64.ActiveCfg = Release|x86
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|x86.ActiveCfg = Release|x86
 		{E9DF5ED1-4CBD-4226-B931-9A51610AC14D}.Release|x86.Build.0 = Release|x86
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|.NET 1.0.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|.NET 1.1.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|.NET 1.1 (Mono Libraries).ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|.NET 2.0.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|.NET 2.0 (Mono Libraries).ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|Any CPU.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|Any CPU.Build.0 = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|Build All 2.0 Platforms Simultaneously.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|Build All 2.0 Platforms Simultaneously.Build.0 = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|Build All Platforms Simultaneously.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|x64.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|x86.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|.NET 1.0.ActiveCfg = Debug|.NET 1.0
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|.NET 1.0.Build.0 = Debug|.NET 1.0
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|.NET 1.1.ActiveCfg = Debug|.NET 1.1
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|.NET 1.1.Build.0 = Debug|.NET 1.1
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|.NET 1.1 (Mono Libraries).ActiveCfg = Debug|.NET 1.1 (Mono Libraries)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|.NET 1.1 (Mono Libraries).Build.0 = Debug|.NET 1.1 (Mono Libraries)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|.NET 2.0.ActiveCfg = Debug|Any CPU
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|.NET 2.0.Build.0 = Debug|Any CPU
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|.NET 2.0 (Mono Libraries).ActiveCfg = Debug|.NET 2.0 (Mono Libraries)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|.NET 2.0 (Mono Libraries).Build.0 = Debug|.NET 2.0 (Mono Libraries)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Debug|Any CPU
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Debug|.NET CF 1.0 (Smartphone 2003)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|.NET CF 1.0 (Smartphone 2003).Build.0 = Debug|.NET CF 1.0 (Smartphone 2003)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Debug|.NET CF 2.0 (Pocket PC 2003)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Debug|.NET CF 2.0 (Windows CE 5.0)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|.NET CF 2.0 (Windows CE 5.0).Build.0 = Debug|.NET CF 2.0 (Windows CE 5.0)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|Build All 2.0 Platforms Simultaneously.ActiveCfg = Debug|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|Build All 2.0 Platforms Simultaneously.Build.0 = Debug|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|Build All Platforms Simultaneously.ActiveCfg = Debug|Build All Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|Build All Platforms Simultaneously.Build.0 = Debug|Build All Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|x64.ActiveCfg = Debug|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|x86.ActiveCfg = Debug|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|.NET 1.0.ActiveCfg = Release|.NET 1.0
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|.NET 1.0.Build.0 = Release|.NET 1.0
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|.NET 1.1.ActiveCfg = Release|.NET 1.1
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|.NET 1.1.Build.0 = Release|.NET 1.1
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|.NET 1.1 (Mono Libraries).ActiveCfg = Release|.NET 1.1 (Mono Libraries)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|.NET 1.1 (Mono Libraries).Build.0 = Release|.NET 1.1 (Mono Libraries)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|.NET 2.0.ActiveCfg = Release|Any CPU
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|.NET 2.0.Build.0 = Release|Any CPU
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|.NET 2.0 (Mono Libraries).ActiveCfg = Release|.NET 2.0 (Mono Libraries)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|.NET 2.0 (Mono Libraries).Build.0 = Release|.NET 2.0 (Mono Libraries)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Release|.NET CF 1.0 (Pocket PC 2003)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|.NET CF 1.0 (Pocket PC 2003).Build.0 = Release|.NET CF 1.0 (Pocket PC 2003)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Release|.NET CF 1.0 (Smartphone 2003)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|.NET CF 1.0 (Smartphone 2003).Build.0 = Release|.NET CF 1.0 (Smartphone 2003)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Release|.NET CF 2.0 (Pocket PC 2003)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|.NET CF 2.0 (Pocket PC 2003).Build.0 = Release|.NET CF 2.0 (Pocket PC 2003)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Release|.NET CF 2.0 (Windows CE 5.0)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|.NET CF 2.0 (Windows CE 5.0).Build.0 = Release|.NET CF 2.0 (Windows CE 5.0)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|Any CPU.ActiveCfg = Release|Any CPU
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|Any CPU.Build.0 = Release|Any CPU
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|Build All 2.0 Platforms Simultaneously.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|Build All 2.0 Platforms Simultaneously.Build.0 = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|Build All Platforms Simultaneously.ActiveCfg = Release|Build All Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|Build All Platforms Simultaneously.Build.0 = Release|Build All Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|x64.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|x86.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|.NET 1.0.ActiveCfg = Release|.NET 1.0
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|.NET 1.0.Build.0 = Release|.NET 1.0
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|.NET 1.1.ActiveCfg = Release|.NET 1.1
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|.NET 1.1.Build.0 = Release|.NET 1.1
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|.NET 1.1 (Mono Libraries).ActiveCfg = Release|.NET 1.1 (Mono Libraries)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|.NET 1.1 (Mono Libraries).Build.0 = Release|.NET 1.1 (Mono Libraries)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|.NET 2.0.ActiveCfg = Release|.NET 2.0
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|.NET 2.0.Build.0 = Release|.NET 2.0
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|.NET 2.0 (Mono Libraries).ActiveCfg = Release|.NET 2.0 (Mono Libraries)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|.NET 2.0 (Mono Libraries).Build.0 = Release|.NET 2.0 (Mono Libraries)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Release|.NET CF 1.0 (Pocket PC 2003)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|.NET CF 1.0 (Pocket PC 2003).Build.0 = Release|.NET CF 1.0 (Pocket PC 2003)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Release|.NET CF 1.0 (Smartphone 2003)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|.NET CF 1.0 (Smartphone 2003).Build.0 = Release|.NET CF 1.0 (Smartphone 2003)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Release|.NET CF 2.0 (Pocket PC 2003)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|.NET CF 2.0 (Pocket PC 2003).Build.0 = Release|.NET CF 2.0 (Pocket PC 2003)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Release|.NET CF 2.0 (Windows CE 5.0)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|.NET CF 2.0 (Windows CE 5.0).Build.0 = Release|.NET CF 2.0 (Windows CE 5.0)
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|Build All 2.0 Platforms Simultaneously.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|Build All 2.0 Platforms Simultaneously.Build.0 = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|Build All Platforms Simultaneously.ActiveCfg = Release|Build All Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|Build All Platforms Simultaneously.Build.0 = Release|Build All Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|x64.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|x86.ActiveCfg = Release|Build All 2.0 Platforms Simultaneously
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|.NET 1.0.ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|.NET 1.1.ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|.NET 1.1 (Mono Libraries).ActiveCfg = Release|x64
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|.NET 2.0.ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|.NET 2.0 (Mono Libraries).ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Any CPU.ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Any CPU.Build.0 = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Build All 2.0 Platforms Simultaneously.ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Build All Platforms Simultaneously.ActiveCfg = Release|x64
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Any CPU.Build.0 = Release|Any CPU
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|x64.ActiveCfg = Release|x64
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|x64.Build.0 = Release|x64
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|x86.ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|.NET 1.0.ActiveCfg = Debug|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|.NET 1.1.ActiveCfg = Debug|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|.NET 1.1 (Mono Libraries).ActiveCfg = Debug|x64
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|.NET 2.0.ActiveCfg = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|.NET 2.0.Build.0 = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|.NET 2.0 (Mono Libraries).ActiveCfg = Debug|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Debug|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Debug|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Debug|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Debug|x64
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Build All 2.0 Platforms Simultaneously.ActiveCfg = Debug|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Build All Platforms Simultaneously.ActiveCfg = Debug|x64
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|x64.ActiveCfg = Debug|x64
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|x64.Build.0 = Debug|x64
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|x86.ActiveCfg = Debug|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|.NET 1.0.ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|.NET 1.1.ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|.NET 1.1 (Mono Libraries).ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|.NET 2.0.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|.NET 2.0.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|.NET 2.0 (Mono Libraries).ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Release|x64
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|.NET 2.0.ActiveCfg = Release|x64
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Any CPU.ActiveCfg = Release|Any CPU
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Any CPU.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Build All 2.0 Platforms Simultaneously.ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Build All Platforms Simultaneously.ActiveCfg = Release|x64
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|x64.ActiveCfg = Release|x64
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|x64.Build.0 = Release|x64
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|x86.ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|.NET 1.0.ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|.NET 1.1.ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|.NET 1.1 (Mono Libraries).ActiveCfg = Release|x64
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|.NET 2.0.ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|.NET 2.0.Build.0 = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|.NET 2.0 (Mono Libraries).ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Release|x64
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Build All 2.0 Platforms Simultaneously.ActiveCfg = Release|x64
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Build All Platforms Simultaneously.ActiveCfg = Release|x64
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x64.ActiveCfg = Release|x64
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x64.Build.0 = Release|x64
 		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x86.ActiveCfg = Release|x64
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|.NET 1.0.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|.NET 1.1.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|.NET 1.1 (Mono Libraries).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|.NET 2.0.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|.NET 2.0 (Mono Libraries).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.Build.0 = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Build All 2.0 Platforms Simultaneously.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Build All Platforms Simultaneously.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x64.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x86.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|.NET 1.0.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|.NET 1.1.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|.NET 1.1 (Mono Libraries).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|.NET 2.0.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|.NET 2.0 (Mono Libraries).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|Any CPU.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|Build All 2.0 Platforms Simultaneously.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|Build All Platforms Simultaneously.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|x64.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|x86.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|.NET 1.0.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|.NET 1.1.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|.NET 1.1 (Mono Libraries).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|.NET 2.0.ActiveCfg = GPL|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|.NET 2.0.Build.0 = GPL|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|.NET 2.0 (Mono Libraries).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Any CPU.ActiveCfg = GPL|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Any CPU.Build.0 = GPL|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Build All 2.0 Platforms Simultaneously.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Build All Platforms Simultaneously.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|x64.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|x86.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|.NET 1.0.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|.NET 1.1.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|.NET 1.1 (Mono Libraries).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|.NET 2.0.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|.NET 2.0 (Mono Libraries).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|Any CPU.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|Build All 2.0 Platforms Simultaneously.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|Build All Platforms Simultaneously.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|x64.ActiveCfg = Commercial|Any CPU
-		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|x86.ActiveCfg = Commercial|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|.NET 1.0.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|.NET 1.1.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|.NET 1.1 (Mono Libraries).ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|.NET 2.0.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|.NET 2.0 (Mono Libraries).ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|Any CPU.Build.0 = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|Build All 2.0 Platforms Simultaneously.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|Build All Platforms Simultaneously.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|x64.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|x86.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|.NET 1.0.ActiveCfg = Debug|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|.NET 1.1 (Mono Libraries).ActiveCfg = Debug|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|.NET 2.0.ActiveCfg = Debug|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|.NET 2.0.Build.0 = Debug|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|.NET 2.0 (Mono Libraries).ActiveCfg = Debug|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Debug|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Debug|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Debug|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Debug|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|Build All 2.0 Platforms Simultaneously.ActiveCfg = Debug|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|Build All Platforms Simultaneously.ActiveCfg = Debug|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|.NET 1.0.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|.NET 1.1.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|.NET 1.1 (Mono Libraries).ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|.NET 2.0.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|.NET 2.0.Build.0 = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|.NET 2.0 (Mono Libraries).ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|Any CPU.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|Any CPU.Build.0 = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|Build All 2.0 Platforms Simultaneously.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|Build All Platforms Simultaneously.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|x64.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|x86.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|.NET 1.0.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|.NET 1.1.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|.NET 1.1 (Mono Libraries).ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|.NET 2.0.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|.NET 2.0.Build.0 = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|.NET 2.0 (Mono Libraries).ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|Build All 2.0 Platforms Simultaneously.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|Build All Platforms Simultaneously.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|x64.ActiveCfg = Release|Any CPU
-		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|x86.ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Commercial|.NET 1.0.ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Commercial|.NET 1.1.ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Commercial|.NET 1.1 (Mono Libraries).ActiveCfg = Release|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|.NET 2.0.ActiveCfg = Release|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|Any CPU.Build.0 = Release|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|x64.ActiveCfg = Release|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Commercial|x86.ActiveCfg = Release|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|.NET 2.0.ActiveCfg = Debug|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|.NET 2.0.ActiveCfg = Release|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|Any CPU.ActiveCfg = Release|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|Any CPU.Build.0 = Release|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|x64.ActiveCfg = Release|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.GPL|x86.ActiveCfg = Release|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|.NET 2.0.ActiveCfg = Release|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|x64.ActiveCfg = Release|Any CPU
+		{C28B1166-1380-445D-AEC1-8A18B990DD18}.Release|x86.ActiveCfg = Release|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|.NET 2.0.ActiveCfg = Release|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|Any CPU.Build.0 = Release|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|x64.ActiveCfg = Release|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Commercial|x86.ActiveCfg = Release|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|.NET 2.0.ActiveCfg = Debug|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|.NET 2.0.ActiveCfg = Release|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|Any CPU.ActiveCfg = Release|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|Any CPU.Build.0 = Release|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|x64.ActiveCfg = Release|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.GPL|x86.ActiveCfg = Release|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|.NET 2.0.ActiveCfg = Release|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|x64.ActiveCfg = Release|Any CPU
+		{F29E5B3D-7F76-4CF9-BF5E-8E3A1377B1E4}.Release|x86.ActiveCfg = Release|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.Commercial|.NET 2.0.ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Commercial|.NET 2.0 (Mono Libraries).ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Commercial|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Commercial|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Commercial|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Commercial|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Release|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.Commercial|Any CPU.Build.0 = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Commercial|Build All 2.0 Platforms Simultaneously.ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Commercial|Build All Platforms Simultaneously.ActiveCfg = Release|Any CPU
+		{710D9251-17A3-4429-9A91-63F03267F310}.Commercial|Any CPU.Deploy.0 = Release|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.Commercial|x64.ActiveCfg = Release|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.Commercial|x86.ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Debug|.NET 1.0.ActiveCfg = Debug|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Debug|.NET 1.1.ActiveCfg = Debug|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Debug|.NET 1.1 (Mono Libraries).ActiveCfg = Debug|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.Debug|.NET 2.0.ActiveCfg = Debug|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Debug|.NET 2.0.Build.0 = Debug|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Debug|.NET 2.0 (Mono Libraries).ActiveCfg = Debug|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Debug|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Debug|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Debug|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Debug|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Debug|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Debug|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Debug|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Debug|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Debug|Build All 2.0 Platforms Simultaneously.ActiveCfg = Debug|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Debug|Build All Platforms Simultaneously.ActiveCfg = Debug|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.GPL|.NET 1.0.ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.GPL|.NET 1.1.ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.GPL|.NET 1.1 (Mono Libraries).ActiveCfg = Release|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.GPL|.NET 2.0.ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.GPL|.NET 2.0.Build.0 = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.GPL|.NET 2.0 (Mono Libraries).ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.GPL|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.GPL|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.GPL|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.GPL|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Release|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.GPL|Any CPU.ActiveCfg = Release|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.GPL|Any CPU.Build.0 = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.GPL|Build All 2.0 Platforms Simultaneously.ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.GPL|Build All Platforms Simultaneously.ActiveCfg = Release|Any CPU
+		{710D9251-17A3-4429-9A91-63F03267F310}.GPL|Any CPU.Deploy.0 = Release|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.GPL|x64.ActiveCfg = Release|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.GPL|x86.ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Release|.NET 1.0.ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Release|.NET 1.1.ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Release|.NET 1.1 (Mono Libraries).ActiveCfg = Release|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.Release|.NET 2.0.ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Release|.NET 2.0.Build.0 = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Release|.NET 2.0 (Mono Libraries).ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Release|.NET CF 1.0 (Pocket PC 2003).ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Release|.NET CF 1.0 (Smartphone 2003).ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Release|.NET CF 2.0 (Pocket PC 2003).ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Release|.NET CF 2.0 (Windows CE 5.0).ActiveCfg = Release|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.Release|Any CPU.Build.0 = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Release|Build All 2.0 Platforms Simultaneously.ActiveCfg = Release|Any CPU
-		{710D9251-17A3-4429-9A91-63F03267F310}.Release|Build All Platforms Simultaneously.ActiveCfg = Release|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.Release|x64.ActiveCfg = Release|Any CPU
 		{710D9251-17A3-4429-9A91-63F03267F310}.Release|x86.ActiveCfg = Release|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|.NET 2.0.ActiveCfg = Release|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|Any CPU.Build.0 = Release|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|Any CPU.Deploy.0 = Release|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|x64.ActiveCfg = Release|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Commercial|x86.ActiveCfg = Release|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|.NET 2.0.ActiveCfg = Debug|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|.NET 2.0.ActiveCfg = Release|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|Any CPU.ActiveCfg = Release|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|Any CPU.Build.0 = Release|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|Any CPU.Deploy.0 = Release|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|x64.ActiveCfg = Release|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.GPL|x86.ActiveCfg = Release|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|.NET 2.0.ActiveCfg = Release|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|x64.ActiveCfg = Release|Any CPU
+		{587A47FB-C1CC-459D-93B6-179D95E41EFB}.Release|x86.ActiveCfg = Release|Any CPU
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|.NET 2.0.ActiveCfg = Commercial|Any CPU
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.ActiveCfg = Commercial|Any CPU
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.Build.0 = Commercial|Any CPU
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x64.ActiveCfg = Commercial|Any CPU
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|x86.ActiveCfg = Commercial|Any CPU
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|.NET 2.0.ActiveCfg = Commercial|Any CPU
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|Any CPU.ActiveCfg = Commercial|Any CPU
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|x64.ActiveCfg = Commercial|Any CPU
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Debug|x86.ActiveCfg = Commercial|Any CPU
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|.NET 2.0.ActiveCfg = GPL|Any CPU
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Any CPU.ActiveCfg = GPL|Any CPU
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|Any CPU.Build.0 = GPL|Any CPU
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|x64.ActiveCfg = GPL|Any CPU
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.GPL|x86.ActiveCfg = GPL|Any CPU
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|.NET 2.0.ActiveCfg = Commercial|Any CPU
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|Any CPU.ActiveCfg = Commercial|Any CPU
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|Any CPU.Build.0 = Commercial|Any CPU
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|x64.ActiveCfg = Commercial|Any CPU
+		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Release|x86.ActiveCfg = Commercial|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/VisualStudio/DataConnectionUIStub.cs
===================================================================
--- trunk/VisualStudio/DataConnectionUIStub.cs	2007-05-01 18:21:29 UTC (rev 692)
+++ trunk/VisualStudio/DataConnectionUIStub.cs	2007-05-01 20:07:55 UTC (rev 693)
@@ -18,9 +18,6 @@
  * This file contains stub class, created to allow form designer 
  * to edit connection dialog.
  */
-using System;
-using System.Collections.Generic;
-using System.Text;
 using Microsoft.VisualStudio.Data;
 
 namespace MySql.Data.VisualStudio
@@ -29,7 +26,7 @@
     /// This class is just a stub, but form designer fails to open connection 
     /// dialog which is direct successor of DataConnectionUIControl.
     /// </summary>
-    class DataConnectionUIStub : DataConnectionUIControl
+    internal class DataConnectionUIStub : DataConnectionUIControl
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/VisualStudio/Installer/Register.reg
===================================================================
--- trunk/VisualStudio/Installer/Register.reg	2007-05-01 18:21:29 UTC (rev 692)
+++ trunk/VisualStudio/Installer/Register.reg	2007-05-01 20:07:55 UTC (rev 693)
@@ -1,6 +1,6 @@
 Windows Registry Editor Version 5.00
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\8.0\DataProviders\{C6882346-E592-4da5-80BA-D2EADCDA0359}]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\8.0\DataProviders\{C6882346-E592-4da5-80BA-D2EADCDA0359}]
 "Description"="Provider_Description, MySql.Data.VisualStudio.Properties.Resources"
 "DisplayName"="Provider_DisplayName, MySql.Data.VisualStudio.Properties.Resources"
 @=".NET Framework Data Provider for MySQL"
@@ -8,31 +8,45 @@
 "FactoryService"="{D949EA95-EDA1-4b65-8A9E-266949A99360}"
 "InvariantName"="MySql.Data.MySqlClient"
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\8.0\DataProviders\{C6882346-E592-4da5-80BA-D2EADCDA0359}\SupportedObjects]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\8.0\DataProviders\{C6882346-E592-4da5-80BA-D2EADCDA0359}\SupportedObjects]
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\8.0\DataProviders\{C6882346-E592-4da5-80BA-D2EADCDA0359}\SupportedObjects\DataConnectionProperties]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\8.0\DataProviders\{C6882346-E592-4da5-80BA-D2EADCDA0359}\SupportedObjects\DataConnectionProperties]
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\8.0\DataProviders\{C6882346-E592-4da5-80BA-D2EADCDA0359}\SupportedObjects\DataConnectionSupport]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\8.0\DataProviders\{C6882346-E592-4da5-80BA-D2EADCDA0359}\SupportedObjects\DataConnectionSupport]
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\8.0\DataProviders\{C6882346-E592-4da5-80BA-D2EADCDA0359}\SupportedObjects\DataConnectionUIControl]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\8.0\DataProviders\{C6882346-E592-4da5-80BA-D2EADCDA0359}\SupportedObjects\DataConnectionUIControl]
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\8.0\DataProviders\{C6882346-E592-4da5-80BA-D2EADCDA0359}\SupportedObjects\DataObjectSupport]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\8.0\DataProviders\{C6882346-E592-4da5-80BA-D2EADCDA0359}\SupportedObjects\DataObjectSupport]
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\8.0\DataProviders\{C6882346-E592-4da5-80BA-D2EADCDA0359}\SupportedObjects\DataSourceInformation]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\8.0\DataProviders\{C6882346-E592-4da5-80BA-D2EADCDA0359}\SupportedObjects\DataSourceInformation]
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\8.0\DataProviders\{C6882346-E592-4da5-80BA-D2EADCDA0359}\SupportedObjects\DataViewSupport]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\8.0\DataProviders\{C6882346-E592-4da5-80BA-D2EADCDA0359}\SupportedObjects\DataViewSupport]
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\8.0\Packages\{79A115C9-B133-4891-9E7B-242509DAD272}]
-@="MySql.Data.VisualStudio.MySqlDataProviderPackage"
-"InprocServer32"="D:\\WINNT\\system32\\mscoree.dll"
+[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\8.0\Packages\{79A115C9-B133-4891-9E7B-242509DAD272}]
+@="MySQL Connector Net 5.1.0"
+"InprocServer32"="C:\\Windows\\system32\\mscoree.dll"
 "Class"="MySql.Data.VisualStudio.MySqlDataProviderPackage"
-"CodeBase"="[!!!PATH TO YOUR DDEX INSTALLATION!!!!]MySql.VisualStudio.dll"
+"CodeBase"="C:\\Program Files (x86)\\MySQL\\MySQL Connector Net 5.1.0\\Visual Studio Integration\\MySql.VisualStudio.dll"
 "CompanyName"="MySQL AB c/o MySQL, Inc."
-"ProductName"="Visual Studio Tools for MySQL"
-"ProductVersion"="1.0"
+"ProductName"="MySQL Tools for Visual Studio"
+"ProductVersion"="1.1"
 "MinEdition"="standard"
-"ID"=1510
+"ID"=100
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\8.0\Services\{D949EA95-EDA1-4b65-8A9E-266949A99360}]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\8.0\Services\{D949EA95-EDA1-4b65-8A9E-266949A99360}]
 @="{79A115C9-B133-4891-9E7B-242509DAD272}"
-"Name"="MySQL Provider Object Factory"
\ No newline at end of file
+"Name"="MySQL Provider Object Factory"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\8.0\DataSources\{98FBE4D8-5583-4233-B219-70FF8C7FBBBD}]
+@="MySQL Database"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\8.0\DataSources\{98FBE4D8-5583-4233-B219-70FF8C7FBBBD}\SupportingProviders]
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\8.0\DataSources\{98FBE4D8-5583-4233-B219-70FF8C7FBBBD}\SupportingProviders\{C6882346-E592-4da5-80BA-D2EADCDA0359}]
+"Description"="Provider_Description, MySql.Data.VisualStudio.Properties.Resources"
+"DisplayName"="Datasource_Displayname, MySql.Data.VisualStudio.Properties.Resources"
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\8.0\Menus]
+"{79A115C9-B133-4891-9E7B-242509DAD272}"=",1000,1"
+
+

Modified: trunk/VisualStudio/MySqlConnectionProperties.cs
===================================================================
--- trunk/VisualStudio/MySqlConnectionProperties.cs	2007-05-01 18:21:29 UTC (rev 692)
+++ trunk/VisualStudio/MySqlConnectionProperties.cs	2007-05-01 20:07:55 UTC (rev 693)
@@ -18,14 +18,7 @@
  * This file contains implementation of customized connection properties. 
  */
 using System;
-using Microsoft.VisualStudio.Data;
 using Microsoft.VisualStudio.Data.AdoDotNet;
-using System.ComponentModel;
-using MySql.Data.VisualStudio.Properties;
-using System.Collections;
-using System.Diagnostics;
-using MySql.Data.VisualStudio.Utils;
-using System.Windows.Forms;
 
 namespace MySql.Data.VisualStudio
 {
@@ -36,6 +29,7 @@
     public class MySqlConnectionProperties : AdoDotNetConnectionProperties
     {
         #region Option names
+
         /// <summary>
         /// This class contains names for all connection options
         /// </summary>
@@ -71,20 +65,23 @@
             public const string ConnectionReset = "Connection Reset";
             public const string InvariantProviderName = "MySql.Data.MySqlClient";
         }
+
         #endregion
 
         #region Initialization
+
         /// <summary>
         /// Constructor fills base object with list of custom options and their description.
         /// </summary>
         public MySqlConnectionProperties()
             : base(Names.InvariantProviderName)
         {
+        }
 
-        } 
         #endregion
 
         #region Overridings
+
         /// <summary>
         /// Test connection for these properties. Uses MySqlConnection support for version validation.
         /// </summary>
@@ -95,9 +92,9 @@
             try
             {
                 // Initializes it with empty provider
-                conn.Initialize(null); 
+                conn.Initialize(null);
                 // Set connection string
-                conn.ConnectionString = ToTestString();                               
+                conn.ConnectionString = ToTestString();
                 // Try to open
                 conn.Open(false);
                 // Close after open
@@ -119,9 +116,10 @@
             get
             {
                 return !String.IsNullOrEmpty(this[Names.Server] as string)
-                        && !String.IsNullOrEmpty(this[Names.Database] as string);
+                       && !String.IsNullOrEmpty(this[Names.Database] as string);
             }
         }
+
         #endregion
-    }    
+    }
 }
\ No newline at end of file

Modified: trunk/VisualStudio/MySqlDataConnectionPromptDialog.cs
===================================================================
--- trunk/VisualStudio/MySqlDataConnectionPromptDialog.cs	2007-05-01 18:21:29 UTC (rev 692)
+++ trunk/VisualStudio/MySqlDataConnectionPromptDialog.cs	2007-05-01 20:07:55 UTC (rev 693)
@@ -18,15 +18,9 @@
  * This file contains an implemetation of prompt dialog.
  */
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using Microsoft.VisualStudio.Data;
 using System.Diagnostics;
 using System.Globalization;
+using Microsoft.VisualStudio.Data;
 using MySql.Data.VisualStudio.Utils;
 
 namespace MySql.Data.VisualStudio
@@ -41,7 +35,7 @@
         /// </summary>
         public MySqlDataConnectionPromptDialog()
         {
-            InitializeComponent();            
+            InitializeComponent();
         }
 
         /// <summary>
@@ -66,19 +60,19 @@
             // Extract server name and port to build connection string
             string server = prop[MySqlConnectionProperties.Names.Server] as string;
             if (String.IsNullOrEmpty(server))
-                server = "localhost";   // Empty server name means local host
-            Int64 port = 3306;          // By default port is 3306
+                server = "localhost"; // Empty server name means local host
+            Int64 port = 3306; // By default port is 3306
             if (DataInterpreter.IsInteger(prop[MySqlConnectionProperties.Names.Port]))
-                port = (Int64)prop[MySqlConnectionProperties.Names.Port];
+                port = (Int64) prop[MySqlConnectionProperties.Names.Port];
 
             // Format caption
             Text = String.Format(CultureInfo.CurrentCulture, Text, server, port);
-            
+
             // Extract options
             login.Text = prop[MySqlConnectionProperties.Names.UserID] as string;
             password.Text = prop[MySqlConnectionProperties.Names.Password] as string;
             if (prop[MySqlConnectionProperties.Names.PersistSecurityInfo] is bool)
-                savePassword.Checked = (bool)prop[MySqlConnectionProperties.Names.PersistSecurityInfo];
+                savePassword.Checked = (bool) prop[MySqlConnectionProperties.Names.PersistSecurityInfo];
             else
                 savePassword.Checked = false;
         }
@@ -100,15 +94,14 @@
             // Create connection properties to parse connection string
             MySqlConnectionProperties prop = new MySqlConnectionProperties();
             prop.ConnectionStringBuilder.ConnectionString = ConnectionSupport.ConnectionString;
-            
+
             // Apply changed options
             prop[MySqlConnectionProperties.Names.UserID] = login.Text;
             prop[MySqlConnectionProperties.Names.Password] = password.Text;
             prop[MySqlConnectionProperties.Names.PersistSecurityInfo] = savePassword.Checked;
-            
+
             // Change connection string for connection support
             ConnectionSupport.ConnectionString = prop.ToFullString();
         }
-        
     }
-}
+}
\ No newline at end of file

Modified: trunk/VisualStudio/MySqlDataProviderPackage.cs
===================================================================
--- trunk/VisualStudio/MySqlDataProviderPackage.cs	2007-05-01 18:21:29 UTC (rev 692)
+++ trunk/VisualStudio/MySqlDataProviderPackage.cs	2007-05-01 20:07:55 UTC (rev 693)
@@ -20,19 +20,15 @@
 
 using System;
 using System.ComponentModel.Design;
+using System.Data.Common;
+using System.Diagnostics;
+using System.Reflection;
 using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Shell;
-using MySql.Data.VisualStudio;
-using MySql.Data.VisualStudio.Utils;
-using System.Reflection;
-using Microsoft.VisualStudio.TextManager.Interop;
-using System.Diagnostics;
-using System.Windows.Forms.Design;
 using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio;
 using MySql.Data.VisualStudio.Properties;
-using System.Data.Common;
-using System.Windows.Forms;
 
 namespace MySql.Data.VisualStudio
 {
@@ -48,7 +44,7 @@
 #else
     [DefaultRegistryRoot(@"Microsoft\VisualStudio\8.0")]
 #endif
-    [ProvideService(typeof(MySqlProviderObjectFactory), ServiceName = "MySQL Provider Object Factory")]
+    [ProvideService(typeof (MySqlProviderObjectFactory), ServiceName = "MySQL Provider Object Factory")]
     [ProvideMenuResource(1000, 1)]
     [ProvideLoadKey("standard", "1.1", "MySQL Tools for Visual Studio", "MySQL AB c/o MySQL, Inc.", 100)]
     public class MySqlDataProviderPackage : Package, IVsInstalledProduct
@@ -70,18 +66,10 @@
         /// </summary>
         protected override void Initialize()
         {
-            ((IServiceContainer)this).AddService(typeof(MySqlProviderObjectFactory), new ServiceCreatorCallback(CreateService), true);
+            ((IServiceContainer) this).AddService(typeof (MySqlProviderObjectFactory),
+                                                  new ServiceCreatorCallback(CreateService), true);
             base.Initialize();
 
-            try
-            {
-                DbProviderFactory f = DbProviderFactories.GetFactory("MySql.Data.MySqlClient");
-            }
-            catch (Exception)
-            {
-                MessageBox.Show(Resources.MySqlClientNotRegistered);
-            }
-
             instanceRef = this;
 
             // Initialize package
@@ -92,7 +80,7 @@
         {
             return GetService(serviceType);
         }
-        
+
         /// <summary>
         /// Enumerate all types and their custom attributes. It is necessary 
         /// to get registration attributes to work. They won@@ -111,12 +99,11 @@
         /// <param name="container">Not used.</param>
         /// <param name="serviceType">Must be typeof(MySqlProviderObjectFactory).</param>
         /// <returns>Reference to created factory.</returns>
-        private object CreateService(IServiceContainer container, Type serviceType)
+        private static object CreateService(IServiceContainer container, Type serviceType)
         {
-            if (serviceType == typeof(MySqlProviderObjectFactory))
-            {
+            if (serviceType == typeof (MySqlProviderObjectFactory))
                 return new MySqlProviderObjectFactory();
-            }
+
             return null;
         }
 
@@ -159,4 +146,4 @@
 
         #endregion
     }
-}
+}
\ No newline at end of file

Modified: trunk/VisualStudio/Properties/AssemblyInfo.cs
===================================================================
--- trunk/VisualStudio/Properties/AssemblyInfo.cs	2007-05-01 18:21:29 UTC (rev 692)
+++ trunk/VisualStudio/Properties/AssemblyInfo.cs	2007-05-01 20:07:55 UTC (rev 693)
@@ -1,26 +1,24 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("MySQL Tools for Visual Studio")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("MySQL AB")]
-[assembly: AssemblyProduct("MySQL Tools for Visual Studio")]
-[assembly: AssemblyCopyright("Copyright © MySQL AB 2006")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly : AssemblyTitle("MySQL Tools for Visual Studio")]
+[assembly : AssemblyDescription("")]
+[assembly : AssemblyConfiguration("")]
+[assembly : AssemblyCompany("MySQL AB")]
+[assembly : AssemblyProduct("MySQL Tools for Visual Studio")]
+[assembly : AssemblyCopyright("Copyright © MySQL AB 2006")]
+[assembly : AssemblyTrademark("")]
+[assembly : AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly : ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("5860AC5F-9DE5-4e2b-9FDA-D2AC4B1D6FA5")]
+[assembly : Guid("5860AC5F-9DE5-4e2b-9FDA-D2AC4B1D6FA5")]
 
 // Version information for an assembly consists of the following four values:
 //
@@ -31,4 +29,4 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.2")]
+[assembly : AssemblyVersion("1.1.2")]
\ No newline at end of file
Thread
• Connector/NET commit: r693 - in trunk: . Driver Driver/Source Installer VisualStudio VisualStudio/Installer VisualStudio/Properties	rburnett	1 May