RC2 master merge

Dapper.Contrib/project.json

@@ -14,7 +14,7 @@
   "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.",
   "version": "1.50-beta10",
   "title": "Dapper.Contrib",
-  "copyright": "2015 Stack Exchange, Inc.",
+  "copyright": "2016 Stack Exchange, Inc.",
   "dependencies": {
     "Dapper": {
       "version": "1.50-*",

Dapper.EntityFramework.StrongName/project.json

@@ -14,7 +14,7 @@
   "description": "Extension handlers for entity framework",
   "version": "1.50-beta10",
   "title": "Dapper entity framework type handlers (with a strong name)",
-  "copyright": "2015 Stack Exchange, Inc.",
+  "copyright": "2016 Stack Exchange, Inc.",
   "dependencies": {
     "Dapper.StrongName": {
       "version": "1.50-*",

Dapper.EntityFramework/project.json

@@ -14,7 +14,7 @@
   "description": "Extension handlers for entity framework",
   "version": "1.50-beta10",
   "title": "Dapper entity framework type handlers",
-  "copyright": "2015 Stack Exchange, Inc.",
+  "copyright": "2016 Stack Exchange, Inc.",
   "dependencies": {
     "Dapper": {
       "version": "1.50-*",

Dapper.SqlBuilder/project.json

@@ -14,7 +14,7 @@
   "description": "The Dapper SqlBuilder component, for building SQL queries dynamically.",
   "version": "1.50-beta10",
   "title": "Dapper SqlBuilder component",
-  "copyright": "2015 Stack Exchange, Inc.",
+  "copyright": "2016 Stack Exchange, Inc.",
   "dependencies": {
     "Dapper": {
       "version": "1.50-*",

Dapper.StrongName/project.json

@@ -15,7 +15,7 @@
   "description": "A high performance Micro-ORM supporting SQL Server, MySQL, Sqlite, SqlCE, Firebird etc..",
   "version": "1.50-beta10",
   "title": "Dapper dot net (strong named)",
-  "copyright": "2015 Stack Exchange, Inc.",
+  "copyright": "2016 Stack Exchange, Inc.",
   "dependencies": {
   },
   "buildOptions": {

Dapper.Tests.Contrib/project.json

@@ -14,7 +14,7 @@
   "description": "Dapper Contrib Test Suite",
   "title": "Dapper.Tests.Contrib",
   "version": "1.0.0",
-  "copyright": "2015 Stack Exchange, Inc.",
+  "copyright": "2016 Stack Exchange, Inc.",
   "dependencies": {
     "Dapper": {
       "version": "1.50-*",

Dapper.Tests/project.json

@@ -14,7 +14,7 @@
   "description": "Dapper Core Test Suite",
   "title": "Dapper.Tests",
   "version": "1.0.0-*",
-  "copyright": "2015 Stack Exchange, Inc.",
+  "copyright": "2016 Stack Exchange, Inc.",
   "dependencies": {
     "Dapper": {
       "version": "1.50-*",

Dapper/project.json

@@ -15,7 +15,7 @@
   "authors": [ "Sam Saffron", "Marc Gravell", "Nick Craver" ],
   "description": "A high performance Micro-ORM supporting SQL Server, MySQL, Sqlite, SqlCE, Firebird etc..",
   "title": "Dapper dot net",
-  "copyright": "2015 Stack Exchange, Inc.",
+  "copyright": "2016 Stack Exchange, Inc.",
   "dependencies": {
   },
   "buildOptions": {

NuGet.Config

@@ -5,9 +5,9 @@
     <!--
     <add key="CoreCLR" value="https://www.myget.org/F/dotnet-coreclr/api/v3/index.json" />
     -->
-    <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />  
-    <add key="aspnetcirelease" value="https://www.myget.org/F/aspnetcirelease/api/v3/index.json" />  
-    <add key="coreclr-xunit" value="https://www.myget.org/F/coreclr-xunit/api/v3/index.json" /> 
+    <!--<add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />  -->
+    <!--<add key="aspnetcirelease" value="https://www.myget.org/F/aspnetcirelease/api/v3/index.json" />  -->
+    <!--<add key="coreclr-xunit" value="https://www.myget.org/F/coreclr-xunit/api/v3/index.json" />-->
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>

build.ps1

@@ -10,6 +10,7 @@ if (!(Test-Path $env:DOTNET_INSTALL_DIR))
 & $getDotNet
 
 $env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH"
+$dotnet = "$env:DOTNET_INSTALL_DIR\dotnet"
 
 $autoGeneratedVersion = $false
 
@@ -30,28 +31,28 @@ foreach {
 }
 
 # Restore packages and build product
-& dotnet restore -v Minimal # Restore all packages
+& $dotnet restore -v Minimal # Restore all packages
 if ($LASTEXITCODE -ne 0)
 {
     throw "dotnet restore failed with exit code $LASTEXITCODE"
 }
 
-& dotnet pack "Dapper" --configuration Release --output "artifacts\packages"
-& dotnet pack "Dapper.Contrib" --configuration Release --output "artifacts\packages"
+& $dotnet pack "Dapper" --configuration Release --output "artifacts\packages"
+& $dotnet pack "Dapper.Contrib" --configuration Release --output "artifacts\packages"
 
 # Build all
 # Note the exclude: https://github.com/dotnet/cli/issues/1342
 dir "Dapper*" | where {$_.PsIsContainer -and $_ -NotLike "*.EntityFramework.StrongName" } |
 foreach {
     pushd "$_"
-    & dotnet build
+    & $dotnet build
     popd
 }
 # Run tests
 dir "*.Tests*" | where {$_.PsIsContainer} |
 foreach {
     pushd "$_"
-    & dotnet test
+    & $dotnet test
     popd
 }