Skip to content

D
Dapper
Commit fd050a59 authored by Marc Gravell's avatar Marc Gravell
Browse files
Options

Don't attempt to load native assemblies on DNX

parent 9a422f16
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
Dapper.Tests/Tests.cs
View file @ fd050a59
...@@ -120,7 +120,7 @@ static TestSuite() ...@@ -120,7 +120,7 @@ static TestSuite()
#endif #endif
Console.WriteLine("Dapper: " + typeof(SqlMapper).AssemblyQualifiedName); Console.WriteLine("Dapper: " + typeof(SqlMapper).AssemblyQualifiedName);
Console.WriteLine("Using Connectionstring: {0}", ConnectionString); Console.WriteLine("Using Connectionstring: {0}", ConnectionString);
#if !COREFX #if !(COREFX || DNX)
Console.Write("Loading native assemblies for SQL types..."); Console.Write("Loading native assemblies for SQL types...");
try { try {
Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory); Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory);
......
Dapper.Tests/project.json
View file @ fd050a59
...@@ -129,6 +129,7 @@ ...@@ -129,6 +129,7 @@
"dnx451": { "dnx451": {
"compilationOptions": { "compilationOptions": {
"define": [ "define": [
"DNX",
"ASYNC", "ASYNC",
"MYSQL", "MYSQL",
"ENTITY_FRAMEWORK", "ENTITY_FRAMEWORK",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment