Added method to look for new api in fakes datacollector

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

@@ -7,9 +7,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Common.Utilities
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.IO;
-#if NET451
     using System.Reflection;
-#endif
     using System.Xml;
 
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
@@ -44,12 +42,6 @@ public static string GenerateFakesSettingsForRunConfiguration(string[] sources,
                 throw new ArgumentNullException(nameof(runSettingsXml));
             }
 
-            // do not generate fakes for netcore
-            if (IsNetCoreFramework(runSettingsXml))
-            {
-                return runSettingsXml;
-            }
-
             var doc = new XmlDocument();
             using (var xmlReader = XmlReader.Create(
                 new StringReader(runSettingsXml),
@@ -58,7 +50,9 @@ public static string GenerateFakesSettingsForRunConfiguration(string[] sources,
                 doc.Load(xmlReader);
             }
 
-            return !TryAddFakesDataCollectorSettings(doc, sources) ? runSettingsXml : doc.OuterXml;
+            var isNetFramework = !IsNetCoreFramework(runSettingsXml);
+
+            return !TryAddFakesDataCollectorSettings(doc, sources, isNetFramework) ? runSettingsXml : doc.OuterXml;
         }
 
         private static bool IsNetCoreFramework(string runSettingsXml)
@@ -77,31 +71,59 @@ private static bool IsNetCoreFramework(string runSettingsXml)
         /// <returns>true if runSettings was modified; false otherwise.</returns>
         private static bool TryAddFakesDataCollectorSettings(
             XmlDocument runSettings,
-            IEnumerable<string> sources)
+            IEnumerable<string> sources,
+            bool isNetFramework)
         {
             // If user provided fakes settings don't do anything
             if (XmlRunSettingsUtilities.ContainsDataCollector(runSettings.CreateNavigator(), FakesMetadata.DataCollectorUri))
             {
                 return false;
             }
 
-            Func<IEnumerable<string>, string> configurator;
+            // A new Fakes Congigurator API makes the decision to add the right datacollector uri to the configuration
+            // There now exist two data collector URIs to support two different scenarios. The new scanrio involves 
+            // using the CLRIE profiler, and the old involves using the Intellitrace profiler (which isn't supported in 
+            // .NET Core scenarios). The old API still exists for fallback measures. 
 
-            // fakes supported?
-            if (!TryGetFakesDataCollectorConfigurator(out configurator))
+            var newConfigurator = TryGetFakesNewDataCollectorConfigurator();
+            if (newConfigurator != null)
+            {
+                var fakesSettings = newConfigurator(sources, isNetFramework);
+                XmlRunSettingsUtilities.InsertDataCollectorsNode(runSettings.CreateNavigator(), fakesSettings);
+                return true;
+            }
+
+            return AddFallbackFakesSettings(runSettings, sources, isNetFramework);
+        }
+
+        private static bool AddFallbackFakesSettings(
+            XmlDocument runSettings,
+            IEnumerable<string> sources,
+            bool isNetFramework)
+        {
+
+            // The fallback settings is for the old implementation of fakes 
+            // that only supports .Net Framework versions
+            if (!isNetFramework)
+            {
+                return false;
+            }
+
+            Func<IEnumerable<string>, string> oldConfigurator = TryGetFakesDataCollectorConfigurator();
+            if (oldConfigurator == null)
             {
                 return false;
             }
 
             // if no fakes, return settings unchanged
-            var fakesConfiguration = configurator(sources);
+            var fakesConfiguration = oldConfigurator(sources);
             if (fakesConfiguration == null)
             {
                 return false;
             }
 
             // integrate fakes settings in configuration
-            // if the settings don't have any data collector settings, populate with empty settings
+            // if the settings doesn't have any data collector settings, populate with empty settings
             EnsureSettingsNode(runSettings, new DataCollectionRunSettings());
 
             // embed fakes settings
@@ -116,6 +138,7 @@ private static bool TryAddFakesDataCollectorSettings(
 
             fakesSettings.Configuration = doc.DocumentElement;
             XmlRunSettingsUtilities.InsertDataCollectorsNode(runSettings.CreateNavigator(), fakesSettings);
+
             return true;
         }
 
@@ -138,22 +161,20 @@ private static void EnsureSettingsNode(XmlDocument settings, TestRunSettings set
             }
         }
 
-        private static bool TryGetFakesDataCollectorConfigurator(out Func<IEnumerable<string>, string> configurator)
+        private static Func<IEnumerable<string>, string> TryGetFakesDataCollectorConfigurator()
         {
 #if NET451
             try
             {
                 Assembly assembly = Assembly.Load(FakesConfiguratorAssembly);
 
                 var type = assembly?.GetType(ConfiguratorAssemblyQualifiedName, false);
-                if (type != null)
+
+                var method = type?.GetMethod(ConfiguratorMethodName, BindingFlags.Public | BindingFlags.Static);
+
+                if (method != null)
                 {
-                    var method = type.GetMethod(ConfiguratorMethodName, BindingFlags.Public | BindingFlags.Static);
-                    if (method != null)
-                    {
-                        configurator = (Func<IEnumerable<string>, string>)method.CreateDelegate(typeof(Func<IEnumerable<string>, string>));
-                        return true;
-                    }
+                    return (Func<IEnumerable<string>, string>)method.CreateDelegate(typeof(Func<IEnumerable<string>, string>));
                 }
             }
             catch (Exception ex)
@@ -164,8 +185,33 @@ private static bool TryGetFakesDataCollectorConfigurator(out Func<IEnumerable<st
                 }
             }
 #endif
-            configurator = null;
-            return false;
+            return null;
+        }
+
+        private static Func<IEnumerable<string>, bool, DataCollectorSettings> TryGetFakesNewDataCollectorConfigurator()
+        {
+            try
+            {
+                Assembly assembly = Assembly.Load(FakesConfiguratorAssembly);
+
+                var type = assembly?.GetType(ConfiguratorAssemblyQualifiedName, false);
+
+                var method = type?.GetMethod(ConfiguratorMethodName, BindingFlags.Public | BindingFlags.Static);
+
+                if (method != null)
+                {
+                    return (Func<IEnumerable<string>, bool, DataCollectorSettings>)method.CreateDelegate(typeof(Func<IEnumerable<string>, bool, DataCollectorSettings>));
+                }
+            }
+            catch (Exception ex)
+            {
+                if (EqtTrace.IsInfoEnabled)
+                {
+                    EqtTrace.Info("Failed to create newly implemented Fakes Configurator. Reason:{0} ", ex);
+                }
+            }
+
+            return null;
         }
 
         /// <summary>
@@ -205,4 +251,4 @@ internal static class FakesMetadata
             public const string DataCollectorAssemblyQualifiedName = "Microsoft.VisualStudio.TraceCollector.UnitTestIsolationDataCollector, Microsoft.VisualStudio.TraceCollector, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
         }
     }
-}
+}