Remove usage of multilingual entities.

framework/src/Volo.Abp.AutoMapper/AutoMapper/AbpAutoMapperMultiLingualDtoExtensions.cs

@@ -1,54 +0,0 @@
-using Volo.Abp.MultiLingualObject;
-using Volo.Abp.Threading;
-
-namespace AutoMapper
-{
-    public static class AbpAutoMapperMultiLingualDtoExtensions
-    {
-        public static CreateMultiLingualMapResult<TSource, TTranslation, TDestination> CreateMultiLingualMap<TSource, TTranslation, TDestination>(this Profile profile)
-            where TTranslation : class, IMultiLingualTranslation
-            where TSource : IHasMultiLingual<TTranslation>
-        {
-
-            return new(
-                profile.CreateMap<TSource, TDestination>().BeforeMap<AbpMultiLingualMapperAction<TSource, TTranslation, TDestination>>(),
-                profile.CreateMap<TTranslation, TDestination>());
-        }
-    }
-
-    public class AbpMultiLingualMapperAction<TSource, TTranslation, TDestination> : IMappingAction<TSource, TDestination>
-        where TTranslation : class, IMultiLingualTranslation
-        where TSource : IHasMultiLingual<TTranslation>
-    {
-        private readonly IMultiLingualObjectManager _multiLingualObjectManager;
-
-        public AbpMultiLingualMapperAction(IMultiLingualObjectManager multiLingualObjectManager)
-        {
-            _multiLingualObjectManager = multiLingualObjectManager;
-        }
-
-        public void Process(TSource source, TDestination destination, ResolutionContext context)
-        {
-            var translation = AsyncHelper.RunSync(() => _multiLingualObjectManager.GetTranslationAsync<TSource, TTranslation>(source));
-            if (translation != null)
-            {
-                context.Mapper.Map(translation, destination);
-            }
-        }
-    }
-
-    public class CreateMultiLingualMapResult<TSource, TTranslation, TDestination>
-    {
-        public IMappingExpression<TSource, TDestination> EntityMap { get; }
-
-        public IMappingExpression<TTranslation, TDestination> TranslateMap { get; }
-
-        public CreateMultiLingualMapResult(
-            IMappingExpression<TSource, TDestination> entityMap,
-            IMappingExpression<TTranslation, TDestination> translateMap)
-        {
-            EntityMap = entityMap;
-            TranslateMap = translateMap;
-        }
-    }
-}

framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj

@@ -16,7 +16,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Auditing\Volo.Abp.Auditing.csproj" />
-    <ProjectReference Include="..\Volo.Abp.MultiLingualObject\Volo.Abp.MultiLingualObject.csproj" />
     <ProjectReference Include="..\Volo.Abp.ObjectExtending\Volo.Abp.ObjectExtending.csproj" />
     <ProjectReference Include="..\Volo.Abp.ObjectMapping\Volo.Abp.ObjectMapping.csproj" />
   </ItemGroup>

framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs

@@ -4,7 +4,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.Auditing;
 using Volo.Abp.Modularity;
-using Volo.Abp.MultiLingualObject;
 using Volo.Abp.ObjectExtending;
 using Volo.Abp.ObjectMapping;
 
@@ -13,8 +12,7 @@ namespace Volo.Abp.AutoMapper
     [DependsOn(
         typeof(AbpObjectMappingModule),
         typeof(AbpObjectExtendingModule),
-        typeof(AbpAuditingModule),
+        typeof(AbpAuditingModule)
-        typeof(AbpMultiLingualObjectModule)
     )]
     public class AbpAutoMapperModule : AbpModule
     {
@@ -29,8 +27,6 @@ namespace Volo.Abp.AutoMapper
 
             context.Services.AddSingleton<MapperAccessor>(CreateMappings);
             context.Services.AddSingleton<IMapperAccessor>(provider => provider.GetRequiredService<MapperAccessor>());
-
-            context.Services.AddTransient(typeof(AbpMultiLingualMapperAction<,,>));
         }
 
         private MapperAccessor CreateMappings(IServiceProvider serviceProvider)

framework/src/Volo.Abp.Ddd.Domain/Volo.Abp.Ddd.Domain.csproj

@@ -20,7 +20,6 @@
     <ProjectReference Include="..\Volo.Abp.EventBus\Volo.Abp.EventBus.csproj" />
     <ProjectReference Include="..\Volo.Abp.ExceptionHandling\Volo.Abp.ExceptionHandling.csproj" />
     <ProjectReference Include="..\Volo.Abp.Guids\Volo.Abp.Guids.csproj" />
-    <ProjectReference Include="..\Volo.Abp.MultiLingualObject\Volo.Abp.MultiLingualObject.csproj" />
     <ProjectReference Include="..\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.csproj" />
     <ProjectReference Include="..\Volo.Abp.ObjectMapping\Volo.Abp.ObjectMapping.csproj" />
     <ProjectReference Include="..\Volo.Abp.Specifications\Volo.Abp.Specifications.csproj" />

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/AbpDddDomainModule.cs

