Use standard Defines instead of custom ones

Author: bording

projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj

@@ -39,10 +39,6 @@
     </None>
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />

projects/client/RabbitMQ.Client/src/client/impl/TcpClientAdapter.cs

@@ -27,11 +27,7 @@ public virtual async Task ConnectAsync(string host, int port)
                 throw new ArgumentException("No ip address could be resolved for " + host);
             }
 
-#if CORECLR
             await _sock.ConnectAsync(ep, port).ConfigureAwait(false);
-#else
-            await Task.Run(() => _sock.Connect(ep, port));
-#endif
         }
 
         public virtual void Close()

projects/client/Unit/Unit.csproj

@@ -18,8 +18,4 @@
     <PackageReference Include="PublicApiGenerator" Version="10.0.2" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
-  </PropertyGroup>
-
 </Project>

projects/client/Unit/src/unit/Fixtures.cs

@@ -456,7 +456,7 @@ private Process ExecRabbitMqCtlUsingDocker(string args, string dockerMachineName
                     UseShellExecute = false
                 }
             };
-            
+
             try {
                 proc.StartInfo.FileName = "docker";
                 proc.StartInfo.Arguments = $"exec {dockerMachineName} rabbitmqctl {args}";
@@ -545,7 +545,7 @@ internal void ReportExecFailure(string cmd, string args, string msg)
 
         public static bool IsRunningOnMonoOrDotNetCore()
         {
-            #if CORECLR
+            #if NETCOREAPP
             return true;
             #else
             return Type.GetType("Mono.Runtime") != null;
@@ -578,7 +578,7 @@ internal void Publish(IConnection conn)
         //
         // Connection Closure
         //
-        
+
         public class ConnectionInfo
         {
             public string Pid

projects/client/Unit/src/unit/TestAmqpUri.cs

@@ -207,7 +207,7 @@ private void ParseSuccess(string uri, string user, string password,
 
         public static bool IsRunningOnMono()
         {
-            #if CORECLR
+            #if NETCOREAPP
             return false;
             #else
             return Type.GetType("Mono.Runtime") != null;