Address PR comments II.

Author: 9swampy

src/GitVersion.Core.Tests/Formatting/DateFormatterTests.cs

@@ -17,8 +17,8 @@ public void TryFormat_NullValue_ReturnsFalse()
         formatted.ShouldBeEmpty();
     }
 
-    [TestCase("2021-01-01", "date:yyyy-MM-dd", "2021-01-01")]
-    [TestCase("2021-01-01T12:00:00Z", "date:yyyy-MM-ddTHH:mm:ssZ", "2021-01-01T12:00:00Z")]
+    [TestCase("2021-01-01", "yyyy-MM-dd", "2021-01-01")]
+    [TestCase("2021-01-01T12:00:00Z", "yyyy-MM-ddTHH:mm:ssZ", "2021-01-01T12:00:00Z")]
     public void TryFormat_ValidDateFormats_ReturnsExpectedResult(string input, string format, string expected)
     {
         var date = DateTime.Parse(input);
@@ -27,13 +27,4 @@ public void TryFormat_ValidDateFormats_ReturnsExpectedResult(string input, strin
         result.ShouldBeTrue();
         formatted.ShouldBe(expected);
     }
-
-    [Test]
-    public void TryFormat_UnsupportedFormat_ReturnsFalse()
-    {
-        var sut = new DateFormatter();
-        var result = sut.TryFormat(DateTime.Now, "unsupported", out var formatted);
-        result.ShouldBeFalse();
-        formatted.ShouldBeEmpty();
-    }
 }

src/GitVersion.Core.Tests/Formatting/FormattableFormatterTests.cs

@@ -19,6 +19,9 @@ public void TryFormat_NullValue_ReturnsFalse()
 
     [TestCase(123.456, "F2", "123.46")]
     [TestCase(1234.456, "F2", "1234.46")]
+    [TestCase(123.456, "C", "¤123.46")]
+    [TestCase(123.456, "P", "12345.60%")]
+    [TestCase(1234567890, "N0", "1,234,567,890")]
     public void TryFormat_ValidFormats_ReturnsExpectedResult(object input, string format, string expected)
     {
         var sut = new FormattableFormatter();
@@ -27,9 +30,6 @@ public void TryFormat_ValidFormats_ReturnsExpectedResult(object input, string fo
         formatted.ShouldBe(expected);
     }
 
-    [TestCase(123.456, "C", "Format 'C' is not supported in FormattableFormatter")]
-    [TestCase(123.456, "P", "Format 'P' is not supported in FormattableFormatter")]
-    [TestCase(1234567890, "N0", "Format 'N0' is not supported in FormattableFormatter")]
     [TestCase(1234567890, "Z", "Format 'Z' is not supported in FormattableFormatter")]
     public void TryFormat_UnsupportedFormat_ReturnsFalse(object input, string format, string expected)
     {

src/GitVersion.Core/Formatting/DateFormatter.cs

@@ -10,22 +10,18 @@ public bool TryFormat(object? value, string format, out string result)
     {
         result = string.Empty;
 
-        if (value is DateTime dt && format.StartsWith("date:"))
+        if (value is DateTime dt)
         {
-            var dateFormat = RemoveDatePrefix(format);
-            result = dt.ToString(dateFormat, CultureInfo.InvariantCulture);
+            result = dt.ToString(format, CultureInfo.InvariantCulture);
             return true;
         }
 
-        if (value is string dateStr && DateTime.TryParse(dateStr, out var parsedDate) && format.StartsWith("date:"))
+        if (value is string dateStr && DateTime.TryParse(dateStr, out var parsedDate))
         {
-            var dateFormat = format.Substring(5);
-            result = parsedDate.ToString(dateFormat, CultureInfo.InvariantCulture);
+            result = parsedDate.ToString(format, CultureInfo.InvariantCulture);
             return true;
         }
 
         return false;
     }
-
-    private static string RemoveDatePrefix(string format) => format.Substring(5);
 }

src/GitVersion.Core/Helpers/ExpressionCompiler.cs renamed to src/GitVersion.Core/Formatting/ExpressionCompiler.cs

@@ -1,6 +1,6 @@
 using System.Linq.Expressions;
 
-namespace GitVersion.Helpers;
+namespace GitVersion.Formatting;
 
 internal class ExpressionCompiler : IExpressionCompiler
 {

src/GitVersion.Core/Formatting/FormattableFormatter.cs

@@ -13,12 +13,6 @@ public bool TryFormat(object? value, string format, out string result)
         if (string.IsNullOrWhiteSpace(format))
             return false;
 
-        if (IsBlockedFormat(format))
-        {
-            result = $"Format '{format}' is not supported in {nameof(FormattableFormatter)}";
-            return false;
-        }
-
         if (value is IFormattable formattable)
         {
             try
@@ -35,9 +29,4 @@ public bool TryFormat(object? value, string format, out string result)
 
         return false;
     }
-
-    private static bool IsBlockedFormat(string format) =>
-        format.Equals("C", StringComparison.OrdinalIgnoreCase) ||
-        format.Equals("P", StringComparison.OrdinalIgnoreCase) ||
-        format.StartsWith("N", StringComparison.OrdinalIgnoreCase);
 }

src/GitVersion.Core/Helpers/IExpressionCompiler.cs renamed to src/GitVersion.Core/Formatting/IExpressionCompiler.cs

@@ -1,4 +1,4 @@
-namespace GitVersion.Helpers
+namespace GitVersion.Formatting
 {
     internal interface IExpressionCompiler
     {

src/GitVersion.Core/Helpers/IMemberResolver.cs renamed to src/GitVersion.Core/Formatting/IMemberResolver.cs

@@ -1,4 +1,4 @@
-namespace GitVersion.Helpers;
+namespace GitVersion.Formatting;
 
 internal interface IMemberResolver
 {

src/GitVersion.Core/Helpers/MemberResolver.cs renamed to src/GitVersion.Core/Formatting/MemberResolver.cs

@@ -1,4 +1,4 @@
-namespace GitVersion.Helpers;
+namespace GitVersion.Formatting;
 
 internal class MemberResolver : IMemberResolver
 {
@@ -29,15 +29,11 @@ public MemberInfo[] ResolveMemberPath(Type type, string memberExpression)
     public static List<MemberInfo>? FindMemberRecursive(Type type, string memberName, HashSet<Type> visited)
     {
         if (!visited.Add(type))
-        {
             return null;
-        }
 
         var member = FindDirectMember(type, memberName);
         if (member != null)
-        {
             return [member];
-        }
 
         foreach (var prop in type.GetProperties())
         {