Add "path" property the .deps.json file for libraries

Update DependencyModel and PlatformAbstractions packages to 1.0.1-beta-000917
Update dotnet-test-xunit to 1.0.0-rc2-330423-54

TestAssets/TestPackages/dotnet-dependency-context-test/project.json

@@ -8,7 +8,7 @@
       "type": "platform",
       "version": "1.0.0"
     },
-    "Microsoft.Extensions.DependencyModel": "1.0.1-beta-000914"
+    "Microsoft.Extensions.DependencyModel": "1.0.1-beta-000919"
   },
   "frameworks": {
     "netcoreapp1.0": {

TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json

@@ -1,7 +1,7 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "Microsoft.Extensions.DependencyModel": "1.0.1-beta-003395"
+    "Microsoft.Extensions.DependencyModel": "1.0.1-beta-000919"
   },
   "frameworks": {
     "netstandard1.6": {

TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json

@@ -1,7 +1,7 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54",
     "xunit": "2.2.0-beta3-build3330"
   },
   "frameworks": {

TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json

@@ -8,7 +8,7 @@
     "System.Linq.Expressions": "4.1.0",
     "System.Runtime.Serialization.Primitives": "4.1.1",
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54",
     "Microsoft.DotNet.InternalAbstractions": {
       "target": "project"
     }

build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json

@@ -8,7 +8,7 @@
     "NETStandard.Library": "1.6.0",
     "System.Diagnostics.Process": "4.1.0",
     "System.Reflection.TypeExtensions": "4.1.0",
-    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
+    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919"
   },
   "frameworks": {
     "netstandard1.5": {

build_projects/dotnet-cli-build/project.json

@@ -23,7 +23,7 @@
     "NuGet.CommandLine.XPlat": "3.6.0-beta.1.msbuild.1",
     "Microsoft.Build.Framework": "0.1.0-preview-00029-160805",
     "Microsoft.Build.Utilities.Core": "0.1.0-preview-00029-160805",
-    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
+    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919"
   },
   "frameworks": {
     "netcoreapp1.0": {

build_projects/shared-build-targets-utils/project.json

@@ -12,7 +12,7 @@
     "Microsoft.DotNet.Cli.Build.Framework": {
       "target": "project"
     },
-    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
+    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919"
   },
   "frameworks": {
     "netstandard1.6": {

src/Microsoft.DotNet.Cli.Utils/project.json

@@ -8,7 +8,7 @@
     "Microsoft.DotNet.ProjectModel": {
       "target": "project"
     },
-    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914",
+    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919",
     "NuGet.Versioning": "3.6.0-beta.1.msbuild.1",
     "NuGet.Packaging": "3.6.0-beta.1.msbuild.1",
     "NuGet.Frameworks": "3.6.0-beta.1.msbuild.1",

src/Microsoft.DotNet.ProjectModel.Workspaces/project.json

@@ -11,7 +11,7 @@
       "target": "project"
     },
     "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.3.0",
-    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
+    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919"
   },
   "frameworks": {
     "net451": {

src/Microsoft.DotNet.ProjectModel/DependencyContextBuilder.cs

@@ -146,8 +146,8 @@ namespace Microsoft.Extensions.DependencyModel
                     export.NativeLibraryGroups.Select(CreateRuntimeAssetGroup).ToArray(),
                     export.ResourceAssemblies.Select(CreateResourceAssembly),
                     libraryDependencies,
-                    serviceable
+                    serviceable,
-                    );
+                    GetLibraryPath(export.Library));
             }
             else
             {
@@ -168,10 +168,28 @@ namespace Microsoft.Extensions.DependencyModel
                     export.Library.Hash,
                     assemblies,
                     libraryDependencies,
-                    serviceable);
+                    serviceable,
+                    GetLibraryPath(export.Library));
             }
         }
 
+        private string GetLibraryPath(LibraryDescription description)
+        {
+            var packageDescription = description as PackageDescription;
+
+            if (packageDescription != null)
+            {
+                // This is the relative path appended to a NuGet packages directory to find the directory containing
+                // the package assets. This string should mastered only byNuGet, but has the format:
+                // {lowercase-package-ID}/{lowercase-package-version}
+                // 
+                // For example: newtonsoft.json/9.0.1
+                return packageDescription.PackageLibrary?.Path;
+            }
+
+            return null;
+        }
+
         private RuntimeAssetGroup CreateRuntimeAssetGroup(LibraryAssetGroup libraryAssetGroup)
         {
             return new RuntimeAssetGroup(

src/Microsoft.DotNet.ProjectModel/Graph/LockFilePackageLibrary.cs

@@ -17,5 +17,7 @@ namespace Microsoft.DotNet.ProjectModel.Graph
         public string Sha512 { get; set; }
 
         public IList<string> Files { get; set; } = new List<string>();
+
+        public string Path { get; set; }
     }
 }

src/Microsoft.DotNet.ProjectModel/Graph/LockFileReader.cs

@@ -144,6 +144,9 @@ namespace Microsoft.DotNet.ProjectModel.Graph
 
                 var type = _symbols.GetString(value.Value<string>("type"));
 
+                var pathValue = value["path"];
+                var path = pathValue == null ? null : ReadString(pathValue);
+
                 if (type == null || string.Equals(type, "package", StringComparison.OrdinalIgnoreCase))
                 {
                     lockFile.PackageLibraries.Add(new LockFilePackageLibrary
@@ -152,7 +155,8 @@ namespace Microsoft.DotNet.ProjectModel.Graph
                         Version = version,
                         IsServiceable = ReadBool(value, "serviceable", defaultValue: false),
                         Sha512 = ReadString(value["sha512"]),
-                        Files = ReadPathArray(value["files"], ReadString)
+                        Files = ReadPathArray(value["files"], ReadString),
+                        Path = path
                     });
                 }
                 else if (type == "project")
@@ -163,8 +167,7 @@ namespace Microsoft.DotNet.ProjectModel.Graph
                         Version = version
                     };
                     
-                    var pathValue = value["path"];
+                    projectLibrary.Path = path;
-                    projectLibrary.Path = pathValue == null ? null : ReadString(pathValue);
 
                     var buildTimeDependencyValue = value["msbuildProject"];
                     projectLibrary.MSBuildProject = buildTimeDependencyValue == null ? null : ReadString(buildTimeDependencyValue);

src/Microsoft.DotNet.ProjectModel/MSBuildProjectDescription.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.Linq;
 using Microsoft.DotNet.ProjectModel.Graph;
 
 namespace Microsoft.DotNet.ProjectModel

src/Microsoft.DotNet.ProjectModel/ProjectDescription.cs

@@ -19,7 +19,8 @@ namespace Microsoft.DotNet.ProjectModel
                   framework: null,
                   resolved: false,
                   compatible: false)
-        { }
+        {
+        }
 
         public ProjectDescription(
             LibraryRange libraryRange,

src/Microsoft.DotNet.ProjectModel/project.json

@@ -5,8 +5,8 @@
   },
   "description": "Types to model a .NET Project",
   "dependencies": {
-    "Microsoft.Extensions.DependencyModel": "1.0.1-beta-000914",
+    "Microsoft.Extensions.DependencyModel": "1.0.1-beta-000919",
-    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914",
+    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919",
     "Newtonsoft.Json": "9.0.1",
     "NuGet.Configuration": "3.6.0-beta.1.msbuild.1",
     "NuGet.Packaging": "3.6.0-beta.1.msbuild.1",

src/dotnet/project.json

@@ -63,7 +63,7 @@
     "Microsoft.Build": "0.1.0-preview-00029-160805",
     "Microsoft.Build.Framework": "0.1.0-preview-00029-160805",
 
-    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
+    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/ArgumentForwardingTests/project.json

@@ -19,8 +19,8 @@
       "target": "project"
     },
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54",
-    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
+    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/EndToEnd/project.json

@@ -20,8 +20,8 @@
     },
     "xunit": "2.2.0-beta3-build3330",
     "xunit.netcore.extensions": "1.0.0-prerelease-00206",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54",
-    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
+    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/Kestrel.Tests/project.json

@@ -13,7 +13,7 @@
       "target": "project"
     },
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/Microsoft.DotNet.Cli.Utils.Tests/project.json

@@ -35,8 +35,8 @@
     },
     "moq.netcore": "4.4.0-beta8",
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54",
-    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
+    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/Microsoft.DotNet.Compiler.Common.Tests/project.json

@@ -16,7 +16,7 @@
       "target": "project"
     },
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/Microsoft.DotNet.Configurer.UnitTests/project.json

