Fixed ExtCore#89

Dmitry Sikorsky · Dmitry Sikorsky · commit 36278e99df44 · 2017-10-08T15:28:45.000+03:00
diff --git a/src/ExtCore.Data.Abstractions/ExtCore.Data.Abstractions.csproj b/src/ExtCore.Data.Abstractions/ExtCore.Data.Abstractions.csproj
@@ -4,7 +4,7 @@
     <Authors>Dmitry Sikorsky</Authors>
     <Copyright>Copyright © 2015 Dmitry Sikorsky</Copyright>
     <Description>The ExtCore.Data extension component. Based on the ExtCore framework.</Description>
-    <VersionPrefix>3.0.0</VersionPrefix>
+    <VersionPrefix>3.1.0-beta1</VersionPrefix>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>ExtCore.Data.Abstractions</AssemblyName>
     <PackageId>ExtCore.Data.Abstractions</PackageId>
diff --git a/src/ExtCore.Data.Entities.Abstractions/ExtCore.Data.Entities.Abstractions.csproj b/src/ExtCore.Data.Entities.Abstractions/ExtCore.Data.Entities.Abstractions.csproj
@@ -4,7 +4,7 @@
     <Authors>Dmitry Sikorsky</Authors>
     <Copyright>Copyright © 2015 Dmitry Sikorsky</Copyright>
     <Description>The ExtCore.Data extension component. Based on the ExtCore framework.</Description>
-    <VersionPrefix>3.0.0</VersionPrefix>
+    <VersionPrefix>3.1.0-beta1</VersionPrefix>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>ExtCore.Data.Entities.Abstractions</AssemblyName>
     <PackageId>ExtCore.Data.Entities.Abstractions</PackageId>
diff --git a/src/ExtCore.Data.EntityFramework.MySql/ExtCore.Data.EntityFramework.MySql.csproj b/src/ExtCore.Data.EntityFramework.MySql/ExtCore.Data.EntityFramework.MySql.csproj
@@ -4,7 +4,7 @@
     <Authors>Dmitry Sikorsky</Authors>
     <Copyright>Copyright © 2017 Dmitry Sikorsky</Copyright>
     <Description>The ExtCore.Data.EntityFramework extension component. Based on the ExtCore framework.</Description>
-    <VersionPrefix>3.0.0</VersionPrefix>
+    <VersionPrefix>3.1.0-beta1</VersionPrefix>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>ExtCore.Data.EntityFramework.MySql</AssemblyName>
     <PackageId>ExtCore.Data.EntityFramework.MySql</PackageId>
diff --git a/src/ExtCore.Data.EntityFramework.MySql/StorageContext.cs b/src/ExtCore.Data.EntityFramework.MySql/StorageContext.cs
@@ -22,7 +22,17 @@ public StorageContext(IOptions<StorageContextOptions> options) : base(options) {
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
       base.OnConfiguring(optionsBuilder);
-      optionsBuilder.UseMySQL(this.ConnectionString);
+
+      if (string.IsNullOrEmpty(this.MigrationsAssembly))
+        optionsBuilder.UseMySQL(this.ConnectionString);
+
+      else optionsBuilder.UseMySQL(
+        this.ConnectionString,
+        options =>
+        {
+          options.MigrationsAssembly(this.MigrationsAssembly);
+        }
+      );
     }
   }
 }
diff --git a/src/ExtCore.Data.EntityFramework.PostgreSql/ExtCore.Data.EntityFramework.PostgreSql.csproj b/src/ExtCore.Data.EntityFramework.PostgreSql/ExtCore.Data.EntityFramework.PostgreSql.csproj
@@ -4,7 +4,7 @@
     <Authors>Dmitry Sikorsky</Authors>
     <Copyright>Copyright © 2015 Dmitry Sikorsky</Copyright>
     <Description>The ExtCore.Data.EntityFramework extension component. Based on the ExtCore framework.</Description>
-    <VersionPrefix>3.0.0</VersionPrefix>
+    <VersionPrefix>3.1.0-beta1</VersionPrefix>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>ExtCore.Data.EntityFramework.PostgreSql</AssemblyName>
     <PackageId>ExtCore.Data.EntityFramework.PostgreSql</PackageId>
