Updating the xunit version to one that does not depend on internalabstractions.

This commit is contained in:
Livar Cunha 2016-08-09 11:05:00 -07:00
parent b7b90175f4
commit dc7f1fdf84
44 changed files with 67 additions and 42 deletions

View file

@ -1,7 +1,7 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-rc2-192208-24", "dotnet-test-xunit": "1.0.0-rc2-318883-21",
"Microsoft.NETCore.Platforms": "1.0.1", "Microsoft.NETCore.Platforms": "1.0.1",
"xunit": "2.1.0", "xunit": "2.1.0",
"Microsoft.DotNet.InternalAbstractions": { "Microsoft.DotNet.InternalAbstractions": {

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.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24", "dotnet-test-xunit": "1.0.0-rc2-318883-21",
"Microsoft.DotNet.InternalAbstractions": { "Microsoft.DotNet.InternalAbstractions": {
"target": "project" "target": "project"
} }

View file

@ -50,10 +50,26 @@
</Target> </Target>
<Target Name="BuildDotnetCliBuildFramework" <Target Name="BuildDotnetCliBuildFramework"
Inputs="@(DotnetCliBuildFrameworkInputs)"
Outputs="$(CLIBuildDll)"
DependsOnTargets="MSBuildWorkaroundTarget; DependsOnTargets="MSBuildWorkaroundTarget;
RestoreDotnetCliBuildFramework"> RestoreDotnetCliBuildFramework">
<Exec Command="$(DotnetStage0) publish -o $(DotnetCliBuildDirectory)/bin --framework netcoreapp1.0" WorkingDirectory="$(DotnetCliBuildDirectory)"/> <Exec Command="$(DotnetStage0) publish -o $(DotnetCliBuildDirectory)/bin --framework netcoreapp1.0" WorkingDirectory="$(DotnetCliBuildDirectory)"/>
<ItemGroup>
<DotnetSdkDirectories Include="$([System.IO.Directory]::GetDirectories(&quot;$(Stage0Directory)/sdk&quot;))" />
<TaskDependenciesDlls Include="$(DotnetCliBuildDirectory)/bin/Microsoft.WindowsAzure.Storage.dll">
<Name>Microsoft.WindowsAzure.Storage.dll</Name>
</TaskDependenciesDlls>
<TaskDependenciesDlls Include="$(DotnetCliBuildDirectory)/bin/Microsoft.DotNet.PlatformAbstractions.dll">
<Name>Microsoft.DotNet.PlatformAbstractions.dll</Name>
</TaskDependenciesDlls>
</ItemGroup>
<!-- This is a work around to issue https://github.com/Microsoft/msbuild/issues/658 -->
<Copy SourceFiles="%(TaskDependenciesDlls.Identity)"
DestinationFolder="@(DotnetSdkDirectories)" />
</Target> </Target>
<Target Name="RestoreDotnetCliBuildFramework" <Target Name="RestoreDotnetCliBuildFramework"

View file

@ -5,7 +5,7 @@ using System;
using System.IO; using System.IO;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.InternalAbstractions; using Microsoft.DotNet.PlatformAbstractions;
namespace Microsoft.DotNet.Cli namespace Microsoft.DotNet.Cli
{ {

View file

@ -9,7 +9,7 @@ using System.Runtime.Loader;
using System.Text; using System.Text;
using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.Configurer; using Microsoft.DotNet.Configurer;
using Microsoft.DotNet.InternalAbstractions; using Microsoft.DotNet.PlatformAbstractions;
using Microsoft.DotNet.Tools.Build; using Microsoft.DotNet.Tools.Build;
using Microsoft.DotNet.Tools.Compiler; using Microsoft.DotNet.Tools.Compiler;
using Microsoft.DotNet.Tools.Compiler.Csc; using Microsoft.DotNet.Tools.Compiler.Csc;

View file

@ -9,7 +9,7 @@ using System.Threading.Tasks;
using Microsoft.ApplicationInsights; using Microsoft.ApplicationInsights;
using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.Configurer; using Microsoft.DotNet.Configurer;
using Microsoft.DotNet.InternalAbstractions; using Microsoft.DotNet.PlatformAbstractions;
namespace Microsoft.DotNet.Cli namespace Microsoft.DotNet.Cli
{ {

View file

@ -2,7 +2,7 @@
// 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 Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.InternalAbstractions; using Microsoft.DotNet.PlatformAbstractions;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;

View file

@ -9,7 +9,7 @@ using System.Linq;
using System.Reflection; using System.Reflection;
using Microsoft.DotNet.Cli.CommandLine; using Microsoft.DotNet.Cli.CommandLine;
using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.InternalAbstractions; using Microsoft.DotNet.PlatformAbstractions;
namespace Microsoft.DotNet.Tools.New namespace Microsoft.DotNet.Tools.New
{ {

View file

@ -65,7 +65,8 @@
"Microsoft.DotNet.Core.Build.Tasks": { "Microsoft.DotNet.Core.Build.Tasks": {
"target": "project" "target": "project"
} },
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -19,7 +19,8 @@
"target": "project" "target": "project"
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -6,6 +6,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Microsoft.DotNet.InternalAbstractions; using Microsoft.DotNet.InternalAbstractions;
using Microsoft.DotNet.PlatformAbstractions;
using Microsoft.DotNet.Tools.Test.Utilities; using Microsoft.DotNet.Tools.Test.Utilities;
using Xunit; using Xunit;

View file

@ -20,7 +20,8 @@
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.netcore.extensions": "1.0.0-prerelease-00206", "xunit.netcore.extensions": "1.0.0-prerelease-00206",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -13,7 +13,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -4,7 +4,7 @@
using System; using System;
using System.IO; using System.IO;
using FluentAssertions; using FluentAssertions;
using Microsoft.DotNet.InternalAbstractions; using Microsoft.DotNet.PlatformAbstractions;
using Microsoft.DotNet.Tools.Test.Utilities; using Microsoft.DotNet.Tools.Test.Utilities;
using Xunit; using Xunit;

View file

@ -4,7 +4,7 @@
using System; using System;
using System.IO; using System.IO;
using FluentAssertions; using FluentAssertions;
using Microsoft.DotNet.InternalAbstractions; using Microsoft.DotNet.PlatformAbstractions;
using Microsoft.DotNet.Tools.Test.Utilities; using Microsoft.DotNet.Tools.Test.Utilities;
using Xunit; using Xunit;

View file

@ -35,7 +35,8 @@
}, },
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -16,7 +16,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21"
}, },
"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.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -16,7 +16,7 @@
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"FluentAssertions.Json": "4.12.0", "FluentAssertions.Json": "4.12.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21"
}, },
"testRunner": "xunit", "testRunner": "xunit",
"frameworks": { "frameworks": {

View file

@ -15,7 +15,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -21,7 +21,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. // 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. // Licensed under the MIT license. See LICENSE file in the project root for full license information.
using Microsoft.DotNet.InternalAbstractions; using Microsoft.DotNet.PlatformAbstractions;
using Xunit; using Xunit;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities

View file

@ -7,13 +7,14 @@
"dependencies": { "dependencies": {
"FluentAssertions": "4.0.0", "FluentAssertions": "4.0.0",
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24", "dotnet-test-xunit": "1.0.0-rc2-318883-21",
"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"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -17,7 +17,7 @@
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.netcore.extensions": "1.0.0-prerelease-00206", "xunit.netcore.extensions": "1.0.0-prerelease-00206",
"dotnet-test-xunit": "1.0.0-rc2-192208-24", "dotnet-test-xunit": "1.0.0-rc2-318883-21",
"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.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -19,7 +19,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24", "dotnet-test-xunit": "1.0.0-rc2-318883-21",
"FluentAssertions": "4.2.2" "FluentAssertions": "4.2.2"
}, },
"frameworks": { "frameworks": {

View file

@ -14,7 +14,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24", "dotnet-test-xunit": "1.0.0-rc2-318883-21",
"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.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24", "dotnet-test-xunit": "1.0.0-rc2-318883-21",
"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.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -10,7 +10,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -12,7 +12,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -13,7 +13,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -30,7 +30,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24", "dotnet-test-xunit": "1.0.0-rc2-318883-21",
"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.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -14,7 +14,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -14,7 +14,7 @@
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.netcore.extensions": "1.0.0-prerelease-00206", "xunit.netcore.extensions": "1.0.0-prerelease-00206",
"dotnet-test-xunit": "1.0.0-rc2-192208-24", "dotnet-test-xunit": "1.0.0-rc2-318883-21",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0" "System.Runtime.InteropServices.RuntimeInformation": "4.0.0"
}, },
"frameworks": { "frameworks": {

View file

@ -14,7 +14,7 @@
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.netcore.extensions": "1.0.0-prerelease-00206", "xunit.netcore.extensions": "1.0.0-prerelease-00206",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -13,7 +13,7 @@
"target": "project" "target": "project"
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -14,7 +14,7 @@
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -6,6 +6,7 @@ using System.Linq;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using FluentAssertions; using FluentAssertions;
using Microsoft.DotNet.InternalAbstractions; using Microsoft.DotNet.InternalAbstractions;
using Microsoft.DotNet.PlatformAbstractions;
using Microsoft.DotNet.ProjectModel; using Microsoft.DotNet.ProjectModel;
using Microsoft.DotNet.TestFramework; using Microsoft.DotNet.TestFramework;
using Microsoft.DotNet.Tools.Test.Utilities; using Microsoft.DotNet.Tools.Test.Utilities;

View file

@ -19,7 +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.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {

View file

@ -14,7 +14,7 @@
"exclude": "Compile" "exclude": "Compile"
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24", "dotnet-test-xunit": "1.0.0-rc2-318883-21",
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"FluentAssertions": "4.2.2" "FluentAssertions": "4.2.2"
}, },

View file

@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
using Xunit; using Xunit;
using Xunit.Abstractions; using Xunit.Abstractions;
using FluentAssertions; using FluentAssertions;
using Microsoft.DotNet.InternalAbstractions; using Microsoft.DotNet.PlatformAbstractions;
namespace Microsoft.DotNet.Tests namespace Microsoft.DotNet.Tests
{ {

View file

@ -17,7 +17,8 @@
"type": "build" "type": "build"
}, },
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24" "dotnet-test-xunit": "1.0.0-rc2-318883-21",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {