Merge branch 'release/8.3.0'

Jericho · Jericho · commit 86854157b816 · 2024-01-10T11:51:16.000-05:00
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "3.0.0",
+      "version": "4.0.0",
       "commands": [
         "dotnet-cake"
       ]
diff --git a/Source/HttpMultipartParser.Benchmark/HttpMultipartParser.Benchmark.csproj b/Source/HttpMultipartParser.Benchmark/HttpMultipartParser.Benchmark.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.3" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/HttpMultipartParser.UnitTests/HttpMultipartFormParserUnitTests.cs b/Source/HttpMultipartParser.UnitTests/HttpMultipartFormParserUnitTests.cs
@@ -46,7 +46,7 @@ public void ConstructingWithNullStreamFails()
 		[Fact]
 		public async Task ConstructingWithNullStreamFailsAsync()
 		{
-			await Assert.ThrowsAsync<ArgumentNullException>(() => MultipartFormDataParser.ParseAsync(Stream.Null)).ConfigureAwait(false);
+			await Assert.ThrowsAsync<ArgumentNullException>(() => MultipartFormDataParser.ParseAsync(Stream.Null));
 		}
 
 		/// <summary>
@@ -89,7 +89,7 @@ line 3
 
 			using (Stream stream = TestUtil.StringToStream(request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
 				Assert.Equal($"line 1{Environment.NewLine}line 2{Environment.NewLine}line 3", parser.GetParameterValue("multilined"));
 				Assert.Equal($"line 1{Environment.NewLine}line 2{Environment.NewLine}line 3", parser.GetParameterValues("multilined").First());
 			}
@@ -139,7 +139,7 @@ public async Task HandlesFileWithLastCrLfAtBufferLengthAsync()
 
 			using (Stream stream = TestUtil.StringToStream(request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
 			}
 		}
 
@@ -187,7 +187,7 @@ public async Task HandlesFileWithLastCrLfImmediatlyAfterBufferLengthAsync()
 
 			using (Stream stream = TestUtil.StringToStream(request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
 			}
 		}
 
@@ -211,7 +211,7 @@ public async Task HandlesFileWithoutFilename()
 
 			using (Stream stream = TestUtil.StringToStream(request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
 				Assert.Single(parser.Files);
 			}
 		}
diff --git a/Source/HttpMultipartParser.UnitTests/HttpMultipartParser.UnitTests.csproj b/Source/HttpMultipartParser.UnitTests/HttpMultipartParser.UnitTests.csproj
@@ -7,13 +7,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="3.2.0">
+    <PackageReference Include="coverlet.msbuild" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.6.5" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/BlankLinesBeforeFirstBoundary.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/BlankLinesBeforeFirstBoundary.cs
@@ -56,7 +56,7 @@ public async Task CanAutoDetectBoundaryAsync()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/EmptyForm.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/EmptyForm.cs
@@ -51,7 +51,7 @@ public async Task Parse_empty_form_boundary_specified_async()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, "----WebKitFormBoundaryb4SfPlH9Bv7c2PKS").ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, "----WebKitFormBoundaryb4SfPlH9Bv7c2PKS");
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
@@ -61,7 +61,7 @@ public async Task Parse_empty_form_boundary_omitted_async()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/ExactBufferTruncate.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/ExactBufferTruncate.cs
@@ -67,7 +67,7 @@ public async Task CanHandleFinalDashesInSeperateBufferFromEndBinaryAsync()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, 16).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, 16);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/FileIsLast.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/FileIsLast.cs
@@ -57,7 +57,7 @@ public async Task CanHandleFileAsLastSectionAsync()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/FileWithAdditionalParameter.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/FileWithAdditionalParameter.cs
@@ -56,7 +56,7 @@ public async Task FileWithAdditionalParameterTest_Async()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/FullPathAsFileName.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/FullPathAsFileName.cs
@@ -48,7 +48,7 @@ public async Task HandlesFullPathAsFileNameWithSemicolonCorrectlyAsync()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/InvalidPart.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/InvalidPart.cs
@@ -44,7 +44,7 @@ public async Task Exception_is_thrown_when_attempting_to_parse_async()
 			// The default behavior is to throw an exception when the form contains an invalid section.
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				await Assert.ThrowsAsync<MultipartParseException>(() => MultipartFormDataParser.ParseAsync(stream)).ConfigureAwait(false);
+				await Assert.ThrowsAsync<MultipartParseException>(() => MultipartFormDataParser.ParseAsync(stream));
 			}
 		}
 
