Merge pull request #16 from OrchardCMS/entityframework

Merging EF branch to Core with DNX Changes

NuGet.Config

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear /> 
+    <add key="AspNetVNext" value="https://www.myget.org/F/aspnetvnext/api/v2" />
+    <add key="NuGet.org2" value="https://nuget.org/api/v2/" />
+  </packageSources>
+</configuration>

OrchardVNext.sln

@@ -1,9 +1,8 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.22512.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OrchardVNext.Web", "src\OrchardVNext.Web\OrchardVNext.Web.kproj", "{07D91819-4C81-434F-8DE4-51D2B5A4EDA8}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OrchardVNext.Web", "src\OrchardVNext.Web\OrchardVNext.Web.xproj", "{07D91819-4C81-434F-8DE4-51D2B5A4EDA8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{60B5B61F-09C1-4F5C-8A5A-953574D0DCA2} = {60B5B61F-09C1-4F5C-8A5A-953574D0DCA2}
 	EndProjectSection
@@ -12,25 +11,30 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		global.json = global.json
 	EndProjectSection
+	ProjectSection(FolderGlobals) = preProject
+		global_1json__JSONSchema = http://json.schemastore.org/global
+	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OrchardVNext.Framework", "src\OrchardVNext\OrchardVNext.Framework.kproj", "{60B5B61F-09C1-4F5C-8A5A-953574D0DCA2}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OrchardVNext.Framework", "src\OrchardVNext\OrchardVNext.Framework.xproj", "{60B5B61F-09C1-4F5C-8A5A-953574D0DCA2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{90030E85-0C4F-456F-B879-443E8A3F220D}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OrchardVNext.Test1", "src\OrchardVNext.Web\Modules\OrchardVNext.Test1\OrchardVNext.Test1.kproj", "{44CF51FB-7C14-4471-B113-9286BD41A783}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OrchardVNext.Test1", "src\OrchardVNext.Web\Modules\OrchardVNext.Test1\OrchardVNext.Test1.xproj", "{44CF51FB-7C14-4471-B113-9286BD41A783}"
 	ProjectSection(ProjectDependencies) = postProject
 		{60B5B61F-09C1-4F5C-8A5A-953574D0DCA2} = {60B5B61F-09C1-4F5C-8A5A-953574D0DCA2}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{275E087F-A4E2-4A7B-A924-ED68E3A52086}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OrchardVNext.Test2", "src\OrchardVNext.Web\Modules\OrchardVNext.Test2\OrchardVNext.Test2.kproj", "{C0BA112A-FD23-451B-8876-912E1AEAD87B}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OrchardVNext.Test2", "src\OrchardVNext.Web\Modules\OrchardVNext.Test2\OrchardVNext.Test2.xproj", "{C0BA112A-FD23-451B-8876-912E1AEAD87B}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OrchardVNext.Demo", "src\OrchardVNext.Web\Modules\OrchardVNext.Demo\OrchardVNext.Demo.kproj", "{19089E81-CEFD-4008-A31C-541D82F58C54}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OrchardVNext.Demo", "src\OrchardVNext.Web\Modules\OrchardVNext.Demo\OrchardVNext.Demo.xproj", "{19089E81-CEFD-4008-A31C-541D82F58C54}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{C362E36F-3F0F-40B3-8BBF-2B0252E77A34}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OrchardVNext.Tests", "src\OrchardVNext.Tests\OrchardVNext.Tests.kproj", "{B8431B91-F908-416A-A82C-B29528FCA4E9}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OrchardVNext.Tests", "src\OrchardVNext.Tests\OrchardVNext.Tests.xproj", "{B8431B91-F908-416A-A82C-B29528FCA4E9}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "OrchardVNext.Core", "src\OrchardVNext.Web\Core\OrchardVNext.Core\OrchardVNext.Core.xproj", "{D2B2A745-17BA-4B5F-8992-93EA803BD068}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -62,6 +66,10 @@ Global
 		{B8431B91-F908-416A-A82C-B29528FCA4E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B8431B91-F908-416A-A82C-B29528FCA4E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B8431B91-F908-416A-A82C-B29528FCA4E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2B2A745-17BA-4B5F-8992-93EA803BD068}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2B2A745-17BA-4B5F-8992-93EA803BD068}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2B2A745-17BA-4B5F-8992-93EA803BD068}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2B2A745-17BA-4B5F-8992-93EA803BD068}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -75,5 +83,6 @@ Global
 		{19089E81-CEFD-4008-A31C-541D82F58C54} = {90030E85-0C4F-456F-B879-443E8A3F220D}
 		{C362E36F-3F0F-40B3-8BBF-2B0252E77A34} = {275E087F-A4E2-4A7B-A924-ED68E3A52086}
 		{B8431B91-F908-416A-A82C-B29528FCA4E9} = {C362E36F-3F0F-40B3-8BBF-2B0252E77A34}
+		{D2B2A745-17BA-4B5F-8992-93EA803BD068} = {275E087F-A4E2-4A7B-A924-ED68E3A52086}
 	EndGlobalSection
 EndGlobal

OrchardVNext.sublime-project

@@ -0,0 +1,10 @@
+{
+    "folders":
+    [
+        {
+            "follow_symlinks": true,
+            "path": "."
+        }
+    ],
+    "solution_file": "./OrchardVNext.sln"
+}