Merge branch 'master' into feature/bump-proc

Author: Mpdreamz

.github/workflows/ci.yml

@@ -30,6 +30,8 @@ jobs:
     - uses: actions/setup-dotnet@v4.1.0
       with:
           global-json-file: global.json
+          dotnet-version: |
+              6.x
       env:
         NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
 

src/Elastic.Elasticsearch.Ephemeral/Tasks/IClusterComposeTask.cs

@@ -225,21 +225,23 @@ protected static void Extract(string file, string toFolder)
 
 		private static void ExtractTar(string file, string toFolder)
 		{
-			using (var inStream = File.OpenRead(file))
-			using (var tarArchive = TarArchive.CreateInputTarArchive(inStream))
-				tarArchive.ExtractContents(toFolder);
+			using var inStream = File.OpenRead(file);
+			using var tarArchive = TarArchive.CreateInputTarArchive(inStream);
+			tarArchive.ExtractContents(toFolder);
 		}
 
 		private static void ExtractTarGz(string file, string toFolder)
 		{
 			if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-				using (var inStream = File.OpenRead(file))
-				using (var gzipStream = new GZipInputStream(inStream))
-				using (var tarArchive = TarArchive.CreateInputTarArchive(gzipStream))
-					tarArchive.ExtractContents(toFolder);
+			{
+				using var inStream = File.OpenRead(file);
+				using var gzipStream = new GZipInputStream(inStream);
+				using var tarArchive = TarArchive.CreateInputTarArchive(gzipStream);
+				tarArchive.ExtractContents(toFolder);
+			}
 			else
 				//SharpZipLib loses permissions when untarring
-				Proc.Exec("tar", "-xvf", file, "-C", toFolder);
+				Proc.Exec("tar", "-zxvf", file, "-C", toFolder);
 		}
 
 		private static void ExtractZip(string file, string toFolder) =>