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

2016-08-09 11:05:00 -07:00 · 2016-08-09 11:05:00 -07:00 · dc7f1fdf84
commit dc7f1fdf84
parent b7b90175f4
44 changed files with 67 additions and 42 deletions
--- a/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json
+++ b/TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json
@ -1,7 +1,7 @@
 {
  "version": "1.0.0-*",
  "dependencies": {
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24",
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
    "Microsoft.NETCore.Platforms": "1.0.1",
    "xunit": "2.1.0",
    "Microsoft.DotNet.InternalAbstractions": {
--- a/TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json
+++ b/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.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24",
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
    "Microsoft.DotNet.InternalAbstractions": {
      "target": "project"
    }
--- a/build.proj
+++ b/build.proj
@ -50,10 +50,26 @@
  </Target>

  <Target Name="BuildDotnetCliBuildFramework"
+          Inputs="@(DotnetCliBuildFrameworkInputs)"
+          Outputs="$(CLIBuildDll)"
          DependsOnTargets="MSBuildWorkaroundTarget;
                            RestoreDotnetCliBuildFramework">

    <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 Name="RestoreDotnetCliBuildFramework"
--- a/src/dotnet/MulticoreJitProfilePathCalculator.cs
+++ b/src/dotnet/MulticoreJitProfilePathCalculator.cs
@ -5,7 +5,7 @@ using System;
 using System.IO;
 using System.Runtime.InteropServices;
 using Microsoft.DotNet.Cli.Utils;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;

 namespace Microsoft.DotNet.Cli
 {
--- a/src/dotnet/Program.cs
+++ b/src/dotnet/Program.cs
@ -9,7 +9,7 @@ using System.Runtime.Loader;
 using System.Text;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Configurer;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 using Microsoft.DotNet.Tools.Build;
 using Microsoft.DotNet.Tools.Compiler;
 using Microsoft.DotNet.Tools.Compiler.Csc;
--- a/src/dotnet/Telemetry.cs
+++ b/src/dotnet/Telemetry.cs
@ -9,7 +9,7 @@ using System.Threading.Tasks;
 using Microsoft.ApplicationInsights;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Configurer;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;

 namespace Microsoft.DotNet.Cli
 {
--- a/src/dotnet/commands/dotnet-build3/MSBuildForwardingApp.cs
+++ b/src/dotnet/commands/dotnet-build3/MSBuildForwardingApp.cs
@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.

 using Microsoft.DotNet.Cli.Utils;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 using System;
 using System.Collections.Generic;
 using System.IO;
--- a/src/dotnet/commands/dotnet-new/Program.cs
+++ b/src/dotnet/commands/dotnet-new/Program.cs
@ -9,7 +9,7 @@ using System.Linq;
 using System.Reflection;
 using Microsoft.DotNet.Cli.CommandLine;
 using Microsoft.DotNet.Cli.Utils;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;

 namespace Microsoft.DotNet.Tools.New
 {
--- a/src/dotnet/project.json
+++ b/src/dotnet/project.json
@ -65,7 +65,8 @@

    "Microsoft.DotNet.Core.Build.Tasks": {
      "target": "project"
-    }
+    },
+    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/test/ArgumentForwardingTests/project.json
+++ b/test/ArgumentForwardingTests/project.json
@ -19,7 +19,8 @@
      "target": "project"
    },
    "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": {
    "netcoreapp1.0": {
--- a/test/EndToEnd/EndToEndTest.cs
+++ b/test/EndToEnd/EndToEndTest.cs
@ -6,6 +6,7 @@ using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 using Microsoft.DotNet.Tools.Test.Utilities;
 using Xunit;

--- a/test/EndToEnd/project.json
+++ b/test/EndToEnd/project.json
@ -20,7 +20,8 @@
    },
    "xunit": "2.1.0",
    "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": {
    "netcoreapp1.0": {
--- a/test/Kestrel.Tests/project.json
+++ b/test/Kestrel.Tests/project.json
@ -13,7 +13,7 @@
      "target": "project"
    },
    "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24"
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectPathCommandResolver.cs
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectPathCommandResolver.cs
@ -4,7 +4,7 @@
 using System;
 using System.IO;
 using FluentAssertions;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 using Microsoft.DotNet.Tools.Test.Utilities;
 using Xunit;

--- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAnAppBaseCommandResolver.cs
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAnAppBaseCommandResolver.cs
@ -4,7 +4,7 @@
 using System;
 using System.IO;
 using FluentAssertions;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 using Microsoft.DotNet.Tools.Test.Utilities;
 using Xunit;

--- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json
@ -35,7 +35,8 @@
    },
    "moq.netcore": "4.4.0-beta8",
    "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": {
    "netcoreapp1.0": {
--- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json
+++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json
@ -16,7 +16,7 @@
      "target": "project"
    },
    "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24"
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/test/Microsoft.DotNet.Configurer.UnitTests/project.json
+++ b/test/Microsoft.DotNet.Configurer.UnitTests/project.json
@ -21,7 +21,7 @@
    "FluentAssertions": "4.0.0",
    "moq.netcore": "4.4.0-beta8",
    "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24"
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/test/Microsoft.DotNet.Core.Build.Tasks.Tests/project.json
+++ b/test/Microsoft.DotNet.Core.Build.Tasks.Tests/project.json
@ -16,7 +16,7 @@
    },
    "xunit": "2.1.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",
  "frameworks": {
--- a/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json
+++ b/test/Microsoft.DotNet.ProjectModel.Loader.Tests/project.json
@ -15,7 +15,7 @@
      "target": "project"
    },
    "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24"
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json
+++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json
@ -21,7 +21,7 @@
      "target": "project"
    },
    "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24"
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyFactAttribute.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyFactAttribute.cs
@ -1,7 +1,7 @@
 // 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 Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 using Xunit;

 namespace Microsoft.DotNet.Tools.Test.Utilities
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json
@ -7,13 +7,14 @@
  "dependencies": {
    "FluentAssertions": "4.0.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.Cli.Utils": { "target": "project" },
    "Microsoft.DotNet.ProjectModel": { "target": "project" },
    "Microsoft.DotNet.InternalAbstractions": {
      "target": "project"
-    }
+    },
+    "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000914"
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/test/Performance/project.json
+++ b/test/Performance/project.json
@ -17,7 +17,7 @@
    },
    "xunit": "2.1.0",
    "xunit.netcore.extensions": "1.0.0-prerelease-00206",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24",
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
    "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0028"
  },
  "frameworks": {
--- a/test/ScriptExecutorTests/project.json
+++ b/test/ScriptExecutorTests/project.json
@ -15,7 +15,7 @@
      "target": "project"
    },
    "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24"
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json
+++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json
@ -19,7 +19,7 @@
      "target": "project"
    },
    "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24",
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
    "FluentAssertions": "4.2.2"
  },
  "frameworks": {
--- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json
+++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json
@ -14,7 +14,7 @@
      "target": "project"
    },
    "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24",
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
    "FluentAssertions": "4.2.2",
    "moq.netcore": "4.4.0-beta8"
  },
