Tooling and project updates (#1333)

This is a branch cleaning up old `#if` clauses, `.csproj` bits, Linux build compatibility, and a few other tid-bits (broken out by commit).

In general: we're on 3.0 tooling and all previous cruft has been removed.

Author: NickCraver

Dapper.Contrib/Dapper.Contrib.csproj

@@ -1,16 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>Dapper.Contrib</AssemblyName>
-    <PackageTags>orm;sql;micro-orm;dapper</PackageTags>
     <Title>Dapper.Contrib</Title>
+    <PackageTags>orm;sql;micro-orm;dapper</PackageTags>
     <Description>The official collection of get, insert, update and delete helpers for Dapper.net. Also handles lists of entities and optional "dirty" tracking of interface-based entities.</Description>
     <Authors>Sam Saffron;Johan Danforth</Authors>
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\Dapper\TypeExtensions.cs" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Dapper\Dapper.csproj" />
   </ItemGroup>

Dapper.Contrib/SqlMapperExtensions.cs

@@ -6,15 +6,10 @@
 using System.Text;
 using System.Collections.Concurrent;
 using System.Reflection.Emit;
+using System.Threading;
 
 using Dapper;
 
-#if NETSTANDARD1_3
-using DataException = System.InvalidOperationException;
-#else
-using System.Threading;
-#endif
-
 namespace Dapper.Contrib.Extensions
 {
     /// <summary>
@@ -290,15 +285,10 @@ private static string GetTableName(Type type)
             }
             else
             {
-#if NETSTANDARD1_3
-                var info = type.GetTypeInfo();
-#else
-                var info = type;
-#endif
                 //NOTE: This as dynamic trick falls back to handle both our own Table-attribute as well as the one in EntityFramework 
                 var tableAttrName =
-                    info.GetCustomAttribute<TableAttribute>(false)?.Name
-                    ?? (info.GetCustomAttributes(false).FirstOrDefault(attr => attr.GetType().Name == "TableAttribute") as dynamic)?.Name;
+                    type.GetCustomAttribute<TableAttribute>(false)?.Name
+                    ?? (type.GetCustomAttributes(false).FirstOrDefault(attr => attr.GetType().Name == "TableAttribute") as dynamic)?.Name;
 
                 if (tableAttrName != null)
                 {
@@ -562,7 +552,7 @@ private static class ProxyGenerator
 
             private static AssemblyBuilder GetAsmBuilder(string name)
             {
-#if NETSTANDARD1_3 || NETSTANDARD2_0
+#if NETSTANDARD2_0
                 return AssemblyBuilder.DefineDynamicAssembly(new AssemblyName { Name = name }, AssemblyBuilderAccess.Run);
 #else
                 return Thread.GetDomain().DefineDynamicAssembly(new AssemblyName { Name = name }, AssemblyBuilderAccess.Run);
@@ -597,7 +587,7 @@ public static T GetInterfaceProxy<T>()
                     CreateProperty<T>(typeBuilder, property.Name, property.PropertyType, setIsDirtyMethod, isId);
                 }
 
-#if NETSTANDARD1_3 || NETSTANDARD2_0
+#if NETSTANDARD2_0
                 var generatedType = typeBuilder.CreateTypeInfo().AsType();
 #else
                 var generatedType = typeBuilder.CreateType();

Dapper.ProviderTools/Dapper.ProviderTools.csproj

@@ -1,8 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-
     <AssemblyName>Dapper.ProviderTools</AssemblyName>
     <PackageTags>orm;sql;micro-orm</PackageTags>
     <Title>Dapper Provider Tools</Title>
@@ -13,8 +10,10 @@
     <Nullable>enable</Nullable>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
   </ItemGroup>
-
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
 </Project>

Dapper.Rainbow/Dapper.Rainbow.csproj

@@ -10,13 +10,9 @@
     <!-- TODO: Docs -->
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\Dapper\TypeExtensions.cs" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Dapper\Dapper.csproj" />
   </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
   </ItemGroup>

Dapper.SqlBuilder/Dapper.SqlBuilder.csproj

@@ -12,7 +12,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Dapper\Dapper.csproj" />
   </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
   </ItemGroup>

Dapper.Tests.Contrib/Dapper.Tests.Contrib.csproj

@@ -1,12 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>Dapper.Tests.Contrib</AssemblyName>
-    <Title>Dapper.Tests.Contrib</Title>
     <Description>Dapper Contrib Test Suite</Description>
-    <DebugType>portable</DebugType>
-    <OutputType>Exe</OutputType>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\Dapper.Tests\Helpers\XunitSkippable.cs;..\Dapper\TypeExtensions.cs" />
@@ -19,12 +17,12 @@
     <PackageReference Include="Microsoft.Data.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
     <PackageReference Include="MySqlConnector" Version="0.56.0" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.6.1" />
     <PackageReference Include="xunit" Version="$(xUnitVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(xUnitVersion)">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Data.SqlClient" Version="4.6.1" />
   </ItemGroup>
   <!-- note: define SQLCE if SQL CE is available -->
 </Project>

Dapper.Tests.Performance/Benchmarks.Dashing.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel;
+#if NET4X
+using System.ComponentModel;
 using BenchmarkDotNet.Attributes;
 using Dapper.Tests.Performance.Dashing;
 using Dashing;
@@ -19,11 +20,15 @@ public void Setup()
             Session = database.BeginTransactionLessSession(_connection);
         }
 
-        [Benchmark(Description = "Get")]
+        // This needs love to be compatible with current SDKs (weaving doesn't work and shouldn't be used here anyway (competition).
+        // I'll file an issue with Dashing to see if someone can help me out here since I can't figure out from the docs how to
+        // make it work correctly.
+        //[Benchmark(Description = "Get")]
         public Dashing.Post Get()
         {
             Step();
             return Session.Get<Dashing.Post>(i);
         }
     }
 }
