modify call-chain from Span<object> to ROS<object>, slice in AvTraceEventHandler

h3xds1nz · h3xds1nz · commit d19d7e029d39 · 2025-04-03T13:25:47.000+02:00
diff --git a/eng/WpfArcadeSdk/tools/CodeGen/AvTrace/AvTraceMessages.tt b/eng/WpfArcadeSdk/tools/CodeGen/AvTrace/AvTraceMessages.tt
@@ -70,13 +70,13 @@ namespace MS.Internal
 <#		} #>
 
         /// <summary> Send a single trace output </summary>
-        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
 
         /// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>
-        public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Generated/AvTraceMessages.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Generated/AvTraceMessages.cs
@@ -69,13 +69,13 @@ public static AvTraceDetails InvokeHandlers
         }
 
         /// <summary> Send a single trace output </summary>
-        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
 
         /// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>
-        public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
@@ -216,13 +216,13 @@ public static AvTraceDetails AnimateStorageValidationNoLongerFailing
         }
 
         /// <summary> Send a single trace output </summary>
-        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
 
         /// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>
-        public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Generated/AvTraceMessages.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/Generated/AvTraceMessages.cs
@@ -1333,13 +1333,13 @@ public static AvTraceDetails XmlBuildCollection(params object[] args)
         }
 
         /// <summary> Send a single trace output </summary>
-        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
 
         /// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>
-        public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
@@ -1424,13 +1424,13 @@ public static AvTraceDetails UnableToFreezeAnimatedProperties
         }
 
         /// <summary> Send a single trace output </summary>
-        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
 
         /// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>
-        public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
@@ -1627,13 +1627,13 @@ public static AvTraceDetails SetKey
         }
 
         /// <summary> Send a single trace output </summary>
-        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
 
         /// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>
-        public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
@@ -1886,13 +1886,13 @@ public static AvTraceDetails TypeConvertFallback
         }
 
         /// <summary> Send a single trace output </summary>
-        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
 
         /// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>
-        public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
@@ -1935,13 +1935,13 @@ public static AvTraceDetails HwndHostIn3D
         }
 
         /// <summary> Send a single trace output </summary>
-        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
 
         /// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>
-        public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters )
+        public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
@@ -2060,13 +2060,13 @@ public static AvTraceDetails RejectingJumpListCategoryBecauseNoRegisteredHandler
         }
 
         /// <summary> Send a single trace output </summary>
-        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
 
         /// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>
-        public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/TraceData.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/TraceData.cs
@@ -87,14 +87,13 @@ public static bool IsExtendedTraceEnabled(object element, TraceDataLevel level)
         }
 
         // report/describe any additional parameters passed to TraceData.Trace()