--- a/test/binding-redirects.Tests/project.json
+++ b/test/binding-redirects.Tests/project.json
@ -2,7 +2,7 @@
  "version": "1.0.0-*",
  "dependencies": {
    "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24",
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
    "Microsoft.NETCore.Platforms": "1.0.1",
    "Microsoft.DotNet.Tools.Tests.Utilities": {
      "target": "project"
--- a/test/crossgen.Tests/project.json
+++ b/test/crossgen.Tests/project.json
@ -12,7 +12,7 @@
      "target": "project"
    },
    "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24"
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/test/dotnet-build3.Tests/project.json
+++ b/test/dotnet-build3.Tests/project.json
@ -10,7 +10,7 @@
      "target": "project"
    },
    "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24"
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/test/dotnet-compile-fsc.Tests/project.json
+++ b/test/dotnet-compile-fsc.Tests/project.json
@ -12,7 +12,7 @@
      "target": "project"
    },
    "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24"
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/test/dotnet-compile.Tests/project.json
+++ b/test/dotnet-compile.Tests/project.json
@ -13,7 +13,7 @@
      "target": "project"
    },
    "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24"
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/test/dotnet-compile.UnitTests/project.json
+++ b/test/dotnet-compile.UnitTests/project.json
@ -30,7 +30,7 @@
      "target": "project"
    },
    "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",
    "FluentAssertions": "4.2.2"
  },