@@ -21,7 +21,7 @@
     "FluentAssertions": "4.0.0",
     "moq.netcore": "4.4.0-beta8",
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json

@@ -15,7 +15,7 @@
       "target": "project"
     },
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/Microsoft.DotNet.ProjectModel.Tests/LockFileReaderTests.cs

@@ -0,0 +1,120 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.IO;
+using System.Linq;
+using System.Text;
+using FluentAssertions;
+using Microsoft.DotNet.ProjectModel.Graph;
+using Microsoft.DotNet.Tools.Test.Utilities;
+using Xunit;
+
+namespace Microsoft.DotNet.ProjectModel.Tests
+{
+    public class LockFileReaderTests : TestBase
+    {
+        [Fact]
+        public void ReadsAllLibraryPropertiesWhenPathIsPresent()
+        {
+            // Arrange
+            var lockFileJson = @"
+            {
+              ""libraries"": {
+                ""PackageA/1.0.1-Alpha"": {
+                  ""sha512"": ""FAKE-HASH"",
+                  ""type"": ""package"",
+                  ""serviceable"": true,
+                  ""files"": [
+                    ""a.txt"",
+                    ""foo/b.txt""
+                  ],
+                  ""path"": ""PackageA/1.0.1-beta-PATH""
+                },
+                ""ProjectA/1.0.2-Beta"": {
+                  ""type"": ""project"",
+                  ""path"": ""ProjectA-PATH"",
+                  ""msbuildProject"": ""some-msbuild""
+                }
+              }
+            }";
+
+            var lockFileStream = new MemoryStream(Encoding.UTF8.GetBytes(lockFileJson));
+            var lockFileReader = new LockFileReader();
+
+            // Act
+            var lockFile = lockFileReader.ReadLockFile(
+                lockFilePath: null,
+                stream: lockFileStream,
+                designTime: true);
+
+            // Assert
+            lockFile.PackageLibraries.Should().HaveCount(1);
+            var package = lockFile.PackageLibraries.First();
+            package.Name.Should().Be("PackageA");
+            package.Version.ToString().Should().Be("1.0.1-Alpha");
+            package.Sha512.Should().Be("FAKE-HASH");
+            package.IsServiceable.Should().BeTrue();
+            package.Files.Should().HaveCount(2);
+            package.Files[0].Should().Be("a.txt");
+            package.Files[1].Should().Be(Path.Combine("foo", "b.txt"));
+            package.Path.Should().Be("PackageA/1.0.1-beta-PATH");
+
+            lockFile.ProjectLibraries.Should().HaveCount(1);
+            var project = lockFile.ProjectLibraries.First();
+            project.Name.Should().Be("ProjectA");
+            project.Version.ToString().Should().Be("1.0.2-Beta");
+            project.Path.Should().Be("ProjectA-PATH");
+        }
+
+        [Fact]
+        public void ReadsAllLibraryPropertiesWhenPathIsNotPresent()
+        {
+            // Arrange
+            var lockFileJson = @"
+            {
+              ""libraries"": {
+                ""PackageA/1.0.1-Alpha"": {
+                  ""sha512"": ""FAKE-HASH"",
+                  ""type"": ""package"",
+                  ""serviceable"": true,
+                  ""files"": [
+                    ""a.txt"",
+                    ""foo/b.txt""
+                  ]
+                },
+                ""ProjectA/1.0.2-Beta"": {
+                  ""type"": ""project"",
+                  ""msbuildProject"": ""some-msbuild""
+                }
+              }
+            }";
+
+            var lockFileStream = new MemoryStream(Encoding.UTF8.GetBytes(lockFileJson));
+            var lockFileReader = new LockFileReader();
+
+            // Act
+            var lockFile = lockFileReader.ReadLockFile(
+                lockFilePath: null,
+                stream: lockFileStream,
+                designTime: true);
+
+            // Assert
+            lockFile.PackageLibraries.Should().HaveCount(1);
+            var package = lockFile.PackageLibraries.First();
+            package.Name.Should().Be("PackageA");
+            package.Version.ToString().Should().Be("1.0.1-Alpha");
+            package.Sha512.Should().Be("FAKE-HASH");
+            package.IsServiceable.Should().BeTrue();
+            package.Files.Should().HaveCount(2);
+            package.Files[0].Should().Be("a.txt");
+            package.Files[1].Should().Be(Path.Combine("foo", "b.txt"));
+            package.Path.Should().BeNull();
+
+            lockFile.ProjectLibraries.Should().HaveCount(1);
+            var project = lockFile.ProjectLibraries.First();
+            project.Name.Should().Be("ProjectA");
+            project.Version.ToString().Should().Be("1.0.2-Beta");
+            project.Path.Should().BeNull();
+        }
+    }
+}

