Adding .NETCore2.1 test project / Fixing .NETCore 2.1 TryParse method resolution / Fixing issue #61

SteveWilkes · SteveWilkes · commit 1e98937fed24 · 2018-05-10T18:53:25.000+01:00
diff --git a/AgileMapper.UnitTests.NetCore/AgileMapper.UnitTests.NetCore.csproj b/AgileMapper.UnitTests.NetCore/AgileMapper.UnitTests.NetCore.csproj
@@ -30,7 +30,7 @@
 
   <ItemGroup>
     <PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.3.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
diff --git a/AgileMapper.UnitTests.NetCore2.1/AgileMapper.UnitTests.NetCore2.1.csproj b/AgileMapper.UnitTests.NetCore2.1/AgileMapper.UnitTests.NetCore2.1.csproj
@@ -0,0 +1,58 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\common.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <AssemblyName>AgileObjects.AgileMapper.UnitTests.NetCore2_1</AssemblyName>
+    <PackageId>AgileObjects.AgileMapper.UnitTests.NetCore2_1</PackageId>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <RuntimeFrameworkVersion>2.1.0-rc1</RuntimeFrameworkVersion>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
+    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
+    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
+    <RootNamespace>AgileObjects.AgileMapper.UnitTests.NetCore2</RootNamespace>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NETCOREAPP2_0;NET_STANDARD</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>TRACE;RELEASE;NETCOREAPP2_0;NETCOREAPP2_1;NET_STANDARD</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
+    <PackageReference Include="System.Data.Common" Version="4.3.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.3.0" />
+    <PackageReference Include="Microsoft.Extensions.Primitives" Version="2.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AgileMapper.UnitTests.MoreTestClasses\AgileMapper.UnitTests.MoreTestClasses.csproj" />
+    <ProjectReference Include="..\AgileMapper\AgileMapper.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\AgileMapper.UnitTests\**\*.cs" Exclude="..\AgileMapper.UnitTests\obj\**\*.cs;..\AgileMapper.UnitTests\WhenUsingPartialTrust.cs;">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\CommonAssemblyInfo.cs" Link="Properties\CommonAssemblyInfo.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+
+</Project>
diff --git a/AgileMapper.UnitTests.NetCore2/AgileMapper.UnitTests.NetCore2.csproj b/AgileMapper.UnitTests.NetCore2/AgileMapper.UnitTests.NetCore2.csproj
@@ -7,7 +7,7 @@
     <AssemblyName>AgileObjects.AgileMapper.UnitTests.NetCore2</AssemblyName>
     <PackageId>AgileObjects.AgileMapper.UnitTests.NetCore2</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <RuntimeFrameworkVersion>2.0.5</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion>2.0.7</RuntimeFrameworkVersion>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
@@ -31,7 +31,7 @@
   <ItemGroup>
     <PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.3.0" />
     <PackageReference Include="Microsoft.Extensions.Primitives" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
diff --git a/AgileMapper.UnitTests.Orms.EFCore2.NetCore2/AgileMapper.UnitTests.Orms.EfCore2.NetCore2.csproj b/AgileMapper.UnitTests.Orms.EFCore2.NetCore2/AgileMapper.UnitTests.Orms.EfCore2.NetCore2.csproj
@@ -7,7 +7,7 @@
     <AssemblyName>AgileObjects.AgileMapper.UnitTests.Orms.EfCore2.NetCore2</AssemblyName>
     <PackageId>AgileObjects.AgileMapper.UnitTests.Orms.EfCore2.NetCore2</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <RuntimeFrameworkVersion>2.0.5</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion>2.0.7</RuntimeFrameworkVersion>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
@@ -36,7 +36,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Primitives" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
diff --git a/AgileMapper.sln b/AgileMapper.sln
@@ -44,6 +44,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgileMapper.UnitTests.Orms.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileMapper.UnitTests.Orms.EfCore2.NetCore2", "AgileMapper.UnitTests.Orms.EFCore2.NetCore2\AgileMapper.UnitTests.Orms.EfCore2.NetCore2.csproj", "{A6A9D59E-905E-4EC8-ABDD-62FA4E3B6B19}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileMapper.UnitTests.NetCore2.1", "AgileMapper.UnitTests.NetCore2.1\AgileMapper.UnitTests.NetCore2.1.csproj", "{26C562E5-43EB-47D7-801A-CF772C7B3A0B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -110,6 +112,10 @@ Global
 		{A6A9D59E-905E-4EC8-ABDD-62FA4E3B6B19}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A6A9D59E-905E-4EC8-ABDD-62FA4E3B6B19}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A6A9D59E-905E-4EC8-ABDD-62FA4E3B6B19}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26C562E5-43EB-47D7-801A-CF772C7B3A0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26C562E5-43EB-47D7-801A-CF772C7B3A0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26C562E5-43EB-47D7-801A-CF772C7B3A0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26C562E5-43EB-47D7-801A-CF772C7B3A0B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/AgileMapper/DataSources/DictionaryEntryVariablePair.cs b/AgileMapper/DataSources/DictionaryEntryVariablePair.cs
