From 2ddd3ca9a05d408848f156c5183e0bd353a349fd Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Sat, 30 Apr 2016 17:29:16 -0700
Subject: [PATCH] Updating to latest dotnet-test-xunit

---
 .../ProjectsWithTests/MultipleFrameworkProject/project.json | 2 +-
 .../ProjectsWithTests/NetCoreAppOnlyProject/project.json    | 2 +-
 .../SourceInformationProvider.cs                            | 6 ------
 src/Microsoft.Extensions.Testing.Abstractions/project.json  | 2 --
 test/ArgumentForwardingTests/project.json                   | 2 +-
 test/EndToEnd/project.json                                  | 2 +-
 test/Kestrel.Tests/project.json                             | 2 +-
 test/Microsoft.DotNet.Cli.Utils.Tests/project.json          | 2 +-
 test/Microsoft.DotNet.Compiler.Common.Tests/project.json    | 2 +-
 test/Microsoft.DotNet.ProjectModel.Tests/project.json       | 2 +-
 test/Microsoft.DotNet.Tools.Tests.Utilities/project.json    | 2 +-
 .../Microsoft.Extensions.DependencyModel.Tests/project.json | 2 +-
 test/Performance/project.json                               | 2 +-
 test/ScriptExecutorTests/project.json                       | 2 +-
 .../project.json                                            | 2 +-
 .../project.json                                            | 2 +-
 test/binding-redirects.Tests/project.json                   | 2 +-
 test/dotnet-build.Tests/project.json                        | 2 +-
 test/dotnet-compile-fsc.Tests/project.json                  | 2 +-
 test/dotnet-compile.Tests/project.json                      | 2 +-
 test/dotnet-compile.UnitTests/project.json                  | 2 +-
 test/dotnet-new.Tests/project.json                          | 2 +-
 test/dotnet-pack.Tests/project.json                         | 2 +-
 test/dotnet-projectmodel-server.Tests/project.json          | 2 +-
 test/dotnet-publish.Tests/project.json                      | 2 +-
 test/dotnet-resgen.Tests/project.json                       | 2 +-
 test/dotnet-run.Tests/project.json                          | 2 +-
 test/dotnet-test.Tests/project.json                         | 2 +-
 test/dotnet-test.UnitTests/project.json                     | 2 +-
 test/dotnet.Tests/project.json                              | 2 +-
 30 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json
index 5aa735cdb..4004e3896 100644
--- a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json
+++ b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json
@@ -1,7 +1,7 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13",
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36",
     "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
     "xunit": "2.1.0"
   },
