merged

Author: ismcagdas

src/AbpCompanyName.AbpProjectName.Application/project.json

@@ -3,17 +3,17 @@
 
   "dependencies": {
     "AbpCompanyName.AbpProjectName.Core": "1.0.0.0-*",
-    "Abp.EntityFrameworkCore": "0.11.3",
-    "Abp.AutoMapper": "0.11.3",
-    "Abp.Zero": "0.11.2",
     "AutoMapper": "5.1.1",
     "Castle.Core": "3.3.3",
     "Castle.LoggingFacility": "3.3.0",
     "Castle.Windsor": "3.3.0",
     "Microsoft.AspNet.Identity.Core": "2.2.1",
     "Newtonsoft.Json": "9.0.1",
     "Nito.AsyncEx": "3.0.1",
-    "System.Collections.Immutable": "1.2.0"
+    "System.Collections.Immutable": "1.2.0",
+    "Abp.AutoMapper": "0.12.0",
+    "Abp.EntityFrameworkCore": "0.12.0",
+    "Abp.Zero": "0.12.0"
   },
 
   "frameworks": {

src/AbpCompanyName.AbpProjectName.Core/project.json

@@ -2,8 +2,6 @@
   "version": "1.0.0.0-*",
 
   "dependencies": {
-    "Abp": "0.11.3",
-    "Abp.Zero": "0.11.2",
     "Castle.Core": "3.3.3",
     "Castle.LoggingFacility": "3.3.0",
     "Castle.Windsor": "3.3.0",
@@ -13,7 +11,9 @@
     "System.Collections.Immutable": "1.2.0",
     "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
     "Microsoft.Extensions.Configuration.Json": "1.0.0",
-    "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0"
+    "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0",
+    "Abp": "0.12.0",
+    "Abp.Zero": "0.12.0"
   },
 
   "frameworks": {

src/AbpCompanyName.AbpProjectName.EntityFramework/EntityFramework/AbpProjectNameDbContext.cs

@@ -10,7 +10,7 @@
 
 namespace AbpCompanyName.AbpProjectName.EntityFramework
 {
-    [DbConfigurationType(typeof(AbpZeroTemplateDbConfiguration))]
+    [DbConfigurationType(typeof(AbpProjectNameDbConfiguration))]
     public class AbpProjectNameDbContext : AbpZeroDbContext<Tenant, Role, User>
     {
         /* Define an IDbSet for each entity of the application */
@@ -38,8 +38,8 @@ private static string GetConnectionString()
                 );
         }
 
-        /* This constructor is used by ABP to pass connection string defined in AbpZeroTemplateDataModule.PreInitialize.
-         * Notice that, actually you will not directly create an instance of AbpZeroTemplateDbContext since ABP automatically handles it.
+        /* This constructor is used by ABP to pass connection string defined in AbpProjectNameDataModule.PreInitialize.
+         * Notice that, actually you will not directly create an instance of AbpProjectNameDbContext since ABP automatically handles it.
          */
         public AbpProjectNameDbContext(string nameOrConnectionString)
             : base(nameOrConnectionString)
@@ -55,9 +55,9 @@ public AbpProjectNameDbContext(DbConnection dbConnection)
         }
     }
 
-    public class AbpZeroTemplateDbConfiguration : DbConfiguration
+    public class AbpProjectNameDbConfiguration : DbConfiguration
     {
-        public AbpZeroTemplateDbConfiguration()
+        public AbpProjectNameDbConfiguration()
         {
             SetProviderServices(
                 "System.Data.SqlClient",

src/AbpCompanyName.AbpProjectName.EntityFramework/project.json

@@ -7,9 +7,8 @@
       "version": "1.0.0",
       "type": "build"
     },
-    "Abp.Zero.EntityFramework": "0.11.2",
-    "Abp.EntityFramework": "0.11.3"
-  },
+    "Abp.EntityFramework": "0.12.0",
+"Abp.Zero.EntityFramework": "0.12.0"  },
 
   "tools": {
     "Migrator.EF6.Tools": {

src/AbpCompanyName.AbpProjectName.Migrator/appsettings.json

@@ -1,5 +1,5 @@
 {
   "ConnectionStrings": {
-    "Default": "Server=localhost; Database=AbpZeroTemplateDb; Trusted_Connection=True;"
+    "Default": "Server=localhost; Database=AbpProjectNameDb; Trusted_Connection=True;"
   }
 }

src/AbpCompanyName.AbpProjectName.Migrator/project.json

@@ -1,4 +1,4 @@
-{
+{
   "version": "1.0.0-*",
 
   "buildOptions": {
@@ -10,7 +10,7 @@
   },
 
   "dependencies": {
-    "Abp.Castle.Log4Net": "0.11.3",
+    "Abp.Castle.Log4Net": "0.12.0",
     "AbpCompanyName.AbpProjectName.EntityFramework": "1.0.0.0-*"
   },
 

src/AbpCompanyName.AbpProjectName.Web/Controllers/Results/ChallengeResult.cs

@@ -4,12 +4,12 @@
 
 namespace AbpCompanyName.AbpProjectName.Web.Views
 {
-    public abstract class AbpZeroTemplateRazorPage<TModel> : AbpRazorPage<TModel>
+    public abstract class AbpProjectNameRazorPage<TModel> : AbpRazorPage<TModel>
     {
         [RazorInject]
         public IAbpSession AbpSession { get; set; }
 
-        protected AbpZeroTemplateRazorPage()
+        protected AbpProjectNameRazorPage()
         {
             LocalizationSourceName = AbpProjectNameConsts.LocalizationSourceName;
         }