Updated to use ExtCore 3.3.0

Dmitry Sikorsky · Dmitry Sikorsky · commit 5c662c74ec57 · 2018-07-21T21:19:00.000+03:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# ExtCore Framework 3.2.0 Sample MVC Web Application
+# ExtCore Framework 3.3.0 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)
 
@@ -22,18 +22,18 @@ add direct dependencies to the main web application project instead, but it is n
 
 ### Other Samples
 
-* [Full-featured ExtCore 3.2.0 framework sample web application](https://github.com/ExtCore/ExtCore-Sample);
-* [ExtCore framework 3.2.0 sample simplest web application](https://github.com/ExtCore/ExtCore-Sample-Simplest);
-* [ExtCore framework 3.2.0 sample web application that uses a database](https://github.com/ExtCore/ExtCore-Sample-Data);
-* [ExtCore framework 3.2.0 sample web application that uses Identity](https://github.com/ExtCore/ExtCore-Sample-Identity);
-* [ExtCore framework 3.2.0 sample web application with modular UI](https://github.com/ExtCore/ExtCore-Sample-Modular-Ui);
-* [ExtCore framework 3.2.0 advanced sample web application with modular UI](https://github.com/ExtCore/ExtCore-Sample-Modular-Ui-Adv);
-* [ExtCore framework 3.2.0 advanced sample accounting web application](https://github.com/ExtCore/ExtCore-Sample-Accounting);
-* [ExtCore framework 3.2.0 sample web application that registers a service inside the extension](https://github.com/ExtCore/ExtCore-Sample-Service);
-* [ExtCore framework 3.2.0 sample web application that uses the events](https://github.com/ExtCore/ExtCore-Sample-Events);
-* [ExtCore framework 3.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-3.2.0.zip).
+* [Full-featured ExtCore 3.3.0 framework sample web application](https://github.com/ExtCore/ExtCore-Sample);
+* [ExtCore framework 3.3.0 sample simplest web application](https://github.com/ExtCore/ExtCore-Sample-Simplest);
+* [ExtCore framework 3.3.0 sample web application that uses a database](https://github.com/ExtCore/ExtCore-Sample-Data);
+* [ExtCore framework 3.3.0 sample web application that uses Identity](https://github.com/ExtCore/ExtCore-Sample-Identity);
+* [ExtCore framework 3.3.0 sample web application with modular UI](https://github.com/ExtCore/ExtCore-Sample-Modular-Ui);
+* [ExtCore framework 3.3.0 advanced sample web application with modular UI](https://github.com/ExtCore/ExtCore-Sample-Modular-Ui-Adv);
+* [ExtCore framework 3.3.0 advanced sample accounting web application](https://github.com/ExtCore/ExtCore-Sample-Accounting);
+* [ExtCore framework 3.3.0 sample web application that registers a service inside the extension](https://github.com/ExtCore/ExtCore-Sample-Service);
+* [ExtCore framework 3.3.0 sample web application that uses the events](https://github.com/ExtCore/ExtCore-Sample-Events);
+* [ExtCore framework 3.3.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-3.3.0.zip).
 It contains everything you need to run ExtCore-based web application from Visual Studio 2017, including SQLite
 database with the test data.
 
diff --git a/src/Extension/Extension.csproj b/src/Extension/Extension.csproj
@@ -2,15 +2,15 @@
 
   <PropertyGroup>
     <Authors>Dmitry Sikorsky</Authors>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <EmbeddedResource Include="Styles\**;Views\**" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ExtCore.Mvc.Infrastructure" Version="3.2.0" />
+    <PackageReference Include="ExtCore.Mvc.Infrastructure" Version="3.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/WebApplication/Program.cs b/src/WebApplication/Program.cs
@@ -1,7 +1,6 @@
 ﻿// 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.IO;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 
@@ -11,15 +10,11 @@ public class Program
   {
     public static void Main(string[] args)
     {
-      Program.BuildWebHost(args).Run();
+      CreateWebHostBuilder(args).Build().Run();
     }
 
-    public static IWebHost BuildWebHost(string[] args) =>
+    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
       WebHost.CreateDefaultBuilder(args)
-        .UseContentRoot(Directory.GetCurrentDirectory())
-        .UseKestrel()
-        .UseIISIntegration()
-        .UseStartup<Startup>()
-        .Build();
+        .UseStartup<Startup>();
   }
 }
diff --git a/src/WebApplication/Startup.cs b/src/WebApplication/Startup.cs
@@ -6,23 +6,16 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 namespace WebApplication
 {
   public class Startup
   {
     private string extensionsPath;
 
-    public Startup(IHostingEnvironment hostingEnvironment, ILoggerFactory loggerFactory)
+    public Startup(IHostingEnvironment hostingEnvironment, IConfiguration configuration)
     {
-      IConfigurationBuilder configurationBuilder = new ConfigurationBuilder()
-        .SetBasePath(hostingEnvironment.ContentRootPath)
-        .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true);
-
-      IConfigurationRoot configurationRoot = configurationBuilder.Build();
-
-      this.extensionsPath = hostingEnvironment.ContentRootPath + configurationRoot["Extensions:Path"];
+      this.extensionsPath = hostingEnvironment.ContentRootPath + configuration["Extensions:Path"];
     }
 
     public void ConfigureServices(IServiceCollection services)
diff --git a/src/WebApplication/WebApplication.csproj b/src/WebApplication/WebApplication.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <Authors>Dmitry Sikorsky</Authors>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ExtCore.Mvc" Version="3.2.0" />
-    <PackageReference Include="ExtCore.WebApplication" Version="3.2.0" />
+    <PackageReference Include="ExtCore.Mvc" Version="3.3.0" />
+    <PackageReference Include="ExtCore.WebApplication" Version="3.3.0" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`// Copyright © 2017 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 System.IO;`
`5`	`4`	`using Microsoft.AspNetCore;`
`6`	`5`	`using Microsoft.AspNetCore.Hosting;`
`7`	`6`
`@@ -11,15 +10,11 @@ public class Program`
`11`	`10`	`{`
`12`	`11`	`public static void Main(string[] args)`
`13`	`12`	`{`
`14`		`- Program.BuildWebHost(args).Run();`
	`13`	`+ CreateWebHostBuilder(args).Build().Run();`
`15`	`14`	`}`
`16`	`15`
`17`		`- public static IWebHost BuildWebHost(string[] args) =>`
	`16`	`+ public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>`
`18`	`17`	`WebHost.CreateDefaultBuilder(args)`
`19`		`- .UseContentRoot(Directory.GetCurrentDirectory())`
`20`		`- .UseKestrel()`
`21`		`- .UseIISIntegration()`
`22`		`- .UseStartup<Startup>()`
`23`		`- .Build();`
	`18`	`+ .UseStartup<Startup>();`
`24`	`19`	`}`
`25`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,23 +6,16 @@`
`6`	`6`	`using Microsoft.AspNetCore.Hosting;`
`7`	`7`	`using Microsoft.Extensions.Configuration;`
`8`	`8`	`using Microsoft.Extensions.DependencyInjection;`
`9`		`-using Microsoft.Extensions.Logging;`
`10`	`9`
`11`	`10`	`namespace WebApplication`
`12`	`11`	`{`
`13`	`12`	`public class Startup`
`14`	`13`	`{`
`15`	`14`	`private string extensionsPath;`
`16`	`15`
`17`		`- public Startup(IHostingEnvironment hostingEnvironment, ILoggerFactory loggerFactory)`
	`16`	`+ public Startup(IHostingEnvironment hostingEnvironment, IConfiguration configuration)`
`18`	`17`	`{`
`19`		`- IConfigurationBuilder configurationBuilder = new ConfigurationBuilder()`
`20`		`- .SetBasePath(hostingEnvironment.ContentRootPath)`
`21`		`- .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true);`
`22`		`-`
`23`		`- IConfigurationRoot configurationRoot = configurationBuilder.Build();`
`24`		`-`
`25`		`- this.extensionsPath = hostingEnvironment.ContentRootPath + configurationRoot["Extensions:Path"];`
	`18`	`+ this.extensionsPath = hostingEnvironment.ContentRootPath + configuration["Extensions:Path"];`
`26`	`19`	`}`
`27`	`20`
`28`	`21`	`public void ConfigureServices(IServiceCollection services)`