diff --git a/src/ExtCore.Data.EntityFramework.PostgreSql/StorageContext.cs b/src/ExtCore.Data.EntityFramework.PostgreSql/StorageContext.cs
@@ -21,7 +21,17 @@ public StorageContext(IOptions<StorageContextOptions> options) : base(options) {
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
       base.OnConfiguring(optionsBuilder);
-      optionsBuilder.UseNpgsql(this.ConnectionString);
+
+      if (string.IsNullOrEmpty(this.MigrationsAssembly))
+        optionsBuilder.UseNpgsql(this.ConnectionString);
+
+      else optionsBuilder.UseNpgsql(
+        this.ConnectionString,
+        options =>
+        {
+          options.MigrationsAssembly(this.MigrationsAssembly);
+        }
+      );
     }
   }
 }
diff --git a/src/ExtCore.Data.EntityFramework.SqlServer/ExtCore.Data.EntityFramework.SqlServer.csproj b/src/ExtCore.Data.EntityFramework.SqlServer/ExtCore.Data.EntityFramework.SqlServer.csproj
@@ -4,7 +4,7 @@
     <Authors>Dmitry Sikorsky</Authors>
     <Copyright>Copyright © 2015 Dmitry Sikorsky</Copyright>
     <Description>The ExtCore.Data.EntityFramework extension component. Based on the ExtCore framework.</Description>
-    <VersionPrefix>3.0.0</VersionPrefix>
+    <VersionPrefix>3.1.0-beta1</VersionPrefix>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>ExtCore.Data.EntityFramework.SqlServer</AssemblyName>
     <PackageId>ExtCore.Data.EntityFramework.SqlServer</PackageId>
diff --git a/src/ExtCore.Data.EntityFramework.SqlServer/StorageContext.cs b/src/ExtCore.Data.EntityFramework.SqlServer/StorageContext.cs
@@ -21,7 +21,17 @@ public StorageContext(IOptions<StorageContextOptions> options) : base(options) {
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
       base.OnConfiguring(optionsBuilder);
-      optionsBuilder.UseSqlServer(this.ConnectionString);
+
+      if (string.IsNullOrEmpty(this.MigrationsAssembly))
+        optionsBuilder.UseSqlServer(this.ConnectionString);
+
+      else optionsBuilder.UseSqlServer(
+        this.ConnectionString,
+        options =>
+        {
+          options.MigrationsAssembly(this.MigrationsAssembly);
+        }
+      );
     }
   }
 }
diff --git a/src/ExtCore.Data.EntityFramework.Sqlite/ExtCore.Data.EntityFramework.Sqlite.csproj b/src/ExtCore.Data.EntityFramework.Sqlite/ExtCore.Data.EntityFramework.Sqlite.csproj
@@ -4,7 +4,7 @@
     <Authors>Dmitry Sikorsky</Authors>
     <Copyright>Copyright © 2015 Dmitry Sikorsky</Copyright>
     <Description>The ExtCore.Data.EntityFramework extension component. Based on the ExtCore framework.</Description>
-    <VersionPrefix>3.0.0</VersionPrefix>
+    <VersionPrefix>3.1.0-beta1</VersionPrefix>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>ExtCore.Data.EntityFramework.Sqlite</AssemblyName>
     <PackageId>ExtCore.Data.EntityFramework.Sqlite</PackageId>
diff --git a/src/ExtCore.Data.EntityFramework.Sqlite/StorageContext.cs b/src/ExtCore.Data.EntityFramework.Sqlite/StorageContext.cs
@@ -16,12 +16,25 @@ public class StorageContext : StorageContextBase
     /// Initializes a new instance of the <see cref="StorageContext">StorageContext</see> class.
     /// </summary>
     /// <param name="connectionString">The connection string that is used to connect to the SQLite database.</param>
-    public StorageContext(IOptions<StorageContextOptions> options) : base(options) { }
+    public StorageContext(IOptions<StorageContextOptions> options)
+      : base(options)
+    {
+    }
 
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
       base.OnConfiguring(optionsBuilder);
-      optionsBuilder.UseSqlite(this.ConnectionString);
+
+      if (string.IsNullOrEmpty(this.MigrationsAssembly))
+        optionsBuilder.UseSqlite(this.ConnectionString);
+
+      else optionsBuilder.UseSqlite(
+        this.ConnectionString,
+        options =>
+        {
+          options.MigrationsAssembly(this.MigrationsAssembly);
+        }
+      );
     }
   }
 }
