List:Commits« Previous MessageNext Message »
From:rburnett Date:June 19 2009 4:26pm
Subject:Connector/NET commit: r1662 - in branches/5.2: . MySql.Data/Provider MySql.Data/Provider/Properties MySql.Data/Provider/Source/cf
View as plain text  
Removed:
   branches/5.2/MySql.Data/Provider/Source/cf/CompilerGeneratedAttribute.cs
Modified:
   branches/5.2/CHANGES
   branches/5.2/MySql.Data/Provider/MySql.Data.CF.csproj
   branches/5.2/MySql.Data/Provider/Properties/Resources.Designer.cs
Log:
- removed our homebrew implemenation of CompilerGeneratedAttribute as it was interfering with
  the compiler in VS2005 (bug #42261)


Modified: branches/5.2/CHANGES
===================================================================
--- branches/5.2/CHANGES	2009-06-19 15:44:32 UTC (rev 1661)
+++ branches/5.2/CHANGES	2009-06-19 16:26:06 UTC (rev 1662)
@@ -17,6 +17,8 @@
   as the inner exception (bug #45021)  
 - added workaround for an apparent problem with WeakReferences and threads in the mono runtime
   (bug #45463)
+- removed our homebrew implemenation of CompilerGeneratedAttribute as it was interfering with
+  the compiler in VS2005 (bug #42261)
   
 Version 5.2.6
 - cleaned up how stored procedure execution operated when the user does or does not have execute privs

Modified: branches/5.2/MySql.Data/Provider/MySql.Data.CF.csproj
===================================================================
--- branches/5.2/MySql.Data/Provider/MySql.Data.CF.csproj	2009-06-19 15:44:32 UTC (rev 1661)
+++ branches/5.2/MySql.Data/Provider/MySql.Data.CF.csproj	2009-06-19 16:26:06 UTC (rev 1662)
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>8.0.50727</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{587A47FB-C1CC-459D-93B6-179D95E41EFB}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -64,7 +64,6 @@
     <Compile Include="Source\base\DbConnectionStringBuilder.cs" />
     <Compile Include="Source\base\DbException.cs" />
     <Compile Include="Source\cf\BufferedStream.cs" />
-    <Compile Include="Source\cf\CompilerGeneratedAttribute.cs" />
     <Compile Include="Source\cf\WinCE.cs" />
     <Compile Include="Source\CharSetMap.cs" />
     <Compile Include="Source\command.cs">

Modified: branches/5.2/MySql.Data/Provider/Properties/Resources.Designer.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Properties/Resources.Designer.cs	2009-06-19 15:44:32 UTC (rev 1661)
+++ branches/5.2/MySql.Data/Provider/Properties/Resources.Designer.cs	2009-06-19 16:26:06 UTC (rev 1662)
@@ -21,7 +21,9 @@
     // with the /str option, or rebuild your VS project.
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+#if !CF
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+#endif
     public class Resources {
         
         private static global::System.Resources.ResourceManager resourceMan;

Deleted: branches/5.2/MySql.Data/Provider/Source/cf/CompilerGeneratedAttribute.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/cf/CompilerGeneratedAttribute.cs	2009-06-19 15:44:32 UTC (rev 1661)
+++ branches/5.2/MySql.Data/Provider/Source/cf/CompilerGeneratedAttribute.cs	2009-06-19 16:26:06 UTC (rev 1662)
@@ -1,7 +0,0 @@
-
-namespace System.Runtime.CompilerServices
-{
-    class CompilerGeneratedAttribute : Attribute
-    {
-    }
-}

Thread
Connector/NET commit: r1662 - in branches/5.2: . MySql.Data/Provider MySql.Data/Provider/Properties MySql.Data/Provider/Source/cfrburnett19 Jun