test/Microsoft.DotNet.ProjectModel.Tests/PackageDependencyProviderTests.cs

@@ -1,5 +1,7 @@
 using System;
+using System.IO;
 using System.Linq;
+using FluentAssertions;
 using Microsoft.DotNet.ProjectModel.Graph;
 using Microsoft.DotNet.ProjectModel.Resolution;
 using Microsoft.DotNet.TestFramework;
@@ -8,16 +10,46 @@ using NuGet.Configuration;
 using NuGet.Frameworks;
 using NuGet.Versioning;
 using Xunit;
-using System.IO;
 
 namespace Microsoft.DotNet.ProjectModel.Tests
 {
     public class PackageDependencyProviderTests : TestBase
     {
+        [Fact]
+        public void GetDescriptionShouldLeavePackageLibraryPathAlone()
+        {
+            // Arrange
+            var provider = new PackageDependencyProvider(
+                NuGetPathContext.Create("/foo/packages"),
+                new FrameworkReferenceResolver("/foo/references"));
+            var package = new LockFilePackageLibrary();
+            package.Name = "Something";
+            package.Version = NuGetVersion.Parse("1.0.0");
+            package.Files.Add("lib/dotnet/_._");
+            package.Files.Add("runtimes/any/native/Microsoft.CSharp.CurrentVersion.targets");
+            package.Path = "SomePath";
+
+            var target = new LockFileTargetLibrary();
+            target.Name = "Something";
+            target.Version = package.Version;
+
+            target.RuntimeAssemblies.Add("lib/dotnet/_._");
+            target.CompileTimeAssemblies.Add("lib/dotnet/_._");
+            target.NativeLibraries.Add("runtimes/any/native/Microsoft.CSharp.CurrentVersion.targets");
+
+            // Act
+            var p = provider.GetDescription(NuGetFramework.Parse("netcoreapp1.0"), package, target);
+
+            // Assert
+            p.PackageLibrary.Path.Should().Be("SomePath");
+        }
+
         [Fact]
         public void GetDescriptionShouldNotModifyTarget()
         {
-            var provider = new PackageDependencyProvider(NuGetPathContext.Create("/foo/packages"), new FrameworkReferenceResolver("/foo/references"));
+            var provider = new PackageDependencyProvider(
+                NuGetPathContext.Create("/foo/packages"),
+                new FrameworkReferenceResolver("/foo/references"));
             var package = new LockFilePackageLibrary();
             package.Name = "Something";
             package.Version = NuGetVersion.Parse("1.0.0");
@@ -48,7 +80,9 @@ namespace Microsoft.DotNet.ProjectModel.Tests
         [Fact]
         public void HasCompileTimePlaceholderChecksAllCompileTimeAssets()
         {
-            var provider = new PackageDependencyProvider(NuGetPathContext.Create("/foo/packages"), new FrameworkReferenceResolver("/foo/references"));
+            var provider = new PackageDependencyProvider(
+                NuGetPathContext.Create("/foo/packages"),
+                new FrameworkReferenceResolver("/foo/references"));
             var package = new LockFilePackageLibrary();
             package.Name = "Something";
             package.Version = NuGetVersion.Parse("1.0.0");
@@ -76,7 +110,9 @@ namespace Microsoft.DotNet.ProjectModel.Tests
         [Fact]
         public void HasCompileTimePlaceholderReturnsFalseIfEmpty()
         {
-            var provider = new PackageDependencyProvider(NuGetPathContext.Create("/foo/packages"), new FrameworkReferenceResolver("/foo/references"));
+            var provider = new PackageDependencyProvider(
+                NuGetPathContext.Create("/foo/packages"),
+                new FrameworkReferenceResolver("/foo/references"));
             var package = new LockFilePackageLibrary();
             package.Name = "Something";
             package.Version = NuGetVersion.Parse("1.0.0");

test/Microsoft.DotNet.ProjectModel.Tests/project.json

@@ -21,7 +21,7 @@
       "target": "project"
     },
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/Microsoft.DotNet.Tools.Tests.Utilities/project.json

@@ -7,14 +7,14 @@
   "dependencies": {
     "FluentAssertions": "4.0.0",
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54",
     "Microsoft.DotNet.TestFramework": { "target": "project" },
     "Microsoft.DotNet.Cli.Utils": { "target": "project" },
     "Microsoft.DotNet.ProjectModel": { "target": "project" },
     "Microsoft.DotNet.InternalAbstractions": {
       "target": "project"
     },
-    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
+    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/Performance/project.json

@@ -17,7 +17,7 @@
     },
     "xunit": "2.2.0-beta3-build3330",
     "xunit.netcore.extensions": "1.0.0-prerelease-00206",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54",
     "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028"
   },
   "frameworks": {

test/ScriptExecutorTests/project.json

@@ -15,7 +15,7 @@
       "target": "project"
     },
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json

@@ -19,7 +19,7 @@
       "target": "project"
     },
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54",
     "FluentAssertions": "4.2.2"
   },
   "frameworks": {

test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json

@@ -14,7 +14,7 @@
       "target": "project"
     },
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54",
     "FluentAssertions": "4.2.2",
     "moq.netcore": "4.4.0-beta8"
   },

