NLog
diff --git a/‎src/NLog.Extensions.Logging/Logging/NLogMessageParameterList.cs
Lines changed: 6 additions & 6 deletions b/‎src/NLog.Extensions.Logging/Logging/NLogMessageParameterList.cs
Lines changed: 6 additions & 6 deletions
@@ -16,19 +16,19 @@ internal class NLogMessageParameterList : IList<MessageTemplateParameter>
         private static readonly NLogMessageParameterList OriginalMessageList = new NLogMessageParameterList(new[] { new KeyValuePair<string, object>(NLogLogger.OriginalFormatPropertyName, string.Empty) }, 0, default, default);
 
         private readonly IReadOnlyList<KeyValuePair<string, object>> _parameterList;
-        private readonly int? _originalMessageIndex;
+        private readonly int _originalMessageIndex;
         private readonly bool _hasComplexParameters;
         private readonly bool _isPositional;
 
         public bool HasComplexParameters => _hasComplexParameters;
         public bool IsPositional => _isPositional;
-        public int Count => _parameterList.Count - (_originalMessageIndex.HasValue ? 1 : 0);
+        public int Count => _originalMessageIndex != int.MaxValue ? _parameterList.Count - 1 : _parameterList.Count;
         public bool IsReadOnly => true;
 
         private NLogMessageParameterList(IReadOnlyList<KeyValuePair<string, object>> parameterList, int? originalMessageIndex, bool hasComplexParameters, bool isPositional)
         {
             _parameterList = parameterList;
-            _originalMessageIndex = originalMessageIndex;
+            _originalMessageIndex = originalMessageIndex ?? int.MaxValue;
             _hasComplexParameters = hasComplexParameters;
             _isPositional = isPositional;
         }
@@ -72,14 +72,14 @@ public static NLogMessageParameterList TryParse(IReadOnlyList<KeyValuePair<strin
 
         public bool HasMessageTemplateSyntax(bool parseMessageTemplates)
         {
-            return _originalMessageIndex.HasValue && (HasComplexParameters || (parseMessageTemplates && Count > 0));
+            return _originalMessageIndex != int.MaxValue && (HasComplexParameters || (parseMessageTemplates && _parameterList.Count > 1));
         }
 
         public string GetOriginalMessage(IReadOnlyList<KeyValuePair<string, object>> messageProperties)
         {
             if (_originalMessageIndex < messageProperties?.Count)
             {
-                return messageProperties[_originalMessageIndex.Value].Value as string;
+                return messageProperties[_originalMessageIndex].Value as string;
             }
             return null;
         }
@@ -179,7 +179,7 @@ public MessageTemplateParameter this[int index]
         {
             get
             {
-                var parameter = _parameterList[index >= _originalMessageIndex ? index + 1 : index];
+                var parameter = _parameterList[index < _originalMessageIndex ? index : index + 1];
                 return _hasComplexParameters ?
                     GetMessageTemplateParameter(parameter.Key, parameter.Value) :
                     new MessageTemplateParameter(parameter.Key, parameter.Value, null, CaptureType.Normal);
Original file line number	Diff line number	Diff line change
`@@ -16,19 +16,19 @@ internal class NLogMessageParameterList : IList<MessageTemplateParameter>`
`16`	`16`	`private static readonly NLogMessageParameterList OriginalMessageList = new NLogMessageParameterList(new[] { new KeyValuePair<string, object>(NLogLogger.OriginalFormatPropertyName, string.Empty) }, 0, default, default);`
`17`	`17`
`18`	`18`	`private readonly IReadOnlyList<KeyValuePair<string, object>> _parameterList;`
`19`		`- private readonly int? _originalMessageIndex;`
	`19`	`+ private readonly int _originalMessageIndex;`
`20`	`20`	`private readonly bool _hasComplexParameters;`
`21`	`21`	`private readonly bool _isPositional;`
`22`	`22`
`23`	`23`	`public bool HasComplexParameters => _hasComplexParameters;`
`24`	`24`	`public bool IsPositional => _isPositional;`
`25`		`- public int Count => _parameterList.Count - (_originalMessageIndex.HasValue ? 1 : 0);`
	`25`	`+ public int Count => _originalMessageIndex != int.MaxValue ? _parameterList.Count - 1 : _parameterList.Count;`
`26`	`26`	`public bool IsReadOnly => true;`
`27`	`27`
`28`	`28`	`private NLogMessageParameterList(IReadOnlyList<KeyValuePair<string, object>> parameterList, int? originalMessageIndex, bool hasComplexParameters, bool isPositional)`
`29`	`29`	`{`
`30`	`30`	`_parameterList = parameterList;`
`31`		`- _originalMessageIndex = originalMessageIndex;`
	`31`	`+ _originalMessageIndex = originalMessageIndex ?? int.MaxValue;`
`32`	`32`	`_hasComplexParameters = hasComplexParameters;`
`33`	`33`	`_isPositional = isPositional;`
`34`	`34`	`}`
`@@ -72,14 +72,14 @@ public static NLogMessageParameterList TryParse(IReadOnlyList<KeyValuePair<strin`
`72`	`72`
`73`	`73`	`public bool HasMessageTemplateSyntax(bool parseMessageTemplates)`
`74`	`74`	`{`
`75`		`- return _originalMessageIndex.HasValue && (HasComplexParameters \|\| (parseMessageTemplates && Count > 0));`
	`75`	`+ return _originalMessageIndex != int.MaxValue && (HasComplexParameters \|\| (parseMessageTemplates && _parameterList.Count > 1));`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`public string GetOriginalMessage(IReadOnlyList<KeyValuePair<string, object>> messageProperties)`
`79`	`79`	`{`
`80`	`80`	`if (_originalMessageIndex < messageProperties?.Count)`
`81`	`81`	`{`
`82`		`- return messageProperties[_originalMessageIndex.Value].Value as string;`
	`82`	`+ return messageProperties[_originalMessageIndex].Value as string;`
`83`	`83`	`}`
`84`	`84`	`return null;`
`85`	`85`	`}`
`@@ -179,7 +179,7 @@ public MessageTemplateParameter this[int index]`
`179`	`179`	`{`
`180`	`180`	`get`
`181`	`181`	`{`
`182`		`- var parameter = _parameterList[index >= _originalMessageIndex ? index + 1 : index];`
	`182`	`+ var parameter = _parameterList[index < _originalMessageIndex ? index : index + 1];`
`183`	`183`	`return _hasComplexParameters ?`
`184`	`184`	`GetMessageTemplateParameter(parameter.Key, parameter.Value) :`
`185`	`185`	`new MessageTemplateParameter(parameter.Key, parameter.Value, null, CaptureType.Normal);`