Releases/1.7 (#199)

* Optimising for loops!

* Tidying

* Organising enumerable mapping classes

* Tidying enumerable mapping code

* Fixing struct method creation factory caching

* Updating projects to .NET Core project format / Tidying

* Converting remaining projects to .NET Core project format, removing common AssemblyInfo files

* Adding more-efficient FilterToArray method

* Organising classes

* Adding .NET 3.5 'hint path'

* Using Environment.NewLine in test

* Updating NUnit version

* Organising configuration classes

* Updating .Net35 test project

* Trying NUnit test discovery fix

* Removing

* Removing unused code

* Updating to v1.7

* Features/map instances using (#192)

* Initial test + implementation

* Resetting implementation

* Adding mapping factories

* Continued

* Support for custom, unconditional root mapping factories

* Continued

* Removing target null checking from nested access checks

* Integrating configured mapping factories as part of alternate mappings in ComplexTypeMappingExpressionFactory

* Support for custom mapping factories in derived collection elements / Erroring if custom factories have invalid return types

* Extending test coverage

* Test coverage for configured root element mapping factory

* Support for unconditional configured enumerable mapping factories

* Support for conditional configured root enumerable mapping

* Extending test coverage

* Incorrect mapping factory configuration test coverge / Updating documentation

* Tidying

* Support for configuring non-enumerable to enumerable mapping using MapInstancesUsing

* Refactoring

* Support for root configured non-enumerable to enumerable mapping

* Extending test coverage

* Updating documentation / Adding inline mapping factory tests

* Support for configured non-enumerable to enumerable element mapping

* Fixing Net35 build

* Support for conditional configured non-enumerable to enumerable mapping (#193)

* Support for conditional configured non-enumerable to enumerable mapping

* Fixing tests

* Tidying

* Removing duplicate short-circuit returns

* Extending test coverage

* Bugs/173 dictionary values to target (#194), re: issue #173

* Splitting ToTarget DataSource tests into dedicated test class / Adding failing test to prove bug

* Fixing Dictionary.Values to List ToTarget data source mapping

* Adding .NET Core 3.1 test project + updating packages and framework runtimes

* Fix for configured simple-to-complex array data sources

* Simplifying 'invocation position' code

* Setting ConfiguredLambdaInfo target value factory in ctor

* Features/value injection (#195)

* All tests passing using ValueInjectors!

* Removing ParametersSwapper + tidying

* Deferring creation of Create mapping data calls

* Support for same-type enumerable-to-enumerable to-target data sources

* Including configured ToTarget data sources in mapping plan validation, re: #184

* Tidying

* Updating readme

* Features/sequential data sources (#196)

* Basic sequential data source support, re: issue #184

* Erroring if duplicate sequential data sources are configured

* Extra test coverage

* Erroring if sequential data source configured for simple type members

* Extra test coverage

* Erroring if configured data sources conflict with ignored source members

* Start of API update

* Updating sequential data source API

* Support for conditional sequential data sources

* Extra test coverage

* Extending test coverage

* Adding documentation

* Extra test coverage

* Start of sequential data sources for ctor parameters / Properly using fallback values in more places / Fixing tests

* Moving map methods back into interface to fix test overload resolution?!

* Fixing data source conflict tests

* Removing sequential ctor data source test

* Updating to v1.7-preview1

* Updating release notes, adding v1.7-preview1 NuGet package

* Surfacing mapping plan Expressions / Updating to ReadableExpressions v2.4

* Adding icon files

* Updating packages

* Features/to target instead (#198)

* Start of ToTargetInstead logic

* Refactoring

* Moar

* Ensuring configured mappings include callbacks and exception handling

* Extending ToTargetInstead test coverage / ToTargetInstead support with simple type members

* ToTargetInstead support for factory Funcs

* Extending test coverage

* Extending test coverage

* Erroring if simple ToTarget source configured for complex target

* Conditional ToTargetInstead support for complex type enumerable elements

* Tidying

* Tidying

* Extra test coverage

* Updating documentation

* Erroring with redundant ToTarget configurations

* Updating .NET Core framework versions for AppVeyor

* Adding Test framework reference for AppVeyor

* Updating framework version for AppVeyor

* Adding NuGet package v1.7

Author: SteveWilkes

AgileMapper.PerformanceTester.Net45/Properties/AssemblyInfo.cs

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="..\common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AgileObjects.AgileMapper.PerformanceTester.Net45</RootNamespace>
     <AssemblyName>AgileObjects.AgileMapper.PerformanceTester.Net45</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -34,11 +34,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AgileObjects.NetStandardPolyfills, Version=1.4.0.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
-      <HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.4.0\lib\net40\AgileObjects.NetStandardPolyfills.dll</HintPath>
+    <Reference Include="AgileObjects.NetStandardPolyfills, Version=1.4.1.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
+      <HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.4.1\lib\net40\AgileObjects.NetStandardPolyfills.dll</HintPath>
     </Reference>
-    <Reference Include="AgileObjects.ReadableExpressions, Version=2.3.2.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
-      <HintPath>..\packages\AgileObjects.ReadableExpressions.2.3.2\lib\net40\AgileObjects.ReadableExpressions.dll</HintPath>
+    <Reference Include="AgileObjects.ReadableExpressions, Version=2.5.0.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
+      <HintPath>..\packages\AgileObjects.ReadableExpressions.2.5.0\lib\net40\AgileObjects.ReadableExpressions.dll</HintPath>
     </Reference>
     <Reference Include="AutoMapper, Version=7.0.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <HintPath>..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll</HintPath>
@@ -69,12 +69,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="..\VersionInfo.cs">
-      <Link>VersionInfo.cs</Link>
-    </Compile>
     <Compile Include="ConcreteMappers\ExpressMapper\ExpressMapperComplexTypeMapper.cs" />
     <Compile Include="ConcreteMappers\ExpressMapper\ExpressMapperComplexTypeMapperSetup.cs" />
     <Compile Include="ConcreteMappers\ExpressMapper\ExpressMapperCtorMapper.cs" />
@@ -83,7 +77,6 @@
     <Compile Include="ConcreteMappers\ExpressMapper\ExpressMapperFlatteningMapper.cs" />
     <Compile Include="ConcreteMappers\ExpressMapper\ExpressMapperInstantiation.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
@@ -101,6 +94,9 @@
       <Name>AgileMapper</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

AgileMapper.PerformanceTester.Net45/AgileMapper.PerformanceTester.Net45.csproj renamed to AgileMapper.PerformanceTester.Net461/AgileMapper.PerformanceTester.Net461.csproj

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="AgileObjects.NetStandardPolyfills" publicKeyToken="06131ac1c008ad4e" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.4.0.0" newVersion="1.4.0.0" />
+        <assemblyIdentity name="AgileObjects.NetStandardPolyfills" publicKeyToken="06131ac1c008ad4e" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.4.0.0" newVersion="1.4.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>

AgileMapper.PerformanceTester.Net45/App.config renamed to AgileMapper.PerformanceTester.Net461/App.config

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AgileObjects.NetStandardPolyfills" version="1.4.0" targetFramework="net452" />
-  <package id="AgileObjects.ReadableExpressions" version="2.3.2" targetFramework="net452" />
+  <package id="AgileObjects.NetStandardPolyfills" version="1.4.1" targetFramework="net461" />
+  <package id="AgileObjects.ReadableExpressions" version="2.5.0" targetFramework="net461" />
   <package id="AutoMapper" version="7.0.1" targetFramework="net452" />
-  <package id="Expressmapper" version="1.9.1" targetFramework="net452" />
+  <package id="Expressmapper" version="1.9.1" targetFramework="net452" requireReinstallation="true" />
   <package id="Mapster" version="3.3.1" targetFramework="net452" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net452" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net452" requireReinstallation="true" />
   <package id="ValueInjecter" version="3.1.3" targetFramework="net452" />
 </packages>

AgileMapper.PerformanceTester.Net45/ConcreteMappers/ExpressMapper/ExpressMapperComplexTypeMapper.cs renamed to AgileMapper.PerformanceTester.Net461/ConcreteMappers/ExpressMapper/ExpressMapperComplexTypeMapper.cs

@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\common.props" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -17,7 +16,6 @@
   <ItemGroup>
     <ProjectReference Include="..\AgileMapper.PerformanceTesting\AgileMapper.PerformanceTesting.csproj" />
     <ProjectReference Include="..\AgileMapper.UnitTests.Common\AgileMapper.UnitTests.Common.csproj" />
-    <ProjectReference Include="..\AgileMapper\AgileMapper.csproj" />
   </ItemGroup>
 
 </Project>

AgileMapper.PerformanceTester.Net45/ConcreteMappers/ExpressMapper/ExpressMapperComplexTypeMapperSetup.cs renamed to AgileMapper.PerformanceTester.Net461/ConcreteMappers/ExpressMapper/ExpressMapperComplexTypeMapperSetup.cs

@@ -1,22 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <AssemblyName>AgileObjects.AgileMapper.PerformanceTesting</AssemblyName>
     <RootNamespace>AgileObjects.AgileMapper.PerformanceTesting</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="7.0.1" />
     <PackageReference Include="Mapster" Version="3.3.1" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
     <PackageReference Include="ValueInjecter" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\AgileMapper.UnitTests.Common\AgileMapper.UnitTests.Common.csproj" />
-    <ProjectReference Include="..\AgileMapper\AgileMapper.csproj" />
   </ItemGroup>
 
 </Project>

AgileMapper.PerformanceTester.Net45/ConcreteMappers/ExpressMapper/ExpressMapperCtorMapper.cs renamed to AgileMapper.PerformanceTester.Net461/ConcreteMappers/ExpressMapper/ExpressMapperCtorMapper.cs

@@ -1,12 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net35;netstandard1.0</TargetFrameworks>
+    <TargetFrameworks>net35;net461;netstandard1.0</TargetFrameworks>
     <AssemblyName>AgileObjects.AgileMapper.UnitTests.Common</AssemblyName>
     <RootNamespace>AgileObjects.AgileMapper.UnitTests.Common</RootNamespace>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\AgileMapper\AgileMapper.csproj" />
   </ItemGroup>

AgileMapper.PerformanceTester.Net45/ConcreteMappers/ExpressMapper/ExpressMapperDeepMapper.cs renamed to AgileMapper.PerformanceTester.Net461/ConcreteMappers/ExpressMapper/ExpressMapperDeepMapper.cs

@@ -0,0 +1,8 @@
+#if NET35
+namespace System.ComponentModel.DataAnnotations
+{
+    using System;
+
+    public sealed class KeyAttribute : Attribute { }
+}
+#endif

AgileMapper.PerformanceTester.Net45/ConcreteMappers/ExpressMapper/ExpressMapperDeepMapperSetup.cs renamed to AgileMapper.PerformanceTester.Net461/ConcreteMappers/ExpressMapper/ExpressMapperDeepMapperSetup.cs

@@ -1,4 +1,4 @@
-namespace AgileObjects.AgileMapper.UnitTests.MoreTestClasses
+namespace AgileObjects.AgileMapper.UnitTests.Common
 {
     using System;
     using System.Collections.Generic;
@@ -7,9 +7,7 @@
     public static class MappingExtensions
     {
         public static object RootMapperCountShouldBeOne(this IMapper mapper)
-        {
-            return RootMapperCountShouldBe(mapper, 1).First();
-        }
+            => RootMapperCountShouldBe(mapper, 1).First();
 
         public static ICollection<object> RootMapperCountShouldBe(this IMapper mapper, int expected)
         {

AgileMapper.PerformanceTester.Net45/ConcreteMappers/ExpressMapper/ExpressMapperFlatteningMapper.cs renamed to AgileMapper.PerformanceTester.Net461/ConcreteMappers/ExpressMapper/ExpressMapperFlatteningMapper.cs

@@ -1,4 +1,4 @@
-namespace AgileObjects.AgileMapper.UnitTests.TestClasses
+namespace AgileObjects.AgileMapper.UnitTests.Common.TestClasses
 {
     public enum PaymentTypeUk
     {

AgileMapper.PerformanceTester.Net45/ConcreteMappers/ExpressMapper/ExpressMapperInstantiation.cs renamed to AgileMapper.PerformanceTester.Net461/ConcreteMappers/ExpressMapper/ExpressMapperInstantiation.cs

@@ -0,0 +1,9 @@
+namespace AgileObjects.AgileMapper.UnitTests.Common.TestClasses
+{
+    public enum PaymentTypeUs
+    {
+        Cash = 101,
+        Card = 102,
+        Check = 103
+    }
+}

AgileMapper.PerformanceTester.Net45/Program.cs renamed to AgileMapper.PerformanceTester.Net461/Program.cs

@@ -1,4 +1,4 @@
-namespace AgileObjects.AgileMapper.UnitTests.TestClasses
+namespace AgileObjects.AgileMapper.UnitTests.Common.TestClasses
 {
     public enum Title
     {

AgileMapper.PerformanceTester.Net45/Results/2016-10-10.txt renamed to AgileMapper.PerformanceTester.Net461/Results/2016-10-10.txt

@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\common.props" />
 
   <PropertyGroup>
     <TargetFrameworks>net35;netstandard1.0</TargetFrameworks>
@@ -8,6 +7,10 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\AgileMapper\AgileMapper.csproj" />
   </ItemGroup>

AgileMapper.PerformanceTester.Net45/Results/2016-10-15 @ 66f3123.txt renamed to AgileMapper.PerformanceTester.Net461/Results/2016-10-15 @ 66f3123.txt

@@ -1,102 +1,53 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="..\common.props" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E0706509-4A4B-4C0D-A3B2-4A713FFC6ED4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>AgileObjects.AgileMapper.UnitTests.Net35</RootNamespace>
+    <TargetFramework>net35</TargetFramework>
+    <LangVersion>8.0</LangVersion>
     <AssemblyName>AgileObjects.AgileMapper.UnitTests.Net35</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
+    <RootNamespace>AgileObjects.AgileMapper.UnitTests.Net35</RootNamespace>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningsAsErrors></WarningsAsErrors>
+    <NoWarn>0649;1701;1702</NoWarn>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NET35</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NET35</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+
+  <PropertyGroup>
+    <FrameworkPathOverride>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants);TRACE;FEATURE_DRAWING</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="AgileObjects.NetStandardPolyfills, Version=1.4.0.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
-      <HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.4.0\lib\net35\AgileObjects.NetStandardPolyfills.dll</HintPath>
-    </Reference>
-    <Reference Include="AgileObjects.ReadableExpressions, Version=2.3.2.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
-      <HintPath>..\packages\AgileObjects.ReadableExpressions.2.3.2\lib\net35\AgileObjects.ReadableExpressions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Dynamic, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
-      <HintPath>..\packages\DynamicLanguageRuntime.1.1.2\lib\Net35\Microsoft.Dynamic.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Scripting, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
-      <HintPath>..\packages\DynamicLanguageRuntime.1.1.2\lib\Net35\Microsoft.Scripting.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Scripting.AspNet, Version=1.1.1.21, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
-      <HintPath>..\packages\DynamicLanguageRuntime.1.1.2\lib\Net35\Microsoft.Scripting.AspNet.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Scripting.Core, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
-      <HintPath>..\packages\DynamicLanguageRuntime.1.1.2\lib\Net35\Microsoft.Scripting.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Scripting.Metadata, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
-      <HintPath>..\packages\DynamicLanguageRuntime.1.1.2\lib\Net35\Microsoft.Scripting.Metadata.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.6.1\lib\net35\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\AgileMapper.UnitTests\**\*.cs" Exclude="..\AgileMapper.UnitTests\obj\**\*.cs;..\AgileMapper.UnitTests\Dynamics\**\*.cs;..\AgileMapper.UnitTests\WhenUsingPartialTrust.cs;..\AgileMapper.UnitTests\WhenFlatteningToDynamics.cs;..\AgileMapper.UnitTests\WhenMappingConcurrently.cs;">
+    <Compile Include="..\AgileMapper.UnitTests\**\*.cs" Exclude="..\AgileMapper.UnitTests\Properties\*.cs;..\AgileMapper.UnitTests\obj\**\*.cs;..\AgileMapper.UnitTests\Dynamics\**\*.cs;..\AgileMapper.UnitTests\WhenUsingPartialTrust.cs;..\AgileMapper.UnitTests\WhenFlatteningToDynamics.cs;..\AgileMapper.UnitTests\WhenMappingConcurrently.cs;">
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
     </Compile>
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>Properties\CommonAssemblyInfo.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
+    <Reference Include="System" />
+    <PackageReference Include="DynamicLanguageRuntime" Version="1.1.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\AgileMapper.UnitTests.Common\AgileMapper.UnitTests.Common.csproj">
-      <Project>{69c1f1a9-f8a4-4cee-90e3-67b8d6dae8f6}</Project>
-      <Name>AgileMapper.UnitTests.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\AgileMapper.UnitTests.MoreTestClasses\AgileMapper.UnitTests.MoreTestClasses.csproj">
-      <Project>{0d045f11-1cbb-4be1-b854-d7e5d348c2fe}</Project>
-      <Name>AgileMapper.UnitTests.MoreTestClasses</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\AgileMapper\AgileMapper.csproj">
-      <Project>{147ddcce-cdd3-4dd0-8ba3-d3f2f239e161}</Project>
-      <Name>AgileMapper</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\AgileMapper.UnitTests.Common\AgileMapper.UnitTests.Common.csproj" />
+    <ProjectReference Include="..\AgileMapper.UnitTests.MoreTestClasses\AgileMapper.UnitTests.MoreTestClasses.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props'))" />
-  </Target>
-</Project>
+
+</Project>