Merge pull request #20 from kevbite/issue19

Issue 19: Supporting Net Standard 2.0

Author: kevbite

src/Kevsoft.PDFtk/DataField.cs

@@ -21,10 +21,10 @@ internal static DataField Parse(string[] args)
             var dataField = new DataField();
             foreach (var arg in args)
             {
-                var split = arg.Split(":", 2);
+                var split = arg.Split(new []{':'}, 2);
                 var key = split[0];
 
-                var value = split.Length == 1 ? null : split[1][1..];
+                var value = split.Length == 1 ? null : split[1].Substring(1);
 
                 FieldSetMap[key](dataField, value);
             }

src/Kevsoft.PDFtk/Kevsoft.PDFtk.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

src/Kevsoft.PDFtk/PDFtk.cs

@@ -39,7 +39,7 @@ public PDFtk(PDFtkOptions options)
             {
                 var key = "NumberOfPages: ";
                 var line = executeProcessResult.StandardOutput
-                    .Split(Environment.NewLine)
+                    .Split(new[] { Environment.NewLine }, StringSplitOptions.None)
                     .Single(x => x.StartsWith(key));
 
                 pages = int.Parse(line.Substring(key.Length));
@@ -103,8 +103,8 @@ public async Task<IPDFtkResult<IDataField[]>> GetDataFieldsAsync(string filePath
             if (executeProcessResult.Success)
             {
                 dataFields = executeProcessResult.StandardOutput
-                    .Split("---" + Environment.NewLine, StringSplitOptions.RemoveEmptyEntries)
-                    .Select(x => x.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries))
+                    .Split(new[] { "---" + Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries)
+                    .Select(x => x.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries))
                     .Select(DataField.Parse)
                     .ToArray();
             }
@@ -190,7 +190,13 @@ private static async Task<IPDFtkResult<byte[]>> ResolveSingleFileExecutionResult
             var bytes = Array.Empty<byte>();
             if (executeProcessResult.Success)
             {
+#if NETSTANDARD2_0
+                bytes = File.ReadAllBytes(outputFile.TempFileName);
+                await Task.CompletedTask;
+
+#else
                 bytes = await File.ReadAllBytesAsync(outputFile.TempFileName);
+#endif
             }
 
             return new PDFtkResult<byte[]>(executeProcessResult, bytes);
@@ -206,13 +212,19 @@ private static async Task<IPDFtkResult<IReadOnlyCollection<KeyValuePair<string,
                 var outputFiles = Directory.GetFiles(outputDirectory.TempDirectoryFullName, searchPattern);
                 foreach (var outputFile in outputFiles)
                 {
+#if NETSTANDARD2_0
+                    var bytes = File.ReadAllBytes(outputFile);
+                    await Task.CompletedTask;
+#else
                     var bytes = await File.ReadAllBytesAsync(outputFile);
+#endif
                     var fileName = Path.GetFileName(outputFile);
-                    outputFileBytes.Add(KeyValuePair.Create(fileName, bytes));
+                    outputFileBytes.Add(new KeyValuePair<string, byte[]>(fileName, bytes));
                 }
             }
 
-            return new PDFtkResult<IReadOnlyCollection<KeyValuePair<string, byte[]>>>(executeProcessResult, outputFileBytes.AsReadOnly());
+            return new PDFtkResult<IReadOnlyCollection<KeyValuePair<string, byte[]>>>(executeProcessResult,
+                outputFileBytes.AsReadOnly());
         }
 
         /// <inheritdoc/>
@@ -272,10 +284,11 @@ public async Task<IPDFtkResult<IReadOnlyCollection<KeyValuePair<string, byte[]>>
 
             return await ResolveSingleDirectoryExecutionResultAsync(executeProcessResult, outputDirectory, "*");
         }
-        
-        
+
+
         /// <inheritdoc/>
