Don't call Add-EFProvider or Add-EFDefaultConnectionFactory

Part of #231
dotnet · Jun 29, 2019 · 158d0cc · 158d0cc
1 parent 17bada0
commit 158d0cc
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 7 deletions.
diff --git 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
@@ -0,0 +1,13 @@
+<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>
+    <providers>
+      <provider invariantName="System.Data.SqlServerCe.4.0" type="System.Data.Entity.SqlServerCompact.SqlCeProviderServices, EntityFramework.SqlServerCompact" xdt:Transform="InsertIfMissing" xdt:Locator="Match(invariantName)" />
+    </providers>
+  </entityFramework>
+</configuration>
diff --git a/src/EntityFramework.SqlServerCompact/content/net40/Web.config.install.xdt b/src/EntityFramework.SqlServerCompact/content/net40/Web.config.install.xdt
@@ -0,0 +1,13 @@
+<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>
+    <providers>
+      <provider invariantName="System.Data.SqlServerCe.4.0" type="System.Data.Entity.SqlServerCompact.SqlCeProviderServices, EntityFramework.SqlServerCompact" xdt:Transform="InsertIfMissing" xdt:Locator="Match(invariantName)" />
+    </providers>
+  </entityFramework>
+</configuration>
diff --git a/src/EntityFramework.SqlServerCompact/tools/install.ps1 b/src/EntityFramework.SqlServerCompact/tools/install.ps1
diff --git a/src/NuGet/EntityFramework/content/net40/App.config.install.xdt b/src/NuGet/EntityFramework/content/net40/App.config.install.xdt
@@ -3,4 +3,9 @@
     <section name="entityFramework" xdt:Transform="Remove" xdt:Locator="Match(name)" />
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" xdt:Transform="Insert" xdt:Locator="Match(name)" />
   </configSections>
+  <entityFramework xdt:Transform="InsertIfMissing">
+    <providers xdt:Transform="InsertIfMissing">
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" xdt:Transform="InsertIfMissing" xdt:Locator="Match(invariantName)" />
+    </providers>
+  </entityFramework>
 </configuration>
diff --git a/src/NuGet/EntityFramework/content/net40/Web.config.install.xdt b/src/NuGet/EntityFramework/content/net40/Web.config.install.xdt
@@ -3,4 +3,9 @@
     <section name="entityFramework" xdt:Transform="Remove" xdt:Locator="Match(name)" />
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" xdt:Transform="Insert" xdt:Locator="Match(name)" />
   </configSections>
+  <entityFramework xdt:Transform="InsertIfMissing">
+    <providers xdt:Transform="InsertIfMissing">
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" xdt:Transform="InsertIfMissing" xdt:Locator="Match(invariantName)" />
+    </providers>
+  </entityFramework>
 </configuration>
diff --git 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."