diff --git a/src/ExtCore.Data.EntityFramework/DesignTimeStorageContextFactoryBase.cs b/src/ExtCore.Data.EntityFramework/DesignTimeStorageContextFactoryBase.cs
@@ -0,0 +1,46 @@
+﻿// Copyright © 2017 David Noreña, 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.Abstractions;
+using Microsoft.EntityFrameworkCore.Design;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace ExtCore.Data.EntityFramework
+{
+  /// <summary>
+  /// Implements the <see cref="IDesignTimeDbContextFactory{TContext}"/> interface and represents the factory for providing
+  /// the registered inside the DI storage context service to the Entity Framework Core tools (such as Migrations).
+  /// Inherit from this class and call the Initialize method in your web application after the <see cref="StorageContextOptions"/> class
+  /// is configured in order the Entity Framework Core tools (such as Migrations) to work.
+  /// </summary>
+  /// <typeparam name="T">The storage context type this factory creates.</typeparam>
+  public abstract class DesignTimeStorageContextFactoryBase<T> : IDesignTimeDbContextFactory<T> where T : StorageContextBase
+  {
+    /// <summary>
+    /// The storage context service from the DI.
+    /// </summary>
+    public static T StorageContext { get; set; }
+
+    /// <summary>
+    /// Gets the storage context service set by the Initialize method.
+    /// </summary>
+    /// <param name="args"></param>
+    /// <returns>Storage context service set by the Initialize method.</returns>
+    public T CreateDbContext(string[] args)
+    {
+      return DesignTimeStorageContextFactoryBase<T>.StorageContext;
+    }
+
+    /// <summary>
+    /// Gets the storage context service from the DI and then sets it to the StorageContext property.
+    /// Call this method inside the Startup.ConfigureServices one after the <see cref="StorageContextOptions"/> class
+    /// is configured.
+    /// </summary>
+    /// <param name="serviceProvider">The service provider to get the storage context service.</param>
+    public static void Initialize(IServiceProvider serviceProvider)
+    {
+      DesignTimeStorageContextFactoryBase<T>.StorageContext = serviceProvider.GetService<IStorageContext>() as T;
+    }
+  }
+}
diff --git a/src/ExtCore.Data.EntityFramework/ExtCore.Data.EntityFramework.csproj b/src/ExtCore.Data.EntityFramework/ExtCore.Data.EntityFramework.csproj
@@ -4,7 +4,7 @@
     <Authors>Dmitry Sikorsky</Authors>
     <Copyright>Copyright © 2017 Dmitry Sikorsky</Copyright>
     <Description>The ExtCore.Data.EntityFramework extension component. Based on the ExtCore framework.</Description>
-    <VersionPrefix>3.0.0</VersionPrefix>
+    <VersionPrefix>3.1.0-beta1</VersionPrefix>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>ExtCore.Data.EntityFramework</AssemblyName>
     <PackageId>ExtCore.Data.EntityFramework</PackageId>
diff --git a/src/ExtCore.Data.EntityFramework/Extension.cs b/src/ExtCore.Data.EntityFramework/Extension.cs
@@ -24,7 +24,7 @@ public class Extension : ExtensionBase
     /// <summary>
     /// Gets the version of the extension.
     /// </summary>
-    public override string Version => "1.0.0";
+    public override string Version => "3.1.0-beta1";
 
     /// <summary>
     /// Gets the authors of the extension (separated by commas).
diff --git a/src/ExtCore.Data.EntityFramework/RepositoryBase.cs b/src/ExtCore.Data.EntityFramework/RepositoryBase.cs
@@ -10,6 +10,7 @@ namespace ExtCore.Data.EntityFramework
   /// <summary>
   /// Implements the <see cref="IRepository">IRepository</see> interface and represents default repository behavior.
   /// </summary>
