Updated to use ExtCore 2.0.0-alpha1

Dmitry Sikorsky · Dmitry Sikorsky · commit 7215b77eadeb · 2017-06-30T13:59:47.000+03:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Full-Featured ExtCore Framework 1.2.0 Sample Web Application
+# Full-Featured ExtCore Framework 2.0.0-alpha1 Sample 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,7 +14,7 @@ This is the full-featured ExtCore framework sample 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.
 
@@ -32,7 +32,7 @@ add direct dependencies to the main web application project instead, but it is n
 * [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).
+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
 
diff --git a/WebApplication.sln b/WebApplication.sln
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApplication", "src\WebAp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApplication.ExtensionA", "src\WebApplication.ExtensionA\WebApplication.ExtensionA.csproj", "{8D722841-4E2C-4673-A7CC-C2690EFE3915}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApplication.ExtensionB.Data.Models", "src\WebApplication.ExtensionB.Data.Models\WebApplication.ExtensionB.Data.Models.csproj", "{6EB08C04-9CA2-48B7-9404-3188AFA3E2DF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApplication.ExtensionB.Data.Entities", "src\WebApplication.ExtensionB.Data.Entities\WebApplication.ExtensionB.Data.Entities.csproj", "{6EB08C04-9CA2-48B7-9404-3188AFA3E2DF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApplication.ExtensionB", "src\WebApplication.ExtensionB\WebApplication.ExtensionB.csproj", "{396A8530-C500-469E-9F6F-A2D9C286C47D}"
 EndProject
diff --git a/src/WebApplication.ExtensionA/Actions/UseMvcAction.cs b/src/WebApplication.ExtensionA/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 ExtensionA.Actions
+{
+  public class UseMvcAction : IUseMvcAction
+  {
+    public int Priority => 1000;
+
+    public void Execute(IRouteBuilder routeBuilder, IServiceProvider serviceProvider)
+    {
+      routeBuilder.MapRoute(name: "Extension A", template: "", defaults: new { controller = "ExtensionA", action = "Index" });
+    }
+  }
+}
diff --git a/src/WebApplication.ExtensionA/Controllers/ExtensionAController.cs b/src/WebApplication.ExtensionA/Controllers/ExtensionAController.cs
@@ -11,7 +11,7 @@ public class ExtensionAController : Controller
   {
     public ActionResult Index()
     {
-      return this.View(ExtensionManager.Extensions.Select(e => e.Name));
+      return this.View(ExtensionManager.GetInstances<IExtension>().Select(e => e.Name));
     }
   }
 }
diff --git a/src/WebApplication.ExtensionA/ExtensionA.cs b/src/WebApplication.ExtensionA/ExtensionA.cs
@@ -1,28 +1,12 @@
-﻿// Copyright © 2015 Dmitry Sikorsky. All rights reserved.
+﻿// 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 System.Collections.Generic;
-using ExtCore.Mvc.Infrastructure;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Routing;
+using ExtCore.Infrastructure;
 
 namespace WebApplication.ExtensionA
 {
-  public class ExtensionA : ExtensionBase
+  public class Extension : ExtensionBase
   {
-    public override IEnumerable<KeyValuePair<int, Action<IRouteBuilder>>> UseMvcActionsByPriorities
-    {
-      get
-      {
-        return new Dictionary<int, Action<IRouteBuilder>>()
-        {
-          [1000] = routeBuilder =>
-          {
-            routeBuilder.MapRoute(name: "Extension A", template: "", defaults: new { controller = "ExtensionA", action = "Index" });
-          }
-        };
-      }
-    }
+    public override string Name => "ExtensionA";
   }
 }
diff --git a/src/WebApplication.ExtensionA/WebApplication.ExtensionA.csproj b/src/WebApplication.ExtensionA/WebApplication.ExtensionA.csproj
@@ -10,7 +10,7 @@
   </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>
 
diff --git a/src/WebApplication.ExtensionB.Data.Abstractions/IItemRepository.cs b/src/WebApplication.ExtensionB.Data.Abstractions/IItemRepository.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using ExtCore.Data.Abstractions;
-using WebApplication.ExtensionB.Data.Models;
+using WebApplication.ExtensionB.Data.Entities;
 
 namespace WebApplication.ExtensionB.Data.Abstractions
 {
diff --git a/src/WebApplication.ExtensionB.Data.Abstractions/WebApplication.ExtensionB.Data.Abstractions.csproj b/src/WebApplication.ExtensionB.Data.Abstractions/WebApplication.ExtensionB.Data.Abstractions.csproj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ExtCore.Data.Abstractions" Version="1.2.0" />
+    <PackageReference Include="ExtCore.Data.Abstractions" Version="2.0.0-alpha1" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\WebApplication.ExtensionB.Data.Models\WebApplication.ExtensionB.Data.Models.csproj" />
+    <ProjectReference Include="..\WebApplication.ExtensionB.Data.Entities\WebApplication.ExtensionB.Data.Entities.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/WebApplication.ExtensionB.Data.Entities/Item.cs b/src/WebApplication.ExtensionB.Data.Entities/Item.cs
@@ -1,9 +1,9 @@
 ﻿// Copyright © 2015 Dmitry Sikorsky. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using ExtCore.Data.Models.Abstractions;
+using ExtCore.Data.Entities.Abstractions;
 
-namespace WebApplication.ExtensionB.Data.Models
+namespace WebApplication.ExtensionB.Data.Entities
 {
   public class Item : IEntity
   {
diff --git a/src/WebApplication.ExtensionB.Data.Entities/WebApplication.ExtensionB.Data.Entities.csproj b/src/WebApplication.ExtensionB.Data.Entities/WebApplication.ExtensionB.Data.Entities.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ExtCore.Data.Models.Abstractions" Version="1.2.0" />
+    <PackageReference Include="ExtCore.Data.Entities.Abstractions" Version="2.0.0-alpha1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/WebApplication.ExtensionB.Data.EntityFramework.Sqlite/EntityRegistrar.cs b/src/WebApplication.ExtensionB.Data.EntityFramework.Sqlite/EntityRegistrar.cs
@@ -1,15 +1,15 @@
 ﻿// Copyright © 2015 Dmitry Sikorsky. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using ExtCore.Data.EntityFramework.Sqlite;
+using ExtCore.Data.EntityFramework;
 using Microsoft.EntityFrameworkCore;
-using WebApplication.ExtensionB.Data.Models;
+using WebApplication.ExtensionB.Data.Entities;
 
 namespace WebApplication.ExtensionB.Data.EntityFramework.Sqlite
 {
-  public class ModelRegistrar : IModelRegistrar
+  public class EntityRegistrar : IEntityRegistrar
   {
-    public void RegisterModels(ModelBuilder modelBuilder)
+    public void RegisterEntities(ModelBuilder modelBuilder)
     {
       modelBuilder.Entity<Item>(etb =>
         {
diff --git a/src/WebApplication.ExtensionB.Data.EntityFramework.Sqlite/ItemRepository.cs b/src/WebApplication.ExtensionB.Data.EntityFramework.Sqlite/ItemRepository.cs
@@ -3,9 +3,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using ExtCore.Data.EntityFramework.Sqlite;
+using ExtCore.Data.EntityFramework;
 using WebApplication.ExtensionB.Data.Abstractions;
-using WebApplication.ExtensionB.Data.Models;
+using WebApplication.ExtensionB.Data.Entities;
 
 namespace WebApplication.ExtensionB.Data.EntityFramework.Sqlite
 {
diff --git a/src/WebApplication.ExtensionB.Data.EntityFramework.Sqlite/WebApplication.ExtensionB.Data.EntityFramework.Sqlite.csproj b/src/WebApplication.ExtensionB.Data.EntityFramework.Sqlite/WebApplication.ExtensionB.Data.EntityFramework.Sqlite.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ExtCore.Data.EntityFramework.Sqlite" Version="1.2.0" />
+    <PackageReference Include="ExtCore.Data.EntityFramework.Sqlite" Version="2.0.0-alpha1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WebApplication.ExtensionB/Actions/UseMvcAction.cs b/src/WebApplication.ExtensionB/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 ExtensionB.Actions
+{
+  public class UseMvcAction : IUseMvcAction
+  {
+    public int Priority => 2000;
+
+    public void Execute(IRouteBuilder routeBuilder, IServiceProvider serviceProvider)
+    {
+      routeBuilder.MapRoute(name: "Extension B", template: "extension-b", defaults: new { controller = "ExtensionB", action = "Index" });
+    }
+  }
+}
diff --git a/src/WebApplication.ExtensionB/ExtensionB.cs b/src/WebApplication.ExtensionB/ExtensionB.cs
@@ -1,28 +1,12 @@
-﻿// Copyright © 2015 Dmitry Sikorsky. All rights reserved.
+﻿// 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 System.Collections.Generic;
-using ExtCore.Mvc.Infrastructure;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Routing;
+using ExtCore.Infrastructure;
 
 namespace WebApplication.ExtensionB
 {
-  public class ExtensionB : ExtensionBase
+  public class Extension : ExtensionBase
   {
-    public override IEnumerable<KeyValuePair<int, Action<IRouteBuilder>>> UseMvcActionsByPriorities
-    {
-      get
-      {
-        return new Dictionary<int, Action<IRouteBuilder>>()
-        {
-          [2000] = routeBuilder =>
-          {
-            routeBuilder.MapRoute(name: "Extension B", template: "extension-b", defaults: new { controller = "ExtensionB", action = "Index" });
-          }
-        };
-      }
-    }
+    public override string Name => "ExtensionB";
   }
 }
diff --git a/src/WebApplication.ExtensionB/ViewModels/ExtensionB/Index/IndexViewModelFactory.cs b/src/WebApplication.ExtensionB/ViewModels/ExtensionB/Index/IndexViewModelFactory.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using WebApplication.ExtensionB.Data.Models;
+using WebApplication.ExtensionB.Data.Entities;
 using WebApplication.ExtensionB.ViewModels.Shared;
 
 namespace WebApplication.ExtensionB.ViewModels.ExtenstionB
diff --git a/src/WebApplication.ExtensionB/ViewModels/Shared/ItemViewModelFactory.cs b/src/WebApplication.ExtensionB/ViewModels/Shared/ItemViewModelFactory.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright © 2015 Dmitry Sikorsky. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using WebApplication.ExtensionB.Data.Models;
+using WebApplication.ExtensionB.Data.Entities;
 
 namespace WebApplication.ExtensionB.ViewModels.Shared
 {
diff --git a/src/WebApplication.ExtensionB/WebApplication.ExtensionB.csproj b/src/WebApplication.ExtensionB/WebApplication.ExtensionB.csproj
@@ -14,7 +14,7 @@
   </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>
 
diff --git a/src/WebApplication/Startup.cs b/src/WebApplication/Startup.cs
@@ -1,7 +1,8 @@
 ﻿// Copyright © 2015 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.Data.EntityFramework;
+using ExtCore.WebApplication.Extensions;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -10,40 +11,43 @@
 
 namespace WebApplication
 {
-  public class Startup : ExtCore.WebApplication.Startup
+  public class Startup
   {
-    public Startup(IServiceProvider serviceProvider)
-      : base(serviceProvider)
-    {
-      this.serviceProvider.GetService<ILoggerFactory>().AddConsole();
+    private IConfigurationRoot configurationRoot;
+    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);
 
       this.configurationRoot = configurationBuilder.Build();
+      this.extensionsPath = hostingEnvironment.ContentRootPath + this.configurationRoot["Extensions:Path"];
+      loggerFactory.AddConsole();
+      loggerFactory.AddDebug();
     }
 
-    public override void ConfigureServices(IServiceCollection services)
+    public void ConfigureServices(IServiceCollection services)
     {
-      base.ConfigureServices(services);
+      services.AddExtCore(this.extensionsPath);
+      services.Configure<StorageContextOptions>(options =>
+      {
+        options.ConnectionString = this.configurationRoot.GetConnectionString("Default");
+      }
+      );
     }
 
-    public override void Configure(IApplicationBuilder applicationBuilder)
+    public void Configure(IApplicationBuilder applicationBuilder, IHostingEnvironment hostingEnvironment)
     {
-      if (this.serviceProvider.GetService<IHostingEnvironment>().IsDevelopment())
+      if (hostingEnvironment.IsDevelopment())
       {
         applicationBuilder.UseDeveloperExceptionPage();
         applicationBuilder.UseDatabaseErrorPage();
         applicationBuilder.UseBrowserLink();
       }
 
-      else
-      {
-
-      }
-
-      base.Configure(applicationBuilder);
+      applicationBuilder.UseExtCore();
     }
   }
 }
diff --git a/src/WebApplication/WebApplication.csproj b/src/WebApplication/WebApplication.csproj
@@ -6,16 +6,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ExtCore.Data" Version="1.2.0" />
-    <PackageReference Include="ExtCore.Data.EntityFramework.Sqlite" Version="1.2.0" />
-    <PackageReference Include="ExtCore.Mvc" Version="1.2.0" />
-    <PackageReference Include="ExtCore.WebApplication" Version="1.2.0" />
+    <PackageReference Include="ExtCore.Data" Version="2.0.0-alpha1" />
+    <PackageReference Include="ExtCore.Data.EntityFramework.Sqlite" Version="2.0.0-alpha1" />
+    <PackageReference Include="ExtCore.Mvc" Version="2.0.0-alpha1" />
+    <PackageReference Include="ExtCore.WebApplication" Version="2.0.0-alpha1" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="1.1.1" />
     <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" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
     <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.0" />
   </ItemGroup>
 
diff --git a/src/WebApplication/appsettings.json b/src/WebApplication/appsettings.json
@@ -0,0 +1,10 @@
+﻿{
+  "ConnectionStrings": {
+    // Please keep in mind that you have to change '\' to '/' on Linux-based systems
+    "Default": "Data Source=..\\..\\..\\db.sqlite"
+  },
+  "Extensions": {
+    // Please keep in mind that you have to change '\' to '/' on Linux-based systems
+    "Path": "\\Extensions"
+  }
+}
diff --git a/src/WebApplication/config.json b/src/WebApplication/config.json
diff --git a/src/WebApplication/gulpfile.js b/src/WebApplication/gulpfile.js

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class ExtensionAController : Controller`
`11`	`11`	`{`
`12`	`12`	`public ActionResult Index()`
`13`	`13`	`{`
`14`		`- return this.View(ExtensionManager.Extensions.Select(e => e.Name));`
	`14`	`+ return this.View(ExtensionManager.GetInstances<IExtension>().Select(e => e.Name));`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`using System.Collections.Generic;`
`5`	`5`	`using ExtCore.Data.Abstractions;`
`6`		`-using WebApplication.ExtensionB.Data.Models;`
	`6`	`+using WebApplication.ExtensionB.Data.Entities;`
`7`	`7`
`8`	`8`	`namespace WebApplication.ExtensionB.Data.Abstractions`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`// Copyright © 2015 Dmitry Sikorsky. All rights reserved.`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.`
`3`	`3`
`4`		`-using ExtCore.Data.Models.Abstractions;`
	`4`	`+using ExtCore.Data.Entities.Abstractions;`
`5`	`5`
`6`		`-namespace WebApplication.ExtensionB.Data.Models`
	`6`	`+namespace WebApplication.ExtensionB.Data.Entities`
`7`	`7`	`{`
`8`	`8`	`public class Item : IEntity`
`9`	`9`	`{`