From aac2efa68a0f3030bdc772923170e00c69a66c96 Mon Sep 17 00:00:00 2001
From: Halil ibrahim Kalkan <hi_kalkan@yahoo.com>
Date: Mon, 2 Jul 2018 08:58:24 +0300
Subject: [PATCH] Template improvements.

---
 ...e.cs => BookStoreApplicationAutoMapperProfile.cs} |  0
 .../MyProjectNameApplicationAutoMapperProfile.cs     | 12 ++++++++++++
 .../MyProjectNameApplicationModule.cs                |  6 ++++++
 .../MyCompanyName.MyProjectName.Domain.csproj        |  1 +
 .../MyProjectNameWebAutoMapperProfile.cs             |  3 +--
 .../MyProjectNameWebModule.cs                        |  9 +++++++--
 6 files changed, 27 insertions(+), 4 deletions(-)
 rename samples/BookStore/src/Acme.BookStore.Application/{BookStoreWebAutoMapperProfile.cs => BookStoreApplicationAutoMapperProfile.cs} (100%)
 create mode 100644 templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs

diff --git a/samples/BookStore/src/Acme.BookStore.Application/BookStoreWebAutoMapperProfile.cs b/samples/BookStore/src/Acme.BookStore.Application/BookStoreApplicationAutoMapperProfile.cs
similarity index 100%
rename from samples/BookStore/src/Acme.BookStore.Application/BookStoreWebAutoMapperProfile.cs
rename to samples/BookStore/src/Acme.BookStore.Application/BookStoreApplicationAutoMapperProfile.cs
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs
new file mode 100644
index 0000000000..343675b9b2
--- /dev/null
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationAutoMapperProfile.cs
@@ -0,0 +1,12 @@
+using AutoMapper;
+
+namespace MyCompanyName.MyProjectName
+{
+    public class MyProjectNameApplicationAutoMapperProfile : Profile
+    {
+        public MyProjectNameApplicationAutoMapperProfile()
+        {
+            //Configure your AutoMapper mapping configuration here...
+        }
+    }
+}
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs
index 301825b9c4..65faecfaa4 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using MyCompanyName.MyProjectName.Permissions;
 using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.AutoMapper;
 using Volo.Abp.Identity;
 using Volo.Abp.Modularity;
 
@@ -18,6 +19,11 @@ namespace MyCompanyName.MyProjectName
                 options.DefinitionProviders.Add<MyProjectNamePermissionDefinitionProvider>();
             });
 
+            services.Configure<AbpAutoMapperOptions>(options =>
+            {
+                options.AddProfile<MyProjectNameApplicationAutoMapperProfile>();
+            });
+
             services.AddAssemblyOf<MyProjectNameApplicationModule>();
         }
     }
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj
index 75316550dc..d90a10cbc7 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj
@@ -7,6 +7,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\modules\identity\src\Volo.Abp.Identity.Domain\Volo.Abp.Identity.Domain.csproj" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs
index b1e9c4a346..8657675ba5 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs
@@ -6,8 +6,7 @@ namespace MyCompanyName.MyProjectName
     {
         public MyProjectNameWebAutoMapperProfile()
         {
-            //Configure your auto mapper mappings...
-            //
+            //Configure your AutoMapper mapping configuration here...
         }
     }
 }
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
index 9ecba971b6..608a47f6f2 100644
--- a/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
+++ b/templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
@@ -52,7 +52,12 @@ namespace MyCompanyName.MyProjectName
         {
             services.PreConfigure<AbpMvcDataAnnotationsLocalizationOptions>(options =>
             {
-                options.AddAssemblyResource(typeof(MyProjectNameResource), typeof(MyProjectNameWebModule).Assembly);
+                options.AddAssemblyResource(
+                    typeof(MyProjectNameResource),
+                    typeof(MyProjectNameDomainModule).Assembly,
+                    typeof(MyProjectNameApplicationModule).Assembly,
+                    typeof(MyProjectNameWebModule).Assembly
+                );
             });
         }
 
@@ -86,7 +91,7 @@ namespace MyCompanyName.MyProjectName
         {
             services.Configure<AbpAutoMapperOptions>(options =>
             {
-                options.AddProfile<MyProjectNameWebAutoMapperProfile>(); //Pass validate parameter as true to validate the configuration
+                options.AddProfile<MyProjectNameWebAutoMapperProfile>();
             });
         }