--- a/test/dotnet-new.Tests/project.json
+++ b/test/dotnet-new.Tests/project.json
@ -13,7 +13,7 @@
      "target": "project"
    },
    "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24"
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/test/dotnet-pack.Tests/project.json
+++ b/test/dotnet-pack.Tests/project.json
@ -14,7 +14,7 @@
      "target": "project"
    },
    "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24"
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/test/dotnet-publish.Tests/project.json
+++ b/test/dotnet-publish.Tests/project.json
@ -14,7 +14,7 @@
    },
    "xunit": "2.1.0",
    "xunit.netcore.extensions": "1.0.0-prerelease-00206",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24",
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
    "System.Runtime.InteropServices.RuntimeInformation": "4.0.0"
  },
  "frameworks": {
--- a/test/dotnet-resgen.Tests/project.json
+++ b/test/dotnet-resgen.Tests/project.json
@ -14,7 +14,7 @@
    },
    "xunit": "2.1.0",
    "xunit.netcore.extensions": "1.0.0-prerelease-00206",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24"
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/test/dotnet-run.Tests/project.json
+++ b/test/dotnet-run.Tests/project.json
@ -13,7 +13,7 @@
      "target": "project"
    },
    "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24"
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21"
  },
  "frameworks": {
    "netcoreapp1.0": {
--- a/test/dotnet-run.UnitTests/project.json
+++ b/test/dotnet-run.UnitTests/project.json
@ -14,7 +14,7 @@
    },
    "xunit": "2.1.0",
    "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": {
    "netcoreapp1.0": {
--- a/test/dotnet-test.Tests/GivenThatWeWantToUseDotnetTestE2EInDesignTimeForMultipleTFms.cs
+++ b/test/dotnet-test.Tests/GivenThatWeWantToUseDotnetTestE2EInDesignTimeForMultipleTFms.cs
@ -6,6 +6,7 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using FluentAssertions;
 using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;
 using Microsoft.DotNet.ProjectModel;
 using Microsoft.DotNet.TestFramework;
 using Microsoft.DotNet.Tools.Test.Utilities;
--- a/test/dotnet-test.Tests/project.json
+++ b/test/dotnet-test.Tests/project.json
@ -19,7 +19,8 @@
    "System.Net.Sockets": "4.1.0",
    "System.Runtime.Serialization.Primitives": "4.1.1",
    "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": {
    "netcoreapp1.0": {
--- a/test/dotnet-test.UnitTests/project.json
+++ b/test/dotnet-test.UnitTests/project.json
@ -14,7 +14,7 @@
      "exclude": "Compile"
    },
    "xunit": "2.1.0",
-    "dotnet-test-xunit": "1.0.0-rc2-192208-24",
+    "dotnet-test-xunit": "1.0.0-rc2-318883-21",
    "moq.netcore": "4.4.0-beta8",
    "FluentAssertions": "4.2.2"
  },
--- a/test/dotnet.Tests/GivenThatIWantToManageMulticoreJIT.cs
+++ b/test/dotnet.Tests/GivenThatIWantToManageMulticoreJIT.cs
@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 using Xunit;
 using Xunit.Abstractions;
 using FluentAssertions;
-using Microsoft.DotNet.InternalAbstractions;
+using Microsoft.DotNet.PlatformAbstractions;

 namespace Microsoft.DotNet.Tests
 {
--- a/test/dotnet.Tests/project.json
+++ b/test/dotnet.Tests/project.json
@ -17,7 +17,8 @@
      "type": "build"
    },
    "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": {
    "netcoreapp1.0": {