@@ -54,8 +54,8 @@ public void Invalid_part_is_ignored()
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
 				var parser = MultipartFormDataParser.Parse(stream, ignoreInvalidParts: true);
-				Assert.Equal(0, parser.Files.Count);
-				Assert.Equal(0, parser.Parameters.Count);
+				Assert.Empty(parser.Files);
+				Assert.Empty(parser.Parameters);
 			}
 		}
 
@@ -64,9 +64,9 @@ public async Task Invalid_part_is_ignored_async()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, ignoreInvalidParts: true).ConfigureAwait(false);
-				Assert.Equal(0, parser.Files.Count);
-				Assert.Equal(0, parser.Parameters.Count);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, ignoreInvalidParts: true);
+				Assert.Empty(parser.Files);
+				Assert.Empty(parser.Parameters);
 			}
 		}
 	}
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/MixedSingleByteAndMultiByteWidth.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/MixedSingleByteAndMultiByteWidth.cs
@@ -58,7 +58,7 @@ public async Task CanHandleMixedSingleByteAndMultiByteWidthCharactersAsync()
 				Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8)
 				)
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/MixedUnicodeWidthAndAsciiWidthCharacters.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/MixedUnicodeWidthAndAsciiWidthCharacters.cs
@@ -49,7 +49,7 @@ public async Task CanHandleUnicodeWidthAndAsciiWidthCharactersAsync()
 			using (
 				Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/MjpegStream.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/MjpegStream.cs
@@ -64,7 +64,7 @@ public async Task MjpegStreamTest_Async()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, "MOBOTIX_Fast_Serverpush", Encoding.UTF8, 32).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, "MOBOTIX_Fast_Serverpush", Encoding.UTF8, 32);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/MultipleFilesWithEmptyName.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/MultipleFilesWithEmptyName.cs
@@ -64,7 +64,7 @@ public async Task MultipleFilesWithNoNameAsync()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, 16).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, 16);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/MultipleFilesWithOmittedName.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/MultipleFilesWithOmittedName.cs
@@ -64,7 +64,7 @@ public async Task MultipleFilesWithOmittedNameAsync()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, 16).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, 16);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/MultipleFilesWithSameName.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/MultipleFilesWithSameName.cs
@@ -64,7 +64,7 @@ public async Task MultipleFilesWithSameNameTestAsync()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, 16).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, 16);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/MultipleParamsAndFiles.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/MultipleParamsAndFiles.cs
@@ -78,7 +78,7 @@ public async Task MultipleFilesAndParamsTestAsync()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, 16).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, 16);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/SeveralValuesWithSameProperty.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/SeveralValuesWithSameProperty.cs
@@ -57,7 +57,7 @@ public async Task AcceptSeveralValuesWithSamePropertyAsync()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/SingleFile.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/SingleFile.cs
@@ -55,7 +55,7 @@ public async Task SingleFileTest_Async()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, 16).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, 16);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/SmallData.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/SmallData.cs
@@ -73,8 +73,8 @@ public async Task SmallDataTestAsync()
 			{
 				// The boundary is missing the first two -- in accordance with the multipart
 				// spec. (A -- is added by the parser, this boundary is what would be sent in the
-				// requset header)
-				var parser = await MultipartFormDataParser.ParseAsync(stream, "---------------------------265001916915724").ConfigureAwait(false);
+				// request header)
+				var parser = await MultipartFormDataParser.ParseAsync(stream, "---------------------------265001916915724");
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/StreamPositionHasBeenMoved.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/StreamPositionHasBeenMoved.cs
@@ -96,12 +96,12 @@ public async Task End_of_stream_and_boundary_is_known_async()
 			{
 				// Move the Position to the end of the stream
 				var sr = new StreamReader(stream);
-				var content = await sr.ReadToEndAsync().ConfigureAwait(false);
+				var content = await sr.ReadToEndAsync();
 
 				// When the developer provides the boundary, the parser does not have to determine the boundary
 				// and therefore the DetectBoundary method is not invoked which avoids the problem altogether.
 				// However, the parser is unable to find the provided boundary and throws a meaningful exception.
-				await Assert.ThrowsAsync<MultipartParseException>(() => MultipartFormDataParser.ParseAsync(stream, "MyBoundary")).ConfigureAwait(false);
+				await Assert.ThrowsAsync<MultipartParseException>(() => MultipartFormDataParser.ParseAsync(stream, "MyBoundary"));
 			}
 		}
 
