Skip to content

Commit 18098f0

Browse files
SteveWilkesSteveWilkes
authored
Releases/1.2 (#119)
* Widening collection 'CouldBeReadOnly' logic to concrete Types without a declared 'Add' method * Disabling entity key mapping in merge and update mappings by default * Features/composite identifiers (#118) * Support for multi-part identifiers * Support for using entities in composite identifiers * Erroring if unidentifiable composite key part supplied * Handling null composite id entries * Adding .Net Core 2.2 test project Updating ReadableExpressions to v2.1.1 * Updating System packages * Updating Effort packages * System.Runtime packages * System packages * System packages * Updating to v1.2 * Removing NuGet licence elements / Adding v1.2 NuGet package
1 parent 74c7870 commit 18098f0

File tree

49 files changed

+832
-195
lines changed

Some content is hidden

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

49 files changed

+832
-195
lines changed

‎AgileMapper.PerformanceTester.Net45/AgileMapper.PerformanceTester.Net45.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@
3737
<Reference Include="AgileObjects.NetStandardPolyfills, Version=1.4.0.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
3838
<HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.4.0\lib\net40\AgileObjects.NetStandardPolyfills.dll</HintPath>
3939
</Reference>
40-
<Reference Include="AgileObjects.ReadableExpressions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
41-
<HintPath>..\packages\AgileObjects.ReadableExpressions.2.1.0\lib\net40\AgileObjects.ReadableExpressions.dll</HintPath>
40+
<Reference Include="AgileObjects.ReadableExpressions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
41+
<HintPath>..\packages\AgileObjects.ReadableExpressions.2.1.1\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>
4545
</Reference>
4646
<Reference Include="ExpressMapper, Version=1.9.1.0, Culture=neutral, PublicKeyToken=ac363faa09311ba0, processorArchitecture=MSIL">
4747
<HintPath>..\packages\Expressmapper.1.9.1\lib\net45\ExpressMapper.dll</HintPath>
4848
</Reference>
49-
<Reference Include="Mapster, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2f39883af23c29a8, processorArchitecture=MSIL">
50-
<HintPath>..\packages\Mapster.3.2.0\lib\net45\Mapster.dll</HintPath>
49+
<Reference Include="Mapster, Version=3.3.1.0, Culture=neutral, PublicKeyToken=2f39883af23c29a8, processorArchitecture=MSIL">
50+
<HintPath>..\packages\Mapster.3.3.1\lib\net45\Mapster.dll</HintPath>
5151
</Reference>
5252
<Reference Include="Omu.ValueInjecter, Version=3.1.3.0, Culture=neutral, PublicKeyToken=5692a4ecdffbe736, processorArchitecture=MSIL">
5353
<HintPath>..\packages\ValueInjecter.3.1.3\lib\net45\Omu.ValueInjecter.dll</HintPath>

‎AgileMapper.PerformanceTester.Net45/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="AgileObjects.NetStandardPolyfills" version="1.4.0" targetFramework="net452" />
4-
<package id="AgileObjects.ReadableExpressions" version="2.1.0" targetFramework="net452" />
4+
<package id="AgileObjects.ReadableExpressions" version="2.1.1" targetFramework="net452" />
55
<package id="AutoMapper" version="7.0.1" targetFramework="net452" />
66
<package id="Expressmapper" version="1.9.1" targetFramework="net452" />
7-
<package id="Mapster" version="3.2.0" targetFramework="net452" />
7+
<package id="Mapster" version="3.3.1" targetFramework="net452" />
88
<package id="System.ValueTuple" version="4.5.0" targetFramework="net452" />
99
<package id="ValueInjecter" version="3.1.3" targetFramework="net452" />
1010
</packages>

‎AgileMapper.PerformanceTester.NetCore21/AgileMapper.PerformanceTester.NetCore21.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="AutoMapper" Version="7.0.1" />
13-
<PackageReference Include="Mapster" Version="3.2.0" />
13+
<PackageReference Include="Mapster" Version="3.3.1" />
1414
<PackageReference Include="ValueInjecter" Version="3.1.3" />
1515
</ItemGroup>
1616

‎AgileMapper.PerformanceTesting/AgileMapper.PerformanceTesting.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="AutoMapper" Version="7.0.1" />
12-
<PackageReference Include="Mapster" Version="3.2.0" />
12+
<PackageReference Include="Mapster" Version="3.3.1" />
1313
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
1414
<PackageReference Include="ValueInjecter" Version="3.1.3" />
1515
</ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<Reference Include="AgileObjects.NetStandardPolyfills, Version=1.4.0.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
3838
<HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.4.0\lib\net35\AgileObjects.NetStandardPolyfills.dll</HintPath>
3939
</Reference>
40-
<Reference Include="AgileObjects.ReadableExpressions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
41-
<HintPath>..\packages\AgileObjects.ReadableExpressions.2.1.0\lib\net35\AgileObjects.ReadableExpressions.dll</HintPath>
40+
<Reference Include="AgileObjects.ReadableExpressions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
41+
<HintPath>..\packages\AgileObjects.ReadableExpressions.2.1.1\lib\net35\AgileObjects.ReadableExpressions.dll</HintPath>
4242
</Reference>
4343
<Reference Include="Microsoft.Dynamic, Version=1.1.2.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
4444
<HintPath>..\packages\DynamicLanguageRuntime.1.1.2\lib\Net35\Microsoft.Dynamic.dll</HintPath>

‎AgileMapper.UnitTests.Net35/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="AgileObjects.NetStandardPolyfills" version="1.4.0" targetFramework="net35" />
4-
<package id="AgileObjects.ReadableExpressions" version="2.1.0" targetFramework="net35" />
4+
<package id="AgileObjects.ReadableExpressions" version="2.1.1" targetFramework="net35" />
55
<package id="DynamicLanguageRuntime" version="1.1.2" targetFramework="net35" />
66
<package id="NUnit" version="3.6.1" targetFramework="net35" />
77
<package id="NUnit3TestAdapter" version="3.10.0" targetFramework="net35" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<ItemGroup>
3232
<PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.4.0" />
3333
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
34-
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.0.0" />
34+
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.1.6" />
3535
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
3636
<PackageReference Include="xunit" Version="2.4.1" />
3737
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">

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

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\common.props" />
3+
4+
<PropertyGroup>
5+
<TargetFramework>netcoreapp2.2</TargetFramework>
6+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7+
<AssemblyName>AgileObjects.AgileMapper.UnitTests.NetCore2_1</AssemblyName>
8+
<PackageId>AgileObjects.AgileMapper.UnitTests.NetCore2_1</PackageId>
9+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
10+
<RuntimeFrameworkVersion>2.2.2</RuntimeFrameworkVersion>
11+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
12+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
14+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
15+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
16+
<RootNamespace>AgileObjects.AgileMapper.UnitTests.NetCore2</RootNamespace>
17+
</PropertyGroup>
18+
19+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
20+
<DefineConstants>TRACE;DEBUG;NETCOREAPP2_0;NET_STANDARD</DefineConstants>
21+
</PropertyGroup>
22+
23+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
24+
<DefineConstants>TRACE;RELEASE;NETCOREAPP2_0;NET_STANDARD</DefineConstants>
25+
</PropertyGroup>
26+
27+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">
28+
<PackageReference Include="System.Data.Common" Version="4.3.0" />
29+
</ItemGroup>
30+
31+
<ItemGroup>
32+
<PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.4.0" />
33+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
34+
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.2.0" />
35+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
36+
<PackageReference Include="xunit" Version="2.4.1" />
37+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
38+
<PrivateAssets>all</PrivateAssets>
39+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
40+
</PackageReference>
41+
</ItemGroup>
42+
43+
<ItemGroup>
44+
<ProjectReference Include="..\AgileMapper.UnitTests.Common\AgileMapper.UnitTests.Common.csproj" />
45+
<ProjectReference Include="..\AgileMapper.UnitTests.MoreTestClasses\AgileMapper.UnitTests.MoreTestClasses.csproj" />
46+
<ProjectReference Include="..\AgileMapper\AgileMapper.csproj" />
47+
</ItemGroup>
48+
49+
<ItemGroup>
50+
<Compile Include="..\AgileMapper.UnitTests\**\*.cs" Exclude="..\AgileMapper.UnitTests\obj\**\*.cs;..\AgileMapper.UnitTests\WhenUsingPartialTrust.cs;">
51+
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
52+
</Compile>
53+
</ItemGroup>
54+
55+
<ItemGroup>
56+
<Compile Include="..\CommonAssemblyInfo.cs" Link="Properties\CommonAssemblyInfo.cs" />
57+
</ItemGroup>
58+
59+
<ItemGroup>
60+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
61+
</ItemGroup>
62+
63+
</Project>

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
<Reference Include="AgileObjects.NetStandardPolyfills, Version=1.4.0.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
4343
<HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.4.0\lib\net40\AgileObjects.NetStandardPolyfills.dll</HintPath>
4444
</Reference>
45-
<Reference Include="AgileObjects.ReadableExpressions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
46-
<HintPath>..\packages\AgileObjects.ReadableExpressions.2.1.0\lib\net40\AgileObjects.ReadableExpressions.dll</HintPath>
45+
<Reference Include="AgileObjects.ReadableExpressions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
46+
<HintPath>..\packages\AgileObjects.ReadableExpressions.2.1.1\lib\net40\AgileObjects.ReadableExpressions.dll</HintPath>
4747
</Reference>
4848
<Reference Include="System" />
4949
<Reference Include="System.Core" />
@@ -89,7 +89,9 @@
8989
</ItemGroup>
9090
<ItemGroup>
9191
<None Include="app.config" />
92-
<None Include="packages.config" />
92+
<None Include="packages.config">
93+
<SubType>Designer</SubType>
94+
</None>
9395
</ItemGroup>
9496
<ItemGroup>
9597
<ProjectReference Include="..\AgileMapper.UnitTests.Common\AgileMapper.UnitTests.Common.csproj">

‎AgileMapper.UnitTests.NonParallel/app.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
<assemblyIdentity name="AgileObjects.NetStandardPolyfills" publicKeyToken="06131ac1c008ad4e" culture="neutral" />
77
<bindingRedirect oldVersion="0.0.0.0-1.4.0.0" newVersion="1.4.0.0" />
88
</dependentAssembly>
9+
<dependentAssembly>
10+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
12+
</dependentAssembly>
913
</assemblyBinding>
1014
</runtime>
1115
</configuration>

0 commit comments

Comments
 (0)