imhven
/
abp
mirror of https://github.com/abpframework/abp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
pull/1194/head
Halil İbrahim Kalkan 6 years ago
parent 162dc7e7ae 98e9d27921
commit a055ae2662
29 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File

1
templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs
Unescape View File

@ -10,6 +10,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.IdentityModel.Protocols.OpenIdConnect;
using MyCompanyName.MyProjectName.Localization;
using MyCompanyName.MyProjectName.MultiTenancy;
using MyCompanyName.MyProjectName.Web;
using StackExchange.Redis;
using Volo.Abp;
using Volo.Abp.AspNetCore.Authentication.OAuth;

1
templates/mvc-module/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs
Unescape View File

@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using MyCompanyName.MyProjectName.EntityFrameworkCore;
using MyCompanyName.MyProjectName.MultiTenancy;
using MyCompanyName.MyProjectName.Web;
using Swashbuckle.AspNetCore.Swagger;
using Volo.Abp;
using Volo.Abp.Account.Web;

2
templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
Unescape View File

@ -7,7 +7,7 @@
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<IsPackable>true</IsPackable>
<OutputType>Library</OutputType>
<RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
<RootNamespace>MyCompanyName.MyProjectName.Web</RootNamespace>
</PropertyGroup>
<ItemGroup>

2
templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameMenuContributor.cs
Unescape View File

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

2
templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs
Unescape View File