+  /// <typeparam name="TEntity">The entity type this repository operates.</typeparam>
   public abstract class RepositoryBase<TEntity> : IRepository where TEntity : class, IEntity
   {
     protected StorageContextBase storageContext;
diff --git a/src/ExtCore.Data.EntityFramework/StorageContextBase.cs b/src/ExtCore.Data.EntityFramework/StorageContextBase.cs
@@ -18,13 +18,19 @@ public abstract class StorageContextBase : DbContext, IStorageContext
     /// </summary>
     public string ConnectionString { get; private set; }
 
+    /// <summary>
+    /// The assembly name where migrations are maintained for this context.
+    /// </summary>
+    public string MigrationsAssembly { get; private set; }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="StorageContext">StorageContext</see> class.
     /// </summary>
     /// <param name="connectionStringProvider">The connection string that is used to connect to the physical storage.</param>
     public StorageContextBase(IOptions<StorageContextOptions> options)
     {
       this.ConnectionString = options.Value.ConnectionString;
+      this.MigrationsAssembly = options.Value.MigrationsAssembly;
     }
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
diff --git a/src/ExtCore.Data.EntityFramework/StorageContextOptions.cs b/src/ExtCore.Data.EntityFramework/StorageContextOptions.cs
@@ -12,5 +12,10 @@ public class StorageContextOptions
     /// The connection string that is used to connect to the physical storage.
     /// </summary>
     public string ConnectionString { get; set; }
+
+    /// <summary>
+    /// The assembly name where migrations are maintained for this context.
+    /// </summary>
+    public string MigrationsAssembly { get; set; }
   }
 }
diff --git a/src/ExtCore.Data/ExtCore.Data.csproj b/src/ExtCore.Data/ExtCore.Data.csproj
@@ -4,7 +4,7 @@
     <Authors>Dmitry Sikorsky</Authors>
     <Copyright>Copyright © 2015 Dmitry Sikorsky</Copyright>
     <Description>The ExtCore.Data extension component. Based on the ExtCore framework.</Description>
-    <VersionPrefix>3.0.0</VersionPrefix>
+    <VersionPrefix>3.1.0-beta1</VersionPrefix>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>ExtCore.Data</AssemblyName>
     <PackageId>ExtCore.Data</PackageId>
diff --git a/src/ExtCore.Data/Extension.cs b/src/ExtCore.Data/Extension.cs
@@ -23,7 +23,7 @@ public class Extension : ExtensionBase
     /// <summary>
     /// Gets the version of the extension.
     /// </summary>
-    public override string Version => "1.0.0";
+    public override string Version => "3.1.0-beta1";
 
     /// <summary>
     /// Gets the authors of the extension (separated by commas).
diff --git a/src/ExtCore.Events/ExtCore.Events.csproj b/src/ExtCore.Events/ExtCore.Events.csproj
@@ -4,7 +4,7 @@
     <Authors>Dmitry Sikorsky</Authors>
     <Copyright>Copyright © 2017 Dmitry Sikorsky</Copyright>
     <Description>The ExtCore.Events extension component. Based on the ExtCore framework.</Description>
-    <VersionPrefix>3.0.0</VersionPrefix>
+    <VersionPrefix>3.1.0-beta1</VersionPrefix>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>ExtCore.Events</AssemblyName>
     <PackageId>ExtCore.Events</PackageId>
diff --git a/src/ExtCore.Events/Extension.cs b/src/ExtCore.Events/Extension.cs
@@ -23,7 +23,7 @@ public class Extension : ExtensionBase
     /// <summary>
     /// Gets the version of the extension.
     /// </summary>
-    public override string Version => "1.0.0";
+    public override string Version => "3.1.0-beta1";
 
     /// <summary>
     /// Gets the authors of the extension (separated by commas).
diff --git a/src/ExtCore.Infrastructure/ExtCore.Infrastructure.csproj b/src/ExtCore.Infrastructure/ExtCore.Infrastructure.csproj
@@ -4,7 +4,7 @@
     <Authors>Dmitry Sikorsky</Authors>
     <Copyright>Copyright © 2015 Dmitry Sikorsky</Copyright>
     <Description>Free, open source and cross-platform framework for creating modular and extendable web applications based on ASP.NET Core.</Description>
-    <VersionPrefix>3.0.0</VersionPrefix>
+    <VersionPrefix>3.1.0-beta1</VersionPrefix>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>ExtCore.Infrastructure</AssemblyName>
     <PackageId>ExtCore.Infrastructure</PackageId>
