Upgrade to EF6 matthewschrager#2

scho · Mar 1, 2014 · 9c28740 · 9c28740
1 parent 35686b8
commit 9c28740
Show file tree

Hide file tree

Showing 23 changed files with 212,556 additions and 12 deletions.
diff --git a/Repository.EntityFramework/App.config b/Repository.EntityFramework/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
   <connectionStrings>

diff --git a/Repository.EntityFramework/DbContextExtensions.cs b/Repository.EntityFramework/DbContextExtensions.cs
@@ -3,14 +3,11 @@
 using System.Data;
 using System.Data.Entity;
 using System.Data.Entity.Infrastructure;
-using System.Data.Objects;
 using System.Data.SqlClient;
+using System.Data.Entity.Core.Objects;
 using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using Microsoft.Samples.EntityDataReader;
-using NUnit.Framework;
 
 namespace Repository.EntityFramework
 {

diff --git a/Repository.EntityFramework/EntityDataReader.cs b/Repository.EntityFramework/EntityDataReader.cs
@@ -36,11 +36,12 @@ namespace Microsoft.Samples.EntityDataReader
   using System.Collections.Generic;
   using System.Linq;
   using System.Data;
+  using System.Data.Entity.Core.Objects;
+  using System.Data.Entity.Core.Objects.DataClasses;
+  using System.Data.Entity.Core.Metadata.Edm;
+  using System.Data.Entity.Core;
   using System.Reflection;
   using System.Data.Common;
-  using System.Data.Objects.DataClasses;
-  using System.Data.Metadata.Edm;
-  using System.Data.Objects;
   using System.Linq.Expressions;
 
 

diff --git a/Repository.EntityFramework/Repository.EntityFramework.csproj b/Repository.EntityFramework/Repository.EntityFramework.csproj
@@ -38,9 +38,13 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\AutoMapper.2.2.1\lib\net40\AutoMapper.dll</HintPath>
     </Reference>
-    <Reference Include="EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll</HintPath>
+      <HintPath>..\packages\EntityFramework.6.0.2\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\EntityFramework.6.0.2\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -50,7 +54,6 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.Entity" />
     <Reference Include="System.Transactions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

diff --git a/Repository.EntityFramework/packages.config b/Repository.EntityFramework/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="2.2.1" targetFramework="net45" />
-  <package id="EntityFramework" version="5.0.0" targetFramework="net45" />
+  <package id="EntityFramework" version="6.0.2" targetFramework="net45" />
   <package id="NUnit" version="2.6.2" targetFramework="net45" />
 </packages>
diff --git a/packages/EntityFramework.6.0.2/content/App.config.transform b/packages/EntityFramework.6.0.2/content/App.config.transform
@@ -0,0 +1,5 @@
+<configuration>
+    <configSections>
+        <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    </configSections>
+</configuration>
diff --git a/packages/EntityFramework.6.0.2/content/Web.config.transform b/packages/EntityFramework.6.0.2/content/Web.config.transform
@@ -0,0 +1,5 @@
+<configuration>
+    <configSections>
+        <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    </configSections>
+</configuration>
diff --git a/packages/EntityFramework.6.0.2/lib/net40/EntityFramework.SqlServer.dll b/packages/EntityFramework.6.0.2/lib/net40/EntityFramework.SqlServer.dll
diff --git a/packages/EntityFramework.6.0.2/lib/net40/EntityFramework.SqlServer.xml b/packages/EntityFramework.6.0.2/lib/net40/EntityFramework.SqlServer.xml
diff --git a/packages/EntityFramework.6.0.2/lib/net40/EntityFramework.dll b/packages/EntityFramework.6.0.2/lib/net40/EntityFramework.dll
diff --git a/packages/EntityFramework.6.0.2/lib/net40/EntityFramework.xml b/packages/EntityFramework.6.0.2/lib/net40/EntityFramework.xml
diff --git a/packages/EntityFramework.6.0.2/lib/net45/EntityFramework.SqlServer.dll b/packages/EntityFramework.6.0.2/lib/net45/EntityFramework.SqlServer.dll
diff --git a/packages/EntityFramework.6.0.2/lib/net45/EntityFramework.SqlServer.xml b/packages/EntityFramework.6.0.2/lib/net45/EntityFramework.SqlServer.xml
diff --git a/packages/EntityFramework.6.0.2/lib/net45/EntityFramework.dll b/packages/EntityFramework.6.0.2/lib/net45/EntityFramework.dll
diff --git a/packages/EntityFramework.6.0.2/lib/net45/EntityFramework.xml b/packages/EntityFramework.6.0.2/lib/net45/EntityFramework.xml
diff --git a/packages/EntityFramework.6.0.2/tools/EntityFramework.PowerShell.Utility.dll b/packages/EntityFramework.6.0.2/tools/EntityFramework.PowerShell.Utility.dll
diff --git a/packages/EntityFramework.6.0.2/tools/EntityFramework.PowerShell.dll b/packages/EntityFramework.6.0.2/tools/EntityFramework.PowerShell.dll
diff --git a/packages/EntityFramework.6.0.2/tools/EntityFramework.psd1 b/packages/EntityFramework.6.0.2/tools/EntityFramework.psd1