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
This commit is contained in:
Joel Verhagen 2016-08-09 16:17:10 -07:00
parent 08fe61aa00
commit aacc30d5d8
46 changed files with 238 additions and 59 deletions

View file

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

View file

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

View file

@ -1,7 +1,7 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "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" "xunit": "2.2.0-beta3-build3330"
}, },
"frameworks": { "frameworks": {

View file

@ -8,7 +8,7 @@
"System.Linq.Expressions": "4.1.0", "System.Linq.Expressions": "4.1.0",
"System.Runtime.Serialization.Primitives": "4.1.1", "System.Runtime.Serialization.Primitives": "4.1.1",
"xunit": "2.2.0-beta3-build3330", "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": { "Microsoft.DotNet.InternalAbstractions": {
"target": "project" "target": "project"
} }

View file

@ -8,7 +8,7 @@
"NETStandard.Library": "1.6.0", "NETStandard.Library": "1.6.0",
"System.Diagnostics.Process": "4.1.0", "System.Diagnostics.Process": "4.1.0",
"System.Reflection.TypeExtensions": "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": { "frameworks": {
"netstandard1.5": { "netstandard1.5": {

View file

@ -23,7 +23,7 @@
"NuGet.CommandLine.XPlat": "3.6.0-beta.1.msbuild.1", "NuGet.CommandLine.XPlat": "3.6.0-beta.1.msbuild.1",
"Microsoft.Build.Framework": "0.1.0-preview-00029-160805", "Microsoft.Build.Framework": "0.1.0-preview-00029-160805",
"Microsoft.Build.Utilities.Core": "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

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

View file

@ -8,7 +8,7 @@
"Microsoft.DotNet.ProjectModel": { "Microsoft.DotNet.ProjectModel": {
"target": "project" "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.Versioning": "3.6.0-beta.1.msbuild.1",
"NuGet.Packaging": "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", "NuGet.Frameworks": "3.6.0-beta.1.msbuild.1",

View file

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

View file

@ -146,8 +146,8 @@ namespace Microsoft.Extensions.DependencyModel
export.NativeLibraryGroups.Select(CreateRuntimeAssetGroup).ToArray(), export.NativeLibraryGroups.Select(CreateRuntimeAssetGroup).ToArray(),
export.ResourceAssemblies.Select(CreateResourceAssembly), export.ResourceAssemblies.Select(CreateResourceAssembly),
libraryDependencies, libraryDependencies,
serviceable serviceable,
); GetLibraryPath(export.Library));
} }
else else
{ {
@ -168,10 +168,28 @@ namespace Microsoft.Extensions.DependencyModel
export.Library.Hash, export.Library.Hash,
assemblies, assemblies,
libraryDependencies, 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) private RuntimeAssetGroup CreateRuntimeAssetGroup(LibraryAssetGroup libraryAssetGroup)
{ {
return new RuntimeAssetGroup( return new RuntimeAssetGroup(

View file

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

View file

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

View file

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

View file

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

View file

@ -5,8 +5,8 @@
}, },
"description": "Types to model a .NET Project", "description": "Types to model a .NET Project",
"dependencies": { "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", "Newtonsoft.Json": "9.0.1",
"NuGet.Configuration": "3.6.0-beta.1.msbuild.1", "NuGet.Configuration": "3.6.0-beta.1.msbuild.1",
"NuGet.Packaging": "3.6.0-beta.1.msbuild.1", "NuGet.Packaging": "3.6.0-beta.1.msbuild.1",

View file

@ -63,7 +63,7 @@
"Microsoft.Build": "0.1.0-preview-00029-160805", "Microsoft.Build": "0.1.0-preview-00029-160805",
"Microsoft.Build.Framework": "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -19,8 +19,8 @@
"target": "project" "target": "project"
}, },
"xunit": "2.2.0-beta3-build3330", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -20,8 +20,8 @@
}, },
"xunit": "2.2.0-beta3-build3330", "xunit": "2.2.0-beta3-build3330",
"xunit.netcore.extensions": "1.0.0-prerelease-00206", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -13,7 +13,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.2.0-beta3-build3330", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -35,8 +35,8 @@
}, },
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"xunit": "2.2.0-beta3-build3330", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -16,7 +16,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.2.0-beta3-build3330", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -21,7 +21,7 @@
"FluentAssertions": "4.0.0", "FluentAssertions": "4.0.0",
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"xunit": "2.2.0-beta3-build3330", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -15,7 +15,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.2.0-beta3-build3330", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -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();
}
}
}

View file

