Merge branch 'dev' of https://github.com/abpframework/abp into dev

templates/app/aspnet-core/common.props

@@ -3,5 +3,6 @@
     <LangVersion>latest</LangVersion>
     <Version>1.0.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
+	<AbpProjectType>app</AbpProjectType>
   </PropertyGroup>
 </Project>

templates/module/aspnet-core/common.props

@@ -3,6 +3,7 @@
     <LangVersion>latest</LangVersion>
     <Version>0.1.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
+	<AbpProjectType>module</AbpProjectType>
   </PropertyGroup>
 
   <ItemGroup>

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Authorization/MyProjectNamePermissionDefinitionProvider.cs → templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissionDefinitionProvider.cs

@@ -2,13 +2,13 @@
 using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.Localization;
 
-namespace MyCompanyName.MyProjectName.Authorization
+namespace MyCompanyName.MyProjectName.Permissions
 {
     public class MyProjectNamePermissionDefinitionProvider : PermissionDefinitionProvider
     {
         public override void Define(IPermissionDefinitionContext context)
         {
-            //var moduleGroup = context.AddGroup(MyProjectNamePermissions.GroupName, L("Permission:MyProjectName"));
+            var myGroup = context.AddGroup(MyProjectNamePermissions.GroupName, L("Permission:MyProjectName"));
         }
 
         private static LocalizableString L(string name)

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Authorization/MyProjectNamePermissions.cs → templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/Permissions/MyProjectNamePermissions.cs

@@ -1,6 +1,6 @@
 using Volo.Abp.Reflection;
 
-namespace MyCompanyName.MyProjectName.Authorization
+namespace MyCompanyName.MyProjectName.Permissions
 {
     public class MyProjectNamePermissions
     {

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameMenuContributor.cs → templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Volo.Abp.UI.Navigation;
 
-namespace MyCompanyName.MyProjectName.Web
+namespace MyCompanyName.MyProjectName.Web.Menus
 {
     public class MyProjectNameMenuContributor : IMenuContributor
     {

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenus.cs

@@ -0,0 +1,11 @@
+namespace MyCompanyName.MyProjectName.Web.Menus
+{
+    public class MyProjectNameMenus
+    {
+        private const string Prefix = "MyProjectName";
+
+        //Add your menu items here...
+        //public const string Home = Prefix + ".MyNewMenuItem";
+
+    }
+}

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs

@@ -1,12 +1,14 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.DependencyInjection;
 using MyCompanyName.MyProjectName.Localization;
+using MyCompanyName.MyProjectName.Web.Menus;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
+using MyCompanyName.MyProjectName.Permissions;
 
 namespace MyCompanyName.MyProjectName.Web
 {