+#endif

Dapper.Tests.Performance/Benchmarks.EntityFramework.cs

@@ -1,4 +1,5 @@
-using BenchmarkDotNet.Attributes;
+#if NET4X
+using BenchmarkDotNet.Attributes;
 using System.ComponentModel;
 using System.Linq;
 
@@ -38,3 +39,4 @@ public Post NoTracking()
         }
     }
 }
+#endif

Dapper.Tests.Performance/Benchmarks.HandCoded.cs

@@ -11,18 +11,15 @@ public class HandCodedBenchmarks : BenchmarkBase
     {
         private SqlCommand _postCommand;
         private SqlParameter _idParam;
-#if !NETCOREAPP1_0
         private DataTable _table;
-#endif
 
         [GlobalSetup]
         public void Setup()
         {
             BaseSetup();
-            _postCommand = new SqlCommand("select * from Posts where Id = @Id", _connection);
+            _postCommand = new SqlCommand("select Top 1 * from Posts where Id = @Id", _connection);
             _idParam = _postCommand.Parameters.Add("@Id", SqlDbType.Int);
             _postCommand.Prepare();
-#if !NETCOREAPP1_0
             _table = new DataTable
             {
                 Columns =
@@ -42,7 +39,6 @@ public void Setup()
                         {"Counter9", typeof (int)},
                     }
             };
-#endif
         }
 
         [Benchmark(Description = "SqlCommand")]

Dapper.Tests.Performance/Benchmarks.Linq2Sql.cs

@@ -1,4 +1,5 @@
-using BenchmarkDotNet.Attributes;
+#if NET4X
+using BenchmarkDotNet.Attributes;
 using Dapper.Tests.Performance.Linq2Sql;
 using System;
 using System.ComponentModel;
@@ -44,3 +45,4 @@ public Post ExecuteQuery()
         }
     }
 }
+#endif