Merge branch 'dev' into cli-nolayers-blazor-wasm

pull/15516/head
Yunus Emre Kalkan 3 years ago
commit e595db4338

@ -1,6 +1,6 @@
using MyCompanyName.MyProjectName.Blazor.Menus;
using MyCompanyName.MyProjectName.Shared.Localization;
using MyCompanyName.MyProjectName.Shared.MultiTenancy;
using MyCompanyName.MyProjectName.Localization;
using MyCompanyName.MyProjectName.MultiTenancy;
using Volo.Abp.Account.Localization;
using Volo.Abp.Authorization.Permissions;
using Volo.Abp.Identity.Blazor;
@ -8,7 +8,7 @@ using Volo.Abp.SettingManagement.Blazor.Menus;
using Volo.Abp.TenantManagement.Blazor.Navigation;
using Volo.Abp.UI.Navigation;
namespace MyCompanyName.MyProjectName.Client.Menus;
namespace MyCompanyName.MyProjectName.Menus;
public class MyProjectNameMenuContributor : IMenuContributor
{

@ -4,6 +4,7 @@
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
<BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
</PropertyGroup>
@ -22,7 +23,7 @@
<!-- </TEMPLATE-REMOVE> -->
<PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme" Version="2.0.0-*" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac.WebAssembly\Volo.Abp.Autofac.WebAssembly.csproj" />
</ItemGroup>
@ -39,7 +40,7 @@
<ProjectReference Include="..\..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.HttpApi.Client\Volo.Abp.SettingManagement.HttpApi.Client.csproj" />
<ProjectReference Include="..\..\..\..\..\modules\openiddict\src\Volo.Abp.OpenIddict.Domain.Shared\Volo.Abp.OpenIddict.Domain.Shared.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Shared\MyCompanyName.MyProjectName.Blazor.WebAssembly.Shared.csproj" />
</ItemGroup>

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

@ -1,8 +1,8 @@
using Blazorise.Bootstrap5;
using Blazorise.Icons.FontAwesome;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using MyCompanyName.MyProjectName.Client.Menus;
using MyCompanyName.MyProjectName.Shared;
using MyCompanyName.MyProjectName.Menus;
using MyCompanyName.MyProjectName;
using OpenIddict.Abstractions;
using Volo.Abp.Account;
using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite;
@ -22,10 +22,10 @@ using Volo.Abp.TenantManagement;
using Volo.Abp.TenantManagement.Blazor.WebAssembly;
using Volo.Abp.UI.Navigation;
namespace MyCompanyName.MyProjectName.Client;
namespace MyCompanyName.MyProjectName;
[DependsOn(
typeof(MyProjectNameSharedModule),
typeof(MyProjectNameContractsModule),
// ABP Framework packages
typeof(AbpAutofacWebAssemblyModule),
@ -98,7 +98,7 @@ public class MyProjectNameBlazorModule : AbpModule
private void ConfigureHttpClientProxies(ServiceConfigurationContext context)
{
context.Services.AddHttpClientProxies(
typeof(MyProjectNameSharedModule).Assembly,
typeof(MyProjectNameContractsModule).Assembly,
RemoteServiceName
);
}

@ -1,7 +1,7 @@
using Volo.Abp.DependencyInjection;
using Volo.Abp.Ui.Branding;
namespace MyCompanyName.MyProjectName.Client;
namespace MyCompanyName.MyProjectName;
[Dependency(ReplaceServices = true)]
public class MyProjectNameBrandingProvider : DefaultBrandingProvider

@ -1,6 +1,6 @@
using Volo.Abp.Bundling;
namespace MyCompanyName.MyProjectName.Client;
namespace MyCompanyName.MyProjectName;
/* Add your global styles/scripts here.
* See https://docs.abp.io/en/abp/latest/UI/Blazor/Global-Scripts-Styles to learn how to use it

@ -1,7 +1,7 @@
using MyCompanyName.MyProjectName.Shared.Localization;
using MyCompanyName.MyProjectName.Localization;
using Volo.Abp.AspNetCore.Components;
namespace MyCompanyName.MyProjectName.Client;
namespace MyCompanyName.MyProjectName;
public abstract class MyProjectNameComponentBase : AbpComponentBase
{

@ -1,4 +1,4 @@
namespace MyCompanyName.MyProjectName.Client.Pages;
namespace MyCompanyName.MyProjectName.Pages;
public partial class Index
{

@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
namespace MyCompanyName.MyProjectName.Client;
namespace MyCompanyName.MyProjectName;
public class Program
{
@ -19,4 +19,4 @@ public class Program
await host.RunAsync();
}
}
}

@ -7,8 +7,8 @@
@using Microsoft.AspNetCore.Components.WebAssembly.Http
@using Microsoft.JSInterop
@using Volo.Abp.AspNetCore.Components.Web
@using MyCompanyName.MyProjectName.Client
@using MyCompanyName.MyProjectName
@using Blazorise
@using Blazorise.DataGrid
@using Volo.Abp.BlazoriseUI
@using Volo.Abp.BlazoriseUI.Components
@using Volo.Abp.BlazoriseUI.Components

@ -1,7 +1,7 @@
using Volo.Abp.Data;
using Volo.Abp.MongoDB;
namespace MyCompanyName.MyProjectName.Server.Data;
namespace MyCompanyName.MyProjectName.Data;
[ConnectionStringName("Default")]
public class MyProjectNameDbContext : AbpMongoDbContext

@ -5,7 +5,7 @@ using Volo.Abp.Identity;
using Volo.Abp.MultiTenancy;
using Volo.Abp.TenantManagement;
namespace MyCompanyName.MyProjectName.Server.Data;
namespace MyCompanyName.MyProjectName.Data;
public class MyProjectNameDbMigrationService : ITransientDependency
{

@ -3,7 +3,7 @@ using Volo.Abp.Data;
using Volo.Abp.DependencyInjection;
using Volo.Abp.MongoDB;
namespace MyCompanyName.MyProjectName.Server.Data;
namespace MyCompanyName.MyProjectName.Data;
public class MyProjectNameMongoDbSchemaMigrator : ITransientDependency
{

@ -9,7 +9,7 @@ using Volo.Abp.OpenIddict.Applications;
using Volo.Abp.PermissionManagement;
using Volo.Abp.Uow;
namespace MyCompanyName.MyProjectName.Server.Data;
namespace MyCompanyName.MyProjectName.Data;
/* Creates initial data that is needed to property run the application
* and make client-to-server communication possible.

@ -4,6 +4,7 @@
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
</PropertyGroup>
<ItemGroup>

@ -3,10 +3,10 @@ using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.OpenApi.Models;
using MyCompanyName.MyProjectName.Server.Data;
using MyCompanyName.MyProjectName.Shared.Localization;
using MyCompanyName.MyProjectName.Shared;
using MyCompanyName.MyProjectName.Shared.MultiTenancy;
using MyCompanyName.MyProjectName.Data;
using MyCompanyName.MyProjectName.Localization;
using MyCompanyName.MyProjectName;
using MyCompanyName.MyProjectName.MultiTenancy;
using OpenIddict.Validation.AspNetCore;
using Volo.Abp;
using Volo.Abp.Account;
@ -44,11 +44,11 @@ using Volo.Abp.UI.Navigation.Urls;
using Volo.Abp.Uow;
using Volo.Abp.VirtualFileSystem;
namespace MyCompanyName.MyProjectName.Server;
namespace MyCompanyName.MyProjectName;
[DependsOn(
typeof(MyProjectNameSharedModule),
typeof(MyProjectNameContractsModule),
// ABP Framework packages
typeof(AbpAspNetCoreMvcModule),
@ -95,7 +95,7 @@ namespace MyCompanyName.MyProjectName.Server;
typeof(AbpSettingManagementMongoDbModule),
typeof(AbpSettingManagementHttpApiModule)
)]
public class MyProjectNameServerModule : AbpModule
public class MyProjectNameHostModule : AbpModule
{
public override void PreConfigureServices(ServiceConfigurationContext context)
{
@ -177,11 +177,11 @@ public class MyProjectNameServerModule : AbpModule
{
Configure<AbpVirtualFileSystemOptions>(options =>
{
options.FileSets.AddEmbedded<MyProjectNameServerModule>();
options.FileSets.AddEmbedded<MyProjectNameHostModule>();
if (hostingEnvironment.IsDevelopment())
{
/* Using physical files in development, so we don't need to recompile on changes */
options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameServerModule>(hostingEnvironment.ContentRootPath);
options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameHostModule>(hostingEnvironment.ContentRootPath);
}
});
}
@ -190,7 +190,7 @@ public class MyProjectNameServerModule : AbpModule
{
Configure<AbpAspNetCoreMvcOptions>(options =>
{
options.ConventionalControllers.Create(typeof(MyProjectNameServerModule).Assembly);
options.ConventionalControllers.Create(typeof(MyProjectNameHostModule).Assembly);
});
}
@ -212,14 +212,14 @@ public class MyProjectNameServerModule : AbpModule
private void ConfigureAutoMapper(ServiceConfigurationContext context)
{
context.Services.AddAutoMapperObjectMapper<MyProjectNameServerModule>();
context.Services.AddAutoMapperObjectMapper<MyProjectNameHostModule>();
Configure<AbpAutoMapperOptions>(options =>
{
/* Uncomment `validate: true` if you want to enable the Configuration Validation feature.
* See AutoMapper's documentation to learn what it is:
* https://docs.automapper.org/en/stable/Configuration-validation.html
*/
options.AddMaps<MyProjectNameServerModule>(/* validate: true */);
options.AddMaps<MyProjectNameHostModule>(/* validate: true */);
});
}

