FW 4.6+ targeting

Author: andrewvk

Main/src/TableData/CsvFormat.cs

@@ -38,7 +38,11 @@ private static string[] ParseCsv(TextReader reader, ref int lineNum, char separa
 			if (curChar.IsEol)
 			{
 				lineNum++;
+#if !FW452
+				return Array.Empty<string>();
+#else
 				return Array<string>.Empty;
+#endif
 			}
 
 			var result = new List<string>();
@@ -162,11 +166,15 @@ private static string[] ParseCsvNoEscape(TextReader reader, ref int lineNum, cha
 			var parts = line.Split(separator);
 			// Special case - whitespace lines are ignored
 			if (parts.Length == 1 && parts[0].IsNullOrWhiteSpace())
+#if !FW452
+				return Array.Empty<string>();
+#else
 				return Array<string>.Empty;
+#endif
 			return parts;
 		}
 
-		#region CharReader struct
+#region CharReader struct
 		private struct CharReader
 		{
 			private const int s_Eof = -1;
@@ -209,20 +217,20 @@ private static int Read(TextReader reader)
 
 			public CharReader Peek() => new CharReader(m_Reader, m_Reader.Peek());
 		}
-		#endregion
+#endregion
 
-		#region ParserState enum
+#region ParserState enum
 		private enum ParserState
 		{
 			ExpectField,
 			Field,
 			QuotedField,
 			AfterField
 		}
-		#endregion
-		#endregion
+#endregion
+#endregion
 
-		#region Formatter
+#region Formatter
 		/// <summary>
 		/// Creates formatter for CSV.
 		/// </summary>
@@ -278,7 +286,7 @@ public string FormatLine(string[] values, int[] columnWidths)
 
 		private class CsvNoEscapeFormatter : ITableDataFormatter
 		{
-			#region Implementation of ITableDataFormatter
+#region Implementation of ITableDataFormatter
 			/// <summary>
 			/// Returns length of formatted value.
 			/// </summary>
@@ -296,8 +304,8 @@ public string FormatLine(string[] values, int[] columnWidths) =>
 				values
 					.Zip(columnWidths, (s, w) => s.PadLeft(w))
 					.Join(", ");
-			#endregion
+#endregion
 		}
-		#endregion
+#endregion
 	}
 }

Main/src/TableData/FixedWidthFormat.cs

@@ -35,7 +35,11 @@ private static string[] Parse(TextReader reader, ref int lineNum, int[] widths)
 			if (line == null)
 				return null;
 			if (line.IsNullOrWhiteSpace())
+#if !FW452
+				return Array.Empty<string>();
+#else
 				return Array<string>.Empty;
+#endif
 
 			var pos = 0;
 			var result = new string[widths.Length];