@ -1,6 +1,6 @@
using AutoMapper;
namespace MyCompanyName.MyProjectName
namespace MyCompanyName.MyProjectName.Web
{
public class MyProjectNameWebAutoMapperProfile : Profile
{

2
templates/mvc-module/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
Unescape View File

@ -10,7 +10,7 @@ using Volo.Abp.Modularity;
using Volo.Abp.UI.Navigation;
using Volo.Abp.VirtualFileSystem;
namespace MyCompanyName.MyProjectName
namespace MyCompanyName.MyProjectName.Web
{
[DependsOn(
typeof(MyProjectNameHttpApiModule),

2
templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs
Unescape View File

@ -6,7 +6,7 @@ using MyCompanyName.MyProjectName.MultiTenancy;
using Volo.Abp.TenantManagement.Web.Navigation;
using Volo.Abp.UI.Navigation;
namespace MyCompanyName.MyProjectName.Menus
namespace MyCompanyName.MyProjectName.Web.Menus
{
public class MyProjectNameMenuContributor : IMenuContributor
{

2
templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj
Unescape View File

@ -4,7 +4,7 @@
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
<RootNamespace>MyCompanyName.MyProjectName.Web</RootNamespace>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>

2
templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameBrandingProvider.cs
Unescape View File

@ -1,7 +1,7 @@
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Components;
using Volo.Abp.DependencyInjection;
namespace MyCompanyName.MyProjectName
namespace MyCompanyName.MyProjectName.Web
{
[Dependency(ReplaceServices = true)]
public class MyProjectNameBrandingProvider : DefaultBrandingProvider

2
templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebAutoMapperProfile.cs
Unescape View File

@ -1,6 +1,6 @@
using AutoMapper;
namespace MyCompanyName.MyProjectName
namespace MyCompanyName.MyProjectName.Web
{
public class MyProjectNameWebAutoMapperProfile : Profile
{

12
templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs
Unescape View File

@ -1,17 +1,17 @@
using System;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using MyCompanyName.MyProjectName.Menus;
using Swashbuckle.AspNetCore.Swagger;
using System.IO;
using Microsoft.AspNetCore.Authentication.OAuth.Claims;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.IdentityModel.Protocols.OpenIdConnect;
using MyCompanyName.MyProjectName.Localization;
using MyCompanyName.MyProjectName.MultiTenancy;
using MyCompanyName.MyProjectName.Web.Menus;
using StackExchange.Redis;
using Swashbuckle.AspNetCore.Swagger;
using Volo.Abp;
using Volo.Abp.AspNetCore.Authentication.OAuth;
using Volo.Abp.AspNetCore.Mvc.Client;
@ -34,7 +34,7 @@ using Volo.Abp.UI;
using Volo.Abp.UI.Navigation;
using Volo.Abp.VirtualFileSystem;
namespace MyCompanyName.MyProjectName
namespace MyCompanyName.MyProjectName.Web
{
[DependsOn(
typeof(MyProjectNameHttpApiModule),

5
templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml
Unescape View File

@ -1,7 +1,6 @@
@page
@using MyCompanyName.MyProjectName.Pages
@inherits MyProjectNamePageBase
@model IndexModel
@inherits MyCompanyName.MyProjectName.Web.Pages.MyProjectNamePageBase
@model MyCompanyName.MyProjectName.Web.Pages.IndexModel
@section styles {
<abp-style-bundle>
<abp-style src="/Pages/Index.css" />

2
templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml.cs
Unescape View File

@ -1,7 +1,7 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authentication;
namespace MyCompanyName.MyProjectName.Pages
namespace MyCompanyName.MyProjectName.Web.Pages
{
public class IndexModel : MyProjectNamePageModelBase
{

2
templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/MyProjectNamePageBase.cs
Unescape View File

@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc.Razor.Internal;
using MyCompanyName.MyProjectName.Localization;
using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
namespace MyCompanyName.MyProjectName.Pages
namespace MyCompanyName.MyProjectName.Web.Pages
{
public abstract class MyProjectNamePageBase : AbpPage
{

2
templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Pages/MyProjectNamePageModelBase.cs
Unescape View File

@ -1,7 +1,7 @@
using MyCompanyName.MyProjectName.Localization;
using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
namespace MyCompanyName.MyProjectName.Pages
namespace MyCompanyName.MyProjectName.Web.Pages
{
public abstract class MyProjectNamePageModelBase : AbpPageModel
{

2
templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Program.cs
Unescape View File

@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Hosting;
using Serilog;
using Serilog.Events;
namespace MyCompanyName.MyProjectName
namespace MyCompanyName.MyProjectName.Web
{
public class Program
{

2
templates/mvc/src/MyCompanyName.MyProjectName.Web.Host/Startup.cs
Unescape View File

@ -4,7 +4,7 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Volo.Abp;
namespace MyCompanyName.MyProjectName
namespace MyCompanyName.MyProjectName.Web
{
public class Startup
{

2
templates/mvc/src/MyCompanyName.MyProjectName.Web/Menus/MyProjectNameMenuContributor.cs
Unescape View File

@ -6,7 +6,7 @@ using MyCompanyName.MyProjectName.MultiTenancy;
using Volo.Abp.TenantManagement.Web.Navigation;
using Volo.Abp.UI.Navigation;
namespace MyCompanyName.MyProjectName.Menus
namespace MyCompanyName.MyProjectName.Web.Menus
{
public class MyProjectNameMenuContributor : IMenuContributor
{

2
templates/mvc/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj
Unescape View File

@ -4,7 +4,7 @@
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
<RootNamespace>MyCompanyName.MyProjectName.Web</RootNamespace>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>

2
templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameBrandingProvider.cs
Unescape View File

@ -1,7 +1,7 @@
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Components;
using Volo.Abp.DependencyInjection;
namespace MyCompanyName.MyProjectName
namespace MyCompanyName.MyProjectName.Web
{
[Dependency(ReplaceServices = true)]
public class MyProjectNameBrandingProvider : DefaultBrandingProvider

2
templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebAutoMapperProfile.cs
Unescape View File

@ -1,6 +1,6 @@
using AutoMapper;
namespace MyCompanyName.MyProjectName
namespace MyCompanyName.MyProjectName.Web
{
public class MyProjectNameWebAutoMapperProfile : Profile
{

12
templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
Unescape View File

@ -1,14 +1,14 @@
using Localization.Resources.AbpUi;
using System.IO;
using Localization.Resources.AbpUi;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using MyCompanyName.MyProjectName.EntityFrameworkCore;
using MyCompanyName.MyProjectName.Menus;
using Swashbuckle.AspNetCore.Swagger;
using System.IO;
using Microsoft.Extensions.Configuration;
using MyCompanyName.MyProjectName.Localization;
using MyCompanyName.MyProjectName.MultiTenancy;
using MyCompanyName.MyProjectName.Web.Menus;
using Swashbuckle.AspNetCore.Swagger;
using Volo.Abp;
using Volo.Abp.Account.Web;
using Volo.Abp.AspNetCore.Authentication.JwtBearer;
@ -30,7 +30,7 @@ using Volo.Abp.UI;
using Volo.Abp.UI.Navigation;
using Volo.Abp.VirtualFileSystem;
namespace MyCompanyName.MyProjectName
namespace MyCompanyName.MyProjectName.Web
{
[DependsOn(
typeof(MyProjectNameHttpApiModule),

5
templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml
Unescape View File

@ -1,7 +1,6 @@
@page
@using MyCompanyName.MyProjectName.Pages
@inherits MyProjectNamePageBase
@model IndexModel
@inherits MyCompanyName.MyProjectName.Web.Pages.MyProjectNamePageBase
@model MyCompanyName.MyProjectName.Web.Pages.IndexModel
@section styles {
<abp-style-bundle>
<abp-style src="/Pages/Index.css" />

2
templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml.cs
Unescape View File

@ -1,4 +1,4 @@
namespace MyCompanyName.MyProjectName.Pages
namespace MyCompanyName.MyProjectName.Web.Pages
{
public class IndexModel : MyProjectNamePageModelBase
{

2
templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageBase.cs
Unescape View File

@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc.Razor.Internal;
using MyCompanyName.MyProjectName.Localization;
using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
namespace MyCompanyName.MyProjectName.Pages
namespace MyCompanyName.MyProjectName.Web.Pages
{
public abstract class MyProjectNamePageBase : AbpPage
{

2
templates/mvc/src/MyCompanyName.MyProjectName.Web/Pages/MyProjectNamePageModelBase.cs
Unescape View File

@ -1,7 +1,7 @@
using MyCompanyName.MyProjectName.Localization;
using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
namespace MyCompanyName.MyProjectName.Pages
namespace MyCompanyName.MyProjectName.Web.Pages
{
public abstract class MyProjectNamePageModelBase : AbpPageModel
{

2
templates/mvc/src/MyCompanyName.MyProjectName.Web/Program.cs
Unescape View File

@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Hosting;
using Serilog;
using Serilog.Events;
namespace MyCompanyName.MyProjectName
namespace MyCompanyName.MyProjectName.Web
{
public class Program
{

2
templates/mvc/src/MyCompanyName.MyProjectName.Web/Startup.cs
Unescape View File

@ -4,7 +4,7 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Volo.Abp;
namespace MyCompanyName.MyProjectName
namespace MyCompanyName.MyProjectName.Web
{
public class Startup
{

3
templates/mvc/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs
Unescape View File

@ -7,7 +7,8 @@ using Microsoft.AspNetCore.Mvc.ApplicationParts;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using MyCompanyName.MyProjectName.Localization;
using MyCompanyName.MyProjectName.Menus;
using MyCompanyName.MyProjectName.Web;
using MyCompanyName.MyProjectName.Web.Menus;
using Volo.Abp;
using Volo.Abp.AspNetCore.TestBase;
using Volo.Abp.Localization;

Write Preview
Loading…
Cancel
Save