Merge pull request microsoft#35 from codito/dotnetcore

Address PR feedback for microsoft#18

Author: codito

src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginDiscoverer.cs

@@ -14,14 +14,17 @@ namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+#if !NET46
+    using System.Runtime.Loader;
+#endif
 
     /// <summary>
     /// Discovers test extensions in a directory.
     /// </summary>
     internal class TestPluginDiscoverer
     {
         #region Fields
-        
+
 #if WINDOWS_UAP
         private static HashSet<string> platformAssemblies = new HashSet<string>(new string[] {
             "MICROSOFT.VISUALSTUDIO.TESTPLATFORM.UNITTESTFRAMEWORK.DLL",
@@ -53,22 +56,14 @@ public TestExtensions GetTestExtensionsInformation(
             bool loadOnlyWellKnownExtensions)
         {
             Debug.Assert(pathToExtensions != null);
-            
+
             var testExtensions = new TestExtensions
-                                     {
-                                         TestDiscoverers =
-                                             new Dictionary<string, TestDiscovererPluginInformation>(
-                                             StringComparer.OrdinalIgnoreCase),
-                                         TestExecutors =
-                                             new Dictionary<string, TestExecutorPluginInformation>(
-                                             StringComparer.OrdinalIgnoreCase),
-                                         TestSettingsProviders =
-                                             new Dictionary <string, TestSettingsProviderPluginInformation>(
-                                             StringComparer.OrdinalIgnoreCase),
-                                         TestLoggers =
-                                             new Dictionary<string, TestLoggerPluginInformation>(
-                                             StringComparer.OrdinalIgnoreCase)
-                                     };
+            {
+                TestDiscoverers = new Dictionary<string, TestDiscovererPluginInformation>(StringComparer.OrdinalIgnoreCase),
+                TestExecutors = new Dictionary<string, TestExecutorPluginInformation>(StringComparer.OrdinalIgnoreCase),
+                TestSettingsProviders = new Dictionary<string, TestSettingsProviderPluginInformation>(StringComparer.OrdinalIgnoreCase),
+                TestLoggers = new Dictionary<string, TestLoggerPluginInformation>(StringComparer.OrdinalIgnoreCase)
+            };
 
 
 #if !WINDOWS_UAP
@@ -165,8 +160,12 @@ private void GetTestExtensionsFromFiles(
                 try
                 {
                     var assemblyName = Path.GetFileNameWithoutExtension(file);
+#if NET46
                     assembly = Assembly.Load(new AssemblyName(assemblyName));
-
+#else
+                    assembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(file);
+#endif
+                    
                     // Check whether this assembly is known or not. 
                     //if (loadOnlyWellKnownExtensions && assembly != null)
                     //{

src/datacollector.x86/project.json

@@ -24,7 +24,7 @@
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
-        "netstandardapp1.5",
+        "netstandardapp1.0",
         "portable-net45+win8",
         "portable-net45+wp80+win8+wpa81+dnxcore50"
       ],
@@ -38,4 +38,4 @@
     },
     "net46": {}
   }
-}
+}

src/datacollector/project.json

@@ -29,7 +29,7 @@
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
-        "netstandardapp1.5",
+        "netstandardapp1.0",
         "portable-net45+win8",
         "portable-net45+wp80+win8+wpa81+dnxcore50"
       ],

src/testhost.x86/Program.cs

@@ -3,9 +3,6 @@
 namespace Microsoft.VisualStudio.TestPlatform.TestHost
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Net.Sockets;
 
     using CrossPlatEngine;
 

src/testhost.x86/project.json

@@ -24,7 +24,7 @@
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
-        "netstandardapp1.5",
+        "netstandardapp1.0",
         "portable-net45+win8",
         "portable-net45+wp80+win8+wpa81+dnxcore50"
       ],

src/testhost/project.json

@@ -26,7 +26,7 @@
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
-        "netstandardapp1.5",
+        "netstandardapp1.0",
         "portable-net45+win8",
         "portable-net45+wp80+win8+wpa81+dnxcore50"
       ],