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

Merge branch 'dev' into maliming/GenericHost

Browse Source
pull/1894/head
maliming 5 years ago
parent 645e5d464e fca431e0af
commit d1c506f994
18 changed files with 34 additions and 82 deletions
Show Stats Download Patch File Download Diff File

15
framework/src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs
Unescape View File

@ -24,14 +24,19 @@ namespace Volo.Abp.Internal
var assemblyFinder = new AssemblyFinder(abpApplication);
var typeFinder = new TypeFinder(assemblyFinder);
services.TryAddSingleton<IConfigurationAccessor>(
new DefaultConfigurationAccessor(
ConfigurationHelper.BuildConfiguration(
applicationCreationOptions.Configuration
)
var configurationAccessor = new DefaultConfigurationAccessor(
ConfigurationHelper.BuildConfiguration(
applicationCreationOptions.Configuration
)
);
services.TryAddSingleton<IConfigurationAccessor>(configurationAccessor);
if (!services.IsAdded<IConfiguration>())
{
services.AddSingleton<IConfiguration>(configurationAccessor.Configuration);
}
services.TryAddSingleton<IModuleLoader>(moduleLoader);
services.TryAddSingleton<IAssemblyFinder>(assemblyFinder);
services.TryAddSingleton<ITypeFinder>(typeFinder);

2
modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo.Abp.FeatureManagement.Domain.Shared.csproj
Unescape View File

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<content Remove="Volo\Abp\FeatureManagement\Localization\Domain\*.json" />
<EmbeddedResource Include="Volo\Abp\FeatureManagement\Localization\Domain\*.json" />
<content Remove="Volo\Abp\FeatureManagement\Localization\Domain\*.json" />
</ItemGroup>
<ItemGroup>

2
modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs
Unescape View File

@ -24,7 +24,7 @@ namespace Volo.Abp.FeatureManagement
.Add<AbpFeatureManagementResource>("en")
.AddBaseTypes(
typeof(AbpValidationResource)
).AddVirtualJson("Volo/Abp/FeatureManagement/Localization/Resources/Domain");
).AddVirtualJson("Volo/Abp/FeatureManagement/Localization/Domain");
});
}
}

2
modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/Localization/Domain/en.json
Unescape View File

@ -2,6 +2,6 @@
"culture": "en",
"texts": {
"Features": "Features",
"NoFeatureFoundMessage": "There is't any available feature."
"NoFeatureFoundMessage": "There isn't any available feature."
}
}

5
modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo.Abp.FeatureManagement.Domain.csproj
Unescape View File

@ -13,11 +13,6 @@
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Caching\Volo.Abp.Caching.csproj" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Volo\Abp\FeatureManagement\Localization\Domain\*.json" />
<Content Remove="Volo\Abp\FeatureManagement\Localization\Domain\*.json" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Volo.Abp.FeatureManagement.Domain.Shared\Volo.Abp.FeatureManagement.Domain.Shared.csproj" />
</ItemGroup>

12
modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs
Unescape View File

