From aee88981210097d533a332869c1a6f871cd78c82 Mon Sep 17 00:00:00 2001
From: Brice Lambson <brice@bricelam.net>
Date: Mon, 29 Jul 2019 15:53:31 -0700
Subject: [PATCH] Automatically include *.edmx files on SDK-style projects

Fixes #891
---
 src/NuGet/EntityFramework/build/EntityFramework.props       | 6 ++++++
 src/NuGet/EntityFramework/build/EntityFramework.targets     | 4 ++++
 .../EntityFramework/buildTransitive/EntityFramework.props   | 3 +++
 3 files changed, 13 insertions(+)
 create mode 100644 src/NuGet/EntityFramework/build/EntityFramework.props
 create mode 100644 src/NuGet/EntityFramework/buildTransitive/EntityFramework.props

diff --git a/src/NuGet/EntityFramework/build/EntityFramework.props b/src/NuGet/EntityFramework/build/EntityFramework.props
new file mode 100644
index 0000000000..d99a8c267f
--- /dev/null
+++ b/src/NuGet/EntityFramework/build/EntityFramework.props
@@ -0,0 +1,6 @@
+<Project>
+  <ItemGroup Condition="'$(EnableDefaultItems)' == 'True' And '$(EnableDefaultEntityDeployItems)' == 'True'">
+    <EntityDeploy Include="**/*.edmx" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+    <None Remove="**/*.edmx" Condition="'$(EnableDefaultNoneItems)' == 'True'" />
+  </ItemGroup>
+</Project>
diff --git a/src/NuGet/EntityFramework/build/EntityFramework.targets b/src/NuGet/EntityFramework/build/EntityFramework.targets
index b3c7416866..c81120ba5a 100644
--- a/src/NuGet/EntityFramework/build/EntityFramework.targets
+++ b/src/NuGet/EntityFramework/build/EntityFramework.targets
@@ -1,5 +1,9 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <PropertyGroup>
+    <EnableDefaultEntityDeployItems Condition="'$(EnableDefaultEntityDeployItems)' == ''">True</EnableDefaultEntityDeployItems>
+  </PropertyGroup>
+
   <!-- This .targets file can be used by updating Microsoft.Common.targets to 
          include the line below (as the last import element just before the end project tag)
       <Import Project="$(MSBuildBinPath)\Microsoft.Data.Entity.targets" Condition="Exists('$(MSBuildBinPath)\Microsoft.Data.Entity.targets')"/>
diff --git a/src/NuGet/EntityFramework/buildTransitive/EntityFramework.props b/src/NuGet/EntityFramework/buildTransitive/EntityFramework.props
new file mode 100644
index 0000000000..1932d7d5de
--- /dev/null
+++ b/src/NuGet/EntityFramework/buildTransitive/EntityFramework.props
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="..\build\EntityFramework.props" />
+</Project>