@@ -112,10 +112,10 @@ public async Task End_of_stream_and_boundary_is_unknown_async()
 			{
 				// Move the Position to the end of the stream
 				var sr = new StreamReader(stream);
-				var content = await sr.ReadToEndAsync().ConfigureAwait(false);
+				var content = await sr.ReadToEndAsync();
 
 				// As of March 2022, the problem was resolved by throwing a more descriptive exception
-				await Assert.ThrowsAsync<MultipartParseException>(() => MultipartFormDataParser.ParseAsync(stream)).ConfigureAwait(false);
+				await Assert.ThrowsAsync<MultipartParseException>(() => MultipartFormDataParser.ParseAsync(stream));
 			}
 		}
 
@@ -130,7 +130,7 @@ public async Task Middle_of_stream_and_boundary_is_known_async()
 				// When the developer provides the boundary, the parser does not have to determine the boundary
 				// and therefore the DetectBoundary method is not invoked which avoids the problem altogether.
 				// However, the parser is unable to find the provided boundary and throws a meaningful exception.
-				await Assert.ThrowsAsync<MultipartParseException>(() => MultipartFormDataParser.ParseAsync(stream, "MyBoundary")).ConfigureAwait(false);
+				await Assert.ThrowsAsync<MultipartParseException>(() => MultipartFormDataParser.ParseAsync(stream, "MyBoundary"));
 			}
 		}
 
@@ -143,7 +143,7 @@ public async Task Middle_of_stream_and_boundary_is_unknown_async()
 				stream.Position = 3;
 
 				// As of March 2022, the problem was resolved by throwing a more descriptive exception
-				await Assert.ThrowsAsync<MultipartParseException>(() => MultipartFormDataParser.ParseAsync(stream)).ConfigureAwait(false);
+				await Assert.ThrowsAsync<MultipartParseException>(() => MultipartFormDataParser.ParseAsync(stream));
 			}
 		}
 	}
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/TinyData.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/TinyData.cs
@@ -67,7 +67,7 @@ public async Task CanAutoDetectBoundaryAsync()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
@@ -95,7 +95,7 @@ public async Task CanDetectBoundariesCrossBufferAsync()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, 16).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, 16);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
@@ -127,7 +127,7 @@ public async Task CorrectlyHandleMixedNewlineFormatsAsync()
 			string request = regex.Replace(_testCase.Request, "\r\n", 1);
 			using (Stream stream = TestUtil.StringToStream(request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
@@ -155,7 +155,7 @@ public async Task CorrectlyHandlesCRLFAsync()
 			string request = _testCase.Request.Replace("\n", "\r\n");
 			using (Stream stream = TestUtil.StringToStream(request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
@@ -181,7 +181,7 @@ public async Task TinyDataTestAsync()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8);
 				Assert.True(_testCase.Validate(parser));
 			}
 		}
@@ -204,7 +204,7 @@ public async Task DoesNotCloseTheStreamAsync()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8);
 				Assert.True(_testCase.Validate(parser));
 
 				stream.Position = 0;
