Fixing usage with net8.0

dotnet · Oct 6, 2023 · 4479347 · 4479347
1 parent 0cbb21d
commit 4479347
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 10 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -25,8 +25,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <ScenarioTestTargetFrameworks>net6.0;net7.0</ScenarioTestTargetFrameworks>
-    <UnitTestTargetFrameworks>net6.0;net7.0</UnitTestTargetFrameworks>
+    <ScenarioTestTargetFrameworks>net6.0;net7.0;net8.0</ScenarioTestTargetFrameworks>
+    <UnitTestTargetFrameworks>net6.0;net7.0;net8.0</UnitTestTargetFrameworks>
     <!-- This is the target framework version of the built tests picked up to send to Helix -->
     <XUnitPublishTargetFramework>net6.0</XUnitPublishTargetFramework>
   </PropertyGroup>

diff --git a/global.json b/global.json
@@ -4,7 +4,8 @@
     "runtimes": {
       "dotnet": [
         "3.1.5",
-        "6.0.5"
+        "6.0.22",
+		"7.0.11"
       ]
     }
   },

diff --git a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/Connection.cs b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/Connection.cs
@@ -365,6 +365,11 @@ public override void Write(byte[] buffer, int offset, int count)
 
         public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
         {
+            if (count == 0)
+            { 
+                return 0; 
+            }
+
             var tcs = new TaskCompletionSource<int>(this);
             AsyncCompletionResult asyncCompletionResult = Connection.BeginRead(0, Math.Min(count, Connection.AsyncReadBufferSize),
                 TimeoutHelper.FromMilliseconds(ReadTimeout), s_onReadComplete, tcs);
@@ -777,7 +782,7 @@ internal static void ValidateBufferBounds(int bufferSize, int offset, int size)
                 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ArgumentOutOfRangeException(nameof(offset), offset, SR.Format(SR.OffsetExceedsBufferSize, bufferSize)));
             }
 
-            if (size <= 0)
+            if (size < 0)
             {
                 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ArgumentOutOfRangeException(nameof(size), size, SR.ValueMustBePositive));
             }

diff --git a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/DetectEofStream.cs b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/DetectEofStream.cs
@@ -24,8 +24,9 @@ public override async Task<int> ReadAsync(byte[] buffer, int offset, int count,
             {
                 return 0;
             }
+
             int returnValue = await base.ReadAsync(buffer, offset, count, cancellationToken);
-            if (returnValue == 0)
+            if (count != 0 && returnValue == 0)
             {
                 ReceivedEof();
             }
@@ -49,7 +50,7 @@ public override int Read(byte[] buffer, int offset, int count)
                 return 0;
             }
             int returnValue = base.Read(buffer, offset, count);
-            if (returnValue == 0)
+            if (count != 0 && returnValue == 0)
             {
                 ReceivedEof();
             }

diff --git a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/ProducerConsumerStream.cs b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/ProducerConsumerStream.cs
@@ -39,6 +39,11 @@ public override void Flush()
 
         public override int Read(byte[] buffer, int offset, int count)
         {
+            if (count == 0)
+            {
+                return 0;
+            }
+
             try
             {
                 return ReadAsync(buffer, offset, count, CancellationToken.None).GetAwaiter().GetResult();
@@ -55,19 +60,24 @@ public override async Task<int> ReadAsync(byte[] buffer, int offset, int count,
         {
             if (buffer == null)
             {
-                throw new ArgumentNullException("buffer");
+                throw new ArgumentNullException(nameof(buffer));
             }
             if (offset < 0 || offset > buffer.Length)
             {
-                throw new ArgumentOutOfRangeException("offset");
+                throw new ArgumentOutOfRangeException(nameof(offset));
             }
-            if (count <= 0 || count > buffer.Length - offset)
+            if (count < 0 || count > buffer.Length - offset)
             {
-                throw new ArgumentOutOfRangeException("count");
+                throw new ArgumentOutOfRangeException(nameof(count));
             }
 
             cancellationToken.ThrowIfCancellationRequested();
 
+            if (count == 0)
+            {
+                return 0;
+            }
+
             // _dataAvail must be set before the disposed check to avoid a race condition
             // when Dispose is called just after the _disposed check which would result in
             // ReadAsync never completing.

diff --git a/...System.Private.ServiceModel/src/System/ServiceModel/Channels/SingletonConnectionReader.cs b/...System.Private.ServiceModel/src/System/ServiceModel/Channels/SingletonConnectionReader.cs
@@ -295,6 +295,11 @@ private void DecodeSize(byte[] buffer, ref int offset, ref int size)
 
             private int ReadCore(byte[] buffer, int offset, int count)
             {
+                if (count == 0)
+                {
+                    return 0;
+                }
+
                 int bytesRead = -1;
                 try
                 {

diff --git a/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/SocketConnection.cs b/src/System.Private.ServiceModel/src/System/ServiceModel/Channels/SocketConnection.cs
@@ -979,6 +979,12 @@ public virtual AsyncCompletionResult BeginRead(int offset, int size, TimeSpan ti
         private AsyncCompletionResult BeginReadCore(int offset, int size, TimeSpan timeout,
             Action<object> callback, object state)
         {
+            if (size == 0)
+            {
+                _asyncReadSize = 0;
+                return AsyncCompletionResult.Completed;
+            }
+
             bool abortRead = true;
 
             lock (ThisLock)