diff --git a/GeekLearning.Storage.sln b/GeekLearning.Storage.sln index 41a94fe..aa49871 100644 --- a/GeekLearning.Storage.sln +++ b/GeekLearning.Storage.sln @@ -5,18 +5,13 @@ VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage", "src\GeekLearning.Storage\GeekLearning.Storage.xproj", "{1F419C53-73C6-4460-B284-6A49AE41C596}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FFFDF8A8-A519-481E-8A4B-6AE80D3E950D}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{FBAC4C17-D755-49A9-959D-18FD6B95B543}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.Azure", "src\GeekLearning.Storage.Azure\GeekLearning.Storage.Azure.xproj", "{FD8BB8F9-9AF5-4C12-B962-9E08C30B01E2}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.FileSystem", "src\GeekLearning.Storage.FileSystem\GeekLearning.Storage.FileSystem.xproj", "{4A12B042-76B3-471B-9235-F653E1ABE3C0}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.BasicSample", "src\GeekLearning.Storage.BasicSample\GeekLearning.Storage.BasicSample.xproj", "{3AB29F6F-D32B-49D1-8CE1-5B61A12B78CC}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "GeekLearning.Storage.BasicSample", "samples\GeekLearning.Storage.BasicSample\GeekLearning.Storage.BasicSample.xproj", "{63416AEA-DA51-4D62-B566-DB7D9BC800DC}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -36,15 +31,15 @@ Global {4A12B042-76B3-471B-9235-F653E1ABE3C0}.Debug|Any CPU.Build.0 = Debug|Any CPU {4A12B042-76B3-471B-9235-F653E1ABE3C0}.Release|Any CPU.ActiveCfg = Release|Any CPU {4A12B042-76B3-471B-9235-F653E1ABE3C0}.Release|Any CPU.Build.0 = Release|Any CPU - {3AB29F6F-D32B-49D1-8CE1-5B61A12B78CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3AB29F6F-D32B-49D1-8CE1-5B61A12B78CC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3AB29F6F-D32B-49D1-8CE1-5B61A12B78CC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3AB29F6F-D32B-49D1-8CE1-5B61A12B78CC}.Release|Any CPU.Build.0 = Release|Any CPU + {63416AEA-DA51-4D62-B566-DB7D9BC800DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {63416AEA-DA51-4D62-B566-DB7D9BC800DC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {63416AEA-DA51-4D62-B566-DB7D9BC800DC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {63416AEA-DA51-4D62-B566-DB7D9BC800DC}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {3AB29F6F-D32B-49D1-8CE1-5B61A12B78CC} = {FBAC4C17-D755-49A9-959D-18FD6B95B543} + {63416AEA-DA51-4D62-B566-DB7D9BC800DC} = {FBAC4C17-D755-49A9-959D-18FD6B95B543} EndGlobalSection EndGlobal diff --git a/global.json b/global.json deleted file mode 100644 index 2613181..0000000 --- a/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "sdk": { - "version": "1.0.0-rc1-final" - }, - "projects": [ "src", "samples" ] -} \ No newline at end of file diff --git a/src/GeekLearning.Storage.BasicSample/Controllers/ValuesController.cs b/samples/GeekLearning.Storage.BasicSample/Controllers/ValuesController.cs similarity index 95% rename from src/GeekLearning.Storage.BasicSample/Controllers/ValuesController.cs rename to samples/GeekLearning.Storage.BasicSample/Controllers/ValuesController.cs index 69b4f59..e163a5f 100644 --- a/src/GeekLearning.Storage.BasicSample/Controllers/ValuesController.cs +++ b/samples/GeekLearning.Storage.BasicSample/Controllers/ValuesController.cs @@ -2,13 +2,14 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc; +using Microsoft.AspNetCore.Mvc; namespace GeekLearning.Storage.BasicSample.Controllers { [Route("api/[controller]")] public class ValuesController : Controller { + // GET api/values private TemplatesStore templates; public ValuesController(TemplatesStore templates) diff --git a/src/GeekLearning.Storage.BasicSample/GeekLearning.Storage.BasicSample.xproj b/samples/GeekLearning.Storage.BasicSample/GeekLearning.Storage.BasicSample.xproj similarity index 60% rename from src/GeekLearning.Storage.BasicSample/GeekLearning.Storage.BasicSample.xproj rename to samples/GeekLearning.Storage.BasicSample/GeekLearning.Storage.BasicSample.xproj index 2a147e0..1a43cd3 100644 --- a/src/GeekLearning.Storage.BasicSample/GeekLearning.Storage.BasicSample.xproj +++ b/samples/GeekLearning.Storage.BasicSample/GeekLearning.Storage.BasicSample.xproj @@ -4,15 +4,16 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + - 3ab29f6f-d32b-49d1-8ce1-5b61a12b78cc + 63416aea-da51-4d62-b566-db7d9bc800dc GeekLearning.Storage.BasicSample - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + v4.5.2 2.0 - + diff --git a/samples/GeekLearning.Storage.BasicSample/Program.cs b/samples/GeekLearning.Storage.BasicSample/Program.cs new file mode 100644 index 0000000..0efd76e --- /dev/null +++ b/samples/GeekLearning.Storage.BasicSample/Program.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Builder; + +namespace GeekLearning.Storage.BasicSample +{ + public class Program + { + public static void Main(string[] args) + { + var host = new WebHostBuilder() + .UseKestrel() + .UseContentRoot(Directory.GetCurrentDirectory()) + .UseIISIntegration() + .UseStartup() + .Build(); + + host.Run(); + } + } +} diff --git a/src/GeekLearning.Storage.BasicSample/Project_Readme.html b/samples/GeekLearning.Storage.BasicSample/Project_Readme.html similarity index 91% rename from src/GeekLearning.Storage.BasicSample/Project_Readme.html rename to samples/GeekLearning.Storage.BasicSample/Project_Readme.html index 0fc12df..bddf864 100644 --- a/src/GeekLearning.Storage.BasicSample/Project_Readme.html +++ b/samples/GeekLearning.Storage.BasicSample/Project_Readme.html @@ -2,7 +2,7 @@ - Welcome to ASP.NET 5 + Welcome to ASP.NET Core