Merge pull request #99 from AutoMapper/jbogard-patch-1

Updating versions

Author: jbogard

src/AutoMapper.Extensions.Microsoft.DependencyInjection/AutoMapper.Extensions.Microsoft.DependencyInjection.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>AutoMapper extensions for ASP.NET Core</Description>
     <Copyright>Copyright Jimmy Bogard</Copyright>
-    <VersionPrefix>6.0.0</VersionPrefix>
+    <VersionPrefix>6.1.0</VersionPrefix>
     <Authors>Jimmy Bogard</Authors>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>AutoMapper.Extensions.Microsoft.DependencyInjection</AssemblyName>
@@ -20,7 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
-    <PackageReference Include="AutoMapper" Version="8.0.0" />
+    <PackageReference Include="AutoMapper" Version="8.1.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All" />
   </ItemGroup>
 

src/AutoMapper.Extensions.Microsoft.DependencyInjection/ServiceCollectionExtensions.cs

@@ -85,19 +85,11 @@ private static IServiceCollection AddAutoMapperClasses(IServiceCollection servic
                 .SelectMany(a => a.DefinedTypes)
                 .ToArray();
 
-            var profileTypeInfo = typeof(Profile).GetTypeInfo();
-            var profiles = allTypes
-                .Where(t => profileTypeInfo.IsAssignableFrom(t) && !t.IsAbstract)
-                .ToArray();
-
             void ConfigAction(IServiceProvider serviceProvider, IMapperConfigurationExpression cfg)
             {
                 configAction?.Invoke(serviceProvider, cfg);
 
-                foreach (var profile in profiles.Select(t => t.AsType()))
-                {
-                    cfg.AddProfile(profile);
-                }
+                cfg.AddMaps(assembliesToScan);
             }
 
             var openTypes = new[]

test/AutoMapper.Extensions.Microsoft.DependencyInjection.Tests/AppDomainResolutionTests.cs

@@ -28,7 +28,7 @@ public void ShouldResolveConfiguration()
         [Fact]
         public void ShouldConfigureProfiles()
         {
-            _provider.GetService<IConfigurationProvider>().GetAllTypeMaps().Length.ShouldBe(2);
+            _provider.GetService<IConfigurationProvider>().GetAllTypeMaps().Length.ShouldBe(3);
         }
 
         [Fact]

test/AutoMapper.Extensions.Microsoft.DependencyInjection.Tests/AssemblyResolutionTests.cs

@@ -33,7 +33,7 @@ public void ShouldResolveConfiguration()
         [Fact]
         public void ShouldConfigureProfiles()
         {
-            _provider.GetService<IConfigurationProvider>().GetAllTypeMaps().Length.ShouldBe(2);
+            _provider.GetService<IConfigurationProvider>().GetAllTypeMaps().Length.ShouldBe(3);
         }
 
         [Fact]

test/AutoMapper.Extensions.Microsoft.DependencyInjection.Tests/AttributeTests.cs

@@ -0,0 +1,27 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Shouldly;
+using Xunit;
+
+namespace AutoMapper.Extensions.Microsoft.DependencyInjection.Tests
+{
+    public class AttributeTests
+    {
+        [Fact]
+        public void Should_not_register_static_instance_when_configured()
+        {
+            IServiceCollection services = new ServiceCollection();
+            services.AddAutoMapper(cfg => cfg.CreateMissingTypeMaps = false, typeof(Source3));
+
+            var serviceProvider = services.BuildServiceProvider();
+
+            var mapper = serviceProvider.GetService<IMapper>();
+
+            var source = new Source3 {Value = 3};
+
+            var dest = mapper.Map<Dest3>(source);
+
+            dest.Value.ShouldBe(source.Value);
+        }
+    }
+}

test/AutoMapper.Extensions.Microsoft.DependencyInjection.Tests/Profiles.cs

@@ -21,6 +21,17 @@ public class Dest2
         public int ConvertedValue { get; set; }
     }
 
+    public class Source3
+    {
+        public int Value { get; set; }
+    }
+
+    [AutoMap(typeof(Source3))]
+    public class Dest3
+    {
+        public int Value { get; set; }
+    }
+
     public class Profile1 : Profile
     {
         public Profile1()

test/AutoMapper.Extensions.Microsoft.DependencyInjection.Tests/TypeResolutionTests.cs

@@ -26,7 +26,7 @@ public void ShouldResolveConfiguration()
         [Fact]
         public void ShouldConfigureProfiles()
         {
-            _provider.GetService<IConfigurationProvider>().GetAllTypeMaps().Length.ShouldBe(2);
+            _provider.GetService<IConfigurationProvider>().GetAllTypeMaps().Length.ShouldBe(3);
         }
 
         [Fact]