Merge pull request #70 from dansiegel/dev

Fixes PostBuild Task

Author: rxtur

Blogifier.Core/Configuration.cs

@@ -27,10 +27,16 @@
 
 namespace Blogifier.Core
 {
-    public class Configuration
+    public static class Configuration
     {
-		public static void InitServices(IServiceCollection services, Action<DbContextOptionsBuilder> databaseOptions = null, IConfiguration config = null)
-		{   
+        public static IServiceCollection AddBlogifier(this IServiceCollection services, Action<DbContextOptionsBuilder> databaseOptions = null, IConfiguration config = null)
+        {
+            InitServices(services, databaseOptions, config);
+            return services;
+        }
+
+        public static void InitServices(IServiceCollection services, Action<DbContextOptionsBuilder> databaseOptions = null, IConfiguration config = null)
+        {
             if(config != null)
             {
                 LoadFromConfigFile(config);
@@ -62,6 +68,12 @@ public static void InitServices(IServiceCollection services, Action<DbContextOpt
 			AddFileProviders(services);
 		}
 
+        public static IApplicationBuilder UseBlogifier(this IApplicationBuilder app, IHostingEnvironment env)
+        {
+            InitApplication(app, env);
+            return app;
+        }
+
 		public static void InitApplication(IApplicationBuilder app, IHostingEnvironment env)
 		{
             app.UseMiddleware<AppSettingsLoader>();

Blogifier.Web/Blogifier.Web.csproj

@@ -27,9 +27,18 @@
     <ProjectReference Include="..\Blogifier.Core\Blogifier.Core.csproj" />
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="Exists('$(SolutionDir)Packages\Widgets\Newsletter\bin\Debug\netcoreapp2.0\Newsletter.dll')">
-    <Exec Command="xcopy &quot;$(SolutionDir)Packages\Widgets\Newsletter\bin\Debug\netcoreapp2.0\Newsletter.dll&quot; &quot;$(TargetDir)&quot; /Y" />
-    <Exec Command="xcopy &quot;$(SolutionDir)Packages\Widgets\PostList\bin\Debug\netcoreapp2.0\PostList.dll&quot; &quot;$(TargetDir)&quot; /Y" />
+  <Target Name="PostBuild" 
+          AfterTargets="PostBuildEvent" 
+          Condition="Exists('$(SolutionDir)Packages\Widgets\Newsletter\bin\Debug\netcoreapp2.0\Newsletter.dll')">
+        <PropertyGroup>
+            <WidgetBaseDir>$(SolutionDir)Packages\Widgets\</WidgetBaseDir>
+        </PropertyGroup>
+    <Copy SourceFiles="$(WidgetBaseDir)Newsletter\bin\$(Configuration)\$(TargetFramework)\Newsletter.dll"
+          DestinationFolder="$(TargetDir)"
+          Condition="Exists('$(WidgetBaseDir)Newsletter\bin\$(Configuration)\$(TargetFramework)\Newsletter.dll')"/>
+    <Copy SourceFiles="$(WidgetBaseDir)PostList\bin\$(Configuration)\$(TargetFramework)\PostList.dll"
+          DestinationFolder="$(TargetDir)"
+          Condition="Exists('$(WidgetBaseDir)PostList\bin\$(Configuration)\$(TargetFramework)\PostList.dll')"/>
   </Target>
 
 </Project>

Blogifier.Web/Startup.cs

@@ -1,4 +1,5 @@
-using Blogifier.Core.Middleware;
+using Blogifier.Core;
+using Blogifier.Core.Middleware;
 using Blogifier.Data;
 using Blogifier.Models;
 using Microsoft.AspNetCore.Builder;
@@ -53,7 +54,7 @@ public void ConfigureServices(IServiceCollection services)
                 }
             });
 
-            Core.Configuration.InitServices(services, databaseOptions, Configuration);
+            services.AddBlogifier(databaseOptions, Configuration);
         }
 
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
@@ -77,7 +78,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
                     template: "{controller=Blog}/{action=Index}/{id?}");
             });
 
-            Core.Configuration.InitApplication(app, env);
+            app.UseBlogifier(env);
 
             if (!Core.Common.ApplicationSettings.UseInMemoryDatabase && Core.Common.ApplicationSettings.InitializeDatabase)
             {