From c08a0038b59983706f9a1196bcdb24192d360330 Mon Sep 17 00:00:00 2001
From: Brice Lambson <brice@bricelam.net>
Date: Thu, 27 Jun 2019 15:20:30 -0700
Subject: [PATCH] Don't call Add-EFProvider or Add-EFDefaultConnectionFactory

Part of #231
---
 .../EntityFramework.SqlServerCompact.nuspec           |  1 -
 .../content/net40/App.config.install.xdt              | 10 ++++++++++
 .../content/net40/App.config.transform                | 10 ++++++----
 .../content/net40/App.config.uninstall.xdt            |  5 +++++
 .../content/net40/Web.config.install.xdt              | 10 ++++++++++
 .../content/net40/Web.config.transform                |  8 +++++---
 .../content/net40/Web.config.uninstall.xdt            |  5 +++++
 .../tools/install.ps1                                 |  4 ----
 .../content/net40/App.config.transform                | 11 ++++++++---
 .../content/net40/App.config.uninstall.xdt            |  4 ++++
 .../content/net40/Web.config.transform                | 11 ++++++++---
 .../content/net40/Web.config.uninstall.xdt            |  4 ++++
 src/NuGet/EntityFramework/tools/install.ps1           |  2 --
 13 files changed, 65 insertions(+), 20 deletions(-)
 create mode 100644 src/EntityFramework.SqlServerCompact/content/net40/App.config.install.xdt
 create mode 100644 src/EntityFramework.SqlServerCompact/content/net40/App.config.uninstall.xdt
 create mode 100644 src/EntityFramework.SqlServerCompact/content/net40/Web.config.install.xdt
 create mode 100644 src/EntityFramework.SqlServerCompact/content/net40/Web.config.uninstall.xdt
 delete mode 100644 src/EntityFramework.SqlServerCompact/tools/install.ps1

diff --git a/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.nuspec b/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.nuspec
index 02efce6fd4..3fbfedb12a 100644
--- a/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.nuspec
+++ b/src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.nuspec
@@ -16,6 +16,5 @@
     <file src="../../artifacts/bin/EntityFramework.SqlServerCompact/$Configuration$/net45/EntityFramework.SqlServerCompact.dll" target="lib/net45/" />
     <file src="../../artifacts/bin/EntityFramework.SqlServerCompact/$Configuration$/net45/EntityFramework.SqlServerCompact.xml" target="lib/net45/" />
     <file src="content\**\*" target="content/" />
-    <file src="tools\**\*" target="tools/" />
   </files>
 </package>
diff --git a/src/EntityFramework.SqlServerCompact/content/net40/App.config.install.xdt b/src/EntityFramework.SqlServerCompact/content/net40/App.config.install.xdt
new file mode 100644
index 0000000000..eb6c68f80a
--- /dev/null
+++ b/src/EntityFramework.SqlServerCompact/content/net40/App.config.install.xdt
@@ -0,0 +1,10 @@
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <entityFramework>
+    <defaultConnectionFactory xdt:Transform="Remove" />
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlCeConnectionFactory, EntityFramework" xdt:Transform="Insert">
+      <parameters>
+        <parameter value="System.Data.SqlServerCe.4.0" />
+      </parameters>
+    </defaultConnectionFactory>
+  </entityFramework>
+</configuration>
diff --git a/src/EntityFramework.SqlServerCompact/content/net40/App.config.transform b/src/EntityFramework.SqlServerCompact/content/net40/App.config.transform
index 0a14d9b929..2c140e323d 100644
--- a/src/EntityFramework.SqlServerCompact/content/net40/App.config.transform
+++ b/src/EntityFramework.SqlServerCompact/content/net40/App.config.transform
@@ -1,11 +1,13 @@
 <configuration>
-  <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-  </configSections>
   <system.data>
     <DbProviderFactories>
       <remove invariant="System.Data.SqlServerCe.4.0" />
       <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
     </DbProviderFactories>
