Flip conditions to future proof

Author: Jimmy Byrd

.paket/Paket.Restore.targets

@@ -7,7 +7,7 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
 
     <DetectedMSBuildVersion>$(MSBuildVersion)</DetectedMSBuildVersion>
-    <DetectedMSBuildVersion Condition="'$(MSBuildVersion)' == ''">15.0.0</DetectedMSBuildVersion>
+    <DetectedMSBuildVersion Condition="$(MSBuildVersion) == ''">15.0.0</DetectedMSBuildVersion>
     <MSBuildSupportsHashing>false</MSBuildSupportsHashing>
     <MSBuildSupportsHashing Condition=" '$(DetectedMSBuildVersion)' &gt; '15.8.0' ">true</MSBuildSupportsHashing>
     <!-- Mark that this target file has been loaded.  -->
@@ -64,7 +64,7 @@
 
     <!-- Disable automagic references for F# dotnet sdk -->
     <!-- This will not do anything for other project types -->
-    <!-- see https://github.com/fsharp/fslang-design/blob/master/tooling/FST-1002-fsharp-in-dotnet-sdk.md -->
+    <!-- see https://github.com/fsharp/fslang-design/blob/master/RFCs/FS-1032-fsharp-in-dotnet-sdk.md -->
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
 
@@ -300,7 +300,7 @@
               DevelopmentDependency="$(DevelopmentDependency)"
               BuildOutputInPackage="@(_BuildOutputInPackage)"
               TargetPathsToSymbols="@(_TargetPathsToSymbols)"
-              SymbolPackageFormat="$(SymbolPackageFormat)"
+              SymbolPackageFormat="symbols.nupkg"
               TargetFrameworks="@(_TargetFrameworks)"
               AssemblyName="$(AssemblyName)"
               PackageOutputPath="$(PackageOutputAbsolutePath)"
@@ -347,7 +347,7 @@
               DevelopmentDependency="$(DevelopmentDependency)"
               BuildOutputInPackage="@(_BuildOutputInPackage)"
               TargetPathsToSymbols="@(_TargetPathsToSymbols)"
-              SymbolPackageFormat="$(SymbolPackageFormat)"
+              SymbolPackageFormat="symbols.nupkg"
               TargetFrameworks="@(_TargetFrameworks)"
               AssemblyName="$(AssemblyName)"
               PackageOutputPath="$(PackageOutputAbsolutePath)"

src/FSharp.Control.Websockets.TPL/FSharp.Control.Websockets.TPL.fs

@@ -196,10 +196,10 @@ module WebSocket =
     ///
     let sendMessage (socket : WebSocket) (bufferSize : int) (messageType : WebSocketMessageType) (cancellationToken : CancellationToken) (readableStream : #IO.Stream)  = task {
         let buffer =
-            #if NETSTANDARD2_1
-            arrayPool.Rent(bufferSize)
-            #else
+            #if NETSTANDARD2_0 || NET461
             Array.create (bufferSize) Byte.MinValue
+            #else
+            arrayPool.Rent(bufferSize)
             #endif
         let mutable moreToRead = true
         try
@@ -211,10 +211,10 @@ module WebSocket =
                     moreToRead <- false
                     do! send socket (ArraySegment(Array.empty)) messageType true cancellationToken
         finally
-            #if NETSTANDARD2_1
-            arrayPool.Return(buffer,true)
-            #else
+            #if NETSTANDARD2_0 || NET461
             ()
+            #else
+            arrayPool.Return(buffer,true)
             #endif
         }
 
@@ -266,10 +266,10 @@ module WebSocket =
     ///
     let receiveMessage (socket : WebSocket) (bufferSize : int) (messageType : WebSocketMessageType) (cancellationToken : CancellationToken) (writeableStream : IO.Stream)  = task {
         let innerbuffer =
-            #if NETSTANDARD2_1
-            arrayPool.Rent(bufferSize)
-            #else
+            #if NETSTANDARD2_0 || NET461
             Array.create (bufferSize) Byte.MinValue
+            #else
+            arrayPool.Rent(bufferSize)
             #endif
         let buffer = new ArraySegment<Byte>(innerbuffer)
         let mutable moreToRead = true
@@ -291,10 +291,10 @@ module WebSocket =
                         mainResult <- Stream writeableStream
             return mainResult
         finally
-            #if NETSTANDARD2_1
-            arrayPool.Return(innerbuffer,true)
-            #else
+            #if NETSTANDARD2_0 || NET461
             ()
+            #else
+            arrayPool.Return(innerbuffer,true)
             #endif
 
     }

src/FSharp.Control.Websockets/FSharp.Control.Websockets.fs

@@ -226,10 +226,10 @@ module WebSocket =
     ///
     let sendMessage (socket : WebSocket) (bufferSize : int) (messageType : WebSocketMessageType) (readableStream : #IO.Stream)  = async {
         let buffer =
-            #if NETSTANDARD2_1
-            arrayPool.Rent(bufferSize)
-            #else
+            #if NETSTANDARD2_0 || NET461
             Array.create (bufferSize) Byte.MinValue
+            #else
+            arrayPool.Rent(bufferSize)
             #endif
 
         let rec sendMessage' () = async {
@@ -244,10 +244,10 @@ module WebSocket =
         try
             return! sendMessage'()
         finally
-            #if NETSTANDARD2_1
-            arrayPool.Return(buffer,true)
-            #else
+            #if NETSTANDARD2_0 || NET461
             ()
+            #else
+            arrayPool.Return(buffer,true)
             #endif
     }
 
@@ -296,10 +296,10 @@ module WebSocket =
     ///
     let receiveMessage (socket : WebSocket) (bufferSize : int) (messageType : WebSocketMessageType) (writeableStream : IO.Stream)  = async {
         let innerbuffer =
-            #if NETSTANDARD2_1
-            arrayPool.Rent(bufferSize)
-            #else
+            #if NETSTANDARD2_0 || NET461
             Array.create (bufferSize) Byte.MinValue
+            #else
+            arrayPool.Rent(bufferSize)
             #endif
         let buffer = new ArraySegment<Byte>(innerbuffer)
 
@@ -322,10 +322,10 @@ module WebSocket =
         try
             return! readTillEnd' ()
         finally
-            #if NETSTANDARD2_1
-            arrayPool.Return(innerbuffer,true)
-            #else
+            #if NETSTANDARD2_0 || NET461
             ()
+            #else
+            arrayPool.Return(innerbuffer,true)
             #endif
 
     }