diff --git a/src/ExtCore.Mvc.Infrastructure/ExtCore.Mvc.Infrastructure.csproj b/src/ExtCore.Mvc.Infrastructure/ExtCore.Mvc.Infrastructure.csproj
@@ -4,7 +4,7 @@
     <Authors>Dmitry Sikorsky</Authors>
     <Copyright>Copyright © 2015 Dmitry Sikorsky</Copyright>
     <Description>The ExtCore.Mvc extension component. Based on the ExtCore framework.</Description>
-    <VersionPrefix>3.0.0</VersionPrefix>
+    <VersionPrefix>3.1.0-beta1</VersionPrefix>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>ExtCore.Mvc.Infrastructure</AssemblyName>
     <PackageId>ExtCore.Mvc.Infrastructure</PackageId>
diff --git a/src/ExtCore.Mvc/ExtCore.Mvc.csproj b/src/ExtCore.Mvc/ExtCore.Mvc.csproj
@@ -4,7 +4,7 @@
     <Authors>Dmitry Sikorsky</Authors>
     <Copyright>Copyright © 2015 Dmitry Sikorsky</Copyright>
     <Description>The ExtCore.Mvc extension component. Based on the ExtCore framework.</Description>
-    <VersionPrefix>3.0.0</VersionPrefix>
+    <VersionPrefix>3.1.0-beta1</VersionPrefix>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>ExtCore.Mvc</AssemblyName>
     <PackageId>ExtCore.Mvc</PackageId>
diff --git a/src/ExtCore.Mvc/Extension.cs b/src/ExtCore.Mvc/Extension.cs
@@ -23,7 +23,7 @@ public class Extension : ExtensionBase
     /// <summary>
     /// Gets the version of the extension.
     /// </summary>
-    public override string Version => "1.0.0";
+    public override string Version => "3.1.0-beta1";
 
     /// <summary>
     /// Gets the authors of the extension (separated by commas).
diff --git a/src/ExtCore.WebApplication/ExtCore.WebApplication.csproj b/src/ExtCore.WebApplication/ExtCore.WebApplication.csproj
@@ -4,7 +4,7 @@
     <Authors>Dmitry Sikorsky</Authors>
     <Copyright>Copyright © 2015 Dmitry Sikorsky</Copyright>
     <Description>Free, open source and cross-platform framework for creating modular and extendable web applications based on ASP.NET Core.</Description>
-    <VersionPrefix>3.0.0</VersionPrefix>
+    <VersionPrefix>3.1.0-beta1</VersionPrefix>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AssemblyName>ExtCore.WebApplication</AssemblyName>
     <PackageId>ExtCore.WebApplication</PackageId>

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,17 @@ public StorageContext(IOptions<StorageContextOptions> options) : base(options) {`
`22`	`22`	`protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)`
`23`	`23`	`{`
`24`	`24`	`base.OnConfiguring(optionsBuilder);`
`25`		`- optionsBuilder.UseMySQL(this.ConnectionString);`
	`25`	`+`
	`26`	`+ if (string.IsNullOrEmpty(this.MigrationsAssembly))`
	`27`	`+ optionsBuilder.UseMySQL(this.ConnectionString);`
	`28`	`+`
	`29`	`+ else optionsBuilder.UseMySQL(`
	`30`	`+ this.ConnectionString,`
	`31`	`+ options =>`
	`32`	`+ {`
	`33`	`+ options.MigrationsAssembly(this.MigrationsAssembly);`
	`34`	`+ }`
	`35`	`+ );`
`26`	`36`	`}`
`27`	`37`	`}`
`28`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,17 @@ public StorageContext(IOptions<StorageContextOptions> options) : base(options) {`
`21`	`21`	`protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)`
`22`	`22`	`{`
`23`	`23`	`base.OnConfiguring(optionsBuilder);`
`24`		`- optionsBuilder.UseNpgsql(this.ConnectionString);`
	`24`	`+`
	`25`	`+ if (string.IsNullOrEmpty(this.MigrationsAssembly))`
	`26`	`+ optionsBuilder.UseNpgsql(this.ConnectionString);`
	`27`	`+`
	`28`	`+ else optionsBuilder.UseNpgsql(`
	`29`	`+ this.ConnectionString,`
	`30`	`+ options =>`
	`31`	`+ {`
	`32`	`+ options.MigrationsAssembly(this.MigrationsAssembly);`
	`33`	`+ }`
	`34`	`+ );`
`25`	`35`	`}`
`26`	`36`	`}`
`27`	`37`	`}`