Updating to 11.0.0

Author: jbogard

.github/workflows/ci.yml

@@ -10,6 +10,8 @@ on:
 jobs:
   build:
     strategy:
+      matrix: 
+        os: [windows-latest]
       fail-fast: false
     runs-on: windows-latest
     steps:

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

@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="10.1.2-alpha.0.4" />
+    <PackageReference Include="AutoMapper" Version="11.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="MinVer" Version="2.5.0" PrivateAssets="All" />

src/TestApp/Program.cs

@@ -1,104 +1,94 @@
-using System;
-
-namespace TestApp
+using AutoMapper;
+using AutoMapper.Internal;
+using Microsoft.Extensions.DependencyInjection;
+
+IServiceCollection services = new ServiceCollection();
+services.AddTransient<ISomeService>(sp => new FooService(5));
+services.AddAutoMapper(typeof(Source));
+var provider = services.BuildServiceProvider();
+using (var scope = provider.CreateScope())
 {
-    using AutoMapper;
-    using AutoMapper.Internal;
-    using Microsoft.Extensions.DependencyInjection;
+    var mapper = scope.ServiceProvider.GetRequiredService<IMapper>();
 
-    public class Program
+    foreach (var typeMap in mapper.ConfigurationProvider.Internal().GetAllTypeMaps())
     {
-        public static void Main(string[] args)
-        {
-            IServiceCollection services = new ServiceCollection();
-            services.AddTransient<ISomeService>(sp => new FooService(5));
-            services.AddAutoMapper(typeof(Source));
-            var provider = services.BuildServiceProvider();
-            using (var scope = provider.CreateScope())
-            {
-                var mapper = scope.ServiceProvider.GetService<IMapper>();
-
-                foreach (var typeMap in mapper.ConfigurationProvider.Internal().GetAllTypeMaps())
-                {
-                    Console.WriteLine($"{typeMap.SourceType.Name} -> {typeMap.DestinationType.Name}");
-                }
-
-                foreach (var service in services)
-                {
-                    Console.WriteLine(service.ServiceType + " - " + service.ImplementationType);
-                }
-
-                var dest = mapper.Map<Dest2>(new Source2());
-                Console.WriteLine(dest.ResolvedValue);
-            }
-
-            Console.ReadKey();
-        }
+        Console.WriteLine($"{typeMap.SourceType.Name} -> {typeMap.DestinationType.Name}");
     }
 
-    public class Source
+    foreach (var service in services)
     {
+        Console.WriteLine(service.ServiceType + " - " + service.ImplementationType);
     }
 
-    public class Dest
-    {
-    }
+    var dest = mapper.Map<Dest2>(new Source2());
+    Console.WriteLine(dest.ResolvedValue);
+}
 
-    public class Source2
-    {
-    }
+Console.ReadKey();
 
-    public class Dest2
-    {
-        public int ResolvedValue { get; set; }
-    }
+public class Source
+{
+}
 
-    public class Profile1 : Profile
-    {
-        public Profile1()
-        {
-            CreateMap<Source, Dest>();
-        }
-    }
+public class Dest
+{
+}
 
-    public class Profile2 : Profile
+public class Source2
+{
+}
+
+public class Dest2
+{
+    public int ResolvedValue { get; set; }
+}
+
+public class Profile1 : Profile
+{
+    public Profile1()
     {
-        public Profile2()
-        {
-            CreateMap<Source2, Dest2>()
-                .ForMember(d => d.ResolvedValue, opt => opt.MapFrom<DependencyResolver>());
-        }
+        CreateMap<Source, Dest>();
     }
+}
 
-    public class DependencyResolver : IValueResolver<object, object, int>
+public class Profile2 : Profile
+{
+    public Profile2()
     {
-        private readonly ISomeService _service;
+        CreateMap<Source2, Dest2>()
+            .ForMember(d => d.ResolvedValue, opt => opt.MapFrom<DependencyResolver>());
+    }
+}
 
-        public DependencyResolver(ISomeService service)
-        {
-            _service = service;
-        }
+public class DependencyResolver : IValueResolver<object, object, int>
+{
+    private readonly ISomeService _service;
 
-        public int Resolve(object source, object destination, int destMember, ResolutionContext context)
-        {
-            return _service.Modify(destMember);
-        }
+    public DependencyResolver(ISomeService service)
+    {
+        _service = service;
     }
 
-    public interface ISomeService
+    public int Resolve(object source, object destination, int destMember, ResolutionContext context)
     {
-        int Modify(int value);
+        return _service.Modify(destMember);
     }
+}
 
-    public class FooService : ISomeService
-    {
-        private readonly int _value;
+public interface ISomeService
+{
+    int Modify(int value);
+}
 
-        public FooService(int value)
-        {
-            _value = value;
-        }
+public class FooService : ISomeService
+{
+    private readonly int _value;
 
-        public int Modify(int value) => value + _value;
+    public FooService(int value)
+    {
+        _value = value;
     }
+
+    public int Modify(int value) => value + _value;
 }
+

src/TestApp/TestApp.csproj

@@ -1,9 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>TestApp</AssemblyName>
     <OutputType>Exe</OutputType>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
     <PackageId>TestApp</PackageId>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>

test/AutoMapper.Extensions.Microsoft.DependencyInjection.Tests/AutoMapper.Extensions.Microsoft.DependencyInjection.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>AutoMapper.Extensions.Microsoft.DependencyInjection.Tests</AssemblyName>
     <PackageId>AutoMapper.Extensions.Microsoft.DependencyInjection.Tests</PackageId>