From 6548a4eeed127163ec0848e6d2fd54dbaf21b180 Mon Sep 17 00:00:00 2001
From: Noah Potash <npotash@outbreaklabs.com>
Date: Mon, 27 Jun 2016 18:50:37 -0400
Subject: [PATCH] Upgraded to .net core 1.0.0, changed versioning scheme

---
 .travis.yml                    |  3 +-
 Source/MySql.Data/project.json | 65 +++++++++++++++++-----------------
 appveyor.yml                   |  2 +-
 global.json                    |  2 +-
 4 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e733640bf..ea6acbb81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,8 +28,9 @@ env:
       Framework: netcoreapp1.0
 
 before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl && brew link --force openssl ; fi
   # Download script to install dotnet cli
-  - curl -sSL https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview1/scripts/obtain/dotnet-install.sh | bash /dev/stdin --version 1.0.0-preview1-002702 --install-dir ~/dotnet
+  - curl -sSL https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.sh | bash /dev/stdin --version 1.0.0-preview2-003121 --install-dir ~/dotnet
 
   - export DOTNET_INSTALL_DIR="~/dotnet"
 
diff --git a/Source/MySql.Data/project.json b/Source/MySql.Data/project.json
index 21a703d69..b724fba8d 100644
--- a/Source/MySql.Data/project.json
+++ b/Source/MySql.Data/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "6.9.8-rc2-008",
+  "version": "6.9.809",
   "description": "MySQL client library targeting netstandard 1.3",
   "authors": [ "Oracle", "SapientGuardian", "ebyte23" ],
   "buildOptions": {
@@ -22,37 +22,38 @@
     "licenseUrl": "http://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
   },
   "dependencies": {
-    "Microsoft.CSharp": "4.0.1-rc2-24027",
-    "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-final",
-    "System.Collections": "4.0.11-rc2-24027",
-    "System.Collections.Specialized": "4.0.1-rc2-24027",
-    "System.Console": "4.0.0-rc2-24027",
-    "System.Diagnostics.Debug": "4.0.11-rc2-24027",
-    "System.Diagnostics.Tracing": "4.1.0-rc2-24027",
-    "System.IO.FileSystem": "4.0.1-rc2-24027",
-    "System.Linq": "4.1.0-rc2-24027",
-    "System.Reflection": "4.1.0-rc2-24027",
-    "System.Reflection.Extensions": "4.0.1-rc2-24027",
-    "System.Resources.Writer": "4.0.0-rc2-24027",
-    "System.Runtime.InteropServices": "4.1.0-rc2-24027",
-    "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
-    "System.Security.Cryptography.Primitives": "4.0.0-rc2-24027",
-    "System.Text.Encoding": "4.0.11-rc2-24027",
-    "System.Text.Encoding.Extensions": "4.0.11-rc2-24027",
-    "System.Text.RegularExpressions": "4.0.12-rc2-24027",
-    "System.Threading": "4.0.11-rc2-24027",
-    "System.Threading.Timer": "4.0.1-rc2-24027",
-    "System.ComponentModel.TypeConverter": "4.0.1-rc2-24027",
-    "System.Data.Common": "4.0.1-rc2-24027",
-    "System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
-    "System.Net.NameResolution": "4.0.0-rc2-24027",
-    "System.Net.Primitives": "4.0.11-rc2-24027",
-    "System.Net.Sockets": "4.1.0-rc2-24027",
-    "System.Security.Cryptography.Algorithms": "4.1.0-rc2-24027",
-    "System.Collections.NonGeneric": "4.0.1-rc2-24027",
-    "System.Reflection.TypeExtensions": "4.1.0-rc2-24027",
-    "System.Security.Cryptography.X509Certificates": "4.1.0-rc2-24027",
-    "System.Net.Security": "4.0.0-rc2-24027"
+    "Microsoft.CSharp": "4.0.1",
+    "Microsoft.Extensions.PlatformAbstractions": "1.0.0",
+    "System.Collections": "4.0.11",
+    "System.Collections.Specialized": "4.0.1",
+    "System.Console": "4.0.0",
+    "System.Diagnostics.Debug": "4.0.11",
+    "System.Diagnostics.Tracing": "4.1.0",
+    "System.IO.FileSystem": "4.0.1",
+    "System.Linq": "4.1.0",
+    "System.Reflection": "4.1.0",
+    "System.Reflection.Extensions": "4.0.1",
+    "System.Resources.Writer": "4.0.0",
+    "System.Runtime.InteropServices": "4.1.0",
+    "System.Runtime.Serialization.Primitives": "4.1.1",
+    "System.Security.Cryptography.Primitives": "4.0.0",
+    "System.Text.Encoding": "4.0.11",
+    "System.Text.Encoding.Extensions": "4.0.11",
+    "System.Text.RegularExpressions": "4.1.0",
+    "System.Threading": "4.0.11",
+    "System.Threading.Timer": "4.0.1",
+    "System.ComponentModel.TypeConverter": "4.1.0",
+    "System.Data.Common": "4.1.0",
+    "System.Diagnostics.TraceSource": "4.0.0",
+    "System.Net.NameResolution": "4.0.0",
+    "System.Net.Primitives": "4.0.11",
+    "System.Net.Sockets": "4.1.0",
+    "System.Security.Cryptography.Algorithms": "4.2.0",
+    "System.Collections.NonGeneric": "4.0.1",
+    "System.Reflection.TypeExtensions": "4.1.0",
+    "System.Security.Cryptography.X509Certificates": "4.1.0",
+    "System.Net.Security": "4.0.0",
+    "System.Runtime.InteropServices.RuntimeInformation": "4.0.0"
   },
   "frameworks": {
     "netstandard1.3": {
diff --git a/appveyor.yml b/appveyor.yml
index 1d48e942c..b67103e0b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 6.9.8-rc2-{build}
+version: 6.9.8{build}
 image: Visual Studio 2015
 build_script:
 - cmd: >-
diff --git a/global.json b/global.json
index d5422c99d..eb9497c82 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "projects": [ "Source/MySql.Data" ],
   "sdk": {
-    "version": "1.0.0-preview1-002702"
+    "version": "1.0.0-preview2-003121"
   }
 }