Fixes Test Platform. (#2393)

Also updates to the latest version of TP.Fakes bits so we can catch this in E2E tests.

Author: AbhitejJohn

scripts/build/TestPlatform.Dependencies.props

@@ -32,7 +32,7 @@
     <JsonNetVersion>9.0.1</JsonNetVersion>
     <MoqVersion>4.7.63</MoqVersion>
     <TestPlatformExternalsVersion>16.0.0-preview-2148743</TestPlatformExternalsVersion>
-    <MicrosoftFakesVersion>16.6.3-beta.20169.2</MicrosoftFakesVersion>
+    <MicrosoftFakesVersion>16.6.2-beta.20208.2</MicrosoftFakesVersion>
 
     <MicrosoftBuildPackageVersion>16.0.461</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>

src/Microsoft.TestPlatform.Common/Utilities/FakesUtilities.cs

@@ -90,6 +90,12 @@ private static bool TryAddFakesDataCollectorSettings(
             {
                 var sourceTFMMap = CreateDictionary(sources, framework);
                 var fakesSettings = newConfigurator(sourceTFMMap);
+                // if no fakes, return settings unchanged
+                if (fakesSettings == null)
+                {
+                    return false;
+                }
+
                 XmlRunSettingsUtilities.InsertDataCollectorsNode(runSettings.CreateNavigator(), fakesSettings);
                 return true;
             }