Fixed date formatting not taking Am/PM into account correctly. More test cases. Updated .Net Core on test project

Author: franknorton

src/ExcelNumberFormat/Formatter.cs

@@ -129,6 +129,7 @@ private static string FormatTimeSpan(TimeSpan timeSpan, List<string> tokens, Cul
 
         private static string FormatDate(DateTime date, List<string> tokens, CultureInfo culture)
         {
+            var containsAmPm = tokens.Contains("AM/PM") || tokens.Contains("A/P");
             var result = new StringBuilder();
             for (var i = 0; i < tokens.Count; i++)
             {
@@ -200,7 +201,10 @@ private static string FormatDate(DateTime date, List<string> tokens, CultureInfo
                 else if (token.StartsWith("h", StringComparison.OrdinalIgnoreCase))
                 {
                     var digits = token.Length;
-                    result.Append(date.Hour.ToString("D" + digits));
+                    if(containsAmPm)
+                        result.Append(date.ToString("%h"));
+                    else
+                        result.Append(date.Hour.ToString("D" + digits));
                 }
                 else if (token.StartsWith("s", StringComparison.OrdinalIgnoreCase))
                 {
@@ -234,7 +238,7 @@ private static string FormatDate(DateTime date, List<string> tokens, CultureInfo
                 }
                 else if (string.Compare(token, "a/p", StringComparison.OrdinalIgnoreCase) == 0)
                 {
-                    var ampm = date.ToString("t", CultureInfo.InvariantCulture);
+                    var ampm = date.ToString("%t", CultureInfo.InvariantCulture);
                     if (char.IsUpper(token[0]))
                     {
                         result.Append(ampm.ToUpperInvariant());

test/ExcelNumberFormat.Tests/Class1.cs

@@ -130,6 +130,9 @@ public void TestDate()
             Test(new DateTime(2010, 9, 26), "m/d/yy", "9/26/10");
             Test(new DateTime(2010, 9, 26, 12, 34, 56, 123), "m/d/yy hh:mm:ss.000", "9/26/10 12:34:56.123");
             Test(new DateTime(2010, 9, 26, 12, 34, 56, 123), "YYYY-MM-DD HH:MM:SS", "2010-09-26 12:34:56");
+            Test(new DateTime(2020, 1, 1, 14, 35, 55), "m/d/yyyy\\ h:mm:ss AM/PM;@", "1/1/2020 2:35:55 PM");
+            Test(new DateTime(2020, 1, 1, 14, 35, 55), "m/d/yyyy\\ h:mm:ss A/P;@", "1/1/2020 2:35:55 P");
+            Test(new DateTime(2020, 1, 1, 14, 35, 55), "m/d/yyyy\\ h:mm:ss;@", "1/1/2020 14:35:55");
         }
 
         [TestMethod]

test/ExcelNumberFormat.Tests/ExcelNumberFormat.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>