diff --git a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json
index f9f0aafe7..34424f79c 100644
--- a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json
+++ b/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json
@@ -8,7 +8,7 @@
     "System.Linq.Expressions": "4.0.11-rc2-24027",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13"
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/src/Microsoft.Extensions.Testing.Abstractions/SourceInformationProvider.cs b/src/Microsoft.Extensions.Testing.Abstractions/SourceInformationProvider.cs
index 02d494ac1..1e018cc0e 100644
--- a/src/Microsoft.Extensions.Testing.Abstractions/SourceInformationProvider.cs
+++ b/src/Microsoft.Extensions.Testing.Abstractions/SourceInformationProvider.cs
@@ -5,7 +5,6 @@ using System;
 using System.IO;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using Microsoft.Extensions.Logging;
 
 namespace Microsoft.Extensions.Testing.Abstractions
 {
@@ -19,11 +18,6 @@ namespace Microsoft.Extensions.Testing.Abstractions
         {
         }
 
-        public SourceInformationProvider(string pdbPath, ILogger logger) :
-            this(pdbPath, new PdbReaderFactory())
-        {
-        }
-
         public SourceInformationProvider(string pdbPath, IPdbReaderFactory pdbReaderFactory)
         {
             if (string.IsNullOrWhiteSpace(pdbPath) || !File.Exists(pdbPath))
diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json
index e31af199f..3e1c2df30 100644
--- a/src/Microsoft.Extensions.Testing.Abstractions/project.json
+++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json
@@ -13,8 +13,6 @@
   "dependencies": {
     "Newtonsoft.Json": "7.0.1",
     "Microsoft.DotNet.ProjectModel": "1.0.0-*",
-    "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-20581",
-    "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-20581",
     "Microsoft.DiaSymReader": "1.0.6",
     "Microsoft.DiaSymReader.Native": "1.3.3"
   },
diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json
index 85ed78a91..8cb93e70f 100644
--- a/test/ArgumentForwardingTests/project.json
+++ b/test/ArgumentForwardingTests/project.json
@@ -19,7 +19,7 @@
       "target": "project"
     },
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13"
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json
index 9a5970385..115617f3a 100644
--- a/test/EndToEnd/project.json
+++ b/test/EndToEnd/project.json
@@ -20,7 +20,7 @@
     },
     "xunit": "2.1.0",
     "xunit.netcore.extensions": "1.0.0-prerelease-00206",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13"
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/test/Kestrel.Tests/project.json b/test/Kestrel.Tests/project.json
index c5333d668..e621605b2 100644
--- a/test/Kestrel.Tests/project.json
+++ b/test/Kestrel.Tests/project.json
@@ -13,7 +13,7 @@
       "target": "project"
     },
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13"
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json
index f3b7511cb..3cd6321da 100644
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json
@@ -25,7 +25,7 @@
     },
     "moq.netcore": "4.4.0-beta8",
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13"
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json
index d18a6a1f2..bf9c1aa52 100644
--- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json
+++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json
@@ -16,7 +16,7 @@
       "target": "project"
     },
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13"
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json
index 2850e6bb0..cc9dcafcf 100644
--- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json
+++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json
@@ -16,7 +16,7 @@
       "target": "project"
     },
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13"
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json
index c4054ee83..605b138f6 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "FluentAssertions": "4.0.0",
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13",
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36",
     "Microsoft.DotNet.TestFramework": "1.0.0-*",
     "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
     "Microsoft.DotNet.ProjectModel": "1.0.0-*",
diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json
index 7a6837fd0..3245d4e7b 100644
--- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json
+++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json
@@ -19,7 +19,7 @@
     "FluentAssertions": "4.0.0",
     "moq.netcore": "4.4.0-beta8",
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13"
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/test/Performance/project.json b/test/Performance/project.json
index afb38c56a..19f8bf541 100644
--- a/test/Performance/project.json
+++ b/test/Performance/project.json
@@ -17,7 +17,7 @@
     },
     "xunit": "2.1.0",
     "xunit.netcore.extensions": "1.0.0-prerelease-00206",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13",
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36",
     "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028"
   },
   "frameworks": {
diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json
index fb4382bfb..09ef980ea 100644
--- a/test/ScriptExecutorTests/project.json
+++ b/test/ScriptExecutorTests/project.json
@@ -15,7 +15,7 @@
       "target": "project"
     },
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13"
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json
index d3291f5d3..170776673 100644
--- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json
+++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json
@@ -19,7 +19,7 @@
       "target": "project"
     },
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13",
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36",
     "FluentAssertions": "4.2.2"
   },
   "frameworks": {
diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json
index 04ecca9a1..20f8d5c21 100644
--- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json
+++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json
@@ -14,7 +14,7 @@
       "target": "project"
     },
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13",
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36",
     "FluentAssertions": "4.2.2",
     "moq.netcore": "4.4.0-beta8"
   },
