Merge pull request #28 from aspnetboilerplate/netcore

hikalkan · web-flow · commit c9bd8637fe82 · 2017-04-26T16:47:27.000+03:00
Converted to netcore
diff --git a/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj b/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj
@@ -2,12 +2,13 @@
 
   <PropertyGroup>
     <VersionPrefix>1.0.0.0</VersionPrefix>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
     <AssemblyName>AbpCompanyName.AbpProjectName.Application</AssemblyName>
     <PackageId>AbpCompanyName.AbpProjectName.Application</PackageId>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameApplicationModule.cs b/src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameApplicationModule.cs
@@ -1,6 +1,6 @@
-﻿using System.Reflection;
-using Abp.AutoMapper;
+﻿using Abp.AutoMapper;
 using Abp.Modules;
+using Abp.Reflection.Extensions;
 
 namespace AbpCompanyName.AbpProjectName
 {
@@ -11,7 +11,7 @@ public class AbpProjectNameApplicationModule : AbpModule
     {
         public override void Initialize()
         {
-            IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
+            IocManager.RegisterAssemblyByConvention(typeof(AbpProjectNameApplicationModule).GetAssembly());
         }
     }
 }
diff --git a/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj b/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj
@@ -2,12 +2,13 @@
 
   <PropertyGroup>
     <VersionPrefix>1.0.0.0</VersionPrefix>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
     <AssemblyName>AbpCompanyName.AbpProjectName.Core</AssemblyName>
     <PackageId>AbpCompanyName.AbpProjectName.Core</PackageId>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/AbpCompanyName.AbpProjectName.Core/AbpProjectNameCoreModule.cs b/src/AbpCompanyName.AbpProjectName.Core/AbpProjectNameCoreModule.cs
@@ -1,5 +1,5 @@
-﻿using System.Reflection;
-using Abp.Modules;
+﻿using Abp.Modules;
+using Abp.Reflection.Extensions;
 using AbpCompanyName.AbpProjectName.Localization;
 
 namespace AbpCompanyName.AbpProjectName
@@ -15,7 +15,7 @@ public override void PreInitialize()
 
         public override void Initialize()
         {
-            IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
+            IocManager.RegisterAssemblyByConvention(typeof(AbpProjectNameCoreModule).GetAssembly());
         }
     }
 }
diff --git a/src/AbpCompanyName.AbpProjectName.Core/Localization/AbpProjectNameLocalizationConfigurer.cs b/src/AbpCompanyName.AbpProjectName.Core/Localization/AbpProjectNameLocalizationConfigurer.cs
@@ -3,6 +3,7 @@
 using Abp.Localization;
 using Abp.Localization.Dictionaries;
 using Abp.Localization.Dictionaries.Json;
