Merge branch 'henkmollema-net451'

Dapper.StrongName/project.json

@@ -15,6 +15,9 @@
   "compile": [
     "../Dapper/**/*.cs"
   ],
+  "compileExclude": [
+    "../Dapper/obj/"
+  ],
   "compilationOptions": {
     "keyFile": "../Dapper.snk",
     "warningsAsErrors": true
@@ -33,7 +36,7 @@
         "System.Data": "4.0.0.0"
       }
     },
-    "dnx451": {
+    "net451": {
       "frameworkAssemblies": {
         "System.Data": "4.0.0.0",
         "System.Xml": "4.0.0.0"

Dapper.Tests/project.json

@@ -75,7 +75,7 @@
         "System.Linq": "4.0.1-*",
         "System.Runtime": "4.0.21-*",
         "System.Threading": "4.0.11-*",
-        "xunit": "2.1.0"
+        "xunit": "2.2.0-beta1-build3239"
       }
     },
     "dnx451": {
@@ -117,8 +117,8 @@
         "define": [ "COREFX", "ASYNC", "DNX" ]
       },
       "dependencies": {
-        "xunit": "2.1.0",
-        "xunit.runner.dnx": "2.1.0-*"
+        "xunit": "2.2.0-beta1-build3239",
+        "xunit.runner.dnx": "2.1.0-rc1-build204"
       }
     }
   }

Dapper/project.json

@@ -31,7 +31,7 @@
         "System.Xml": "4.0.0.0"
       }
     },
-    "dnx451": {
+    "net451": {
       "frameworkAssemblies": {
         "System.Data": "4.0.0.0",
         "System.Xml": "4.0.0.0"

global.json

 {
   "sdk": {
-    "version": "1.0.0-rc1-final"
+    "version": "1.0.0-rc1-update1"
   },
   "projects": [
       "Dapper", "Dapper.EntityFramework", "Dapper.Contrib", "Dapper.Rainbow", "Dapper.SqlBuilder", "Dapper.Tests"