From 9ae864a7ba76707b84be1d043f113217588a7009 Mon Sep 17 00:00:00 2001
From: Chris Robbers <chrisr@payscale.com>
Date: Wed, 22 Aug 2018 13:19:24 -0700
Subject: [PATCH 1/2] Add netstandard2.0 target framework.

---
 projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj b/projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj
index 1f15ba91d4..c095a8792f 100755
--- a/projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj
+++ b/projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj
@@ -6,7 +6,7 @@
   <PropertyGroup>
     <Description>The RabbitMQ .NET client is the official client library for C# (and, implicitly, other .NET languages)</Description>
     <VersionPrefix>5.0.0</VersionPrefix>
-    <TargetFrameworks>net451;netstandard1.5</TargetFrameworks>
+    <TargetFrameworks>net451;netstandard1.5;netstandard2.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

From 2cb58861c3af503b93b107d7f48711a16e1b1ed1 Mon Sep 17 00:00:00 2001
From: Chris Robbers <chrisr@payscale.com>
Date: Wed, 22 Aug 2018 13:46:53 -0700
Subject: [PATCH 2/2] Also define CORECLR for netstandard2.0 configuration.

---
 projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj b/projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj
index c095a8792f..a492514675 100755
--- a/projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj
+++ b/projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj
@@ -37,7 +37,7 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' Or '$(TargetFramework)' == 'netstandard2.0' ">
     <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>