Skip to content

Commit 4b76ad8

Browse files
SteveWilkesSteveWilkes
authored
Releases/1.8 (#215)
* Updating AO packages * Adding .NET Standard 2.0 target / Rationalising compiler directives / Removing non-latest-major-version .NET Core test projects * Fixing caching thread safety issue / Handling null keys in default key comparer, re: #212 * Throwing ObjectDisposedException on attempt to use a disposed mapper * Simplifying numeric constants setup, re: #213 * Tidying * Improving target member selection, re: #209 * Adding v1.8 preview NuGet package * Tidying documentation * Organising classes * Features/target member matcher data sources (#214) * Adding data source -> target member matcher selection * Member matcher data sources / Conflict testing / Documentation improvements * Fixing query projection * All fixed * Adding documentation * Updating release notes / Updating to v1.8 * Extra test coverage * Adding v1.8 NuGet package
1 parent 6f51655 commit 4b76ad8

File tree

171 files changed

+3301
-1644
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+3301
-1644
lines changed

‎AgileMapper.PerformanceTester.Net461/AgileMapper.PerformanceTester.Net461.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="AgileObjects.NetStandardPolyfills, Version=1.4.1.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
38-
<HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.4.1\lib\net40\AgileObjects.NetStandardPolyfills.dll</HintPath>
37+
<Reference Include="AgileObjects.NetStandardPolyfills, Version=1.5.0.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
38+
<HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.5.0\lib\net40\AgileObjects.NetStandardPolyfills.dll</HintPath>
3939
</Reference>
40-
<Reference Include="AgileObjects.ReadableExpressions, Version=2.5.1.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
41-
<HintPath>..\packages\AgileObjects.ReadableExpressions.2.5.1\lib\net40\AgileObjects.ReadableExpressions.dll</HintPath>
40+
<Reference Include="AgileObjects.ReadableExpressions, Version=2.6.0.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
41+
<HintPath>..\packages\AgileObjects.ReadableExpressions.2.6.0\lib\net40\AgileObjects.ReadableExpressions.dll</HintPath>
4242
</Reference>
4343
<Reference Include="AutoMapper, Version=7.0.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
4444
<HintPath>..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll</HintPath>

‎AgileMapper.PerformanceTester.Net461/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AgileObjects.NetStandardPolyfills" version="1.4.1" targetFramework="net461" />
4-
<package id="AgileObjects.ReadableExpressions" version="2.5.1" targetFramework="net461" />
3+
<package id="AgileObjects.NetStandardPolyfills" version="1.5.0" targetFramework="net461" />
4+
<package id="AgileObjects.ReadableExpressions" version="2.6.0" targetFramework="net461" />
55
<package id="AutoMapper" version="7.0.1" targetFramework="net452" />
66
<package id="Expressmapper" version="1.9.1" targetFramework="net452" requireReinstallation="true" />
77
<package id="Mapster" version="3.3.1" targetFramework="net452" />

‎AgileMapper.UnitTests.Net35/AgileMapper.UnitTests.Net35.csproj‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,7 @@
1717
</PropertyGroup>
1818

1919
<PropertyGroup>
20-
<DefineConstants>$(DefineConstants);TRACE;FEATURE_DRAWING</DefineConstants>
21-
</PropertyGroup>
22-
23-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
24-
<DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
25-
</PropertyGroup>
26-
27-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
28-
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
20+
<DefineConstants>$(DefineConstants);TRACE;FEATURE_DRAWING;FEATURE_APPDOMAIN</DefineConstants>
2921
</PropertyGroup>
3022

3123
<ItemGroup>

‎AgileMapper.UnitTests.NetCore/AgileMapper.UnitTests.NetCore.csproj‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<RuntimeFrameworkVersion>1.1.13</RuntimeFrameworkVersion>
66
<LangVersion>8.0</LangVersion>
77
<AssemblyName>AgileObjects.AgileMapper.UnitTests.NetCore</AssemblyName>
8-
<RootNamespace>AgileObjects.AgileMapper.UnitTests.NetCore</RootNamespace>
8+
<RootNamespace>AgileObjects.AgileMapper.UnitTests</RootNamespace>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1010
<WarningsAsErrors></WarningsAsErrors>
1111
<NoWarn>0649;1701;1702</NoWarn>
@@ -14,15 +14,7 @@
1414
</PropertyGroup>
1515

1616
<PropertyGroup>
17-
<DefineConstants>$(DefineConstants);NETCOREAPP1_0;NET_STANDARD;NET_STANDARD_1;TRACE;FEATURE_DYNAMIC;FEATURE_ISET</DefineConstants>
18-
</PropertyGroup>
19-
20-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
21-
<DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
22-
</PropertyGroup>
23-
24-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
25-
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
17+
<DefineConstants>$(DefineConstants);NETCOREAPP1_0;TRACE;FEATURE_DYNAMIC;FEATURE_ISET</DefineConstants>
2618
</PropertyGroup>
2719

2820
<ItemGroup>

‎AgileMapper.UnitTests.NetCore2.1/AgileMapper.UnitTests.NetCore2.1.csproj‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎AgileMapper.UnitTests.NetCore2.2/AgileMapper.UnitTests.NetCore2.2.csproj‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎AgileMapper.UnitTests.NetCore2/AgileMapper.UnitTests.NetCore2.csproj‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
5-
<RuntimeFrameworkVersion>2.0.9</RuntimeFrameworkVersion>
4+
<TargetFramework>netcoreapp2.2</TargetFramework>
5+
<RuntimeFrameworkVersion>2.2.7</RuntimeFrameworkVersion>
66
<LangVersion>8.0</LangVersion>
77
<AssemblyName>AgileObjects.AgileMapper.UnitTests.NetCore2</AssemblyName>
8-
<RootNamespace>AgileObjects.AgileMapper.UnitTests.NetCore2</RootNamespace>
8+
<RootNamespace>AgileObjects.AgileMapper.UnitTests</RootNamespace>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1010
<WarningsAsErrors></WarningsAsErrors>
1111
<NoWarn>0649;1701;1702</NoWarn>
@@ -14,15 +14,7 @@
1414
</PropertyGroup>
1515

1616
<PropertyGroup>
17-
<DefineConstants>$(DefineConstants);NET_STANDARD;NET_STANDARD_2;TRACE;FEATURE_SERIALIZATION;FEATURE_DYNAMIC;FEATURE_DYNAMIC_ROOT_SOURCE;FEATURE_ISET;FEATURE_STRINGSPLIT_OPTIONS</DefineConstants>
18-
</PropertyGroup>
19-
20-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
21-
<DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
22-
</PropertyGroup>
23-
24-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
25-
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
17+
<DefineConstants>$(DefineConstants);TRACE;FEATURE_SERIALIZATION;FEATURE_DYNAMIC;FEATURE_DYNAMIC_ROOT_SOURCE;FEATURE_ISET;FEATURE_STRINGSPLIT_OPTIONS;FEATURE_APPDOMAIN</DefineConstants>
2618
</PropertyGroup>
2719

2820
<ItemGroup>
@@ -32,12 +24,12 @@
3224
</ItemGroup>
3325

3426
<ItemGroup>
35-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
36-
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.0.0" />
27+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
28+
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.2.0" />
3729
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
3830
<PackageReference Include="System.Data.Common" Version="4.3.0" />
3931
<PackageReference Include="xunit" Version="2.4.1" />
40-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
32+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
4133
<PrivateAssets>all</PrivateAssets>
4234
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4335
</PackageReference>
@@ -46,7 +38,6 @@
4638
<ItemGroup>
4739
<ProjectReference Include="..\AgileMapper.UnitTests.Common\AgileMapper.UnitTests.Common.csproj" />
4840
<ProjectReference Include="..\AgileMapper.UnitTests.MoreTestClasses\AgileMapper.UnitTests.MoreTestClasses.csproj" />
49-
<ProjectReference Include="..\AgileMapper\AgileMapper.csproj" />
5041
</ItemGroup>
5142

5243
</Project>

‎AgileMapper.UnitTests.NetCore3.1/AgileMapper.UnitTests.NetCore3.1.csproj‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎AgileMapper.UnitTests.NetCore3/AgileMapper.UnitTests.NetCore3.csproj‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
5-
<RuntimeFrameworkVersion>3.0.3</RuntimeFrameworkVersion>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<RuntimeFrameworkVersion>3.1.4</RuntimeFrameworkVersion>
66
<LangVersion>8.0</LangVersion>
77
<AssemblyName>AgileObjects.AgileMapper.UnitTests.NetCore3</AssemblyName>
8-
<RootNamespace>AgileObjects.AgileMapper.UnitTests.NetCore3</RootNamespace>
8+
<RootNamespace>AgileObjects.AgileMapper.UnitTests</RootNamespace>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1010
<WarningsAsErrors></WarningsAsErrors>
1111
<NoWarn>0649;1701;1702</NoWarn>
@@ -14,15 +14,7 @@
1414
</PropertyGroup>
1515

1616
<PropertyGroup>
17-
<DefineConstants>$(DefineConstants);NET_STANDARD;NET_STANDARD_2;TRACE;FEATURE_SERIALIZATION;FEATURE_DYNAMIC;FEATURE_DYNAMIC_ROOT_SOURCE;FEATURE_ISET;FEATURE_STRINGSPLIT_OPTIONS</DefineConstants>
18-
</PropertyGroup>
19-
20-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
21-
<DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
22-
</PropertyGroup>
23-
24-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
25-
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
17+
<DefineConstants>$(DefineConstants);TRACE;FEATURE_SERIALIZATION;FEATURE_DYNAMIC;FEATURE_DYNAMIC_ROOT_SOURCE;FEATURE_ISET;FEATURE_STRINGSPLIT_OPTIONS;FEATURE_APPDOMAIN</DefineConstants>
2618
</PropertyGroup>
2719

2820
<ItemGroup>
@@ -32,8 +24,8 @@
3224
</ItemGroup>
3325

3426
<ItemGroup>
35-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.3" />
36-
<PackageReference Include="Microsoft.Extensions.Primitives" Version="3.0.3" />
27+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />
28+
<PackageReference Include="Microsoft.Extensions.Primitives" Version="3.1.5" />
3729
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
3830
<PackageReference Include="System.Data.Common" Version="4.3.0" />
3931
<PackageReference Include="xunit" Version="2.4.1" />

‎AgileMapper.UnitTests.NonParallel/AgileMapper.UnitTests.NonParallel.csproj‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,7 @@
1111
</PropertyGroup>
1212

1313
<PropertyGroup>
14-
<DefineConstants>$(DefineConstants);TRACE;FEATURE_SERIALIZATION;FEATURE_DYNAMIC;FEATURE_DYNAMIC_ROOT_SOURCE;FEATURE_ISET;NET_40;</DefineConstants>
15-
</PropertyGroup>
16-
17-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
18-
<DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
19-
</PropertyGroup>
20-
21-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
22-
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
14+
<DefineConstants>$(DefineConstants);TRACE;FEATURE_SERIALIZATION;FEATURE_DYNAMIC;FEATURE_DYNAMIC_ROOT_SOURCE;FEATURE_ISET</DefineConstants>
2315
</PropertyGroup>
2416

2517
<ItemGroup>

0 commit comments

Comments
 (0)