-        public async Task<IPDFtkResult<byte[]>> AttachFiles(string pdfFilePath, IEnumerable<string> files, int? page = null)
+        public async Task<IPDFtkResult<byte[]>> AttachFiles(string pdfFilePath, IEnumerable<string> files,
+            int? page = null)
         {
             using var outputFile = TempPDFtkFile.Create();
             var args = new List<string>(7)
@@ -290,7 +303,7 @@ public async Task<IPDFtkResult<byte[]>> AttachFiles(string pdfFilePath, IEnumera
                 args.Add("to_page");
                 args.Add(p.ToString());
             }
-            
+
             args.Add("output");
             args.Add(outputFile.TempFileName);
             var executeProcessResult = await _pdftkProcess.ExecuteAsync(args.ToArray());

src/Kevsoft.PDFtk/PDFtkProcess.cs

@@ -32,7 +32,7 @@ internal async Task<ExecutionResult> ExecuteAsync(params string[] args)
             var standardOutput = await GetAllStreamAsync(process.StandardOutput);
             var standardError = await GetAllStreamAsync(process.StandardError);
 
-#if NETSTANDARD2_1
+#if NETSTANDARD2_1 || NETSTANDARD2_0
             process.WaitForExit();
 #else
             await process.WaitForExitAsync();

src/Kevsoft.PDFtk/TempPDFtkFile.cs

@@ -18,12 +18,17 @@ public static async Task<TempPDFtkFile> FromAsync(byte[] pdfFileBytes)
             var tempPdFtkFile = new TempPDFtkFile();
             if (pdfFileBytes is not null)
             {
+#if NETSTANDARD2_0
+                File.WriteAllBytes(tempPdFtkFile.TempFileName, pdfFileBytes);
+                await Task.CompletedTask;
+#else
                 await File.WriteAllBytesAsync(tempPdFtkFile.TempFileName, pdfFileBytes);
+#endif
             }
 
             return tempPdFtkFile;
         }
-        
+
         public static TempPDFtkFile Create()
         {
             return new();
@@ -33,8 +38,11 @@ public static async Task<TempPDFtkFile> FromAsync(Stream stream)
         {
             var tempPdFtkFile = new TempPDFtkFile();
 
+#if NETSTANDARD2_0
+            using var openWrite = File.OpenWrite(tempPdFtkFile.TempFileName);
+#else
             await using var openWrite = File.OpenWrite(tempPdFtkFile.TempFileName);
-
+#endif
             await stream.CopyToAsync(openWrite);
 
             return tempPdFtkFile;

src/Kevsoft.PDFtk/TempPDFtkFiles.cs

@@ -24,10 +24,19 @@ public void Dispose()
         public static async Task<TempPDFtkFiles> FromAsync(IEnumerable<KeyValuePair<string, byte[]>> attachments)
         {
             var tempPdFtkFiles = new TempPDFtkFiles();
-            foreach (var (fileName, content) in attachments)
+            foreach (var kvp in attachments)
             {
-                await File.WriteAllBytesAsync(Path.Combine(tempPdFtkFiles._directory.TempDirectoryFullName, fileName),
+                var fileName = kvp.Key;
+                var content = kvp.Value;
+
+#if NETSTANDARD2_0
+                File.WriteAllBytes(Path.Combine(tempPdFtkFiles._directory.TempDirectoryFullName, fileName),
+                    content);
+                await Task.CompletedTask;
+#else
+                   await File.WriteAllBytesAsync(Path.Combine(tempPdFtkFiles._directory.TempDirectoryFullName, fileName),
                     content);
+#endif
             }
 
             return tempPdFtkFiles;
@@ -36,10 +45,19 @@ await File.WriteAllBytesAsync(Path.Combine(tempPdFtkFiles._directory.TempDirecto
         public static async Task<TempPDFtkFiles> FromAsync(IEnumerable<KeyValuePair<string, Stream>> attachments)
         {
             var tempPdFtkFiles = new TempPDFtkFiles();
-            foreach (var (fileName, stream) in attachments)
+            foreach (var kvp in attachments)
             {
-                await using var openWrite =
+                var fileName = kvp.Key;
+                var stream = kvp.Value;
+
+#if NETSTANDARD2_0
+                using var openWrite =
+                    File.OpenWrite(Path.Combine(tempPdFtkFiles._directory.TempDirectoryFullName, fileName));
+
+#else
+                    await using var openWrite =
                     File.OpenWrite(Path.Combine(tempPdFtkFiles._directory.TempDirectoryFullName, fileName));
+#endif
 
                 await stream.CopyToAsync(openWrite);
             }

src/Kevsoft.PDFtk/XfdfGenerator.cs

@@ -15,7 +15,7 @@ internal async Task<TempPDFtkFile> CreateXfdfFile(IReadOnlyDictionary<string, st
                 Async = true
             };
 
-#if NETSTANDARD2_1
+#if NETSTANDARD2_1 || NETSTANDARD2_0
             using var xmlWriter =
                 XmlWriter.Create(inputFile.TempFileName, xmlWriterSettings);
 #else
@@ -48,9 +48,9 @@ private static async Task WriteFieldsElement(XmlWriter xmlWriter, IReadOnlyDicti
         {
             await xmlWriter.WriteStartElementAsync(null, "fields", null);
 
-            foreach (var (key, value) in fieldData)
+            foreach (var kvp in fieldData)
             {
-                await WriteField(xmlWriter, key, value);
+                await WriteField(xmlWriter, kvp.Key, kvp.Value);
             }
 
             await xmlWriter.WriteEndElementAsync();