Skip to content

Commit 11d9864

Browse files
SteveWilkesSteveWilkes
committed
Adding NetCoreApp2 test project / Fixing NetCoreApp2 Enum mapping / Fixing NetCoreApp2 cast operator use / Fixing NetCoreApp2 String.Join use / Updating to NetStandardPolyfills 1.3 / Updating to ReadableExpressions 1.11
1 parent 3f7cff8 commit 11d9864

File tree

20 files changed

+143
-69
lines changed

20 files changed

+143
-69
lines changed

‎AgileMapper.PerformanceTester/AgileMapper.PerformanceTester.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.2.1.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
38-
<HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.2.1\lib\net40\AgileObjects.NetStandardPolyfills.dll</HintPath>
37+
<Reference Include="AgileObjects.NetStandardPolyfills, Version=1.3.0.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
38+
<HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.3.0\lib\net40\AgileObjects.NetStandardPolyfills.dll</HintPath>
3939
</Reference>
40-
<Reference Include="AgileObjects.ReadableExpressions, Version=1.10.1.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
41-
<HintPath>..\packages\AgileObjects.ReadableExpressions.1.10.1\lib\net40\AgileObjects.ReadableExpressions.dll</HintPath>
40+
<Reference Include="AgileObjects.ReadableExpressions, Version=1.11.0.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
41+
<HintPath>..\packages\AgileObjects.ReadableExpressions.1.11.0\lib\net40\AgileObjects.ReadableExpressions.dll</HintPath>
4242
</Reference>
4343
<Reference Include="AutoMapper, Version=5.2.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
4444
<HintPath>..\packages\AutoMapper.5.2.0\lib\net45\AutoMapper.dll</HintPath>

‎AgileMapper.PerformanceTester/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
88
<dependentAssembly>
99
<assemblyIdentity name="AgileObjects.NetStandardPolyfills" publicKeyToken="06131ac1c008ad4e" culture="neutral" />
10-
<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
10+
<bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
1111
</dependentAssembly>
1212
</assemblyBinding>
1313
</runtime>

‎AgileMapper.PerformanceTester/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.2.1" targetFramework="net452" />
4-
<package id="AgileObjects.ReadableExpressions" version="1.10.1" targetFramework="net452" />
3+
<package id="AgileObjects.NetStandardPolyfills" version="1.3.0" targetFramework="net452" />
4+
<package id="AgileObjects.ReadableExpressions" version="1.11.0" targetFramework="net452" />
55
<package id="AutoMapper" version="5.2.0" targetFramework="net452" />
66
<package id="Expressmapper" version="1.8.3" targetFramework="net452" />
77
<package id="Mapster" version="2.6.1" targetFramework="net452" />

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
</ItemGroup>
3030

3131
<ItemGroup>
32+
<PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.3.0" />
3233
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
33-
<PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.2.1" />
3434
<PackageReference Include="xunit" Version="2.3.1" />
3535
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
3636
</ItemGroup>
@@ -46,6 +46,10 @@
4646
</Compile>
4747
</ItemGroup>
4848

49+
<ItemGroup>
50+
<Compile Include="..\CommonAssemblyInfo.cs" Link="Properties\CommonAssemblyInfo.cs" />
51+
</ItemGroup>
52+
4953
<ItemGroup>
5054
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
5155
</ItemGroup>

‎AgileMapper.UnitTests.NetCore/Properties/AssemblyInfo.cs‎

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

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

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\common.props" />
3+
4+
<PropertyGroup>
5+
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7+
<AssemblyName>AgileObjects.AgileMapper.UnitTests.NetCore2</AssemblyName>
8+
<PackageId>AgileObjects.AgileMapper.UnitTests.NetCore2</PackageId>
9+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
10+
<RuntimeFrameworkVersion>2.0.0</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.0' ">
28+
<PackageReference Include="System.Data.Common" Version="4.3.0" />
29+
</ItemGroup>
30+
31+
<ItemGroup>
32+
<PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.3.0" />
33+
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.0.0" />
34+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
35+
<PackageReference Include="xunit" Version="2.3.1" />
36+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
37+
</ItemGroup>
38+
39+
<ItemGroup>
40+
<ProjectReference Include="..\AgileMapper.UnitTests.MoreTestClasses\AgileMapper.UnitTests.MoreTestClasses.csproj" />
41+
<ProjectReference Include="..\AgileMapper\AgileMapper.csproj" />
42+
</ItemGroup>
43+
44+
<ItemGroup>
45+
<Compile Include="..\AgileMapper.UnitTests\**\*.cs" Exclude="..\AgileMapper.UnitTests\obj\**\*.cs;..\AgileMapper.UnitTests\WhenUsingPartialTrust.cs;">
46+
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
47+
</Compile>
48+
</ItemGroup>
49+
50+
<ItemGroup>
51+
<Compile Include="..\CommonAssemblyInfo.cs" Link="Properties\CommonAssemblyInfo.cs" />
52+
</ItemGroup>
53+
54+
<ItemGroup>
55+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
56+
</ItemGroup>
57+
58+
</Project>

