mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TestAssets/TestPackages/dotnet-dependency-context-test/project.json
View file

@ -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": {

2
TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json
View file

@ -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": {

2
TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json
View file

@ -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": {

2
TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json
View file

@ -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"
}

2
build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json
View file

@ -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": {

2
build_projects/dotnet-cli-build/project.json
View file

@ -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": {

2
build_projects/shared-build-targets-utils/project.json
View file

@ -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": {

2
src/Microsoft.DotNet.Cli.Utils/project.json
View file

@ -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",

2
src/Microsoft.DotNet.ProjectModel.Workspaces/project.json
View file

@ -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": {

24
src/Microsoft.DotNet.ProjectModel/DependencyContextBuilder.cs
View file

@ -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(

2
src/Microsoft.DotNet.ProjectModel/Graph/LockFilePackageLibrary.cs
View file

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

11
src/Microsoft.DotNet.ProjectModel/Graph/LockFileReader.cs
View file

@ -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")
@ -162,9 +166,8 @@ namespace Microsoft.DotNet.ProjectModel.Graph
Name = name,
Version = version
};
var pathValue = value["path"];
projectLibrary.Path = pathValue == null ? null : ReadString(pathValue);
projectLibrary.Path = path;
var buildTimeDependencyValue = value["msbuildProject"];
projectLibrary.MSBuildProject = buildTimeDependencyValue == null ? null : ReadString(buildTimeDependencyValue);

1
src/Microsoft.DotNet.ProjectModel/MSBuildProjectDescription.cs
View file

@ -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

3
src/Microsoft.DotNet.ProjectModel/ProjectDescription.cs
View file

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

4
src/Microsoft.DotNet.ProjectModel/project.json
View file

@ -5,8 +5,8 @@
},
"description": "Types to model a .NET Project",
"dependencies": {
"Microsoft.Extensions.DependencyModel": "1.0.1-beta-000914",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914",
"Microsoft.Extensions.DependencyModel": "1.0.1-beta-000919",
"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",

2
src/dotnet/project.json
View file

@ -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": {

4
test/ArgumentForwardingTests/project.json
View file

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

4
test/EndToEnd/project.json
View file

@ -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",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
"dotnet-test-xunit": "1.0.0-rc2-330423-54",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919"
},
"frameworks": {
"netcoreapp1.0": {

2
test/Kestrel.Tests/project.json
View file

@ -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": {

4
test/Microsoft.DotNet.Cli.Utils.Tests/project.json
View file

@ -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",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
"dotnet-test-xunit": "1.0.0-rc2-330423-54",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919"
},
"frameworks": {
"netcoreapp1.0": {

2
test/Microsoft.DotNet.Compiler.Common.Tests/project.json
View file

@ -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": {

2
test/Microsoft.DotNet.Configurer.UnitTests/project.json
View file

@ -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": {

2
test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json
View file

@ -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": {

120
test/Microsoft.DotNet.ProjectModel.Tests/LockFileReaderTests.cs Normal file
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();
}
}
}

44
test/Microsoft.DotNet.ProjectModel.Tests/PackageDependencyProviderTests.cs
View file

@ -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");

2
test/Microsoft.DotNet.ProjectModel.Tests/project.json
View file

@ -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": {

4
test/Microsoft.DotNet.Tools.Tests.Utilities/project.json
View file

@ -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": {

2
test/Performance/project.json
View file

@ -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": {

2
test/ScriptExecutorTests/project.json
View file

@ -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": {

2
test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json
View file

@ -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": {

2
test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json
View file

@ -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"
},

2
test/binding-redirects.Tests/project.json
View file

@ -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"

2
test/crossgen.Tests/project.json
View file

@ -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": {

2
test/dotnet-build3.Tests/project.json
View file

@ -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": {

2
test/dotnet-compile-fsc.Tests/project.json
View file

@ -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": {

2
test/dotnet-compile.Tests/project.json
View file

@ -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": {

2
test/dotnet-compile.UnitTests/project.json
View file

@ -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"
},

2
test/dotnet-new.Tests/project.json
View file

@ -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": {

2
test/dotnet-pack.Tests/project.json
View file

@ -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": {

2
test/dotnet-publish.Tests/project.json
View file

@ -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": {

2
test/dotnet-resgen.Tests/project.json
View file

@ -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": {

2
test/dotnet-run.Tests/project.json
View file

@ -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": {

2
test/dotnet-run.UnitTests/project.json
View file

@ -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": {

4
test/dotnet-test.Tests/project.json
View file

@ -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",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
"dotnet-test-xunit": "1.0.0-rc2-330423-54",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919"
},
"frameworks": {
"netcoreapp1.0": {

2
test/dotnet-test.UnitTests/project.json
View file

@ -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"
},

4
test/dotnet.Tests/project.json
View file

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