@ -27,18 +27,6 @@ namespace Volo.Abp.FeatureManagement
options.ProviderPolicies[TenantFeatureValueProvider.ProviderName] = "AbpTenantManagement.Tenants.ManageFeatures";
});
Configure<VirtualFileSystemOptions>(options =>
{
options.FileSets.AddEmbedded<AbpFeatureManagementDomainModule>();
});
Configure<AbpLocalizationOptions>(options =>
{
options.Resources
.Get<AbpFeatureManagementResource>()
.AddVirtualJson("/Volo/Abp/FeatureManagement/Localization/Domain");
});
Configure<ExceptionLocalizationOptions>(options =>
{
options.MapCodeNamespace("AbpFeatureManagement", typeof(AbpFeatureManagementResource));

6
modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/cs.json
Unescape View File

@ -1,6 +0,0 @@
{
"culture": "cs",
"texts": {
}
}

6
modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/en.json
Unescape View File

@ -1,6 +0,0 @@
{
"culture": "en",
"texts": {
}
}

6
modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/pl.json
Unescape View File

@ -1,6 +0,0 @@
{
"culture": "pl",
"texts": {
}
}

6
modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/pt-BR.json
Unescape View File

@ -1,6 +0,0 @@
{
"culture": "pt-BR",
"texts": {
}
}

6
modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/tr.json
Unescape View File

@ -1,6 +0,0 @@
{
"culture": "tr",
"texts": {
}
}

6
modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/vi.json
Unescape View File

@ -1,6 +0,0 @@
{
"culture": "vi",
"texts": {
}
}

6
modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/Localization/Domain/zh-Hans.json
Unescape View File

@ -1,6 +0,0 @@
{
"culture": "zh-Hans",
"texts": {
}
}

26
templates/app/angular/package.json
Unescape View File

@ -6,7 +6,7 @@
"start": "ng serve",
"start:hmr": "ng serve --configuration hmr",
"build": "ng build",
"build:prod": "ng build --configuration production",
"build:prod": "ng build --prod",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
@ -18,14 +18,14 @@
"@abp/ng.theme.basic": "^0.9.0",
"@abp/ng.tenant-management": "^0.9.0",
"@abp/ng.setting-management": "^0.9.0",
"@angular/animations": "~8.2.8",
"@angular/common": "~8.2.8",
"@angular/compiler": "~8.2.8",
"@angular/core": "~8.2.8",
"@angular/forms": "~8.2.8",
"@angular/platform-browser": "~8.2.8",
"@angular/platform-browser-dynamic": "~8.2.8",
"@angular/router": "~8.2.8",
"@angular/animations": "~8.2.10",
"@angular/common": "~8.2.10",
"@angular/compiler": "~8.2.10",
"@angular/core": "~8.2.10",
"@angular/forms": "~8.2.10",
"@angular/platform-browser": "~8.2.10",
"@angular/platform-browser-dynamic": "~8.2.10",
"@angular/router": "~8.2.10",
"@angularclass/hmr": "^2.1.3",
"@ngxs/hmr-plugin": "^3.5.0",
"@ngxs/devtools-plugin": "^3.5.0",
@ -34,10 +34,10 @@
"zone.js": "~0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.803.6",
"@angular/cli": "~8.3.6",
"@angular/compiler-cli": "~8.2.8",
"@angular/language-service": "~8.2.8",
"@angular-devkit/build-angular": "~0.803.9",
"@angular/cli": "~8.3.9",
"@angular/compiler-cli": "~8.2.10",
"@angular/language-service": "~8.2.10",
"@types/jasmine": "~3.3.8",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",

3
templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj
Unescape View File

@ -8,7 +8,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj" />
<ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Ddd.Application.Contracts\Volo.Abp.Ddd.Application.Contracts.csproj" />
<ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Authorization\Volo.Abp.Authorization.csproj" />
<ProjectReference Include="..\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj" />
</ItemGroup>

4
templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs
Unescape View File

@ -1,12 +1,14 @@
using Volo.Abp.Application;
using Volo.Abp.Modularity;
using Volo.Abp.VirtualFileSystem;
using Volo.Abp.Authorization;
namespace MyCompanyName.MyProjectName
{
[DependsOn(
typeof(MyProjectNameDomainSharedModule),
typeof(AbpDddApplicationModule)
typeof(AbpDddApplicationContractsModule),
typeof(AbpAuthorizationModule)
)]
public class MyProjectNameApplicationContractsModule : AbpModule
{

1
templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj
Unescape View File

@ -9,6 +9,7 @@
<ItemGroup>
<ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
<ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj" />
<ProjectReference Include="..\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj" />
<ProjectReference Include="..\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj" />
</ItemGroup>

2
templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs
Unescape View File

@ -1,11 +1,13 @@
using Volo.Abp.AutoMapper;
using Volo.Abp.Modularity;
using Volo.Abp.Application;
namespace MyCompanyName.MyProjectName
{
[DependsOn(
typeof(MyProjectNameDomainModule),
typeof(MyProjectNameApplicationContractsModule),
typeof(AbpDddApplicationModule),
typeof(AbpAutoMapperModule)
)]
public class MyProjectNameApplicationModule : AbpModule

Write Preview
Loading…
Cancel
Save