diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln index ad70bec8dd..aa0a3f1222 100644 --- a/framework/Volo.Abp.sln +++ b/framework/Volo.Abp.sln @@ -331,8 +331,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.GlobalFeatures", " EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.GlobalFeatures.Tests", "test\Volo.Abp.GlobalFeatures.Tests\Volo.Abp.GlobalFeatures.Tests.csproj", "{231F1581-AA21-44C3-BF27-51EB3AD5355C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.MultiLingualEntities", "src\Volo.Abp.MultiLingualEntities\Volo.Abp.MultiLingualEntities.csproj", "{83E4016D-5941-4735-AF88-422144619588}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -987,10 +985,6 @@ Global {231F1581-AA21-44C3-BF27-51EB3AD5355C}.Debug|Any CPU.Build.0 = Debug|Any CPU {231F1581-AA21-44C3-BF27-51EB3AD5355C}.Release|Any CPU.ActiveCfg = Release|Any CPU {231F1581-AA21-44C3-BF27-51EB3AD5355C}.Release|Any CPU.Build.0 = Release|Any CPU - {83E4016D-5941-4735-AF88-422144619588}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83E4016D-5941-4735-AF88-422144619588}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83E4016D-5941-4735-AF88-422144619588}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83E4016D-5941-4735-AF88-422144619588}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1158,7 +1152,6 @@ Global {C1D891B0-AE83-42CB-987D-425A2787DE78} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {04F44063-C952-403A-815F-EFB778BDA125} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {231F1581-AA21-44C3-BF27-51EB3AD5355C} = {447C8A77-E5F0-4538-8687-7383196D04EA} - {83E4016D-5941-4735-AF88-422144619588} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5} diff --git a/framework/src/Volo.Abp.AutoMapper/AutoMapper/AbpAutoMapperMultiLingualDtoExtensions.cs b/framework/src/Volo.Abp.AutoMapper/AutoMapper/AbpAutoMapperMultiLingualDtoExtensions.cs index 345f28d542..37ed4af95d 100644 --- a/framework/src/Volo.Abp.AutoMapper/AutoMapper/AbpAutoMapperMultiLingualDtoExtensions.cs +++ b/framework/src/Volo.Abp.AutoMapper/AutoMapper/AbpAutoMapperMultiLingualDtoExtensions.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; +using Volo.Abp.Domain.Entities; using Volo.Abp.Localization; -using Volo.Abp.MultiLingualEntities; using Volo.Abp.Settings; using Volo.Abp.Threading; diff --git a/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj b/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj index a026d68c48..6e261e0b2a 100644 --- a/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj +++ b/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj @@ -18,7 +18,7 @@ - + diff --git a/framework/src/Volo.Abp.MultiLingualEntities/Volo/Abp/MultiLingualEntities/IEntityTranslation.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/IEntityTranslation.cs similarity index 74% rename from framework/src/Volo.Abp.MultiLingualEntities/Volo/Abp/MultiLingualEntities/IEntityTranslation.cs rename to framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/IEntityTranslation.cs index 1a770bff92..0684e615ad 100644 --- a/framework/src/Volo.Abp.MultiLingualEntities/Volo/Abp/MultiLingualEntities/IEntityTranslation.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/IEntityTranslation.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.MultiLingualEntities +namespace Volo.Abp.Domain.Entities { public interface IEntityTranslation { @@ -6,6 +6,7 @@ } public interface IEntityTranslation : IEntityTranslation + where TEntity : IEntity { TEntity Core { get; set; } @@ -13,6 +14,7 @@ } public interface IEntityTranslation: IEntityTranslation + where TEntity : IEntity { } diff --git a/framework/src/Volo.Abp.MultiLingualEntities/Volo/Abp/MultiLingualEntities/IMultiLingualEntity.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/IMultiLingualEntity.cs similarity index 84% rename from framework/src/Volo.Abp.MultiLingualEntities/Volo/Abp/MultiLingualEntities/IMultiLingualEntity.cs rename to framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/IMultiLingualEntity.cs index 9e3dae8cc2..2b25a7a90a 100644 --- a/framework/src/Volo.Abp.MultiLingualEntities/Volo/Abp/MultiLingualEntities/IMultiLingualEntity.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/IMultiLingualEntity.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Volo.Abp.MultiLingualEntities +namespace Volo.Abp.Domain.Entities { public interface IMultiLingualEntity where TTranslation : class, IEntityTranslation diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs index 179e575358..f70e64bb0a 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs @@ -7,7 +7,6 @@ using Volo.Abp.Data; using Volo.Abp.Domain.Entities; using Volo.Abp.EntityFrameworkCore.ValueComparers; using Volo.Abp.EntityFrameworkCore.ValueConverters; -using Volo.Abp.MultiLingualEntities; using Volo.Abp.MultiTenancy; using Volo.Abp.ObjectExtending; diff --git a/framework/src/Volo.Abp.MultiLingualEntities/FodyWeavers.xml b/framework/src/Volo.Abp.MultiLingualEntities/FodyWeavers.xml deleted file mode 100644 index be0de3a908..0000000000 --- a/framework/src/Volo.Abp.MultiLingualEntities/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/framework/src/Volo.Abp.MultiLingualEntities/FodyWeavers.xsd b/framework/src/Volo.Abp.MultiLingualEntities/FodyWeavers.xsd deleted file mode 100644 index 3f3946e282..0000000000 --- a/framework/src/Volo.Abp.MultiLingualEntities/FodyWeavers.xsd +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/framework/src/Volo.Abp.MultiLingualEntities/Volo.Abp.MultiLingualEntities.csproj b/framework/src/Volo.Abp.MultiLingualEntities/Volo.Abp.MultiLingualEntities.csproj deleted file mode 100644 index 7b81cbbe05..0000000000 --- a/framework/src/Volo.Abp.MultiLingualEntities/Volo.Abp.MultiLingualEntities.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - netstandard2.0 - - - -