@ -1,5 +1,7 @@
using System; using System;
using System.IO;
using System.Linq; using System.Linq;
using FluentAssertions;
using Microsoft.DotNet.ProjectModel.Graph; using Microsoft.DotNet.ProjectModel.Graph;
using Microsoft.DotNet.ProjectModel.Resolution; using Microsoft.DotNet.ProjectModel.Resolution;
using Microsoft.DotNet.TestFramework; using Microsoft.DotNet.TestFramework;
@ -8,16 +10,46 @@ using NuGet.Configuration;
using NuGet.Frameworks; using NuGet.Frameworks;
using NuGet.Versioning; using NuGet.Versioning;
using Xunit; using Xunit;
using System.IO;
namespace Microsoft.DotNet.ProjectModel.Tests namespace Microsoft.DotNet.ProjectModel.Tests
{ {
public class PackageDependencyProviderTests : TestBase 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] [Fact]
public void GetDescriptionShouldNotModifyTarget() 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(); var package = new LockFilePackageLibrary();
package.Name = "Something"; package.Name = "Something";
package.Version = NuGetVersion.Parse("1.0.0"); package.Version = NuGetVersion.Parse("1.0.0");
@ -48,7 +80,9 @@ namespace Microsoft.DotNet.ProjectModel.Tests
[Fact] [Fact]
public void HasCompileTimePlaceholderChecksAllCompileTimeAssets() 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(); var package = new LockFilePackageLibrary();
package.Name = "Something"; package.Name = "Something";
package.Version = NuGetVersion.Parse("1.0.0"); package.Version = NuGetVersion.Parse("1.0.0");
@ -76,7 +110,9 @@ namespace Microsoft.DotNet.ProjectModel.Tests
[Fact] [Fact]
public void HasCompileTimePlaceholderReturnsFalseIfEmpty() 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(); var package = new LockFilePackageLibrary();
package.Name = "Something"; package.Name = "Something";
package.Version = NuGetVersion.Parse("1.0.0"); package.Version = NuGetVersion.Parse("1.0.0");

View file

@ -21,7 +21,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.2.0-beta3-build3330", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -7,14 +7,14 @@
"dependencies": { "dependencies": {
"FluentAssertions": "4.0.0", "FluentAssertions": "4.0.0",
"xunit": "2.2.0-beta3-build3330", "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.TestFramework": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" },
"Microsoft.DotNet.ProjectModel": { "target": "project" }, "Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DotNet.InternalAbstractions": { "Microsoft.DotNet.InternalAbstractions": {
"target": "project" "target": "project"
}, },
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914" "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -17,7 +17,7 @@
}, },
"xunit": "2.2.0-beta3-build3330", "xunit": "2.2.0-beta3-build3330",
"xunit.netcore.extensions": "1.0.0-prerelease-00206", "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" "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028"
}, },
"frameworks": { "frameworks": {

View file

@ -15,7 +15,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.2.0-beta3-build3330", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -19,7 +19,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.2.0-beta3-build3330", "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" "FluentAssertions": "4.2.2"
}, },
"frameworks": { "frameworks": {

View file

@ -14,7 +14,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.2.0-beta3-build3330", "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", "FluentAssertions": "4.2.2",
"moq.netcore": "4.4.0-beta8" "moq.netcore": "4.4.0-beta8"
}, },

View file

@ -2,7 +2,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"xunit": "2.2.0-beta3-build3330", "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.NETCore.Platforms": "1.0.1",
"Microsoft.DotNet.Tools.Tests.Utilities": { "Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project" "target": "project"

View file

@ -12,7 +12,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.2.0-beta3-build3330", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -10,7 +10,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.2.0-beta3-build3330", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -12,7 +12,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.2.0-beta3-build3330", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -13,7 +13,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.2.0-beta3-build3330", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -30,7 +30,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.2.0-beta3-build3330", "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", "moq.netcore": "4.4.0-beta8",
"FluentAssertions": "4.2.2" "FluentAssertions": "4.2.2"
}, },

View file

@ -13,7 +13,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.2.0-beta3-build3330", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -14,7 +14,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.2.0-beta3-build3330", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -14,7 +14,7 @@
}, },
"xunit": "2.2.0-beta3-build3330", "xunit": "2.2.0-beta3-build3330",
"xunit.netcore.extensions": "1.0.0-prerelease-00206", "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" "System.Runtime.InteropServices.RuntimeInformation": "4.0.0"
}, },
"frameworks": { "frameworks": {

View file

@ -14,7 +14,7 @@
}, },
"xunit": "2.2.0-beta3-build3330", "xunit": "2.2.0-beta3-build3330",
"xunit.netcore.extensions": "1.0.0-prerelease-00206", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -13,7 +13,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.2.0-beta3-build3330", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -14,7 +14,7 @@
}, },
"xunit": "2.2.0-beta3-build3330", "xunit": "2.2.0-beta3-build3330",
"moq.netcore": "4.4.0-beta8", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -19,8 +19,8 @@
"System.Net.Sockets": "4.1.0", "System.Net.Sockets": "4.1.0",
"System.Runtime.Serialization.Primitives": "4.1.1", "System.Runtime.Serialization.Primitives": "4.1.1",
"xunit": "2.2.0-beta3-build3330", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -14,7 +14,7 @@
"exclude": "Compile" "exclude": "Compile"
}, },
"xunit": "2.2.0-beta3-build3330", "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", "moq.netcore": "4.4.0-beta8",
"FluentAssertions": "4.2.2" "FluentAssertions": "4.2.2"
}, },

View file

@ -17,8 +17,8 @@
"type": "build" "type": "build"
}, },
"xunit": "2.2.0-beta3-build3330", "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": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {