Merge branch 'master' of https://github.com/exceptionless/Exceptionless.DateTimeExtensions into master

Author: ejsmith

.vscode/tasks.json

@@ -12,7 +12,8 @@
       "args": [
         "build",
         "${workspaceFolder}",
-        "/p:GenerateFullPaths=true"
+        "/p:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
       ],
       "problemMatcher": "$msCompile"
     },
@@ -27,7 +28,8 @@
       "args": [
         "test",
         "${workspaceFolder}",
-        "/p:GenerateFullPaths=true"
+        "/p:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
       ],
       "problemMatcher": "$msCompile"
     },

src/Exceptionless.DateTimeExtensions/TimeSpanExtensions.cs

@@ -148,14 +148,20 @@ public string ToString(int maxParts, bool shortForm = false, bool includeMillise
             if (seconds > 10)
                 seconds = Math.Round(seconds);
 
-            if (AppendPart(sb, "second", seconds, shortForm, ref partCount))
-                if (maxParts > 0 && partCount >= maxParts)
-                    return sb.ToString();
-
-            if (includeMilliseconds && AppendPart(sb, "millisecond", Milliseconds, shortForm, ref partCount))
-                if (maxParts > 0 && partCount >= maxParts)
-                    return sb.ToString();
-
+            if (Math.Abs(TotalSeconds) > 2) {
+                if (AppendPart(sb, "second", seconds, shortForm, ref partCount))
+                    if (maxParts > 0 && partCount >= maxParts)
+                        return sb.ToString();
+
+                if (includeMilliseconds && AppendPart(sb, "millisecond", Milliseconds, shortForm, ref partCount))
+                    if (maxParts > 0 && partCount >= maxParts)
+                        return sb.ToString();
+            } else {
+                if (AppendPart(sb, "millisecond", TotalMilliseconds, shortForm, ref partCount))
+                    if (maxParts > 0 && partCount >= maxParts)
+                        return sb.ToString();
+            }
+            
             return sb.ToString();
         }
 

tests/Exceptionless.DateTimeExtensions.Tests/Exceptionless.DateTimeExtensions.Tests.csproj

@@ -9,6 +9,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="Foundatio.Xunit" Version="10.0.0-beta8" />

tests/Exceptionless.DateTimeExtensions.Tests/TimeSpanExtensionTests.cs

@@ -6,13 +6,13 @@ public class TimeSpanExtensionTests {
         [Fact]
         public void ToWords() {
             TimeSpan value = TimeSpan.FromMilliseconds(100);
-            Assert.Equal("0.1 second", value.ToWords());
+            Assert.Equal("100 milliseconds", value.ToWords());
 
             value = TimeSpan.FromMilliseconds(-100);
-            Assert.Equal("-0.1 second", value.ToWords());
+            Assert.Equal("-100 milliseconds", value.ToWords());
 
             value = TimeSpan.FromMilliseconds(100);
-            Assert.Equal("0.1s", value.ToWords(true));
+            Assert.Equal("100ms", value.ToWords(true));
 
             value = TimeSpan.FromMilliseconds(2500);
             Assert.Equal("2.5 seconds", value.ToWords());