+using Abp.Reflection.Extensions;
 
 namespace AbpCompanyName.AbpProjectName.Localization
 {
@@ -16,8 +17,8 @@ public static void Configure(ILocalizationConfiguration localizationConfiguratio
             localizationConfiguration.Sources.Add(
                 new DictionaryBasedLocalizationSource(AbpProjectNameConsts.LocalizationSourceName,
                     new JsonEmbeddedFileLocalizationDictionaryProvider(
-                        Assembly.GetExecutingAssembly(),
-                        "AbpCompanyName.AbpProjectName.Core.Localization.SourceFiles"
+                        typeof(AbpProjectNameLocalizationConfigurer).GetAssembly(),
+                        "AbpCompanyName.AbpProjectName.Localization.SourceFiles"
                     )
                 )
             );
diff --git a/src/AbpCompanyName.AbpProjectName.Core/Web/WebContentFolderHelper.cs b/src/AbpCompanyName.AbpProjectName.Core/Web/WebContentFolderHelper.cs
@@ -15,15 +15,15 @@ public static string CalculateContentRootFolder()
             var coreAssemblyDirectoryPath = Path.GetDirectoryName(AppContext.BaseDirectory);
             if (coreAssemblyDirectoryPath == null)
             {
-                throw new ApplicationException("Could not find location of AbpCompanyName.AbpProjectName.Core assembly!");
+                throw new Exception("Could not find location of AbpCompanyName.AbpProjectName.Core assembly!");
             }
 
             var directoryInfo = new DirectoryInfo(coreAssemblyDirectoryPath);
             while (!DirectoryContains(directoryInfo.FullName, "AbpCompanyName.AbpProjectName.sln"))
             {
                 if (directoryInfo.Parent == null)
                 {
-                    throw new ApplicationException("Could not find content root folder!");
+                    throw new Exception("Could not find content root folder!");
                 }
 
                 directoryInfo = directoryInfo.Parent;
diff --git a/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj b/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj
@@ -2,13 +2,14 @@
 
   <PropertyGroup>
     <VersionPrefix>1.0.0.0</VersionPrefix>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
     <AssemblyName>AbpCompanyName.AbpProjectName.EntityFrameworkCore</AssemblyName>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <PackageId>AbpCompanyName.AbpProjectName.EntityFrameworkCore</PackageId>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContext.cs b/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContext.cs
@@ -5,6 +5,8 @@ namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore
 {
     public class AbpProjectNameDbContext : AbpDbContext
     {
+        //Add DbSet properties for your entities...
+
         public AbpProjectNameDbContext(DbContextOptions<AbpProjectNameDbContext> options) 
             : base(options)
         {
diff --git a/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContextFactory.cs b/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContextFactory.cs
@@ -6,7 +6,7 @@
 
 namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore
 {
-    /* This class is needed to run "dotnet ef ..." commands from command line on development. Not used anywhere else */
+    /* This class is needed to run EF Core PMC commands. Not used anywhere else */
     public class AbpProjectNameDbContextFactory : IDbContextFactory<AbpProjectNameDbContext>
     {
         public AbpProjectNameDbContext Create(DbContextFactoryOptions options)
diff --git a/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameEntityFrameworkCoreModule.cs b/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameEntityFrameworkCoreModule.cs
@@ -1,6 +1,6 @@
-﻿using System.Reflection;
-using Abp.EntityFrameworkCore;
+﻿using Abp.EntityFrameworkCore;
 using Abp.Modules;
+using Abp.Reflection.Extensions;
 
 namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore
 {
@@ -11,7 +11,7 @@ public class AbpProjectNameEntityFrameworkCoreModule : AbpModule
     {
         public override void Initialize()
         {
-            IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
+            IocManager.RegisterAssemblyByConvention(typeof(AbpProjectNameEntityFrameworkCoreModule).GetAssembly());
         }
     }
 }
diff --git a/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Program.cs b/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Program.cs
diff --git a/src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj b/src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>AbpCompanyName.AbpProjectName.Web</AssemblyName>
     <OutputType>Exe</OutputType>
diff --git a/src/AbpCompanyName.AbpProjectName.Web/Startup/AbpProjectNameWebModule.cs b/src/AbpCompanyName.AbpProjectName.Web/Startup/AbpProjectNameWebModule.cs
@@ -1,7 +1,7 @@
-﻿using System.Reflection;
-using Abp.AspNetCore;
+﻿using Abp.AspNetCore;
 using Abp.AspNetCore.Configuration;
 using Abp.Modules;
+using Abp.Reflection.Extensions;
 using AbpCompanyName.AbpProjectName.Configuration;
 using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
 using Microsoft.AspNetCore.Hosting;
@@ -30,13 +30,13 @@ public override void PreInitialize()
 
             Configuration.Modules.AbpAspNetCore()
                 .CreateControllersForAppServices(
-                    typeof(AbpProjectNameApplicationModule).Assembly
+                    typeof(AbpProjectNameApplicationModule).GetAssembly()
                 );
         }
 
         public override void Initialize()
         {
-            IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
+            IocManager.RegisterAssemblyByConvention(typeof(AbpProjectNameWebModule).GetAssembly());
         }
     }
 }
diff --git a/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj b/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.0.0.0</VersionPrefix>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
     <AssemblyName>AbpCompanyName.AbpProjectName.Tests</AssemblyName>
     <PackageId>AbpCompanyName.AbpProjectName.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
diff --git a/test/AbpCompanyName.AbpProjectName.Tests/AbpProjectNameTestModule.cs b/test/AbpCompanyName.AbpProjectName.Tests/AbpProjectNameTestModule.cs
@@ -1,5 +1,6 @@
 using System.Reflection;
 using Abp.Modules;
+using Abp.Reflection.Extensions;
 using Abp.TestBase;
 using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
 using Castle.MicroKernel.Registration;
@@ -24,7 +25,7 @@ public override void PreInitialize()
 
         public override void Initialize()
         {
-            IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
+            IocManager.RegisterAssemblyByConvention(typeof(AbpProjectNameTestModule).GetAssembly());
         }
 
         private void SetupInMemoryDb()
diff --git a/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj b/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.0.0.0</VersionPrefix>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>AbpCompanyName.AbpProjectName.Web.Tests</AssemblyName>
     <PackageId>AbpCompanyName.AbpProjectName.Web.Tests</PackageId>
diff --git a/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpProjectNameWebTestModule.cs b/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpProjectNameWebTestModule.cs
@@ -1,6 +1,7 @@
 using System.Reflection;
 using Abp.AspNetCore.TestBase;
 using Abp.Modules;
+using Abp.Reflection.Extensions;
 using AbpCompanyName.AbpProjectName.Web.Startup;
 
 namespace AbpCompanyName.AbpProjectName.Web.Tests
@@ -13,7 +14,7 @@ public class AbpProjectNameWebTestModule : AbpModule
     {
         public override void Initialize()
         {
-            IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
+            IocManager.RegisterAssemblyByConvention(typeof(AbpProjectNameWebTestModule).GetAssembly());
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-using System.Reflection;`
`2`		`-using Abp.AutoMapper;`
	`1`	`+using Abp.AutoMapper;`
`3`	`2`	`using Abp.Modules;`
	`3`	`+using Abp.Reflection.Extensions;`
`4`	`4`
`5`	`5`	`namespace AbpCompanyName.AbpProjectName`
`6`	`6`	`{`
`@@ -11,7 +11,7 @@ public class AbpProjectNameApplicationModule : AbpModule`
`11`	`11`	`{`
`12`	`12`	`public override void Initialize()`
`13`	`13`	`{`
`14`		`- IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());`
	`14`	`+ IocManager.RegisterAssemblyByConvention(typeof(AbpProjectNameApplicationModule).GetAssembly());`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-using System.Reflection;`
`2`		`-using Abp.Modules;`
	`1`	`+using Abp.Modules;`
	`2`	`+using Abp.Reflection.Extensions;`
`3`	`3`	`using AbpCompanyName.AbpProjectName.Localization;`
`4`	`4`
`5`	`5`	`namespace AbpCompanyName.AbpProjectName`
`@@ -15,7 +15,7 @@ public override void PreInitialize()`
`15`	`15`
`16`	`16`	`public override void Initialize()`
`17`	`17`	`{`
`18`		`- IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());`
	`18`	`+ IocManager.RegisterAssemblyByConvention(typeof(AbpProjectNameCoreModule).GetAssembly());`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using Abp.Localization;`
`4`	`4`	`using Abp.Localization.Dictionaries;`
`5`	`5`	`using Abp.Localization.Dictionaries.Json;`
	`6`	`+using Abp.Reflection.Extensions;`
`6`	`7`
`7`	`8`	`namespace AbpCompanyName.AbpProjectName.Localization`
`8`	`9`	`{`
`@@ -16,8 +17,8 @@ public static void Configure(ILocalizationConfiguration localizationConfiguratio`
`16`	`17`	`localizationConfiguration.Sources.Add(`
`17`	`18`	`new DictionaryBasedLocalizationSource(AbpProjectNameConsts.LocalizationSourceName,`
`18`	`19`	`new JsonEmbeddedFileLocalizationDictionaryProvider(`
`19`		`- Assembly.GetExecutingAssembly(),`
`20`		`- "AbpCompanyName.AbpProjectName.Core.Localization.SourceFiles"`
	`20`	`+ typeof(AbpProjectNameLocalizationConfigurer).GetAssembly(),`
	`21`	`+ "AbpCompanyName.AbpProjectName.Localization.SourceFiles"`
`21`	`22`	`)`
`22`	`23`	`)`
`23`	`24`	`);`
Original file line number	Diff line number	Diff line change
`@@ -15,15 +15,15 @@ public static string CalculateContentRootFolder()`
`15`	`15`	`var coreAssemblyDirectoryPath = Path.GetDirectoryName(AppContext.BaseDirectory);`
`16`	`16`	`if (coreAssemblyDirectoryPath == null)`
`17`	`17`	`{`
`18`		`- throw new ApplicationException("Could not find location of AbpCompanyName.AbpProjectName.Core assembly!");`
	`18`	`+ throw new Exception("Could not find location of AbpCompanyName.AbpProjectName.Core assembly!");`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`var directoryInfo = new DirectoryInfo(coreAssemblyDirectoryPath);`
`22`	`22`	`while (!DirectoryContains(directoryInfo.FullName, "AbpCompanyName.AbpProjectName.sln"))`
`23`	`23`	`{`
`24`	`24`	`if (directoryInfo.Parent == null)`
`25`	`25`	`{`
`26`		`- throw new ApplicationException("Could not find content root folder!");`
	`26`	`+ throw new Exception("Could not find content root folder!");`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`directoryInfo = directoryInfo.Parent;`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore`
`5`	`5`	`{`
`6`	`6`	`public class AbpProjectNameDbContext : AbpDbContext`
`7`	`7`	`{`
	`8`	`+ //Add DbSet properties for your entities...`
	`9`	`+`
`8`	`10`	`public AbpProjectNameDbContext(DbContextOptions<AbpProjectNameDbContext> options)`
`9`	`11`	`: base(options)`
`10`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore`
`8`	`8`	`{`
`9`		`- /* This class is needed to run "dotnet ef ..." commands from command line on development. Not used anywhere else */`
	`9`	`+ /* This class is needed to run EF Core PMC commands. Not used anywhere else */`
`10`	`10`	`public class AbpProjectNameDbContextFactory : IDbContextFactory<AbpProjectNameDbContext>`
`11`	`11`	`{`
`12`	`12`	`public AbpProjectNameDbContext Create(DbContextFactoryOptions options)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-using System.Reflection;`
`2`		`-using Abp.EntityFrameworkCore;`
	`1`	`+using Abp.EntityFrameworkCore;`
`3`	`2`	`using Abp.Modules;`
	`3`	`+using Abp.Reflection.Extensions;`
`4`	`4`
`5`	`5`	`namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore`
`6`	`6`	`{`
`@@ -11,7 +11,7 @@ public class AbpProjectNameEntityFrameworkCoreModule : AbpModule`
`11`	`11`	`{`
`12`	`12`	`public override void Initialize()`
`13`	`13`	`{`
`14`		`- IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());`
	`14`	`+ IocManager.RegisterAssemblyByConvention(typeof(AbpProjectNameEntityFrameworkCoreModule).GetAssembly());`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`}`