Use the built in versioning macros that exist in .NET Core/SDK projects (#122)

NET45 specifically means .NET 4.5, not 4.5.1 or 4.5.2. The project had been redefining that macro with a different meaning. Also some of the places this code was using `#if NET45` should really use `#if NETFRAMEWORK`

Author: dlstucki

src/Microsoft.Azure.Relay/Common/AsyncLock.cs

@@ -77,10 +77,9 @@ void Dispose(bool disposing)
                 if (disposing)
                 {
                     this.asyncSemaphore.Dispose();
-#if NET45
+
                     // This is only disposing the Task...
                     this.lockRelease.Dispose();
-#endif
                 }
 
                 this.disposed = true;

src/Microsoft.Azure.Relay/Common/Fx.cs

@@ -31,14 +31,9 @@ public static bool IsFatal(Exception exception)
         {
             while (exception != null)
             {
-                // FYI, CallbackException is-a FatalException
-                if (
-                    //exception is FatalException ||
-#if NET45
-                    (exception is OutOfMemoryException && !(exception is InsufficientMemoryException)) ||
+                if (exception is AccessViolationException ||
                     exception is ThreadAbortException ||
-                    exception is AccessViolationException ||
-#endif
+                    (exception is OutOfMemoryException && !(exception is InsufficientMemoryException)) ||
                     exception is SEHException)
                 {
                     return true;

src/Microsoft.Azure.Relay/Common/PlatformHelpers.cs

@@ -6,14 +6,14 @@ namespace Microsoft.Azure.Relay
     using System;
     using System.IO;
 
-    static class PlatformExtensions
+    static class PlatformHelpers
     {
         public static ArraySegment<byte> GetArraySegment(this MemoryStream memoryStream)
         {
             Fx.Assert(memoryStream != null, "memoryStream is required");
 
             ArraySegment<byte> buffer;
-#if NET45
+#if NET45 || NET451 || NET452
             buffer = new ArraySegment<byte>(memoryStream.GetBuffer(), 0, (int)memoryStream.Length);
 #else
             // .NET 4.6 and .NET Core added MemoryStream.TryGetBuffer()

src/Microsoft.Azure.Relay/HybridConnectionUtility.cs

@@ -8,7 +8,7 @@ namespace Microsoft.Azure.Relay
     using System.Collections.Specialized;
     using System.Net;
     using System.Text;
-#if NET45
+#if NETFRAMEWORK
     using System.Web;
 #else
     // NETSTANDARD
@@ -53,7 +53,7 @@ public static Uri BuildUri(string host, int port, string path, string query, str
             }.Uri;
         }
 
-#if NET45
+#if NETFRAMEWORK
         public static NameValueCollection ParseQueryString(string queryString)
         {
             return HttpUtility.ParseQueryString(queryString);

src/Microsoft.Azure.Relay/HybridHttpConnection.cs

@@ -454,7 +454,7 @@ public override async Task WriteAsync(byte[] array, int offset, int count, Cance
                 }
             }
 
-#if NET45
+#if NETFRAMEWORK
             public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
             {
                 return this.WriteAsync(buffer, offset, count).ToAsyncResult(callback, state);
@@ -464,7 +464,7 @@ public override void EndWrite(IAsyncResult asyncResult)
             {
                 TaskEx.EndAsyncResult(asyncResult);
             }
-#endif // NET45
+#endif // NETFRAMEWORK
 
             public override string ToString()
             {

src/Microsoft.Azure.Relay/Microsoft.Azure.Relay.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>This is the Azure Relay .NET Standard client library for Hybrid Connections. For more information about Relay see https://azure.microsoft.com/en-us/services/service-bus/.
@@ -30,7 +30,7 @@
 
   <!-- .NET Framework specific -->
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <DefineConstants>$(DefineConstants);NET45</DefineConstants>
+    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
     <Reference Include="System.Net.Http" />
@@ -40,7 +40,7 @@
 
   <!-- .NET Standard specific -->
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
+    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="1.0.0" />

src/Microsoft.Azure.Relay/WebSocketMessageStream.cs

@@ -65,7 +65,7 @@ public override int Read(byte[] buffer, int offset, int count)
             return this.ReadAsync(buffer, offset, count).ConfigureAwait(false).GetAwaiter().GetResult();
         }
 
-#if NET45
+#if NETFRAMEWORK
         public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
         {
             return this.ReadAsync(buffer, offset, count).ToAsyncResult(callback, state);
@@ -75,7 +75,7 @@ public override int EndRead(IAsyncResult asyncResult)
         {
             return TaskEx.EndAsyncResult<int>(asyncResult);
         }
-#endif // NET45
+#endif // NETFRAMEWORK
 
         public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancelToken)
         {

src/Microsoft.Azure.Relay/WebSocketStream.cs

@@ -120,7 +120,7 @@ public override async Task<int> ReadAsync(byte[] buffer, int offset, int count,
             }
         }
 
-#if NET45
+#if NETFRAMEWORK
         public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
         {
             return this.ReadAsync(buffer, offset, count, CancellationToken.None).ToAsyncResult(callback, state, true);
@@ -130,7 +130,7 @@ public override int EndRead(IAsyncResult asyncResult)
         {
             return TaskEx.EndAsyncResult<int>(asyncResult);
         }
-#endif // NET45
+#endif // NETFRAMEWORK
 
         public override long Seek(long offset, SeekOrigin origin)
         {
@@ -185,7 +185,7 @@ await this.webSocket.SendAsync(
             }
         }
 
-#if NET45
+#if NETFRAMEWORK
         public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
         {
             return this.WriteAsync(buffer, offset, count, CancellationToken.None).ToAsyncResult(callback, state, true);
@@ -195,7 +195,7 @@ public override void EndWrite(IAsyncResult asyncResult)
         {
             TaskEx.EndAsyncResult(asyncResult);
         }
-#endif // NET45
+#endif // NETFRAMEWORK
 
         internal void Abort()
         {

test/Microsoft.Azure.Relay.UnitTests/Microsoft.Azure.Relay.UnitTests.csproj

@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <DefineConstants>$(DefineConstants);NET46</DefineConstants>
+    <DefineConstants>$(DefineConstants)</DefineConstants>
   </PropertyGroup>
 
 </Project>