‎AgileMapper.UnitTests.NonParallel/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="AgileObjects.NetStandardPolyfills" publicKeyToken="06131ac1c008ad4e" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
88
</dependentAssembly>
99
</assemblyBinding>
1010
</runtime>

‎AgileMapper.UnitTests/AgileMapper.UnitTests.csproj‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
<Prefer32Bit>false</Prefer32Bit>
3939
</PropertyGroup>
4040
<ItemGroup>
41-
<Reference Include="AgileObjects.NetStandardPolyfills, Version=1.2.1.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
42-
<HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.2.1\lib\net40\AgileObjects.NetStandardPolyfills.dll</HintPath>
41+
<Reference Include="AgileObjects.NetStandardPolyfills, Version=1.3.0.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
42+
<HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.3.0\lib\net40\AgileObjects.NetStandardPolyfills.dll</HintPath>
4343
</Reference>
44-
<Reference Include="AgileObjects.ReadableExpressions, Version=1.10.1.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
45-
<HintPath>..\packages\AgileObjects.ReadableExpressions.1.10.1\lib\net40\AgileObjects.ReadableExpressions.dll</HintPath>
44+
<Reference Include="AgileObjects.ReadableExpressions, Version=1.11.0.0, Culture=neutral, PublicKeyToken=9f54ad81db69da8e, processorArchitecture=MSIL">
45+
<HintPath>..\packages\AgileObjects.ReadableExpressions.1.11.0\lib\net40\AgileObjects.ReadableExpressions.dll</HintPath>
4646
</Reference>
4747
<Reference Include="Microsoft.Extensions.Primitives, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
4848
<HintPath>..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
@@ -287,7 +287,9 @@
287287
<Compile Include="Members\WhenMatchingSourceToTargetMembers.cs" />
288288
</ItemGroup>
289289
<ItemGroup>
290-
<None Include="app.config" />
290+
<None Include="app.config">
291+
<SubType>Designer</SubType>
292+
</None>
291293
<None Include="packages.config">
292294
<SubType>Designer</SubType>
293295
</None>

‎AgileMapper.UnitTests/Dictionaries/WhenMappingFromDictionariesToNewEnumerableMembers.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace AgileObjects.AgileMapper.UnitTests.Dictionaries
44
using System.Collections.Generic;
55
using System.Collections.ObjectModel;
66
using System.Linq;
7-
#if !NET_STANDARD
7+
#if !NETCOREAPP1_0
88
using Microsoft.Extensions.Primitives;
99
#endif
1010
using TestClasses;
@@ -115,8 +115,7 @@ public void ShouldMapToAComplexTypeArrayFromUntypedDottedEntries()
115115
result.Value.Second().HowMega.ShouldBe(0.99);
116116
}
117117

118-
#if !NET_STANDARD
119-
118+
#if !NETCOREAPP1_0
120119
// See https://github.com/agileobjects/AgileMapper/issues/50
121120
// See https://github.com/agileobjects/AgileMapper/issues/51
122121
[Fact]
@@ -161,7 +160,6 @@ public class StringValuesTestDto
161160

162161
#endregion
163162
#endif
164-
165163
[Fact]
166164
public void ShouldHandleAnUnconvertibleValueForACollection()
167165
{

‎AgileMapper.UnitTests/WhenMappingToNewEnumerableMembers.cs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,11 @@ public void ShouldApplyAConfiguredExpressionToAnArray()
241241
mapper.WhenMapping
242242
.From<PublicProperty<string>>()
243243
.To<PublicField<int[]>>()
244+
#if NETCOREAPP2_0
245+
.Map(ctx => ctx.Source.Value.Split(':', System.StringSplitOptions.None))
246+
#else
244247
.Map(ctx => ctx.Source.Value.Split(':'))
248+
#endif
245249
.To(x => x.Value);
246250

247251
var source = new PublicProperty<string> { Value = "8:7:6:5" };
@@ -259,7 +263,11 @@ public void ShouldHandleANullSourceMemberInAConfiguredEnumerableSource()
259263
mapper.WhenMapping
260264
.From<PublicProperty<string>>()
261265
.To<PublicField<int[]>>()
262-
.Map(ctx => ctx.Source.Value.Split(','))
266+
#if NETCOREAPP2_0
267+
.Map(ctx => ctx.Source.Value.Split(':', System.StringSplitOptions.None))
268+
#else
269+
.Map(ctx => ctx.Source.Value.Split(':'))
270+
#endif
263271
.To(x => x.Value);
264272

265273
var source = new PublicProperty<string> { Value = null };

0 commit comments

Comments
 (0)