Skip to content

Commit 6548a4e

Browse files
author
Noah Potash
committed
Upgraded to .net core 1.0.0, changed versioning scheme
1 parent be2f7ca commit 6548a4e

File tree

4 files changed

+37
-35
lines changed

4 files changed

+37
-35
lines changed

Diff for: .travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ env:
2828
Framework: netcoreapp1.0
2929

3030
before_install:
31+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl && brew link --force openssl ; fi
3132
# Download script to install dotnet cli
32-
- 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
33+
- 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
3334

3435
- export DOTNET_INSTALL_DIR="~/dotnet"
3536

Diff for: Source/MySql.Data/project.json

+33-32
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "6.9.8-rc2-008",
2+
"version": "6.9.809",
33
"description": "MySQL client library targeting netstandard 1.3",
44
"authors": [ "Oracle", "SapientGuardian", "ebyte23" ],
55
"buildOptions": {
@@ -22,37 +22,38 @@
2222
"licenseUrl": "http://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
2323
},
2424
"dependencies": {
25-
"Microsoft.CSharp": "4.0.1-rc2-24027",
26-
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-final",
27-
"System.Collections": "4.0.11-rc2-24027",
28-
"System.Collections.Specialized": "4.0.1-rc2-24027",
29-
"System.Console": "4.0.0-rc2-24027",
30-
"System.Diagnostics.Debug": "4.0.11-rc2-24027",
31-
"System.Diagnostics.Tracing": "4.1.0-rc2-24027",
32-
"System.IO.FileSystem": "4.0.1-rc2-24027",
33-
"System.Linq": "4.1.0-rc2-24027",
34-
"System.Reflection": "4.1.0-rc2-24027",
35-
"System.Reflection.Extensions": "4.0.1-rc2-24027",
36-
"System.Resources.Writer": "4.0.0-rc2-24027",
37-
"System.Runtime.InteropServices": "4.1.0-rc2-24027",
38-
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
39-
"System.Security.Cryptography.Primitives": "4.0.0-rc2-24027",
40-
"System.Text.Encoding": "4.0.11-rc2-24027",
41-
"System.Text.Encoding.Extensions": "4.0.11-rc2-24027",
42-
"System.Text.RegularExpressions": "4.0.12-rc2-24027",
43-
"System.Threading": "4.0.11-rc2-24027",
44-
"System.Threading.Timer": "4.0.1-rc2-24027",
45-
"System.ComponentModel.TypeConverter": "4.0.1-rc2-24027",
46-
"System.Data.Common": "4.0.1-rc2-24027",
47-
"System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
48-
"System.Net.NameResolution": "4.0.0-rc2-24027",
49-
"System.Net.Primitives": "4.0.11-rc2-24027",
50-
"System.Net.Sockets": "4.1.0-rc2-24027",
51-
"System.Security.Cryptography.Algorithms": "4.1.0-rc2-24027",
52-
"System.Collections.NonGeneric": "4.0.1-rc2-24027",
53-
"System.Reflection.TypeExtensions": "4.1.0-rc2-24027",
54-
"System.Security.Cryptography.X509Certificates": "4.1.0-rc2-24027",
55-
"System.Net.Security": "4.0.0-rc2-24027"
25+
"Microsoft.CSharp": "4.0.1",
26+
"Microsoft.Extensions.PlatformAbstractions": "1.0.0",
27+
"System.Collections": "4.0.11",
28+
"System.Collections.Specialized": "4.0.1",
29+
"System.Console": "4.0.0",
30+
"System.Diagnostics.Debug": "4.0.11",
31+
"System.Diagnostics.Tracing": "4.1.0",
32+
"System.IO.FileSystem": "4.0.1",
33+
"System.Linq": "4.1.0",
34+
"System.Reflection": "4.1.0",
35+
"System.Reflection.Extensions": "4.0.1",
36+
"System.Resources.Writer": "4.0.0",
37+
"System.Runtime.InteropServices": "4.1.0",
38+
"System.Runtime.Serialization.Primitives": "4.1.1",
39+
"System.Security.Cryptography.Primitives": "4.0.0",
40+
"System.Text.Encoding": "4.0.11",
41+
"System.Text.Encoding.Extensions": "4.0.11",
42+
"System.Text.RegularExpressions": "4.1.0",
43+
"System.Threading": "4.0.11",
44+
"System.Threading.Timer": "4.0.1",
45+
"System.ComponentModel.TypeConverter": "4.1.0",
46+
"System.Data.Common": "4.1.0",
47+
"System.Diagnostics.TraceSource": "4.0.0",
48+
"System.Net.NameResolution": "4.0.0",
49+
"System.Net.Primitives": "4.0.11",
50+
"System.Net.Sockets": "4.1.0",
51+
"System.Security.Cryptography.Algorithms": "4.2.0",
52+
"System.Collections.NonGeneric": "4.0.1",
53+
"System.Reflection.TypeExtensions": "4.1.0",
54+
"System.Security.Cryptography.X509Certificates": "4.1.0",
55+
"System.Net.Security": "4.0.0",
56+
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0"
5657
},
5758
"frameworks": {
5859
"netstandard1.3": {

Diff for: appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 6.9.8-rc2-{build}
1+
version: 6.9.8{build}
22
image: Visual Studio 2015
33
build_script:
44
- cmd: >-

Diff for: global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"projects": [ "Source/MySql.Data" ],
33
"sdk": {
4-
"version": "1.0.0-preview1-002702"
4+
"version": "1.0.0-preview2-003121"
55
}
66
}

0 commit comments

Comments
 (0)