Added EntityFrameworkCore project.

hikalkan · hikalkan · commit 0404fe348e18 · 2016-06-19T14:00:28.000+03:00
diff --git a/AbpCompanyName.AbpProjectName.sln b/AbpCompanyName.AbpProjectName.sln
@@ -16,6 +16,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpCompanyName.AbpProjectNa
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpCompanyName.AbpProjectName.Application", "src\AbpCompanyName.AbpProjectName.Application\AbpCompanyName.AbpProjectName.Application.xproj", "{3870C648-4AEA-4B85-BA3F-F2F63B96136A}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpCompanyName.AbpProjectName.EntityFrameworkCore", "src\AbpCompanyName.AbpProjectName.EntityFrameworkCore\AbpCompanyName.AbpProjectName.EntityFrameworkCore.xproj", "{DC780BC4-4EAC-4C63-9052-6F3169A59FA4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -34,6 +36,10 @@ Global
 		{3870C648-4AEA-4B85-BA3F-F2F63B96136A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3870C648-4AEA-4B85-BA3F-F2F63B96136A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3870C648-4AEA-4B85-BA3F-F2F63B96136A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC780BC4-4EAC-4C63-9052-6F3169A59FA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC780BC4-4EAC-4C63-9052-6F3169A59FA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC780BC4-4EAC-4C63-9052-6F3169A59FA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC780BC4-4EAC-4C63-9052-6F3169A59FA4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -42,5 +48,6 @@ Global
 		{A2213374-BB48-48FD-BBD4-81E6A961D866} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
 		{0FA75A5B-AB83-4FD0-B545-279774C01E87} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
 		{3870C648-4AEA-4B85-BA3F-F2F63B96136A} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
+		{DC780BC4-4EAC-4C63-9052-6F3169A59FA4} = {AFAA0841-BD93-466F-B8F4-FB4EEC86F1FC}
 	EndGlobalSection
 EndGlobal
diff --git a/src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameAppServiceBase.cs b/src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameAppServiceBase.cs
@@ -1,4 +1,5 @@
 ﻿using Abp.Application.Services;
+using Abp.ObjectMapping;
 
 namespace AbpCompanyName.AbpProjectName
 {
@@ -7,8 +8,15 @@ namespace AbpCompanyName.AbpProjectName
     /// </summary>
     public abstract class AbpProjectNameAppServiceBase : ApplicationService
     {
+        /// <summary>
+        /// Reference to the object to object mapper.
+        /// TODO: REMOVE THIS WHEN IT'S ADDED TO ApplicationService in Abp.
+        /// </summary>
+        public IObjectMapper ObjectMapper { get; set; }
+        
         protected AbpProjectNameAppServiceBase()
         {
+            ObjectMapper = NullObjectMapper.Instance;
             LocalizationSourceName = AbpProjectNameConsts.LocalizationSourceName;
         }
     }
diff --git a/src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameApplicationModule.cs b/src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameApplicationModule.cs
@@ -1,9 +1,10 @@
 ﻿using System.Reflection;
+using Abp.AutoMapper;
 using Abp.Modules;
 
 namespace AbpCompanyName.AbpProjectName
 {
-    [DependsOn(typeof(AbpProjectNameCoreModule))]
+    [DependsOn(typeof(AbpProjectNameCoreModule), typeof(AbpAutoMapperModule))]
     public class AbpProjectNameApplicationModule : AbpModule
     {
         public override void Initialize()
diff --git a/src/AbpCompanyName.AbpProjectName.Application/Products/Dtos/ProductDto.cs b/src/AbpCompanyName.AbpProjectName.Application/Products/Dtos/ProductDto.cs
@@ -1,11 +1,13 @@
 ﻿using Abp.Application.Services.Dto;
+using Abp.AutoMapper;
 
 namespace AbpCompanyName.AbpProjectName.Products.Dtos
 {
+    [AutoMapFrom(typeof(Product))]
     public class ProductDto : EntityDto
     {
         public string Name { get; set; }
 
-        public float Price { get; set; }
+        public float? Price { get; set; }
     }
 }
diff --git a/src/AbpCompanyName.AbpProjectName.Application/Products/IProductAppService.cs b/src/AbpCompanyName.AbpProjectName.Application/Products/IProductAppService.cs
@@ -1,11 +1,12 @@
-﻿using Abp.Application.Services;
+﻿using System.Threading.Tasks;
+using Abp.Application.Services;
 using Abp.Application.Services.Dto;
 using AbpCompanyName.AbpProjectName.Products.Dtos;
 
 namespace AbpCompanyName.AbpProjectName.Products
 {
     public interface IProductAppService : IApplicationService
     {
-        ListResultOutput<ProductDto> GetAllProducts();
+        Task<ListResultOutput<ProductDto>> GetAllProducts();
     }
 }
diff --git a/src/AbpCompanyName.AbpProjectName.Application/Products/ProductAppService.cs b/src/AbpCompanyName.AbpProjectName.Application/Products/ProductAppService.cs
@@ -1,25 +1,26 @@
-﻿using Abp.Application.Services.Dto;
+﻿using System.Collections.Generic;
+using System.Threading.Tasks;
+using Abp.Application.Services.Dto;
+using Abp.Domain.Repositories;
 using AbpCompanyName.AbpProjectName.Products.Dtos;
 
 namespace AbpCompanyName.AbpProjectName.Products
 {
     public class ProductAppService : AbpProjectNameAppServiceBase, IProductAppService
     {
-        public ListResultOutput<ProductDto> GetAllProducts()
+        private readonly IRepository<Product> _productRepository;
+
+        public ProductAppService(IRepository<Product> productRepository)
+        {
+            _productRepository = productRepository;
+        }
+
+        public async Task<ListResultOutput<ProductDto>> GetAllProducts()
         {
-            return new ListResultOutput<ProductDto>(new []
-            {
-                new ProductDto
-                {
-                    Name = "Acme 23 inch monitor.",
-                    Price = 899.9f
-                },
-                new ProductDto
-                {
-                    Name = "Acme wireless keyboard and mouse set.",
-                    Price = 95.0f
-                }
-            });
+            var products = await _productRepository.GetAllListAsync();
+            return new ListResultOutput<ProductDto>(
+                ObjectMapper.Map<List<ProductDto>>(products)
+            );
         }
     }
 }
diff --git a/src/AbpCompanyName.AbpProjectName.Application/project.json b/src/AbpCompanyName.AbpProjectName.Application/project.json
@@ -2,6 +2,7 @@
   "version": "1.0.0.0-*",
 
   "dependencies": {
+    "Abp.AutoMapper": "0.9.4",
     "AbpCompanyName.AbpProjectName.Core": "1.0.0.0-*"
   },
 
diff --git a/src/AbpCompanyName.AbpProjectName.Core/Products/Product.cs b/src/AbpCompanyName.AbpProjectName.Core/Products/Product.cs
@@ -0,0 +1,16 @@
+﻿using System.ComponentModel.DataAnnotations;
+using Abp.Domain.Entities.Auditing;
+
+namespace AbpCompanyName.AbpProjectName.Products
+{
+    public class Product : AuditedEntity
+    {
+        public const int MaxNameLength = 128;
+
+        [Required]
+        [StringLength(MaxNameLength)]
+        public string Name { get; set; }
+
+        public float? Price { get; set; }
+    }
+}
diff --git a/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.xproj b/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.xproj
@@ -0,0 +1,19 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>dc780bc4-4eac-4c63-9052-6f3169a59fa4</ProjectGuid>
+    <RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>
diff --git a/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContext.cs b/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContext.cs
@@ -0,0 +1,19 @@
+﻿using Abp.EntityFrameworkCore;
+using AbpCompanyName.AbpProjectName.Products;
+using Microsoft.EntityFrameworkCore;
+
+namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore
+{
+    public class AbpProjectNameDbContext : AbpDbContext
+    {
+        //TODO: Define an DbSet for each Entity...
+
+        public DbSet<Product> Products { get; set; }
+
+        public AbpProjectNameDbContext(DbContextOptions<AbpProjectNameDbContext> options) 
+            : base(options)
+        {
+
+        }
+    }
+}
diff --git a/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameEntityFrameworkCoreModule.cs b/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameEntityFrameworkCoreModule.cs
@@ -0,0 +1,20 @@
+﻿using System.Reflection;
+using Abp.EntityFrameworkCore;
+using Abp.Modules;
+
+namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore
+{
+    [DependsOn(typeof(AbpProjectNameCoreModule), typeof(AbpEntityFrameworkCoreModule))]
+    public class AbpProjectNameEntityFrameworkCoreModule : AbpModule
+    {
+        public override void PreInitialize()
+        {
+            Configuration.DefaultNameOrConnectionString = "Default";
+        }
+
+        public override void Initialize()
+        {
+            IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
+        }
+    }
+}
diff --git a/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Properties/AssemblyInfo.cs b/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/Properties/AssemblyInfo.cs
@@ -0,0 +1,19 @@
+﻿using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("AbpCompanyName.AbpProjectName.EntityFrameworkCore")]
+[assembly: AssemblyTrademark("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("dc780bc4-4eac-4c63-9052-6f3169a59fa4")]
diff --git a/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/project.json b/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/project.json
@@ -0,0 +1,13 @@
+﻿{
+  "version": "1.0.0.0-*",
+
+  "dependencies": {
+    "Abp.EntityFrameworkCore": "0.9.4",
+    "AbpCompanyName.AbpProjectName.Core": "1.0.0.0-*"
+  },
+
+  "frameworks": {
+    "net452": {
+    }
+  }
+}
diff --git a/src/AbpCompanyName.AbpProjectName.Web/Startup.cs b/src/AbpCompanyName.AbpProjectName.Web/Startup.cs
@@ -5,12 +5,15 @@
 using Abp.AspNetCore.Mvc.ExceptionHandling;
 using Abp.AspNetCore.Mvc.Results;
 using Abp.AspNetCore.Mvc.Validation;
+using Abp.Configuration.Startup;
+using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
 using Castle.Facilities.Logging;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
@@ -50,9 +53,11 @@ public override IServiceProvider ConfigureServices(IServiceCollection services)
             services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
             services.TryAddSingleton<IActionContextAccessor, ActionContextAccessor>();
 
-            //services.AddDbContext<MyDbContext>(
-            //    options => options.UseSqlServer(Configuration.GetConnectionString("Default"))
-            //);
+            var defaultConnectionString = Configuration.GetConnectionString("Default");
+            AbpBootstrapper.IocManager.Resolve<IAbpStartupConfiguration>().DefaultNameOrConnectionString = defaultConnectionString;
+            services.AddDbContext<AbpProjectNameDbContext>(
+                options => options.UseSqlServer(defaultConnectionString)
+            );
 
             // Add framework services.
             services.AddMvc(options =>
diff --git a/src/AbpCompanyName.AbpProjectName.Web/project.json b/src/AbpCompanyName.AbpProjectName.Web/project.json
@@ -32,7 +32,8 @@
     },
     "Castle.Windsor-log4net": "3.3.0",
     "Abp.AspNetCore": "0.9.4",
-    "AbpCompanyName.AbpProjectName.Application": "1.0.0.0-*"
+    "AbpCompanyName.AbpProjectName.Application": "1.0.0.0-*",
+    "AbpCompanyName.AbpProjectName.EntityFrameworkCore": "1.0.0.0-*"
   },
 
   "tools": {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using Abp.Application.Services;`
	`2`	`+using Abp.ObjectMapping;`
`2`	`3`
`3`	`4`	`namespace AbpCompanyName.AbpProjectName`
`4`	`5`	`{`
`@@ -7,8 +8,15 @@ namespace AbpCompanyName.AbpProjectName`
`7`	`8`	`/// </summary>`
`8`	`9`	`public abstract class AbpProjectNameAppServiceBase : ApplicationService`
`9`	`10`	`{`
	`11`	`+ /// <summary>`
	`12`	`+ /// Reference to the object to object mapper.`
	`13`	`+ /// TODO: REMOVE THIS WHEN IT'S ADDED TO ApplicationService in Abp.`
	`14`	`+ /// </summary>`
	`15`	`+ public IObjectMapper ObjectMapper { get; set; }`
	`16`	`+`
`10`	`17`	`protected AbpProjectNameAppServiceBase()`
`11`	`18`	`{`
	`19`	`+ ObjectMapper = NullObjectMapper.Instance;`
`12`	`20`	`LocalizationSourceName = AbpProjectNameConsts.LocalizationSourceName;`
`13`	`21`	`}`
`14`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`	`1`	`using System.Reflection;`
	`2`	`+using Abp.AutoMapper;`
`2`	`3`	`using Abp.Modules;`
`3`	`4`
`4`	`5`	`namespace AbpCompanyName.AbpProjectName`
`5`	`6`	`{`
`6`		`- [DependsOn(typeof(AbpProjectNameCoreModule))]`
	`7`	`+ [DependsOn(typeof(AbpProjectNameCoreModule), typeof(AbpAutoMapperModule))]`
`7`	`8`	`public class AbpProjectNameApplicationModule : AbpModule`
`8`	`9`	`{`
`9`	`10`	`public override void Initialize()`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,13 @@`
`1`	`1`	`using Abp.Application.Services.Dto;`
	`2`	`+using Abp.AutoMapper;`
`2`	`3`
`3`	`4`	`namespace AbpCompanyName.AbpProjectName.Products.Dtos`
`4`	`5`	`{`
	`6`	`+ [AutoMapFrom(typeof(Product))]`
`5`	`7`	`public class ProductDto : EntityDto`
`6`	`8`	`{`
`7`	`9`	`public string Name { get; set; }`
`8`	`10`
`9`		`- public float Price { get; set; }`
	`11`	`+ public float? Price { get; set; }`
`10`	`12`	`}`
`11`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`		`-using Abp.Application.Services;`
	`1`	`+using System.Threading.Tasks;`
	`2`	`+using Abp.Application.Services;`
`2`	`3`	`using Abp.Application.Services.Dto;`
`3`	`4`	`using AbpCompanyName.AbpProjectName.Products.Dtos;`
`4`	`5`
`5`	`6`	`namespace AbpCompanyName.AbpProjectName.Products`
`6`	`7`	`{`
`7`	`8`	`public interface IProductAppService : IApplicationService`
`8`	`9`	`{`
`9`		`- ListResultOutput<ProductDto> GetAllProducts();`
	`10`	`+ Task<ListResultOutput<ProductDto>> GetAllProducts();`
`10`	`11`	`}`
`11`	`12`	`}`