Skip to content

Commit 0cd895a

Browse files
committed
Use .NET Core 2.1 SDK on Linux.
This uses the latest .NET Core 2.1 SDK and instructions from https://www.microsoft.com/net/download/linux-package-manager/ubuntu14-04/sdk-current
1 parent 14a8d3d commit 0cd895a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ env:
2121

2222
before_install:
2323
- .ci/docker-run.sh $IMAGE $NAME 3307 $OMIT_FEATURES
24-
- curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg
25-
- sudo mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg
26-
- sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
24+
- wget -q -O packages-microsoft-prod.deb https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb
25+
- sudo dpkg -i packages-microsoft-prod.deb
26+
- sudo apt-get install apt-transport-https
2727
- sudo apt-get update
28-
- sudo apt-get install -y dotnet-sdk-2.1.4 dotnet-sharedframework-microsoft.netcore.app-1.1.2
28+
- sudo apt-get install -y dotnet-sdk-2.1 dotnet-sharedframework-microsoft.netcore.app-1.1.2
2929

3030
script:
3131
- dotnet restore

src/MySqlConnector/Protocol/Serialization/StreamByteHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ async Task<int> DoReadBytesAsync(ArraySegment<byte> buffer_)
5757
{
5858
bytesRead = await m_stream.ReadAsync(buffer_.Array, buffer_.Offset, buffer_.Count).ConfigureAwait(false);
5959
}
60-
catch (ObjectDisposedException ex)
60+
catch (Exception ex) when (ex is ObjectDisposedException || ex is IOException)
6161
{
6262
if (RemainingTimeout != Constants.InfiniteTimeout)
6363
{

0 commit comments

Comments
 (0)