Skip to content

Commit b194925

Browse files
author
Roberto E. Garcia
committed
Merge branch '6.7' into 6.8
2 parents ab6e8f3 + f0089b7 commit b194925

File tree

10 files changed

+44
-10
lines changed

10 files changed

+44
-10
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@
5151

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

Source/MySql.Data/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,10 @@
7878
// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
7979
// documentation for more information on this.
8080
//
81-
[assembly: AssemblyDelaySign(false)]
81+
#if DEBUG
82+
[assembly: AssemblyDelaySign(true)]
83+
[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")]
84+
#endif
8285
[assembly: AssemblyKeyName("ConnectorNet")]
8386
[assembly: InternalsVisibleTo("MySql.Data.Tests, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100d973bda91f71752c78294126974a41a08643168271f65fc0fb3cd45f658da01fbca75ac74067d18e7afbf1467d7a519ce0248b13719717281bb4ddd4ecd71a580dfe0912dfc3690b1d24c7e1975bf7eed90e4ab14e10501eedf763bff8ac204f955c9c15c2cf4ebf6563d8320b6ea8d1ea3807623141f4b81ae30a6c886b3ee1")]
8487
[assembly: InternalsVisibleTo("MySql.Data.CF.Tests, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100d973bda91f71752c78294126974a41a08643168271f65fc0fb3cd45f658da01fbca75ac74067d18e7afbf1467d7a519ce0248b13719717281bb4ddd4ecd71a580dfe0912dfc3690b1d24c7e1975bf7eed90e4ab14e10501eedf763bff8ac204f955c9c15c2cf4ebf6563d8320b6ea8d1ea3807623141f4b81ae30a6c886b3ee1")]

Source/MySql.Web/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,8 @@
5050
// The following GUID is for the ID of the typelib if this project is exposed to COM
5151
//[assembly: Guid("01520f33-9ecd-4574-96d0-5e6604e0f3aa")]
5252

53+
#if DEBUG
54+
[assembly: AssemblyDelaySign(true)]
55+
[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")]
56+
#endif
5357
[assembly: AssemblyKeyName("ConnectorNet")]

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,8 @@
5454
// You can specify all the values or you can default the Build and Revision Numbers
5555
// by using the '*' as shown below:
5656
// [assembly: AssemblyVersion("1.0.*")]
57-
[assembly: AssemblyDelaySign(false)]
57+
#if DEBUG
58+
[assembly: AssemblyDelaySign(true)]
59+
[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")]
60+
#endif
5861
[assembly: AssemblyKeyName("ConnectorNet")]

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,9 @@
5454
// You can specify all the values or you can default the Build and Revision Numbers
5555
// by using the '*' as shown below:
5656
// [assembly: AssemblyVersion("1.0.*")]
57-
[assembly: AssemblyKeyName("ConnectorNet")]
57+
58+
#if DEBUG
59+
[assembly: AssemblyDelaySign(true)]
60+
[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")]
61+
#endif
62+
[assembly: AssemblyKeyName("ConnectorNet")]

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,8 @@
4444
// The following GUID is for the ID of the typelib if this project is exposed to COM
4545
[assembly: Guid("a4c0a8f2-5e48-4227-a712-bf8ae7446101")]
4646

47-
[assembly: AssemblyKeyName("ConnectorNet")]
47+
#if DEBUG
48+
[assembly: AssemblyDelaySign(true)]
49+
[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")]
50+
#endif
51+
[assembly: AssemblyKeyName("ConnectorNet")]

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,8 @@
4444
// The following GUID is for the ID of the typelib if this project is exposed to COM
4545
[assembly: Guid("02681727-f306-4923-8c16-717d6f1716ce")]
4646

47-
[assembly: AssemblyDelaySign(false)]
47+
#if DEBUG
48+
[assembly: AssemblyDelaySign(true)]
49+
[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")]
50+
#endif
4851
[assembly: AssemblyKeyName("ConnectorNet")]

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,10 @@
6363
// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
6464
// documentation for more information on this.
6565
//
66-
[assembly: AssemblyDelaySign(false)]
67-
[assembly: AssemblyKeyFile("")]
66+
#if DEBUG
67+
[assembly: AssemblyDelaySign(true)]
68+
[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")]
69+
#endif
6870
[assembly: AssemblyKeyName("ConnectorNet")]
6971
#if !CF && !RT
7072
[assembly: AllowPartiallyTrustedCallers]

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,8 @@
4545
// The following GUID is for the ID of the typelib if this project is exposed to COM
4646
[assembly: Guid("02681727-f306-4923-8c16-717d6f1716ce")]
4747

48-
[assembly: AssemblyDelaySign(false)]
48+
#if DEBUG
49+
[assembly: AssemblyDelaySign(true)]
50+
[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")]
51+
#endif
4952
[assembly: AssemblyKeyName("ConnectorNet")]

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,8 @@
4444
// The following GUID is for the ID of the typelib if this project is exposed to COM
4545
[assembly: Guid("5ea74c78-c679-464f-99ba-ae1b0b54550b")]
4646

47-
[assembly: AssemblyKeyName("ConnectorNet")]
47+
#if DEBUG
48+
[assembly: AssemblyDelaySign(true)]
49+
[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")]
50+
#endif
51+
[assembly: AssemblyKeyName("ConnectorNet")]

0 commit comments

Comments
 (0)