-        public static void OnTrace(AvTraceBuilder traceBuilder, ReadOnlySpan<object> parameters, int start)
+        public static void OnTrace(AvTraceBuilder traceBuilder, ReadOnlySpan<object> parameters)
         {
-            for( int i = start; i < parameters.Length; i++ )
+            for (int i = 0; i < parameters.Length; i++)
             {
                 object o = parameters[i];
-                string s = o as string;
                 traceBuilder.Append(" ");
-                if (s != null)
+                if (o is string s)
                 {
                     traceBuilder.Append(s);
                 }
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/AvTrace.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/AvTrace.cs
@@ -246,7 +246,7 @@ internal static bool IsDebuggerAttached()
         //  note: labels start at index 1, parameters start at index 0
         //
 
-        public string Trace(TraceEventType type, int eventId, string message, string[] labels, params Span<object> parameters)
+        public string Trace(TraceEventType type, int eventId, string message, string[] labels, params ReadOnlySpan<object> parameters)
         {
             // Don't bother building the string if this trace is going to be ignored.
 
@@ -265,19 +265,25 @@ public string Trace(TraceEventType type, int eventId, string message, string[] l
                 int i = 1, j = 0;
                 for (; i < labels.Length && j < parameters.Length; i++, j++)
                 {
-                    // Append to the format string a "; {0} = '{1}'", where the index increments (e.g. the second iteration will
-                    // produce {2} & {3}).
+                    // Append to the format string a "; {0} = '{1}'", where the index increments
+                    // (e.g. the second iteration will produce {2} & {3}).
 
                     traceBuilder.Append($"; {{{formatIndex++}}}='{{{formatIndex++}}}'");
 
-                    // If this parameter is null, convert to "<null>"; otherwise, when a string.format is ultimately called
-                    // it produces bad results.
+                    // Add the label to the combined list.
+
+                    combinedList.Add(labels[i]);
+
+                    // If the parameter is null, convert to "<null>"; otherwise,
+                    // when a string.format is ultimately called it produces bad results.
 
                     if (parameters[j] == null)
-                        parameters[j] = "<null>";
+                    {
+                        combinedList.Add("<null>");
+                    }
 
                     // Otherwise, if this is an interesting object, add the hash code and type to
-                    // the format string explicitely.
+                    // the format string explicitly.
 
                     else if (SuppressGeneratedParameters == false
                              && parameters[j].GetType() != typeof(string)
@@ -287,23 +293,23 @@ public string Trace(TraceEventType type, int eventId, string message, string[] l
                     {
                         traceBuilder.Append($"; {labels[i]}.HashCode='{GetHashCodeHelper(parameters[j])}'");
                         traceBuilder.Append($"; {labels[i]}.Type='{GetTypeHelper(parameters[j])}'");
-                    }
-
 
-                    // Add the label & parameter to the combined list.
-                    // (As an optimization, the generated classes could pre-allocate a thread-safe static array, to avoid
-                    // this allocation and the ToArray allocation below.)
+                        // Add the parameter to the combined list.
 
-                    combinedList.Add(labels[i]);
-                    combinedList.Add(parameters[j]);
+                        combinedList.Add(parameters[j]);
+                    }
+                    else // Add the parameter to the combined list.
+                    {
+                        combinedList.Add(parameters[j]);
+                    }
                 }
 
-                // It's OK if we terminate because we have more lables than parameters;
+                // It's OK if we terminate because we have more labels than parameters;
                 // this is used by traces to have out-values in the Stop message.
 
                 if (TraceExtraMessages != null && j < parameters.Length)
                 {
-                    TraceExtraMessages(traceBuilder, parameters, j);
+                    TraceExtraMessages(traceBuilder, parameters.Slice(j));
                 }
             }
 
@@ -326,19 +332,17 @@ public string Trace(TraceEventType type, int eventId, string message, string[] l
             return traceMessage;
         }
 
-
         //
         //  Trace an event, as both a TraceEventType.Start and TraceEventType.Stop.
         //  (information is contained in the Start event)
         //
 
-        public void TraceStartStop(int eventID, string message, string[] labels, params Span<object> parameters)
+        public void TraceStartStop(int eventID, string message, string[] labels, params ReadOnlySpan<object> parameters)
         {
             Trace(TraceEventType.Start, eventID, message, labels, parameters);
             _traceSource.TraceEvent(TraceEventType.Stop, eventID);
         }
 
-
         //
         //  Convert the value to a string, even if the system conversion throws
         //  an exception.
@@ -496,7 +500,7 @@ public static Type GetTypeHelper(object value)
 
     }
 
-    internal delegate void AvTraceEventHandler(AvTraceBuilder traceBuilder, ReadOnlySpan<object> parameters, int start);
+    internal delegate void AvTraceEventHandler(AvTraceBuilder traceBuilder, ReadOnlySpan<object> parameters);
 
     internal class AvTraceBuilder
     {
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/Generated/AvTraceMessages.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/Generated/AvTraceMessages.cs
@@ -70,13 +70,13 @@ public static AvTraceDetails UpdateEffectiveValueStop
         }
 
         /// <summary> Send a single trace output </summary>
-        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
 
         /// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>
-        public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
@@ -161,13 +161,13 @@ public static AvTraceDetails UnableToFreezeAnimatedProperties
         }
 
         /// <summary> Send a single trace output </summary>
-        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
 
         /// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>
-        public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
@@ -225,13 +225,13 @@ public static AvTraceDetails UnregisterName
         }
 
         /// <summary> Send a single trace output </summary>
-        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }
 
         /// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>