diff --git a/test/binding-redirects.Tests/project.json b/test/binding-redirects.Tests/project.json
index dcbee7b91..40a59cb03 100644
--- a/test/binding-redirects.Tests/project.json
+++ b/test/binding-redirects.Tests/project.json
@@ -2,7 +2,7 @@
   "version": "1.0.0-*",
   "dependencies": {
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13",
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36",
     "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
     "Microsoft.DotNet.Tools.Tests.Utilities": {
       "target": "project"
diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json
index 9d60bd274..4449b87a7 100644
--- a/test/dotnet-build.Tests/project.json
+++ b/test/dotnet-build.Tests/project.json
@@ -14,7 +14,7 @@
     },
     "Newtonsoft.Json": "7.0.1",
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13"
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/test/dotnet-compile-fsc.Tests/project.json b/test/dotnet-compile-fsc.Tests/project.json
index f68ee9b50..3da2305a7 100644
--- a/test/dotnet-compile-fsc.Tests/project.json
+++ b/test/dotnet-compile-fsc.Tests/project.json
@@ -12,7 +12,7 @@
       "target": "project"
     },
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13"
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json
index 598e24d3c..72ccdd84d 100644
--- a/test/dotnet-compile.Tests/project.json
+++ b/test/dotnet-compile.Tests/project.json
@@ -13,7 +13,7 @@
       "target": "project"
     },
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13"
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json
index 5e07bb5b1..7ab894ae3 100644
--- a/test/dotnet-compile.UnitTests/project.json
+++ b/test/dotnet-compile.UnitTests/project.json
@@ -25,7 +25,7 @@
       "target": "project"
     },
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13",
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36",
     "moq.netcore": "4.4.0-beta8",
     "FluentAssertions": "4.2.2"
   },
diff --git a/test/dotnet-new.Tests/project.json b/test/dotnet-new.Tests/project.json
index 3b7503209..f0effd5a9 100644
--- a/test/dotnet-new.Tests/project.json
+++ b/test/dotnet-new.Tests/project.json
@@ -13,7 +13,7 @@
       "target": "project"
     },
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-dev-140469-38"
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json
index 265169bb7..1d157d9d9 100644
--- a/test/dotnet-pack.Tests/project.json
+++ b/test/dotnet-pack.Tests/project.json
@@ -14,7 +14,7 @@
       "target": "project"
     },
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13"
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json
index df031d0eb..d1e7ff5c5 100644
--- a/test/dotnet-projectmodel-server.Tests/project.json
+++ b/test/dotnet-projectmodel-server.Tests/project.json
@@ -18,7 +18,7 @@
       "target": "project"
     },
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13",
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36",
     "System.Net.NameResolution": "4.0.0-rc2-24027"
   },
   "frameworks": {
diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json
index 1499b49ac..aadfe5f96 100644
--- a/test/dotnet-publish.Tests/project.json
+++ b/test/dotnet-publish.Tests/project.json
@@ -12,7 +12,7 @@
     },
     "xunit": "2.1.0",
     "xunit.netcore.extensions": "1.0.0-prerelease-00206",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13",
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36",
     "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-24027"
   },
   "frameworks": {
diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json
index b1848a5c6..37f42b120 100644
--- a/test/dotnet-resgen.Tests/project.json
+++ b/test/dotnet-resgen.Tests/project.json
@@ -14,7 +14,7 @@
     },
     "xunit": "2.1.0",
     "xunit.netcore.extensions": "1.0.0-prerelease-00206",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13"
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json
index c5333d668..e621605b2 100644
--- a/test/dotnet-run.Tests/project.json
+++ b/test/dotnet-run.Tests/project.json
@@ -13,7 +13,7 @@
       "target": "project"
     },
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13"
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json
index 34a363c75..531f71610 100644
--- a/test/dotnet-test.Tests/project.json
+++ b/test/dotnet-test.Tests/project.json
@@ -19,7 +19,7 @@
     "System.Net.Sockets": "4.1.0-rc2-24027",
     "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13"
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json
index 265b2289e..b554460df 100644
--- a/test/dotnet-test.UnitTests/project.json
+++ b/test/dotnet-test.UnitTests/project.json
@@ -14,7 +14,7 @@
       "exclude": "Compile"
     },
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13",
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36",
     "moq.netcore": "4.4.0-beta8",
     "FluentAssertions": "4.2.2"
   },
diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json
index 7104d0211..910296432 100644
--- a/test/dotnet.Tests/project.json
+++ b/test/dotnet.Tests/project.json
@@ -17,7 +17,7 @@
       "type": "build"
     },
     "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-162081-13"
+    "dotnet-test-xunit": "1.0.0-rc2-173361-36"
   },
   "frameworks": {
     "netcoreapp1.0": {