Don't attempt to load native assemblies on DNX

fd050a59 · Marc Gravell · 9a422f16 · fd050a59 · fd050a59
Commit fd050a59 authored Feb 11, 2016 by Marc Gravell
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

Tests.cs Dapper.Tests/Tests.cs +1 -1

project.json Dapper.Tests/project.json +1 -0

No files found.
--- a/Dapper.Tests/Tests.cs
+++ b/Dapper.Tests/Tests.cs
@@ -120,7 +120,7 @@ static TestSuite()
 #endif
            Console.WriteLine("Dapper: " + typeof(SqlMapper).AssemblyQualifiedName);
            Console.WriteLine("Using Connectionstring: {0}", ConnectionString);
-#if !COREFX
+#if !(COREFX || DNX)
            Console.Write("Loading native assemblies for SQL types...");
            try {
                Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory);

--- a/Dapper.Tests/project.json
+++ b/Dapper.Tests/project.json
@@ -129,6 +129,7 @@
    "dnx451": {
      "compilationOptions": {
        "define": [
+          "DNX",
          "ASYNC",
          "MYSQL",
          "ENTITY_FRAMEWORK",