-  </system.data>  
+  </system.data>
+  <entityFramework>
+    <providers>
+      <provider invariantName="System.Data.SqlServerCe.4.0" type="System.Data.Entity.SqlServerCompact.SqlCeProviderServices, EntityFramework.SqlServerCompact" />
+    </providers>
+  </entityFramework>
 </configuration>
diff --git a/src/EntityFramework.SqlServerCompact/content/net40/App.config.uninstall.xdt b/src/EntityFramework.SqlServerCompact/content/net40/App.config.uninstall.xdt
new file mode 100644
index 0000000000..ad7edc0fd7
--- /dev/null
+++ b/src/EntityFramework.SqlServerCompact/content/net40/App.config.uninstall.xdt
@@ -0,0 +1,5 @@
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <entityFramework>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlCeConnectionFactory, EntityFramework" xdt:Transform="Remove" xdt:Locator="Match(type)" />
+  </entityFramework>
+</configuration>
diff --git a/src/EntityFramework.SqlServerCompact/content/net40/Web.config.install.xdt b/src/EntityFramework.SqlServerCompact/content/net40/Web.config.install.xdt
new file mode 100644
index 0000000000..eb6c68f80a
--- /dev/null
+++ b/src/EntityFramework.SqlServerCompact/content/net40/Web.config.install.xdt
@@ -0,0 +1,10 @@
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <entityFramework>
+    <defaultConnectionFactory xdt:Transform="Remove" />
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlCeConnectionFactory, EntityFramework" xdt:Transform="Insert">
+      <parameters>
+        <parameter value="System.Data.SqlServerCe.4.0" />
+      </parameters>
+    </defaultConnectionFactory>
+  </entityFramework>
+</configuration>
diff --git a/src/EntityFramework.SqlServerCompact/content/net40/Web.config.transform b/src/EntityFramework.SqlServerCompact/content/net40/Web.config.transform
index 9088c73150..2c140e323d 100644
--- a/src/EntityFramework.SqlServerCompact/content/net40/Web.config.transform
+++ b/src/EntityFramework.SqlServerCompact/content/net40/Web.config.transform
@@ -1,11 +1,13 @@
 <configuration>
-  <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-  </configSections>
   <system.data>
     <DbProviderFactories>
       <remove invariant="System.Data.SqlServerCe.4.0" />
       <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
     </DbProviderFactories>
   </system.data>
+  <entityFramework>
+    <providers>
+      <provider invariantName="System.Data.SqlServerCe.4.0" type="System.Data.Entity.SqlServerCompact.SqlCeProviderServices, EntityFramework.SqlServerCompact" />
+    </providers>
+  </entityFramework>
 </configuration>
diff --git a/src/EntityFramework.SqlServerCompact/content/net40/Web.config.uninstall.xdt b/src/EntityFramework.SqlServerCompact/content/net40/Web.config.uninstall.xdt
new file mode 100644
index 0000000000..ad7edc0fd7
--- /dev/null
+++ b/src/EntityFramework.SqlServerCompact/content/net40/Web.config.uninstall.xdt
@@ -0,0 +1,5 @@
+<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <entityFramework>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlCeConnectionFactory, EntityFramework" xdt:Transform="Remove" xdt:Locator="Match(type)" />
+  </entityFramework>
+</configuration>
diff --git a/src/EntityFramework.SqlServerCompact/tools/install.ps1 b/src/EntityFramework.SqlServerCompact/tools/install.ps1
deleted file mode 100644
index 048f9be6fd..0000000000
--- a/src/EntityFramework.SqlServerCompact/tools/install.ps1
+++ /dev/null
@@ -1,4 +0,0 @@
-param($installPath, $toolsPath, $package, $project)
-
-Add-EFDefaultConnectionFactory $project 'System.Data.Entity.Infrastructure.SqlCeConnectionFactory, EntityFramework' -ConstructorArguments 'System.Data.SqlServerCe.4.0'
-Add-EFProvider $project 'System.Data.SqlServerCe.4.0' 'System.Data.Entity.SqlServerCompact.SqlCeProviderServices, EntityFramework.SqlServerCompact'
diff --git a/src/NuGet/EntityFramework/content/net40/App.config.transform b/src/NuGet/EntityFramework/content/net40/App.config.transform
index 4fa1b95a55..2ad91f99ce 100644
--- a/src/NuGet/EntityFramework/content/net40/App.config.transform
+++ b/src/NuGet/EntityFramework/content/net40/App.config.transform
@@ -1,5 +1,10 @@
 <configuration>
-    <configSections>
-        <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-    </configSections>
+  <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+  </configSections>
+  <entityFramework>
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+    </providers>
+  </entityFramework>
 </configuration>
diff --git a/src/NuGet/EntityFramework/content/net40/App.config.uninstall.xdt b/src/NuGet/EntityFramework/content/net40/App.config.uninstall.xdt
index fb0fb5a9c3..5218e06999 100644
--- a/src/NuGet/EntityFramework/content/net40/App.config.uninstall.xdt
+++ b/src/NuGet/EntityFramework/content/net40/App.config.uninstall.xdt
@@ -2,4 +2,8 @@
   <configSections>
     <section name="entityFramework" xdt:Transform="Remove" xdt:Locator="Match(name)" />
   </configSections>
+  <entityFramework>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" xdt:Transform="Remove" xdt:Locator="Match(type)" />
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework" xdt:Transform="Remove" xdt:Locator="Match(type)" />
+  </entityFramework>
 </configuration>
diff --git a/src/NuGet/EntityFramework/content/net40/Web.config.transform b/src/NuGet/EntityFramework/content/net40/Web.config.transform
index 4fa1b95a55..cb00d26db3 100644
--- a/src/NuGet/EntityFramework/content/net40/Web.config.transform
+++ b/src/NuGet/EntityFramework/content/net40/Web.config.transform
@@ -1,5 +1,10 @@
 <configuration>
-    <configSections>
-        <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-    </configSections>
+  <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+  </configSections>
+  <entityFramework>
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" xdt:Transform="Replace" xdt:Locator="Match(invariantName)" />
+    </providers>
+  </entityFramework>
 </configuration>
diff --git a/src/NuGet/EntityFramework/content/net40/Web.config.uninstall.xdt b/src/NuGet/EntityFramework/content/net40/Web.config.uninstall.xdt
index fb0fb5a9c3..5218e06999 100644
--- a/src/NuGet/EntityFramework/content/net40/Web.config.uninstall.xdt
+++ b/src/NuGet/EntityFramework/content/net40/Web.config.uninstall.xdt
@@ -2,4 +2,8 @@
   <configSections>
     <section name="entityFramework" xdt:Transform="Remove" xdt:Locator="Match(name)" />
   </configSections>
+  <entityFramework>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" xdt:Transform="Remove" xdt:Locator="Match(type)" />
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework" xdt:Transform="Remove" xdt:Locator="Match(type)" />
+  </entityFramework>
 </configuration>
diff --git a/src/NuGet/EntityFramework/tools/install.ps1 b/src/NuGet/EntityFramework/tools/install.ps1
index e2077c7fa1..a538d6ce85 100644
--- a/src/NuGet/EntityFramework/tools/install.ps1
+++ b/src/NuGet/EntityFramework/tools/install.ps1
@@ -26,7 +26,5 @@ $project.Object.References |
     ?{ $_.Identity -eq 'System.Data.Entity' } |
     %{ $_.Remove() }
 
-Add-EFProvider $project 'System.Data.SqlClient' 'System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer'
-
 Write-Host
 Write-Host "Type 'get-help EntityFramework' to see all available Entity Framework commands."