Updated to use ExtCore 2.0.0-alpha1

Author: Dmitry Sikorsky

README.md

@@ -1,4 +1,4 @@
-# ExtCore Framework 1.2.0 Sample MVC Web Application
+# ExtCore Framework 2.0.0-alpha1 Sample MVC Web Application
 
 [![Join the chat at https://gitter.im/ExtCore/ExtCore](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ExtCore/ExtCore?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
@@ -14,25 +14,25 @@ This is the ExtCore framework sample MVC web application.
 
 * rebuild the solution;
 * copy the extensions DLL files into the Extensions folder of the main web application (this folder doesn’t exist by default,
-so you need to create it in the web application root or specify another location in the config.json file; also you may just
+so you need to create it in the web application root or specify another location in the appsettings.json file; also you may just
 add direct dependencies to the main web application project instead, but it is not so interesting);
 * run the main web application.
 
 ## More Information
 
 ### Other Samples
 
-* [Full-featured ExtCore 1.2.0 framework sample web application](https://github.com/ExtCore/ExtCore-Sample);
-* [ExtCore framework 1.2.0 sample simplest web application](https://github.com/ExtCore/ExtCore-Sample-Simplest);
-* [ExtCore framework 1.2.0 sample web application that uses a database](https://github.com/ExtCore/ExtCore-Sample-Data);
-* [ExtCore framework 1.2.0 sample web application with modular UI](https://github.com/ExtCore/ExtCore-Sample-Modular-Ui);
-* [ExtCore framework 1.2.0 advanced sample web application with modular UI](https://github.com/ExtCore/ExtCore-Sample-Modular-Ui-Adv);
-* [ExtCore framework 1.2.0 advanced sample accounting web application](https://github.com/ExtCore/ExtCore-Sample-Accounting);
-* [ExtCore framework 1.2.0 sample web application that registers a service inside the extension](https://github.com/ExtCore/ExtCore-Sample-Service);
-* [ExtCore framework 1.2.0 sample web application that uses the events](https://github.com/ExtCore/ExtCore-Sample-Events);
-* [ExtCore framework 1.2.0 sample API web application](https://github.com/ExtCore/ExtCore-Sample-Api).
-
-You can also download our [ready to use full-featured sample](http://extcore.net/files/ExtCore-Sample-1.2.0.zip).
+* [Full-featured ExtCore 2.0.0-alpha1 framework sample web application](https://github.com/ExtCore/ExtCore-Sample);
+* [ExtCore framework 2.0.0-alpha1 sample simplest web application](https://github.com/ExtCore/ExtCore-Sample-Simplest);
+* [ExtCore framework 2.0.0-alpha1 sample web application that uses a database](https://github.com/ExtCore/ExtCore-Sample-Data);
+* [ExtCore framework 2.0.0-alpha1 sample web application with modular UI](https://github.com/ExtCore/ExtCore-Sample-Modular-Ui);
+* [ExtCore framework 2.0.0-alpha1 advanced sample web application with modular UI](https://github.com/ExtCore/ExtCore-Sample-Modular-Ui-Adv);
+* [ExtCore framework 2.0.0-alpha1 advanced sample accounting web application](https://github.com/ExtCore/ExtCore-Sample-Accounting);
+* [ExtCore framework 2.0.0-alpha1 sample web application that registers a service inside the extension](https://github.com/ExtCore/ExtCore-Sample-Service);
+* [ExtCore framework 2.0.0-alpha1 sample web application that uses the events](https://github.com/ExtCore/ExtCore-Sample-Events);
+* [ExtCore framework 2.0.0-alpha1 sample API web application](https://github.com/ExtCore/ExtCore-Sample-Api).
+
+You can also download our [ready to use full-featured sample](http://extcore.net/files/ExtCore-Sample-2.0.0-alpha1.zip).
 It contains everything you need to run ExtCore-based web application from Visual Studio 2017, including SQLite
 database with the test data.
 
@@ -44,7 +44,7 @@ to help you start developing your ExtCore-based web applications.
 ### Real Projects
 
 Please take a look at [Platformus](https://github.com/Platformus/Platformus) on GitHub. It is CMS
-built on ExtCore framework with 10 extensions and 70 projects.
+built on ExtCore framework with more than 10 extensions and 70 projects.
 
 ## Links
 

src/Extension/Actions/UseMvcAction.cs

@@ -0,0 +1,20 @@
+// Copyright © 2017 Dmitry Sikorsky. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using ExtCore.Mvc.Infrastructure.Actions;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Routing;
+
+namespace Extension.Actions
+{
+  public class UseMvcAction : IUseMvcAction
+  {
+    public int Priority => 1000;
+
+    public void Execute(IRouteBuilder routeBuilder, IServiceProvider serviceProvider)
+    {
+      routeBuilder.MapRoute(name: "Default", template: "{controller}/{action}", defaults: new { controller = "Default", action = "Index" });
+    }
+  }
+}

src/Extension/Extension.cs

@@ -10,12 +10,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ExtCore.Mvc.Infrastructure" Version="1.2.0" />
+    <PackageReference Include="ExtCore.Mvc.Infrastructure" Version="2.0.0-alpha1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-
 </Project>

src/Extension/Extension.csproj

@@ -1,7 +1,7 @@
 // Copyright © 2017 Dmitry Sikorsky. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
+using ExtCore.WebApplication.Extensions;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -10,28 +10,29 @@
 
 namespace WebApplication
 {
-  public class Startup : ExtCore.WebApplication.Startup
+  public class Startup
   {
-    public Startup(IServiceProvider serviceProvider)
-      : base (serviceProvider)
-    {
-      this.serviceProvider.GetService<ILoggerFactory>().AddConsole();
+    private string extensionsPath;
 
+    public Startup(IHostingEnvironment hostingEnvironment, ILoggerFactory loggerFactory)
+    {
       IConfigurationBuilder configurationBuilder = new ConfigurationBuilder()
-        .SetBasePath(this.serviceProvider.GetService<IHostingEnvironment>().ContentRootPath)
-        .AddJsonFile("config.json", optional: true, reloadOnChange: true);
+        .SetBasePath(hostingEnvironment.ContentRootPath)
+        .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true);
+
+      IConfigurationRoot configurationRoot = configurationBuilder.Build();
 
-      this.configurationRoot = configurationBuilder.Build();
+      this.extensionsPath = hostingEnvironment.ContentRootPath + configurationRoot["Extensions:Path"];
     }
 
-    public override void ConfigureServices(IServiceCollection services)
+    public void ConfigureServices(IServiceCollection services)
     {
-      base.ConfigureServices(services);
+      services.AddExtCore(this.extensionsPath);
     }
 
-    public override void Configure(IApplicationBuilder applicationBuilder)
+    public void Configure(IApplicationBuilder applicationBuilder)
     {
-      base.Configure(applicationBuilder);
+      applicationBuilder.UseExtCore();
     }
   }
 }

src/WebApplication/Startup.cs

@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ExtCore.Mvc" Version="1.2.0" />
-    <PackageReference Include="ExtCore.WebApplication" Version="1.2.0" />
+    <PackageReference Include="ExtCore.Mvc" Version="2.0.0-alpha1" />
+    <PackageReference Include="ExtCore.WebApplication" Version="2.0.0-alpha1" />
     <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />