From 3063790f70075731632d03161cc22d803d64d80a Mon Sep 17 00:00:00 2001
From: Laurents Meyer <meyer@gemos-management.de>
Date: Sun, 21 Jan 2018 13:38:31 +0100
Subject: [PATCH] Fix the issue that after selecting the MySQL data source in
 the Entity Data Model wizard in Visual Studio and clicking on "Next", the
 wizard just closes.

The AllowPartiallyTrustedCallers attribute issue for MySQL.Data.Entity.EF6 in AssemblyInfo.cs has already been addressed with:
Bug #89134: https://bugs.mysql.com/bug.php?id=89134
Bug #89137: https://bugs.mysql.com/bug.php?id=89137

The AllowPartiallyTrustedCallers attribute issue for MySQL.Data in AssemblyInfo.cs has not been addressed before.

This Bug is tracked in the MySQL bug tracker as Bug #89338: https://bugs.mysql.com/bug.php?id=89338
---
 .gitignore                                      | 38 +++++++++++++++++++++++++
 EntityFramework6/src/Properties/AssemblyInfo.cs |  1 -
 MySQL.Data/src/MySqlClientFactory.cs            |  2 +-
 MySQL.Data/src/Properties/AssemblyInfo.cs       |  1 -
 4 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..6b16789f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,38 @@
+*.obj
+*.csproj.user
+*.vcxproj.user
+*.ipch
+*.suo
+*.sdf
+*.diff
+*check.py
+.bzrignore
+**/obj/**
+**/bin/**
+**/bin
+**/obj
+**/tmp
+**/.vs
+MySql.Data/Provider/MySql.Data.xml
+MySql.VisualStudio/Documentation/Build
+MySql.Data.Entity/Tests/Service References
+**/*.InstallLog
+UpgradeLog.XML
+**/UpgradeLog*.*
+Documention/Output/**
+**/bin-4.0/**
+**/bin-4.0
+Documentation/Output
+_UpgradeReport_Files
+VS.targets
+**/*.sln.cache
+**/ProjectTemplatesZipFolder/**
+**/ItemTemplatesZipFolder/**
+**/.bzr-mysql/**
+**/packages/**
+XShellClient/Debug/
+XShellClient/XShellClientMgd/Debug/
+XShellClient/XShellClientMgd/Release/
+XShellClient/Release/
+XShellClient/ipch/
+XShellClient.VC.db
\ No newline at end of file
diff --git a/EntityFramework6/src/Properties/AssemblyInfo.cs b/EntityFramework6/src/Properties/AssemblyInfo.cs
index 331eea32..3c1058ea 100644
--- a/EntityFramework6/src/Properties/AssemblyInfo.cs
+++ b/EntityFramework6/src/Properties/AssemblyInfo.cs
@@ -42,7 +42,6 @@
 // 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: AllowPartiallyTrustedCallers]
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 // [assembly: Guid("540e7b3c-bd0b-4980-96d1-5d140d303f7e")]
 
diff --git a/MySQL.Data/src/MySqlClientFactory.cs b/MySQL.Data/src/MySqlClientFactory.cs
index cec98021..38c2659c 100644
--- a/MySQL.Data/src/MySqlClientFactory.cs
+++ b/MySQL.Data/src/MySqlClientFactory.cs
@@ -102,7 +102,7 @@ private FieldInfo MySqlDbProviderServicesInstance
 #else
 					string fullName = Assembly.GetExecutingAssembly().FullName;
 #endif
-					string assemblyName = fullName.Replace("MySql.Data", "MySql.Data.Entity");
+					string assemblyName = fullName.Replace("MySql.Data", "MySql.Data.Entity.EF6");
 					string assemblyEf5Name = fullName.Replace("MySql.Data", "MySql.Data.Entity.EF5");
 					fullName = $"MySql.Data.MySqlClient.MySqlProviderServices, {assemblyEf5Name}";
 
diff --git a/MySQL.Data/src/Properties/AssemblyInfo.cs b/MySQL.Data/src/Properties/AssemblyInfo.cs
index 009d8749..362039e2 100644
--- a/MySQL.Data/src/Properties/AssemblyInfo.cs
+++ b/MySQL.Data/src/Properties/AssemblyInfo.cs
@@ -77,7 +77,6 @@
 //       documentation for more information on this.
 //
 
-[assembly: AllowPartiallyTrustedCallers()]
 
 [assembly: InternalsVisibleTo("MySql.Data.Tests, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100d973bda91f71752c78294126974a41a08643168271f65fc0fb3cd45f658da01fbca75ac74067d18e7afbf1467d7a519ce0248b13719717281bb4ddd4ecd71a580dfe0912dfc3690b1d24c7e1975bf7eed90e4ab14e10501eedf763bff8ac204f955c9c15c2cf4ebf6563d8320b6ea8d1ea3807623141f4b81ae30a6c886b3ee1")]
 [assembly: InternalsVisibleTo("MySql.Data.Entity, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100d973bda91f71752c78294126974a41a08643168271f65fc0fb3cd45f658da01fbca75ac74067d18e7afbf1467d7a519ce0248b13719717281bb4ddd4ecd71a580dfe0912dfc3690b1d24c7e1975bf7eed90e4ab14e10501eedf763bff8ac204f955c9c15c2cf4ebf6563d8320b6ea8d1ea3807623141f4b81ae30a6c886b3ee1")]