-        public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)
+        public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)
         {
             _avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);
         }

Original file line number	Diff line number	Diff line change
`@@ -70,13 +70,13 @@ namespace MS.Internal`
`70`	`70`	`<# } #>`
`71`	`71`
`72`	`72`	`/// <summary> Send a single trace output </summary>`
`73`		`- public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)`
	`73`	`+ public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`74`	`74`	`{`
`75`	`75`	`_avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`/// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>`
`79`		`- public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)`
	`79`	`+ public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`80`	`80`	`{`
`81`	`81`	`_avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,13 +69,13 @@ public static AvTraceDetails InvokeHandlers`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/// <summary> Send a single trace output </summary>`
`72`		`- public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)`
	`72`	`+ public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`73`	`73`	`{`
`74`	`74`	`_avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>`
`78`		`- public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)`
	`78`	`+ public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`79`	`79`	`{`
`80`	`80`	`_avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`81`	`81`	`}`
`@@ -216,13 +216,13 @@ public static AvTraceDetails AnimateStorageValidationNoLongerFailing`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`/// <summary> Send a single trace output </summary>`
`219`		`- public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)`
	`219`	`+ public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`220`	`220`	`{`
`221`	`221`	`_avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`/// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>`
`225`		`- public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)`
	`225`	`+ public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`226`	`226`	`{`
`227`	`227`	`_avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`228`	`228`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1333,13 +1333,13 @@ public static AvTraceDetails XmlBuildCollection(params object[] args)`
`1333`	`1333`	`}`
`1334`	`1334`
`1335`	`1335`	`/// <summary> Send a single trace output </summary>`
`1336`		`- public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)`
	`1336`	`+ public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`1337`	`1337`	`{`
`1338`	`1338`	`_avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`1339`	`1339`	`}`
`1340`	`1340`
`1341`	`1341`	`/// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>`
`1342`		`- public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)`
	`1342`	`+ public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`1343`	`1343`	`{`
`1344`	`1344`	`_avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`1345`	`1345`	`}`
`@@ -1424,13 +1424,13 @@ public static AvTraceDetails UnableToFreezeAnimatedProperties`
`1424`	`1424`	`}`
`1425`	`1425`
`1426`	`1426`	`/// <summary> Send a single trace output </summary>`
`1427`		`- public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)`
	`1427`	`+ public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`1428`	`1428`	`{`
`1429`	`1429`	`_avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`1430`	`1430`	`}`
`1431`	`1431`
`1432`	`1432`	`/// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>`
`1433`		`- public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)`
	`1433`	`+ public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`1434`	`1434`	`{`
`1435`	`1435`	`_avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`1436`	`1436`	`}`
`@@ -1627,13 +1627,13 @@ public static AvTraceDetails SetKey`
`1627`	`1627`	`}`
`1628`	`1628`
`1629`	`1629`	`/// <summary> Send a single trace output </summary>`
`1630`		`- public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)`
	`1630`	`+ public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`1631`	`1631`	`{`
`1632`	`1632`	`_avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`1633`	`1633`	`}`
`1634`	`1634`
`1635`	`1635`	`/// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>`
`1636`		`- public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)`
	`1636`	`+ public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`1637`	`1637`	`{`
`1638`	`1638`	`_avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`1639`	`1639`	`}`
`@@ -1886,13 +1886,13 @@ public static AvTraceDetails TypeConvertFallback`
`1886`	`1886`	`}`
`1887`	`1887`
`1888`	`1888`	`/// <summary> Send a single trace output </summary>`
`1889`		`- public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)`
	`1889`	`+ public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`1890`	`1890`	`{`
`1891`	`1891`	`_avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`1892`	`1892`	`}`
`1893`	`1893`
`1894`	`1894`	`/// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>`
`1895`		`- public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)`
	`1895`	`+ public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`1896`	`1896`	`{`
`1897`	`1897`	`_avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`1898`	`1898`	`}`
`@@ -1935,13 +1935,13 @@ public static AvTraceDetails HwndHostIn3D`
`1935`	`1935`	`}`
`1936`	`1936`
`1937`	`1937`	`/// <summary> Send a single trace output </summary>`
`1938`		`- public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)`
	`1938`	`+ public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`1939`	`1939`	`{`
`1940`	`1940`	`_avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`1941`	`1941`	`}`
`1942`	`1942`
`1943`	`1943`	`/// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>`
`1944`		`- public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters )`
	`1944`	`+ public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`1945`	`1945`	`{`
`1946`	`1946`	`_avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`1947`	`1947`	`}`
`@@ -2060,13 +2060,13 @@ public static AvTraceDetails RejectingJumpListCategoryBecauseNoRegisteredHandler`
`2060`	`2060`	`}`
`2061`	`2061`
`2062`	`2062`	`/// <summary> Send a single trace output </summary>`
`2063`		`- public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)`
	`2063`	`+ public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`2064`	`2064`	`{`
`2065`	`2065`	`_avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`2066`	`2066`	`}`
`2067`	`2067`
`2068`	`2068`	`/// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>`
`2069`		`- public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)`
	`2069`	`+ public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`2070`	`2070`	`{`
`2071`	`2071`	`_avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`2072`	`2072`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,14 +87,13 @@ public static bool IsExtendedTraceEnabled(object element, TraceDataLevel level)`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`// report/describe any additional parameters passed to TraceData.Trace()`
`90`		`- public static void OnTrace(AvTraceBuilder traceBuilder, ReadOnlySpan<object> parameters, int start)`
	`90`	`+ public static void OnTrace(AvTraceBuilder traceBuilder, ReadOnlySpan<object> parameters)`
`91`	`91`	`{`
`92`		`- for( int i = start; i < parameters.Length; i++ )`
	`92`	`+ for (int i = 0; i < parameters.Length; i++)`
`93`	`93`	`{`
`94`	`94`	`object o = parameters[i];`
`95`		`- string s = o as string;`
`96`	`95`	`traceBuilder.Append(" ");`
`97`		`- if (s != null)`
	`96`	`+ if (o is string s)`
`98`	`97`	`{`
`99`	`98`	`traceBuilder.Append(s);`
`100`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,13 +70,13 @@ public static AvTraceDetails UpdateEffectiveValueStop`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`/// <summary> Send a single trace output </summary>`
`73`		`- public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)`
	`73`	`+ public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`74`	`74`	`{`
`75`	`75`	`_avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`/// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>`
`79`		`- public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)`
	`79`	`+ public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`80`	`80`	`{`
`81`	`81`	`_avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`82`	`82`	`}`
`@@ -161,13 +161,13 @@ public static AvTraceDetails UnableToFreezeAnimatedProperties`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`/// <summary> Send a single trace output </summary>`
`164`		`- public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)`
	`164`	`+ public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`165`	`165`	`{`
`166`	`166`	`_avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`/// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>`
`170`		`- public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)`
	`170`	`+ public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`171`	`171`	`{`
`172`	`172`	`_avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`173`	`173`	`}`
`@@ -225,13 +225,13 @@ public static AvTraceDetails UnregisterName`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`/// <summary> Send a single trace output </summary>`
`228`		`- public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params Span<object> parameters)`
	`228`	`+ public static void Trace(TraceEventType type, AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`229`	`229`	`{`
`230`	`230`	`_avTrace.Trace(type, traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`/// <summary> Send a singleton "activity" trace (really, this sends the same trace as both a Start and a Stop) </summary>`
`234`		`- public static void TraceActivityItem(AvTraceDetails traceDetails, params Span<object> parameters)`
	`234`	`+ public static void TraceActivityItem(AvTraceDetails traceDetails, params ReadOnlySpan<object> parameters)`
`235`	`235`	`{`
`236`	`236`	`_avTrace.TraceStartStop(traceDetails.Id, traceDetails.Message, traceDetails.Labels, parameters);`
`237`	`237`	`}`