v 1.0.5-rc20-alpha5
in order to build 1.0.5-rc20-alpha5, an alpha6 * moves again the db context from server lib to main assembly, since migrations are not written correctly in these conditions. * fixing dep graph, while moving as must as possible code from Yavsc to Yavsc.Server * impoved topmost Makefile * cleaned the badly desined, ans system redondant "Action" definiton * reoganized some source code file locations
This commit is contained in:
@ -26,6 +26,7 @@ using Yavsc.Models;
|
||||
using Yavsc.Server.Helpers;
|
||||
using Yavsc.Services;
|
||||
using Yavsc.Templates;
|
||||
using Microsoft.Data.Entity;
|
||||
|
||||
namespace cli
|
||||
{
|
||||
@ -33,8 +34,7 @@ namespace cli
|
||||
{
|
||||
public string ConnectionString
|
||||
{
|
||||
get { return DbHelpers.ConnectionString; }
|
||||
private set { DbHelpers.ConnectionString = value; }
|
||||
get ; set;
|
||||
}
|
||||
|
||||
public static SiteSettings SiteSetup { get; private set; }
|
||||
@ -79,6 +79,13 @@ namespace cli
|
||||
{
|
||||
options.ResourcesPath = "Resources";
|
||||
});
|
||||
ConnectionString = Configuration["Data:DefaultConnection:ConnectionString"];
|
||||
|
||||
services.AddEntityFramework()
|
||||
.AddNpgsql()
|
||||
.AddDbContext<ApplicationDbContext>(
|
||||
db => db.UseNpgsql(ConnectionString)
|
||||
);
|
||||
}
|
||||
|
||||
public void Configure (IApplicationBuilder app, IHostingEnvironment env,
|
||||
@ -88,8 +95,6 @@ namespace cli
|
||||
loggerFactory.AddDebug();
|
||||
logger = loggerFactory.CreateLogger<Startup>();
|
||||
logger.LogInformation(env.EnvironmentName);
|
||||
var cxstr = Configuration["Data:DefaultConnection:ConnectionString"];
|
||||
DbHelpers.ConnectionString = cxstr;
|
||||
|
||||
}
|
||||
|
||||
|
@ -44,9 +44,8 @@
|
||||
"Microsoft.Framework.Configuration.Json": "1.0.0-beta8",
|
||||
"Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4",
|
||||
"Newtonsoft.Json": "9.0.1",
|
||||
"Yavsc.Abstract": { "version": "1.0.5-rc20-alpha5", "target": "package" },
|
||||
"Yavsc.Server": { "version": "1.0.5-rc20-alpha5", "target": "package" },
|
||||
"Yavsc": { "version": "1.0.5-rc20-alpha5", "target": "package" }
|
||||
"Yavsc.Abstract": { "version": "1.0.5-rc20-alpha6", "target": "package" },
|
||||
"Yavsc.Server": { "version": "1.0.5-rc20-alpha6", "target": "package" }
|
||||
},
|
||||
"frameworks": {
|
||||
"dnx451": {}
|
||||
|
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user