fix framework compiler flags

loresoft · Mar 19, 2024 · 348680d · 348680d
1 parent f543955
commit 348680d
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/src/FluentCommand.Csv/CsvCommandExtensions.cs b/src/FluentCommand.Csv/CsvCommandExtensions.cs
@@ -25,13 +25,16 @@ public static class CsvCommandExtensions
     /// </returns>
     public static string QueryCsv(this IDataCommand dataCommand, CsvConfiguration csvConfiguration = default)
     {
+        if (dataCommand is null)
+            throw new ArgumentNullException(nameof(dataCommand));
+
         using var stream = _memoryStreamManager.GetStream();
 
         QueryCsv(dataCommand, stream, csvConfiguration);
 
         var bytes = stream.GetReadOnlySequence();
 
-#if NETSTANDARD2_1_OR_GREATER
+#if NET5_0_OR_GREATER
         return Encoding.UTF8.GetString(bytes);
 #else
         return Encoding.UTF8.GetString(bytes.ToArray());
@@ -46,6 +49,11 @@ public static string QueryCsv(this IDataCommand dataCommand, CsvConfiguration cs
     /// <param name="csvConfiguration">The configuration used for the CSV writer</param>
     public static void QueryCsv(this IDataCommand dataCommand, Stream stream, CsvConfiguration csvConfiguration = default)
     {
+        if (dataCommand is null)
+            throw new ArgumentNullException(nameof(dataCommand));
+        if (stream is null)
+            throw new ArgumentNullException(nameof(stream));
+
         if (csvConfiguration == null)
             csvConfiguration = new CsvConfiguration(CultureInfo.InvariantCulture) { HasHeaderRecord = true };
 
@@ -70,12 +78,16 @@ public static void QueryCsv(this IDataCommand dataCommand, Stream stream, CsvCon
     /// </returns>
     public static async Task<string> QueryCsvAsync(this IDataCommand dataCommand, CsvConfiguration csvConfiguration = default, CancellationToken cancellationToken = default)
     {
+        if (dataCommand is null)
+            throw new ArgumentNullException(nameof(dataCommand));
+
         using var stream = _memoryStreamManager.GetStream();
 
         await QueryCsvAsync(dataCommand, stream, csvConfiguration, cancellationToken);
 
         var bytes = stream.GetReadOnlySequence();
-#if NETSTANDARD2_1_OR_GREATER
+
+#if NET5_0_OR_GREATER
         return Encoding.UTF8.GetString(bytes);
 #else
         return Encoding.UTF8.GetString(bytes.ToArray());
@@ -94,6 +106,11 @@ public static async Task<string> QueryCsvAsync(this IDataCommand dataCommand, Cs
     /// </returns>
     public static async Task QueryCsvAsync(this IDataCommand dataCommand, Stream stream, CsvConfiguration csvConfiguration = default, CancellationToken cancellationToken = default)
     {
+        if (dataCommand is null)
+            throw new ArgumentNullException(nameof(dataCommand));
+        if (stream is null)
+            throw new ArgumentNullException(nameof(stream));
+
         if (csvConfiguration == null)
             csvConfiguration = new CsvConfiguration(CultureInfo.InvariantCulture) { HasHeaderRecord = true };
 

diff --git a/src/FluentCommand.Json/JsonCommandExtensions.cs b/src/FluentCommand.Json/JsonCommandExtensions.cs
@@ -25,13 +25,16 @@ public static class JsonCommandExtensions
     /// </returns>
     public static string QueryJson(this IDataCommand dataCommand, JsonWriterOptions options = default)
     {
+        if (dataCommand is null)
+            throw new ArgumentNullException(nameof(dataCommand));
+
         using var stream = _memoryStreamManager.GetStream();
 
         QueryJson(dataCommand, stream, options);
 
         var bytes = stream.GetReadOnlySequence();
 
-#if NETSTANDARD2_1_OR_GREATER
+#if NET5_0_OR_GREATER
         return Encoding.UTF8.GetString(bytes);
 #else
         return Encoding.UTF8.GetString(bytes.ToArray());
@@ -49,6 +52,11 @@ public static string QueryJson(this IDataCommand dataCommand, JsonWriterOptions
     /// </returns>
     public static void QueryJson(this IDataCommand dataCommand, Stream stream, JsonWriterOptions options = default)
     {
+        if (dataCommand is null)
+            throw new ArgumentNullException(nameof(dataCommand));
+        if (stream is null)
+            throw new ArgumentNullException(nameof(stream));
+
         var writer = new Utf8JsonWriter(stream, options);
 
         writer.WriteStartArray();
@@ -72,13 +80,16 @@ public static void QueryJson(this IDataCommand dataCommand, Stream stream, JsonW
     /// </returns>
     public static async Task<string> QueryJsonAsync(this IDataCommand dataCommand, JsonWriterOptions options = default, CancellationToken cancellationToken = default)
     {
+        if (dataCommand is null)
+            throw new ArgumentNullException(nameof(dataCommand));
+
         using var stream = _memoryStreamManager.GetStream();
 
         await QueryJsonAsync(dataCommand, stream, options, cancellationToken);
 
         var bytes = stream.GetReadOnlySequence();
 
-#if NETSTANDARD2_1_OR_GREATER
+#if NET5_0_OR_GREATER
         return Encoding.UTF8.GetString(bytes);
 #else
         return Encoding.UTF8.GetString(bytes.ToArray());
@@ -98,6 +109,11 @@ public static async Task<string> QueryJsonAsync(this IDataCommand dataCommand, J
     /// </returns>
     public static async Task QueryJsonAsync(this IDataCommand dataCommand, Stream stream, JsonWriterOptions options = default, CancellationToken cancellationToken = default)
     {
+        if (dataCommand is null)
+            throw new ArgumentNullException(nameof(dataCommand));
+        if (stream is null)
+            throw new ArgumentNullException(nameof(stream));
+
         var writer = new Utf8JsonWriter(stream, options);
 
         writer.WriteStartArray();