@ -1,6 +1,6 @@
using AutoMapper;
namespace MyCompanyName.MyProjectName.Server.ObjectMapping;
namespace MyCompanyName.MyProjectName.ObjectMapping;
public class MyProjectNameAutoMapperProfile : Profile
{

@ -1,5 +1,5 @@
using MyCompanyName.MyProjectName.Server;
using MyCompanyName.MyProjectName.Server.Data;
using MyCompanyName.MyProjectName;
using MyCompanyName.MyProjectName.Data;
using Serilog;
using Serilog.Events;
using Volo.Abp.Data;
@ -40,7 +40,7 @@ public class Program
builder.Host.AddAppSettingsSecretsJson()
.UseAutofac()
.UseSerilog();
await builder.AddApplicationAsync<MyProjectNameServerModule>();
await builder.AddApplicationAsync<MyProjectNameHostModule>();
if (IsMigrateDatabase(args))
{
builder.Services.AddDataMigrationEnvironment();

@ -5,7 +5,7 @@
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
</handlers>
<aspNetCore processPath="dotnet" arguments=".\MyCompanyName.MyProjectName.Server.dll" stdoutLogEnabled="false" stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
<aspNetCore processPath="dotnet" arguments=".\MyCompanyName.MyProjectName.Host.dll" stdoutLogEnabled="false" stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
</system.webServer>
</location>
<system.webServer>

@ -8,7 +8,7 @@ using Volo.Abp.PermissionManagement.EntityFrameworkCore;
using Volo.Abp.SettingManagement.EntityFrameworkCore;
using Volo.Abp.TenantManagement.EntityFrameworkCore;
namespace MyCompanyName.MyProjectName.Server.Data;
namespace MyCompanyName.MyProjectName.Data;
public class MyProjectNameDbContext : AbpDbContext<MyProjectNameDbContext>
{

@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Design;
namespace MyCompanyName.MyProjectName.Server.Data;
namespace MyCompanyName.MyProjectName.Data;
public class MyProjectNameDbContextFactory : IDesignTimeDbContextFactory<MyProjectNameDbContext>
{

@ -7,7 +7,7 @@ using Volo.Abp.Identity;
using Volo.Abp.MultiTenancy;
using Volo.Abp.TenantManagement;
namespace MyCompanyName.MyProjectName.Server.Data;
namespace MyCompanyName.MyProjectName.Data;
public class MyProjectNameDbMigrationService : ITransientDependency
{

@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using Volo.Abp.DependencyInjection;
namespace MyCompanyName.MyProjectName.Server.Data;
namespace MyCompanyName.MyProjectName.Data;
public class MyProjectNameEFCoreDbSchemaMigrator : ITransientDependency
{

@ -9,7 +9,7 @@ using Volo.Abp.OpenIddict.Applications;
using Volo.Abp.PermissionManagement;
using Volo.Abp.Uow;
namespace MyCompanyName.MyProjectName.Server.Data;
namespace MyCompanyName.MyProjectName.Data;
/* Creates initial data that is needed to property run the application
* and make client-to-server communication possible.

@ -5,12 +5,12 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using MyCompanyName.MyProjectName.Server.Data;
using MyCompanyName.MyProjectName.Data;
using Volo.Abp.EntityFrameworkCore;
#nullable disable
namespace MyCompanyName.MyProjectName.Server.Migrations
namespace MyCompanyName.MyProjectName.Migrations
{
[DbContext(typeof(MyProjectNameDbContext))]
[Migration("20221205080257_Initial")]

@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace MyCompanyName.MyProjectName.Server.Migrations
namespace MyCompanyName.MyProjectName.Migrations
{
/// <inheritdoc />
public partial class Initial : Migration

@ -4,12 +4,12 @@ using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using MyCompanyName.MyProjectName.Server.Data;
using MyCompanyName.MyProjectName.Data;
using Volo.Abp.EntityFrameworkCore;
#nullable disable
namespace MyCompanyName.MyProjectName.Server.Migrations
namespace MyCompanyName.MyProjectName.Migrations
{
[DbContext(typeof(MyProjectNameDbContext))]
partial class MyProjectNameDbContextModelSnapshot : ModelSnapshot

@ -4,6 +4,7 @@
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
</PropertyGroup>
<ItemGroup>

@ -3,10 +3,10 @@ using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.OpenApi.Models;
using MyCompanyName.MyProjectName.Server.Data;
using MyCompanyName.MyProjectName.Shared.Localization;
using MyCompanyName.MyProjectName.Shared;
using MyCompanyName.MyProjectName.Shared.MultiTenancy;
using MyCompanyName.MyProjectName.Data;
using MyCompanyName.MyProjectName.Localization;
using MyCompanyName.MyProjectName;
using MyCompanyName.MyProjectName.MultiTenancy;
using OpenIddict.Validation.AspNetCore;
using Volo.Abp;
using Volo.Abp.Account;
@ -46,11 +46,11 @@ using Volo.Abp.UI.Navigation.Urls;
using Volo.Abp.Uow;
using Volo.Abp.VirtualFileSystem;
namespace MyCompanyName.MyProjectName.Server;
namespace MyCompanyName.MyProjectName;
[DependsOn(
typeof(MyProjectNameSharedModule),
typeof(MyProjectNameContractsModule),
// ABP Framework packages
typeof(AbpAspNetCoreMvcModule),
@ -98,7 +98,7 @@ namespace MyCompanyName.MyProjectName.Server;
typeof(AbpSettingManagementEntityFrameworkCoreModule),
typeof(AbpSettingManagementHttpApiModule)
)]
public class MyProjectNameServerModule : AbpModule
public class MyProjectNameHostModule : AbpModule
{
public override void PreConfigureServices(ServiceConfigurationContext context)
{
@ -180,11 +180,11 @@ public class MyProjectNameServerModule : AbpModule
{
Configure<AbpVirtualFileSystemOptions>(options =>
{
options.FileSets.AddEmbedded<MyProjectNameServerModule>();
options.FileSets.AddEmbedded<MyProjectNameHostModule>();
if (hostingEnvironment.IsDevelopment())
{
/* Using physical files in development, so we don't need to recompile on changes */
options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameServerModule>(hostingEnvironment.ContentRootPath);
options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameHostModule>(hostingEnvironment.ContentRootPath);
}
});
}
@ -193,7 +193,7 @@ public class MyProjectNameServerModule : AbpModule
{
Configure<AbpAspNetCoreMvcOptions>(options =>
{
options.ConventionalControllers.Create(typeof(MyProjectNameServerModule).Assembly);
options.ConventionalControllers.Create(typeof(MyProjectNameHostModule).Assembly);
});
}
@ -215,14 +215,14 @@ public class MyProjectNameServerModule : AbpModule
private void ConfigureAutoMapper(ServiceConfigurationContext context)
{
context.Services.AddAutoMapperObjectMapper<MyProjectNameServerModule>();
context.Services.AddAutoMapperObjectMapper<MyProjectNameHostModule>();
Configure<AbpAutoMapperOptions>(options =>
{
/* Uncomment `validate: true` if you want to enable the Configuration Validation feature.
* See AutoMapper's documentation to learn what it is:
* https://docs.automapper.org/en/stable/Configuration-validation.html
*/
options.AddMaps<MyProjectNameServerModule>(/* validate: true */);
options.AddMaps<MyProjectNameHostModule>(/* validate: true */);
});
}

@ -1,6 +1,6 @@
using AutoMapper;
namespace MyCompanyName.MyProjectName.Server.ObjectMapping;
namespace MyCompanyName.MyProjectName.ObjectMapping;
public class MyProjectNameAutoMapperProfile : Profile
{

@ -1,5 +1,5 @@
using MyCompanyName.MyProjectName.Server;
using MyCompanyName.MyProjectName.Server.Data;
using MyCompanyName.MyProjectName;
using MyCompanyName.MyProjectName.Data;
using Serilog;
using Serilog.Events;
using Volo.Abp.Data;
@ -40,7 +40,7 @@ public class Program
builder.Host.AddAppSettingsSecretsJson()
.UseAutofac()
.UseSerilog();
await builder.AddApplicationAsync<MyProjectNameServerModule>();
await builder.AddApplicationAsync<MyProjectNameHostModule>();
if (IsMigrateDatabase(args))
{
builder.Services.AddDataMigrationEnvironment();

@ -5,7 +5,7 @@
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
</handlers>
<aspNetCore processPath="dotnet" arguments=".\MyCompanyName.MyProjectName.Server.dll" stdoutLogEnabled="false" stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
<aspNetCore processPath="dotnet" arguments=".\MyCompanyName.MyProjectName.Host.dll" stdoutLogEnabled="false" stdoutLogFile=".\Logs\stdout" hostingModel="inprocess" />
</system.webServer>
</location>
<system.webServer>

@ -1,9 +1,9 @@
using Volo.Abp.Localization;
namespace MyCompanyName.MyProjectName.Shared.Localization;
namespace MyCompanyName.MyProjectName.Localization;
[LocalizationResourceName("MyProjectName")]
public class MyProjectNameResource
{
}
}

@ -1,4 +1,4 @@
namespace MyCompanyName.MyProjectName.Shared.MultiTenancy;
namespace MyCompanyName.MyProjectName.MultiTenancy;
public static class MultiTenancyConsts
{

@ -4,6 +4,7 @@
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>

@ -1,4 +1,4 @@
using MyCompanyName.MyProjectName.Shared.Localization;
using MyCompanyName.MyProjectName.Localization;
using Volo.Abp.Account;
using Volo.Abp.FeatureManagement;
using Volo.Abp.Identity;
@ -12,7 +12,7 @@ using Volo.Abp.Validation;
using Volo.Abp.Validation.Localization;
using Volo.Abp.VirtualFileSystem;
namespace MyCompanyName.MyProjectName.Shared;
namespace MyCompanyName.MyProjectName;
[DependsOn(
typeof(AbpValidationModule),
@ -23,15 +23,15 @@ namespace MyCompanyName.MyProjectName.Shared;
typeof(AbpFeatureManagementApplicationContractsModule),
typeof(AbpSettingManagementApplicationContractsModule)
)]
public class MyProjectNameSharedModule : AbpModule
public class MyProjectNameContractsModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
Configure<AbpVirtualFileSystemOptions>(options =>
{
options.FileSets.AddEmbedded<MyProjectNameSharedModule>();
options.FileSets.AddEmbedded<MyProjectNameContractsModule>();
});
Configure<AbpLocalizationOptions>(options =>
{
options.Resources
@ -68,4 +68,4 @@ public class MyProjectNameSharedModule : AbpModule
options.MapCodeNamespace("MyProjectName", typeof(MyProjectNameResource));
});
}
}
}
Loading…
Cancel
Save