Merge pull request #1585 from microsoft/vnext

master release

Author: baywet

src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj

@@ -3,7 +3,7 @@
         <TargetFramework>netstandard2.0</TargetFramework>
         <LangVersion>latest</LangVersion>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>1.6.13</Version>
+        <Version>1.6.14</Version>
         <Description>OpenAPI.NET Readers for JSON and YAML documents</Description>
         <SignAssembly>true</SignAssembly>
         <!-- https://github.com/dotnet/sourcelink/blob/main/docs/README.md#embeduntrackedsources -->

src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs

@@ -41,14 +41,8 @@ public OpenApiStreamReader(OpenApiReaderSettings settings = null)
         /// <returns>Instance of newly created OpenApiDocument.</returns>
         public OpenApiDocument Read(Stream input, out OpenApiDiagnostic diagnostic)
         {
-            var reader = new StreamReader(input);
-            var result = new OpenApiTextReaderReader(_settings).Read(reader, out diagnostic);
-            if (!_settings.LeaveStreamOpen)
-            {
-                reader.Dispose();
-            }
-
-            return result;
+            using var reader = new StreamReader(input, default, true, -1, _settings.LeaveStreamOpen);
+            return new OpenApiTextReaderReader(_settings).Read(reader, out diagnostic);
         }
 
         /// <summary>
@@ -73,7 +67,7 @@ public async Task<ReadResult> ReadAsync(Stream input, CancellationToken cancella
                 bufferedStream.Position = 0;
             }
 
-            using var reader = new StreamReader(bufferedStream);
+            using var reader = new StreamReader(bufferedStream, default, true, -1, _settings.LeaveStreamOpen);
             return await new OpenApiTextReaderReader(_settings).ReadAsync(reader, cancellationToken);
         }
 
@@ -86,7 +80,7 @@ public async Task<ReadResult> ReadAsync(Stream input, CancellationToken cancella
         /// <returns>Instance of newly created OpenApiDocument</returns>
         public T ReadFragment<T>(Stream input, OpenApiSpecVersion version, out OpenApiDiagnostic diagnostic) where T : IOpenApiReferenceable
         {
-            using var reader = new StreamReader(input);
+            using var reader = new StreamReader(input, default, true, -1, _settings.LeaveStreamOpen);
             return new OpenApiTextReaderReader(_settings).ReadFragment<T>(reader, version, out diagnostic);
         }
     }

src/Microsoft.OpenApi/Microsoft.OpenApi.csproj

@@ -3,7 +3,7 @@
         <TargetFramework>netstandard2.0</TargetFramework>
         <LangVersion>Latest</LangVersion>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>1.6.13</Version>
+        <Version>1.6.14</Version>
         <Description>.NET models with JSON and YAML writers for OpenAPI specification</Description>
         <SignAssembly>true</SignAssembly>
         <!-- https://github.com/dotnet/sourcelink/blob/main/docs/README.md#embeduntrackedsources -->

test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiStreamReaderTests.cs

@@ -27,5 +27,21 @@ public void StreamShouldNotCloseIfLeaveStreamOpenSettingEqualsTrue()
             reader.Read(stream, out _);
             Assert.True(stream.CanRead);
         }
+
+        [Fact]
+        public async void StreamShouldNotBeDisposedIfLeaveStreamOpenSettingIsTrue()
+        {
+            var memoryStream = new MemoryStream();
+            using var fileStream = Resources.GetStream(Path.Combine(SampleFolderPath, "petStore.yaml"));
+
+            await fileStream.CopyToAsync(memoryStream);
+            memoryStream.Position = 0;
+            var stream = memoryStream;
+
+            var reader = new OpenApiStreamReader(new() { LeaveStreamOpen = true });
+            _ = await reader.ReadAsync(stream);
+            stream.Seek(0, SeekOrigin.Begin); // does not throw an object disposed exception
+            Assert.True(stream.CanRead);
+        }
     }
 }