@@ -19,7 +19,7 @@ internal class DictionaryEntryVariablePair
             .MakeGenericMethod(typeof(string));
 
         private static readonly MethodInfo _stringStartsWithMethod = typeof(string)
-            .GetPublicInstanceMethod("StartsWith", parameterCount: 2);
+            .GetPublicInstanceMethod("StartsWith", typeof(string), typeof(StringComparison));
 
         #endregion
 
diff --git a/AgileMapper/Extensions/Internal/ExpressionExtensions.cs b/AgileMapper/Extensions/Internal/ExpressionExtensions.cs
@@ -180,8 +180,7 @@ public static Expression GetCount(
         public static Expression GetValueOrDefaultCall(this Expression nullableExpression)
         {
             var parameterlessGetValueOrDefault = nullableExpression.Type
-                .GetPublicInstanceMethods()
-                .First(m => (m.Name == "GetValueOrDefault") && !m.GetParameters().Any());
+                .GetPublicInstanceMethod("GetValueOrDefault", parameterCount: 0);
 
             return Expression.Call(nullableExpression, parameterlessGetValueOrDefault);
         }
diff --git a/AgileMapper/Properties/AssemblyInfo.cs b/AgileMapper/Properties/AssemblyInfo.cs
@@ -11,6 +11,7 @@
 [assembly: InternalsVisibleTo("AgileObjects.AgileMapper.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100570b21a39fbc3df774a5e60b41cd41078ebae1c9210a3ae4355d518a0abecab27f9346fbfe941618dc835e99ab21b75ff38e5815dceebdd8480dc14c0ee14f5cdcd3ace7f980173238c9d827f95a6f46100ff19a7dcf912c9291bf95dcd64694692a193428f2a35023bbed186f3c8f9769e01e5077a8ea5cabafe5d7948024af")]
 [assembly: InternalsVisibleTo("AgileObjects.AgileMapper.UnitTests.NetCore, PublicKey=0024000004800000940000000602000000240000525341310004000001000100570b21a39fbc3df774a5e60b41cd41078ebae1c9210a3ae4355d518a0abecab27f9346fbfe941618dc835e99ab21b75ff38e5815dceebdd8480dc14c0ee14f5cdcd3ace7f980173238c9d827f95a6f46100ff19a7dcf912c9291bf95dcd64694692a193428f2a35023bbed186f3c8f9769e01e5077a8ea5cabafe5d7948024af")]
 [assembly: InternalsVisibleTo("AgileObjects.AgileMapper.UnitTests.NetCore2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100570b21a39fbc3df774a5e60b41cd41078ebae1c9210a3ae4355d518a0abecab27f9346fbfe941618dc835e99ab21b75ff38e5815dceebdd8480dc14c0ee14f5cdcd3ace7f980173238c9d827f95a6f46100ff19a7dcf912c9291bf95dcd64694692a193428f2a35023bbed186f3c8f9769e01e5077a8ea5cabafe5d7948024af")]
+[assembly: InternalsVisibleTo("AgileObjects.AgileMapper.UnitTests.NetCore2_1, PublicKey=0024000004800000940000000602000000240000525341310004000001000100570b21a39fbc3df774a5e60b41cd41078ebae1c9210a3ae4355d518a0abecab27f9346fbfe941618dc835e99ab21b75ff38e5815dceebdd8480dc14c0ee14f5cdcd3ace7f980173238c9d827f95a6f46100ff19a7dcf912c9291bf95dcd64694692a193428f2a35023bbed186f3c8f9769e01e5077a8ea5cabafe5d7948024af")]
 [assembly: InternalsVisibleTo("AgileObjects.AgileMapper.UnitTests.NonParallel, PublicKey=0024000004800000940000000602000000240000525341310004000001000100570b21a39fbc3df774a5e60b41cd41078ebae1c9210a3ae4355d518a0abecab27f9346fbfe941618dc835e99ab21b75ff38e5815dceebdd8480dc14c0ee14f5cdcd3ace7f980173238c9d827f95a6f46100ff19a7dcf912c9291bf95dcd64694692a193428f2a35023bbed186f3c8f9769e01e5077a8ea5cabafe5d7948024af")]
 [assembly: InternalsVisibleTo("AgileObjects.AgileMapper.UnitTests.Orms, PublicKey=0024000004800000940000000602000000240000525341310004000001000100570b21a39fbc3df774a5e60b41cd41078ebae1c9210a3ae4355d518a0abecab27f9346fbfe941618dc835e99ab21b75ff38e5815dceebdd8480dc14c0ee14f5cdcd3ace7f980173238c9d827f95a6f46100ff19a7dcf912c9291bf95dcd64694692a193428f2a35023bbed186f3c8f9769e01e5077a8ea5cabafe5d7948024af")]
 [assembly: InternalsVisibleTo("AgileObjects.AgileMapper.UnitTests.MoreTestClasses, PublicKey=0024000004800000940000000602000000240000525341310004000001000100570b21a39fbc3df774a5e60b41cd41078ebae1c9210a3ae4355d518a0abecab27f9346fbfe941618dc835e99ab21b75ff38e5815dceebdd8480dc14c0ee14f5cdcd3ace7f980173238c9d827f95a6f46100ff19a7dcf912c9291bf95dcd64694692a193428f2a35023bbed186f3c8f9769e01e5077a8ea5cabafe5d7948024af")]
diff --git a/AgileMapper/Queryables/Settings/DefaultQueryProviderSettings.cs b/AgileMapper/Queryables/Settings/DefaultQueryProviderSettings.cs
@@ -84,7 +84,7 @@ public Expression ConvertTryParseCall(MethodCallExpression call, Expression fall
         private static Expression GetConvertStringToGuid(MethodCallExpression guidTryParseCall, Expression fallbackValue)
         {
             var parseMethod = typeof(Guid)
-                .GetPublicStaticMethod("Parse", parameterCount: 1);
+                .GetPublicStaticMethod("Parse", typeof(string));
 
             var sourceValue = guidTryParseCall.Arguments.First();
             var guidConversion = Expression.Call(parseMethod, sourceValue);
diff --git a/AgileMapper/TypeConversion/ToEnumConverter.cs b/AgileMapper/TypeConversion/ToEnumConverter.cs
@@ -101,7 +101,7 @@ private static Expression GetFlagsEnumConversion(
 
             var splitSourceValueCall = Expression.Call(
                 sourceValue,
-                typeof(string).GetPublicInstanceMethod("Split", parameterCount: 1),
+                typeof(string).GetPublicInstanceMethod("Split", typeof(char[])),
                 Expression.NewArrayInit(typeof(char), ','.ToConstantExpression()));
 
             var assignSourceValues = GetValuesEnumeratorAssignment(sourceValuesVariable, splitSourceValueCall);
diff --git a/AgileMapper/TypeConversion/TryParseConverter.cs b/AgileMapper/TypeConversion/TryParseConverter.cs
@@ -20,8 +20,10 @@ protected TryParseConverter()
             _nonNullableTargetType = typeof(T);
             _nullableTargetType = typeof(Nullable<>).MakeGenericType(_nonNullableTargetType);
 
-            _tryParseMethod = _nonNullableTargetType
-                .GetPublicStaticMethod("TryParse", parameterCount: 2);
+            _tryParseMethod = _nonNullableTargetType.GetPublicStaticMethod(
+                "TryParse",
+                typeof(string),
+                _nonNullableTargetType.MakeByRefType());
 
             _valueVariable = Expression.Variable(
                 _nonNullableTargetType,

Original file line number	Diff line number	Diff line change
`@@ -180,8 +180,7 @@ public static Expression GetCount(`
`180`	`180`	`public static Expression GetValueOrDefaultCall(this Expression nullableExpression)`
`181`	`181`	`{`
`182`	`182`	`var parameterlessGetValueOrDefault = nullableExpression.Type`
`183`		`- .GetPublicInstanceMethods()`
`184`		`- .First(m => (m.Name == "GetValueOrDefault") && !m.GetParameters().Any());`
	`183`	`+ .GetPublicInstanceMethod("GetValueOrDefault", parameterCount: 0);`
`185`	`184`
`186`	`185`	`return Expression.Call(nullableExpression, parameterlessGetValueOrDefault);`
`187`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public Expression ConvertTryParseCall(MethodCallExpression call, Expression fall`
`84`	`84`	`private static Expression GetConvertStringToGuid(MethodCallExpression guidTryParseCall, Expression fallbackValue)`
`85`	`85`	`{`
`86`	`86`	`var parseMethod = typeof(Guid)`
`87`		`- .GetPublicStaticMethod("Parse", parameterCount: 1);`
	`87`	`+ .GetPublicStaticMethod("Parse", typeof(string));`
`88`	`88`
`89`	`89`	`var sourceValue = guidTryParseCall.Arguments.First();`
`90`	`90`	`var guidConversion = Expression.Call(parseMethod, sourceValue);`