fix: fix sonarqube issues

Author: robertcoltheart

global.json

@@ -4,9 +4,6 @@
         "new-cli",
         "src"
     ],
-    "sdk": {
-        "version": "10.0.301"
-    },
     "test": {
         "runner": "Microsoft.Testing.Platform"
     }

src/GitVersion.Core.Tests/Extensions/StringFormatWithExtensionTests.cs

@@ -317,9 +317,9 @@ public void FormatProperty_NullInteger_WithFallback()
     public void FormatProperty_NullObject_WithFallback_Quoted()
     {
         var propertyObject = new { Property = (object?)null };
-        const string target = "{Property ?? \"fallback\"}";
+        const string target = "{Property ?? \"literal\"}";
         var actual = target.FormatWith(propertyObject, this.environment);
-        Assert.That(actual, Is.EqualTo("fallback"));
+        Assert.That(actual, Is.EqualTo("literal"));
     }
 
     [Test]

src/GitVersion.Core/Formatting/StringFormatWithExtension.cs

@@ -99,20 +99,17 @@ private static string EvaluateMatch(string input, Func<string, string?> memberEv
                     ? EvaluateEnvVar(token.Name, environment)
                     : memberEvaluator(token.Name);
 
-                if (value is not null && !string.IsNullOrEmpty(token.Format))
+                if (value is null)
                 {
-                    if (ValueFormatter.Default.TryFormat(value, InputSanitizer.SanitizeFormat(token.Format), out var formatted))
-                    {
-                        return formatted;
-                    }
-
-                    return value;
+                    continue;
                 }
 
-                if (value is not null)
+                if (!string.IsNullOrEmpty(token.Format) && ValueFormatter.Default.TryFormat(value, InputSanitizer.SanitizeFormat(token.Format), out var formatted))
                 {
-                    return value;
+                    return formatted;
                 }
+
+                return value;
             }
             catch (Exception e)
             {