From 21f6b5f6648138f80639e91b51d4c506c21df7f0 Mon Sep 17 00:00:00 2001
From: Arthur Vickers <ajcvickers@hotmail.com>
Date: Thu, 13 Jun 2019 14:06:17 -0700
Subject: [PATCH 1/2] Update submodules.props for EF 2.2.6

---
 build/submodules.props      | 2 +-
 modules/EntityFrameworkCore | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/submodules.props b/build/submodules.props
index 4370c412c7..a088430493 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -37,6 +37,6 @@
 
   <ItemGroup>
     <Repository Include="Templating" PatchPolicy="AlwaysUpdateAndCascadeVersions" RootPath="$(RepositoryRoot)src\Templating\" />
-    <ShippedRepository Include="EntityFrameworkCore" />
+    <Repository Include="EntityFrameworkCore" />
   </ItemGroup>
 </Project>
diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore
index f04e9ca9d7..01da710cde 160000
--- a/modules/EntityFrameworkCore
+++ b/modules/EntityFrameworkCore
@@ -1 +1 @@
-Subproject commit f04e9ca9d7a134f5061cb3226a4b0a6c71c285bc
+Subproject commit 01da710cdeff0431fc60379580aa63f335fbc165

From d8581565daeafe0205838c6fec4fbf2f42b228ce Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Thu, 13 Jun 2019 15:06:21 -0700
Subject: [PATCH 2/2] Fix order in which EF properties are set

---
 build/dependencies.props | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index 39d1a507a2..ff1b314c33 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -6,9 +6,6 @@
     <MicrosoftNETCoreDotNetAppHostPackageVersion>2.2.5</MicrosoftNETCoreDotNetAppHostPackageVersion>
   </PropertyGroup>
 
-  <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
-  <Import Project="dependencies.folderbuilds.props" Condition=" '$(IsUniverseBuild)' != 'true' AND '$(DotNetPackageVersionPropsPath)' == ''" />
-
   <PropertyGroup>
     <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.2.4</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
     <MicrosoftEntityFrameworkCorePackageVersion>2.2.4</MicrosoftEntityFrameworkCorePackageVersion>
@@ -18,6 +15,9 @@
     <MicrosoftEntityFrameworkCoreToolsPackageVersion>2.2.4</MicrosoftEntityFrameworkCoreToolsPackageVersion>
   </PropertyGroup>
 
+  <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
+  <Import Project="dependencies.folderbuilds.props" Condition=" '$(IsUniverseBuild)' != 'true' AND '$(DotNetPackageVersionPropsPath)' == ''" />
+
   <PropertyGroup>
     <!-- Assign this variable last because it may be updated from DotNetPackageVersionPropsPath as MicrosoftNETCoreAppPackageVersion. -->
     <MicrosoftNETCoreApp22PackageVersion Condition="'$(MicrosoftNETCoreAppPackageVersion)' != ''">$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreApp22PackageVersion>