@@ -6,7 +6,6 @@ using Volo.Abp.EventBus;
 using Volo.Abp.ExceptionHandling;
 using Volo.Abp.Guids;
 using Volo.Abp.Modularity;
-using Volo.Abp.MultiLingualObject;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.ObjectMapping;
 using Volo.Abp.Specifications;
@@ -26,7 +25,6 @@ namespace Volo.Abp.Domain
         typeof(AbpTimingModule),
         typeof(AbpUnitOfWorkModule),
         typeof(AbpObjectMappingModule),
-        typeof(AbpMultiLingualObjectModule),
         typeof(AbpExceptionHandlingModule),
         typeof(AbpSpecificationsModule)
         )]

framework/test/Volo.Abp.AutoMapper.Tests/AutoMapper/AbpAutoMapperMultiLingualDto_Tests.cs

@@ -1,114 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.Extensions.DependencyInjection;
-using Shouldly;
-using Volo.Abp;
-using Volo.Abp.AutoMapper;
-using Volo.Abp.Localization;
-using Volo.Abp.MultiLingualObject.TestObjects;
-using Volo.Abp.Testing;
-using Xunit;
-
-namespace AutoMapper
-{
-    public class AbpAutoMapperMultiLingualDto_Tests : AbpIntegratedTest<AutoMapperTestModule>
-    {
-        private readonly Volo.Abp.ObjectMapping.IObjectMapper _objectMapper;
-        private readonly MultiLingualBook _book;
-
-        public AbpAutoMapperMultiLingualDto_Tests()
-        {
-            _objectMapper = ServiceProvider.GetRequiredService<Volo.Abp.ObjectMapping.IObjectMapper>();
-
-            var id = Guid.NewGuid();
-            _book = new MultiLingualBook(id, 100)
-            {
-                Translations = new List<MultiLingualBookTranslation>()
-            };
-
-            var en = new MultiLingualBookTranslation
-            {
-                Language = "en",
-                Name = "C# in Depth",
-            };
-            var zh = new MultiLingualBookTranslation
-            {
-                Language = "zh-Hans",
-                Name = "深入理解C#",
-            };
-
-            _book.Translations.Add(en);
-            _book.Translations.Add(zh);
-        }
-
-        protected override void SetAbpApplicationCreationOptions(AbpApplicationCreationOptions options)
-        {
-            options.UseAutofac();
-        }
-
-        [Fact]
-        public void Should_Map_Current_UI_Culture()
-        {
-            using (CultureHelper.Use("zh-Hans"))
-            {
-                var bookDto = _objectMapper.Map<MultiLingualBook, MultiLingualBookDto>(_book);
-
-                bookDto.Name.ShouldBe("深入理解C#");
-                bookDto.Price.ShouldBe(_book.Price);
-                bookDto.Id.ShouldBe(_book.Id);
-            }
-        }
-
-        [Fact]
-        public void Should_Map_Fallback_UI_Culture()
-        {
-            using (CultureHelper.Use("en-us"))
-            {
-                var bookDto = _objectMapper.Map<MultiLingualBook, MultiLingualBookDto>(_book);
-
-                bookDto.Name.ShouldBe("C# in Depth");
-                bookDto.Price.ShouldBe(_book.Price);
-                bookDto.Id.ShouldBe(_book.Id);
-            }
-        }
-
-        [Fact]
-        public void Should_Map_Default_Language()
-        {
-            using (CultureHelper.Use("tr"))
-            {
-                var bookDto = _objectMapper.Map<MultiLingualBook, MultiLingualBookDto>(_book);
-
-                bookDto.Name.ShouldBe("C# in Depth");
-                bookDto.Price.ShouldBe(_book.Price);
-                bookDto.Id.ShouldBe(_book.Id);
-            }
-        }
-
-        [Fact]
-        public void NoTranslations_ShouldStillMapObject()
-        {
-            _book.Translations.Clear();
-
-            using (CultureHelper.Use("tr"))
-            {
-                var bookDto = _objectMapper.Map<MultiLingualBook, MultiLingualBookDto>(_book);
-
-                bookDto.Name.ShouldBeNull();
-                bookDto.Price.ShouldBe(_book.Price);
-                bookDto.Id.ShouldBe(_book.Id);
-            }
-        }
-    }
-
-    public class BookProfile : Profile
-    {
-        public BookProfile()
-        {
-            var mapResult = this.CreateMultiLingualMap<MultiLingualBook, MultiLingualBookTranslation, MultiLingualBookDto>();
-
-            mapResult.EntityMap.ValidateMemberList(MemberList.None);
-            mapResult.TranslateMap.ValidateMemberList(MemberList.None);
-        }
-    }
-}