Automatically include *.edmx files on SDK-style projects

Fixes #891
dotnet · Jul 30, 2019 · aee8898 · aee8898
1 parent 15aeaf9
commit aee8898
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/src/NuGet/EntityFramework/build/EntityFramework.props 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
@@ -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
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="..\build\EntityFramework.props" />
+</Project>