@@ -227,7 +227,7 @@ public async Task GetParameterValueReturnsNullIfNoParameterFoundAsync()
 		{
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
-				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8).ConfigureAwait(false);
+				var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8);
 				Assert.Null(parser.GetParameterValue("does not exist"));
 			}
 		}
@@ -296,7 +296,7 @@ public async Task CanDetectBoundriesWithNewLineInNextBufferAsync()
 			{
 				using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 				{
-					var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, i).ConfigureAwait(false);
+					var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, i);
 					Assert.True(_testCase.Validate(parser), $"Failure in buffer length {i}");
 				}
 			}
diff --git a/Source/HttpMultipartParser.UnitTests/ParserScenarios/UnclosedBoundary.cs b/Source/HttpMultipartParser.UnitTests/ParserScenarios/UnclosedBoundary.cs
@@ -48,7 +48,7 @@ public async Task DoesntInfiniteLoopOnUnclosedInputAsync()
 			using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))
 			{
 				// We expect this to throw!
-				await Assert.ThrowsAsync<MultipartParseException>(() => MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8)).ConfigureAwait(false);
+				await Assert.ThrowsAsync<MultipartParseException>(() => MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8));
 			}
 		}
 	}
diff --git a/Source/HttpMultipartParser.UnitTests/RebufferableBinaryReaderUnitTests.cs b/Source/HttpMultipartParser.UnitTests/RebufferableBinaryReaderUnitTests.cs
diff --git a/Source/HttpMultipartParser/HttpMultipartParser.csproj b/Source/HttpMultipartParser/HttpMultipartParser.csproj
diff --git a/appveyor.psm1 b/appveyor.psm1
diff --git a/appveyor.yml b/appveyor.yml
diff --git a/build.cake b/build.cake
diff --git a/global.json b/global.json

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"isRoot": true,`
`4`	`4`	`"tools": {`
`5`	`5`	`"cake.tool": {`
`6`		`- "version": "3.0.0",`
	`6`	`+ "version": "4.0.0",`
`7`	`7`	`"commands": [`
`8`	`8`	`"dotnet-cake"`
`9`	`9`	`]`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public void ConstructingWithNullStreamFails()`
`46`	`46`	`[Fact]`
`47`	`47`	`public async Task ConstructingWithNullStreamFailsAsync()`
`48`	`48`	`{`
`49`		`- await Assert.ThrowsAsync<ArgumentNullException>(() => MultipartFormDataParser.ParseAsync(Stream.Null)).ConfigureAwait(false);`
	`49`	`+ await Assert.ThrowsAsync<ArgumentNullException>(() => MultipartFormDataParser.ParseAsync(Stream.Null));`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`/// <summary>`
`@@ -89,7 +89,7 @@ line 3`
`89`	`89`
`90`	`90`	`using (Stream stream = TestUtil.StringToStream(request, Encoding.UTF8))`
`91`	`91`	`{`
`92`		`- var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8).ConfigureAwait(false);`
	`92`	`+ var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);`
`93`	`93`	`Assert.Equal($"line 1{Environment.NewLine}line 2{Environment.NewLine}line 3", parser.GetParameterValue("multilined"));`
`94`	`94`	`Assert.Equal($"line 1{Environment.NewLine}line 2{Environment.NewLine}line 3", parser.GetParameterValues("multilined").First());`
`95`	`95`	`}`
`@@ -139,7 +139,7 @@ public async Task HandlesFileWithLastCrLfAtBufferLengthAsync()`
`139`	`139`
`140`	`140`	`using (Stream stream = TestUtil.StringToStream(request, Encoding.UTF8))`
`141`	`141`	`{`
`142`		`- var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8).ConfigureAwait(false);`
	`142`	`+ var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`
`@@ -187,7 +187,7 @@ public async Task HandlesFileWithLastCrLfImmediatlyAfterBufferLengthAsync()`
`187`	`187`
`188`	`188`	`using (Stream stream = TestUtil.StringToStream(request, Encoding.UTF8))`
`189`	`189`	`{`
`190`		`- var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8).ConfigureAwait(false);`
	`190`	`+ var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);`
`191`	`191`	`}`
`192`	`192`	`}`
`193`	`193`
`@@ -211,7 +211,7 @@ public async Task HandlesFileWithoutFilename()`
`211`	`211`
`212`	`212`	`using (Stream stream = TestUtil.StringToStream(request, Encoding.UTF8))`
`213`	`213`	`{`
`214`		`- var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8).ConfigureAwait(false);`
	`214`	`+ var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);`
`215`	`215`	`Assert.Single(parser.Files);`
`216`	`216`	`}`
`217`	`217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public async Task CanAutoDetectBoundaryAsync()`
`56`	`56`	`{`
`57`	`57`	`using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))`
`58`	`58`	`{`
`59`		`- var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8).ConfigureAwait(false);`
	`59`	`+ var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);`
`60`	`60`	`Assert.True(_testCase.Validate(parser));`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public async Task Parse_empty_form_boundary_specified_async()`
`51`	`51`	`{`
`52`	`52`	`using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))`
`53`	`53`	`{`
`54`		`- var parser = await MultipartFormDataParser.ParseAsync(stream, "----WebKitFormBoundaryb4SfPlH9Bv7c2PKS").ConfigureAwait(false);`
	`54`	`+ var parser = await MultipartFormDataParser.ParseAsync(stream, "----WebKitFormBoundaryb4SfPlH9Bv7c2PKS");`
`55`	`55`	`Assert.True(_testCase.Validate(parser));`
`56`	`56`	`}`
`57`	`57`	`}`
`@@ -61,7 +61,7 @@ public async Task Parse_empty_form_boundary_omitted_async()`
`61`	`61`	`{`
`62`	`62`	`using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))`
`63`	`63`	`{`
`64`		`- var parser = await MultipartFormDataParser.ParseAsync(stream).ConfigureAwait(false);`
	`64`	`+ var parser = await MultipartFormDataParser.ParseAsync(stream);`
`65`	`65`	`Assert.True(_testCase.Validate(parser));`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public async Task CanHandleFinalDashesInSeperateBufferFromEndBinaryAsync()`
`67`	`67`	`{`
`68`	`68`	`using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))`
`69`	`69`	`{`
`70`		`- var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, 16).ConfigureAwait(false);`
	`70`	`+ var parser = await MultipartFormDataParser.ParseAsync(stream, "boundary", Encoding.UTF8, 16);`
`71`	`71`	`Assert.True(_testCase.Validate(parser));`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public async Task CanHandleFileAsLastSectionAsync()`
`57`	`57`	`{`
`58`	`58`	`using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))`
`59`	`59`	`{`
`60`		`- var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8).ConfigureAwait(false);`
	`60`	`+ var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);`
`61`	`61`	`Assert.True(_testCase.Validate(parser));`
`62`	`62`	`}`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public async Task FileWithAdditionalParameterTest_Async()`
`56`	`56`	`{`
`57`	`57`	`using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))`
`58`	`58`	`{`
`59`		`- var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8).ConfigureAwait(false);`
	`59`	`+ var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);`
`60`	`60`	`Assert.True(_testCase.Validate(parser));`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public async Task HandlesFullPathAsFileNameWithSemicolonCorrectlyAsync()`
`48`	`48`	`{`
`49`	`49`	`using (Stream stream = TestUtil.StringToStream(_testCase.Request, Encoding.UTF8))`
`50`	`50`	`{`
`51`		`- var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8).ConfigureAwait(false);`
	`51`	`+ var parser = await MultipartFormDataParser.ParseAsync(stream, Encoding.UTF8);`
`52`	`52`	`Assert.True(_testCase.Validate(parser));`
`53`	`53`	`}`
`54`	`54`	`}`