test/binding-redirects.Tests/project.json

@@ -2,7 +2,7 @@
   "version": "1.0.0-*",
   "dependencies": {
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54",
     "Microsoft.NETCore.Platforms": "1.0.1",
     "Microsoft.DotNet.Tools.Tests.Utilities": {
       "target": "project"

test/crossgen.Tests/project.json

@@ -12,7 +12,7 @@
       "target": "project"
     },
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/dotnet-build3.Tests/project.json

@@ -10,7 +10,7 @@
       "target": "project"
     },
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/dotnet-compile-fsc.Tests/project.json

@@ -12,7 +12,7 @@
       "target": "project"
     },
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/dotnet-compile.Tests/project.json

@@ -13,7 +13,7 @@
       "target": "project"
     },
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/dotnet-compile.UnitTests/project.json

@@ -30,7 +30,7 @@
       "target": "project"
     },
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54",
     "moq.netcore": "4.4.0-beta8",
     "FluentAssertions": "4.2.2"
   },

test/dotnet-new.Tests/project.json

@@ -13,7 +13,7 @@
       "target": "project"
     },
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/dotnet-pack.Tests/project.json

@@ -14,7 +14,7 @@
       "target": "project"
     },
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/dotnet-publish.Tests/project.json

@@ -14,7 +14,7 @@
     },
     "xunit": "2.2.0-beta3-build3330",
     "xunit.netcore.extensions": "1.0.0-prerelease-00206",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54",
     "System.Runtime.InteropServices.RuntimeInformation": "4.0.0"
   },
   "frameworks": {

test/dotnet-resgen.Tests/project.json

@@ -14,7 +14,7 @@
     },
     "xunit": "2.2.0-beta3-build3330",
     "xunit.netcore.extensions": "1.0.0-prerelease-00206",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/dotnet-run.Tests/project.json

@@ -13,7 +13,7 @@
       "target": "project"
     },
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/dotnet-run.UnitTests/project.json

@@ -14,7 +14,7 @@
     },
     "xunit": "2.2.0-beta3-build3330",
     "moq.netcore": "4.4.0-beta8",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/dotnet-test.Tests/project.json

@@ -19,8 +19,8 @@
     "System.Net.Sockets": "4.1.0",
     "System.Runtime.Serialization.Primitives": "4.1.1",
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54",
-    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
+    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919"
   },
   "frameworks": {
     "netcoreapp1.0": {

test/dotnet-test.UnitTests/project.json

@@ -14,7 +14,7 @@
       "exclude": "Compile"
     },
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54",
     "moq.netcore": "4.4.0-beta8",
     "FluentAssertions": "4.2.2"
   },

test/dotnet.Tests/project.json

@@ -17,8 +17,8 @@
       "type": "build"
     },
     "xunit": "2.2.0-beta3-build3330",
-    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
+    "dotnet-test-xunit": "1.0.0-rc2-330423-54",
-    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
+    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919"
   },
   "frameworks": {
     "netcoreapp1.0": {