From c4009fd4c752800b0c0150e674f45e53c4abd69f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?nils=20m=C3=A5s=C3=A9n?= <nils@piksel.se>
Date: Fri, 16 Dec 2022 16:19:36 +0100
Subject: [PATCH] fix(tar): enable async overrides on net6 (#811)

---
 src/ICSharpCode.SharpZipLib/Tar/TarBuffer.cs      | 4 ++--
 src/ICSharpCode.SharpZipLib/Tar/TarHeader.cs      | 2 +-
 src/ICSharpCode.SharpZipLib/Tar/TarInputStream.cs | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ICSharpCode.SharpZipLib/Tar/TarBuffer.cs b/src/ICSharpCode.SharpZipLib/Tar/TarBuffer.cs
index b987f1ce0..a0f9bab80 100644
--- a/src/ICSharpCode.SharpZipLib/Tar/TarBuffer.cs
+++ b/src/ICSharpCode.SharpZipLib/Tar/TarBuffer.cs
@@ -640,7 +640,7 @@ private async ValueTask CloseAsync(CancellationToken ct, bool isAsync)
 				{
 					if (isAsync)
 					{
-#if NETSTANDARD2_1_OR_GREATER
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 						await outputStream.DisposeAsync().ConfigureAwait(false);
 #else
 						outputStream.Dispose();
@@ -660,7 +660,7 @@ private async ValueTask CloseAsync(CancellationToken ct, bool isAsync)
 				{
 					if (isAsync)
 					{
-#if NETSTANDARD2_1_OR_GREATER
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 						await inputStream.DisposeAsync().ConfigureAwait(false);
 #else
 						inputStream.Dispose();
diff --git a/src/ICSharpCode.SharpZipLib/Tar/TarHeader.cs b/src/ICSharpCode.SharpZipLib/Tar/TarHeader.cs
index 36d6eca44..2ef3777aa 100644
--- a/src/ICSharpCode.SharpZipLib/Tar/TarHeader.cs
+++ b/src/ICSharpCode.SharpZipLib/Tar/TarHeader.cs
@@ -869,7 +869,7 @@ public static string ParseName(ReadOnlySpan<byte> header, Encoding encoding)
 					}
 				}
 
-#if NETSTANDARD2_1_OR_GREATER
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 				var value = encoding.GetString(header.Slice(0, count));
 #else
 				var value = encoding.GetString(header.ToArray(), 0, count);
diff --git a/src/ICSharpCode.SharpZipLib/Tar/TarInputStream.cs b/src/ICSharpCode.SharpZipLib/Tar/TarInputStream.cs
index c87c48d32..2cd646ae9 100644
--- a/src/ICSharpCode.SharpZipLib/Tar/TarInputStream.cs
+++ b/src/ICSharpCode.SharpZipLib/Tar/TarInputStream.cs
@@ -232,7 +232,7 @@ public override Task<int> ReadAsync(byte[] buffer, int offset, int count, Cancel
 			return ReadAsync(buffer.AsMemory().Slice(offset, count), cancellationToken, true).AsTask();
 		}
 
-#if NETSTANDARD2_1_OR_GREATER
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 		/// <summary>
 		/// Reads bytes from the current tar archive entry.
 		/// 
@@ -372,7 +372,7 @@ protected override void Dispose(bool disposing)
 			}
 		}
 
-#if NETSTANDARD2_1_OR_GREATER
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 		/// <summary>
 		/// Closes this stream. Calls the TarBuffer's close() method.
 		/// The underlying stream is closed by the TarBuffer.