microsoft
diff --git a/‎src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelRunDataAggregator.cs‎
Lines changed: 9 additions & 14 deletions b/‎src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelRunDataAggregator.cs‎
Lines changed: 9 additions & 14 deletions
diff --git a/‎src/Microsoft.TestPlatform.ObjectModel/Navigation/FullSymbolReader.cs‎
Lines changed: 3 additions & 2 deletions b/‎src/Microsoft.TestPlatform.ObjectModel/Navigation/FullSymbolReader.cs‎
Lines changed: 3 additions & 2 deletions
@@ -70,30 +70,25 @@ public ParallelRunDataAggregator(string runSettingsXml)
 
     public string RunSettings { get; }
 
-    // Note: This method is called once at the end of the test run to aggregate results.
-    // It is NOT called in parallel, so thread-safety optimizations here would be misleading.
     public ITestRunStatistics GetAggregatedRunStats()
     {
         var testOutcomeMap = new Dictionary<TestOutcome, long>();
         long totalTests = 0;
-        lock (_dataUpdateSyncObject)
+        if (_testRunStatsList.Count > 0)
         {
-            if (_testRunStatsList.Count > 0)
+            foreach (var runStats in _testRunStatsList)
             {
-                foreach (var runStats in _testRunStatsList)
+                // TODO: we get nullref here if the stats are empty.
+                foreach (var kvp in runStats.Stats!)
                 {
-                    // TODO: we get nullref here if the stats are empty.
-                    foreach (var kvp in runStats.Stats!)
+                    if (!testOutcomeMap.TryGetValue(kvp.Key, out long currentCount))
                     {
-                        if (!testOutcomeMap.TryGetValue(kvp.Key, out long currentCount))
-                        {
-                            currentCount = 0;
-                        }
-
-                        testOutcomeMap[kvp.Key] = currentCount + kvp.Value;
+                        currentCount = 0;
                     }
-                    totalTests += runStats.ExecutedTests;
+
+                    testOutcomeMap[kvp.Key] = currentCount + kvp.Value;
                 }
+                totalTests += runStats.ExecutedTests;
             }
         }
 
 
@@ -379,13 +379,14 @@ private void PopulateCacheForTypeAndMethodSymbols()
 
         IDiaEnumSymbols? enumSymbols = null;
         IDiaSymbol? methodSymbol;
-        Dictionary<string, IDiaSymbol>? methodSymbolsForType;
+        Dictionary<string, IDiaSymbol> methodSymbolsForType;
 
         try
         {
             typeSymbol.GetName(out string symbolName);
-            if (_methodSymbols.TryGetValue(symbolName, out methodSymbolsForType))
+            if (_methodSymbols.TryGetValue(symbolName, out var existingMethodSymbols))
             {
+                methodSymbolsForType = existingMethodSymbols;
                 if (methodSymbolsForType.TryGetValue(methodName, out var cachedMethodSymbol))
                 {
                     return cachedMethodSymbol;
Original file line number	Diff line number	Diff line change
`@@ -70,30 +70,25 @@ public ParallelRunDataAggregator(string runSettingsXml)`
`70`	`70`
`71`	`71`	`public string RunSettings { get; }`
`72`	`72`
`73`		`- // Note: This method is called once at the end of the test run to aggregate results.`
`74`		`- // It is NOT called in parallel, so thread-safety optimizations here would be misleading.`
`75`	`73`	`public ITestRunStatistics GetAggregatedRunStats()`
`76`	`74`	`{`
`77`	`75`	`var testOutcomeMap = new Dictionary<TestOutcome, long>();`
`78`	`76`	`long totalTests = 0;`
`79`		`- lock (_dataUpdateSyncObject)`
	`77`	`+ if (_testRunStatsList.Count > 0)`
`80`	`78`	`{`
`81`		`- if (_testRunStatsList.Count > 0)`
	`79`	`+ foreach (var runStats in _testRunStatsList)`
`82`	`80`	`{`
`83`		`- foreach (var runStats in _testRunStatsList)`
	`81`	`+ // TODO: we get nullref here if the stats are empty.`
	`82`	`+ foreach (var kvp in runStats.Stats!)`
`84`	`83`	`{`
`85`		`- // TODO: we get nullref here if the stats are empty.`
`86`		`- foreach (var kvp in runStats.Stats!)`
	`84`	`+ if (!testOutcomeMap.TryGetValue(kvp.Key, out long currentCount))`
`87`	`85`	`{`
`88`		`- if (!testOutcomeMap.TryGetValue(kvp.Key, out long currentCount))`
`89`		`- {`
`90`		`- currentCount = 0;`
`91`		`- }`
`92`		`-`
`93`		`- testOutcomeMap[kvp.Key] = currentCount + kvp.Value;`
	`86`	`+ currentCount = 0;`
`94`	`87`	`}`
`95`		`- totalTests += runStats.ExecutedTests;`
	`88`	`+`
	`89`	`+ testOutcomeMap[kvp.Key] = currentCount + kvp.Value;`
`96`	`90`	`}`
	`91`	`+ totalTests += runStats.ExecutedTests;`
`97`	`92`	`}`
`98`	`93`	`}`
`99`	`94`
Original file line number	Diff line number	Diff line change
`@@ -379,13 +379,14 @@ private void PopulateCacheForTypeAndMethodSymbols()`
`379`	`379`
`380`	`380`	`IDiaEnumSymbols? enumSymbols = null;`
`381`	`381`	`IDiaSymbol? methodSymbol;`
`382`		`- Dictionary<string, IDiaSymbol>? methodSymbolsForType;`
	`382`	`+ Dictionary<string, IDiaSymbol> methodSymbolsForType;`
`383`	`383`
`384`	`384`	`try`
`385`	`385`	`{`
`386`	`386`	`typeSymbol.GetName(out string symbolName);`
`387`		`- if (_methodSymbols.TryGetValue(symbolName, out methodSymbolsForType))`
	`387`	`+ if (_methodSymbols.TryGetValue(symbolName, out var existingMethodSymbols))`
`388`	`388`	`{`
	`389`	`+ methodSymbolsForType = existingMethodSymbols;`
`389`	`390`	`if (methodSymbolsForType.TryGetValue(methodName, out var cachedMethodSymbol))`
`390`	`391`	`{`
`391`	`392`	`return cachedMethodSymbol;`