Merge branch '6.7' into 6.8

Author: Roberto E. Garcia

Source/MySql.Data.Entity/Properties/AssemblyInfo.cs

@@ -51,7 +51,10 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("540e7b3c-bd0b-4980-96d1-5d140d303f7e")]
-[assembly: AssemblyDelaySign(false)]
+#if DEBUG
+[assembly: AssemblyDelaySign(true)]
+[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")]
+#endif
 [assembly: AssemblyKeyName("ConnectorNet")]
 [assembly: InternalsVisibleTo("MySql.Data.Entity.Tests, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100d973bda91f71752c78294126974a41a08643168271f65fc0fb3cd45f658da01fbca75ac74067d18e7afbf1467d7a519ce0248b13719717281bb4ddd4ecd71a580dfe0912dfc3690b1d24c7e1975bf7eed90e4ab14e10501eedf763bff8ac204f955c9c15c2cf4ebf6563d8320b6ea8d1ea3807623141f4b81ae30a6c886b3ee1")]
 [assembly: InternalsVisibleTo("MySql.Data.Entity.Migrations.Tests, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100d973bda91f71752c78294126974a41a08643168271f65fc0fb3cd45f658da01fbca75ac74067d18e7afbf1467d7a519ce0248b13719717281bb4ddd4ecd71a580dfe0912dfc3690b1d24c7e1975bf7eed90e4ab14e10501eedf763bff8ac204f955c9c15c2cf4ebf6563d8320b6ea8d1ea3807623141f4b81ae30a6c886b3ee1")]

Source/MySql.Data/Properties/AssemblyInfo.cs

@@ -78,7 +78,10 @@
 //   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
 //       documentation for more information on this.
 //
-[assembly: AssemblyDelaySign(false)]
+#if DEBUG
+[assembly: AssemblyDelaySign(true)]
+[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")]
+#endif
 [assembly: AssemblyKeyName("ConnectorNet")]
 [assembly: InternalsVisibleTo("MySql.Data.Tests, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100d973bda91f71752c78294126974a41a08643168271f65fc0fb3cd45f658da01fbca75ac74067d18e7afbf1467d7a519ce0248b13719717281bb4ddd4ecd71a580dfe0912dfc3690b1d24c7e1975bf7eed90e4ab14e10501eedf763bff8ac204f955c9c15c2cf4ebf6563d8320b6ea8d1ea3807623141f4b81ae30a6c886b3ee1")]
 [assembly: InternalsVisibleTo("MySql.Data.CF.Tests, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100d973bda91f71752c78294126974a41a08643168271f65fc0fb3cd45f658da01fbca75ac74067d18e7afbf1467d7a519ce0248b13719717281bb4ddd4ecd71a580dfe0912dfc3690b1d24c7e1975bf7eed90e4ab14e10501eedf763bff8ac204f955c9c15c2cf4ebf6563d8320b6ea8d1ea3807623141f4b81ae30a6c886b3ee1")]

Source/MySql.Web/Properties/AssemblyInfo.cs

@@ -50,4 +50,8 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 //[assembly: Guid("01520f33-9ecd-4574-96d0-5e6604e0f3aa")]
 
+#if DEBUG
+[assembly: AssemblyDelaySign(true)]
+[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")]
+#endif
 [assembly: AssemblyKeyName("ConnectorNet")]

Tests/MySql.Data.Entity.CodeFirst.Tests/Properties/AssemblyInfo.cs

@@ -54,5 +54,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyDelaySign(false)]
+#if DEBUG
+[assembly: AssemblyDelaySign(true)]
+[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")]
+#endif
 [assembly: AssemblyKeyName("ConnectorNet")]

Tests/MySql.Data.Entity.Migrations.Tests/Properties/AssemblyInfo.cs

@@ -54,4 +54,9 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyKeyName("ConnectorNet")]
+
+#if DEBUG
+[assembly: AssemblyDelaySign(true)]
+[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")]
+#endif
+[assembly: AssemblyKeyName("ConnectorNet")]

Tests/MySql.Data.Entity.Tests/Properties/AssemblyInfo.cs

@@ -44,4 +44,8 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("a4c0a8f2-5e48-4227-a712-bf8ae7446101")]
 
-[assembly: AssemblyKeyName("ConnectorNet")]
+#if DEBUG
+[assembly: AssemblyDelaySign(true)]
+[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")]
+#endif
+[assembly: AssemblyKeyName("ConnectorNet")]

Tests/MySql.Data.Tests.Stress/Properties/AssemblyInfo.cs

@@ -44,5 +44,8 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("02681727-f306-4923-8c16-717d6f1716ce")]
 
-[assembly: AssemblyDelaySign(false)]
+#if DEBUG
+[assembly: AssemblyDelaySign(true)]
+[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")]
+#endif
 [assembly: AssemblyKeyName("ConnectorNet")]

Tests/MySql.Data.Tests/Properties/AssemblyInfo.cs

@@ -63,8 +63,10 @@
 //   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
 //       documentation for more information on this.
 //
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
+#if DEBUG
+[assembly: AssemblyDelaySign(true)]
+[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")]
+#endif
 [assembly: AssemblyKeyName("ConnectorNet")]
 #if !CF && !RT
 [assembly: AllowPartiallyTrustedCallers]

Tests/MySql.Replication.Tests/Properties/AssemblyInfo.cs

@@ -45,5 +45,8 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("02681727-f306-4923-8c16-717d6f1716ce")]
 
-[assembly: AssemblyDelaySign(false)]
+#if DEBUG
+[assembly: AssemblyDelaySign(true)]
+[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")]
+#endif
 [assembly: AssemblyKeyName("ConnectorNet")]

Tests/MySql.Web.Tests/Properties/AssemblyInfo.cs

@@ -44,4 +44,8 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("5ea74c78-c679-464f-99ba-ae1b0b54550b")]
 
-[assembly: AssemblyKeyName("ConnectorNet")]
+#if DEBUG
+[assembly: AssemblyDelaySign(true)]
+[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")]
+#endif
+[assembly: AssemblyKeyName("ConnectorNet")]