Merge pull request #59412 from dotnet/merges/release/dev17.1-vs-deps-to-release/dev17.2

dotnet-bot · web-flow · commit a29b6ae89a88 · 2022-02-08T23:12:57.000-08:00
Merge release/dev17.1-vs-deps to release/dev17.2
diff --git a/src/VisualStudio/Core/Def/Telemetry/VSTelemetryLogger.cs b/src/VisualStudio/Core/Def/Telemetry/VSTelemetryLogger.cs
@@ -181,7 +181,7 @@ private static void AppendProperties(TelemetryEvent telemetryEvent, FunctionId f
                 telemetryEvent.Properties.Add(functionId.GetPropertyName(key), value switch
                 {
                     PiiValue pii => new TelemetryPiiProperty(pii.Value),
-                    IEnumerable<object> items => new TelemetryComplexProperty(items.Select(item => (item is PiiValue pii) ? pii.Value : item)),
+                    IEnumerable<object> items => new TelemetryComplexProperty(items.Select(item => (item is PiiValue pii) ? new TelemetryPiiProperty(pii.Value) : item)),
                     _ => value
                 });
             }

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ private static void AppendProperties(TelemetryEvent telemetryEvent, FunctionId f`
`181`	`181`	`telemetryEvent.Properties.Add(functionId.GetPropertyName(key), value switch`
`182`	`182`	`{`
`183`	`183`	`PiiValue pii => new TelemetryPiiProperty(pii.Value),`
`184`		`- IEnumerable<object> items => new TelemetryComplexProperty(items.Select(item => (item is PiiValue pii) ? pii.Value : item)),`
	`184`	`+ IEnumerable<object> items => new TelemetryComplexProperty(items.Select(item => (item is PiiValue pii) ? new TelemetryPiiProperty(pii.Value) : item)),`
`185`	`185`	`_ => value`
`186`	`186`	`});`
`187`	`187`	`}`