diff options
| author | Lakshmi Priya Sekar <lasekar@microsoft.com> | 2015-05-08 00:40:40 +0300 |
|---|---|---|
| committer | Lakshmi Priya Sekar <lasekar@microsoft.com> | 2015-05-08 02:15:32 +0300 |
| commit | 03e32211d668ee215f32c599849987cb7d9d4e2a (patch) | |
| tree | cd5ed7cf91149400c0f13144a323af29690aeaa4 /src | |
| parent | f1b588db6cc15ae351026fc53016cc6b1f2d283c (diff) | |
Remove XunitTraitDiscoverers from corefx and reference the nuget package xunit.netcore.extensions.
Diffstat (limited to 'src')
188 files changed, 147 insertions, 1020 deletions
diff --git a/src/.nuget/packages.config b/src/.nuget/packages.config index b7445be8cd..f55e579846 100644 --- a/src/.nuget/packages.config +++ b/src/.nuget/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00044" /> + <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00045" /> <package id="dnx-coreclr-win-x86" version="1.0.0-beta5-11682" /> <package id="Microsoft.DotNet.BuildTools.ApiTools" version="1.0.0-prerelease" /> <package id="dnx-mono" version="1.0.0-beta5-11624" /> diff --git a/src/Common/tests/XunitTraitsDiscoverers/Attributes/ActiveIssueAttribute.cs b/src/Common/tests/XunitTraitsDiscoverers/Attributes/ActiveIssueAttribute.cs deleted file mode 100644 index b7326e64ca..0000000000 --- a/src/Common/tests/XunitTraitsDiscoverers/Attributes/ActiveIssueAttribute.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using System; -using Xunit.Sdk; - -namespace Xunit -{ - /// <summary> - /// Apply this attribute to your test method to specify an active issue. - /// </summary> - [TraitDiscoverer("Xunit.TraitDiscoverers.ActiveIssueDiscoverer", "XunitTraitsDiscoverers")] - [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] - public class ActiveIssueAttribute : Attribute, ITraitAttribute - { - public ActiveIssueAttribute(int issueNumber, PlatformID platforms = PlatformID.Any) { } - public ActiveIssueAttribute(string issue, PlatformID platforms = PlatformID.Any) { } - } -} diff --git a/src/Common/tests/XunitTraitsDiscoverers/Attributes/OuterLoopAttribute.cs b/src/Common/tests/XunitTraitsDiscoverers/Attributes/OuterLoopAttribute.cs deleted file mode 100644 index 9fe305d4ad..0000000000 --- a/src/Common/tests/XunitTraitsDiscoverers/Attributes/OuterLoopAttribute.cs +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using System; -using Xunit.Sdk; - -namespace Xunit -{ - /// <summary> - /// Apply this attribute to your test method to specify a outer-loop category. - /// </summary> - [TraitDiscoverer("Xunit.TraitDiscoverers.OuterLoopTestsDiscoverer", "XunitTraitsDiscoverers")] - [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] - public class OuterLoopAttribute : Attribute, ITraitAttribute - { - public OuterLoopAttribute() { } - } -} diff --git a/src/Common/tests/XunitTraitsDiscoverers/Attributes/PlatformSpecificAttribute.cs b/src/Common/tests/XunitTraitsDiscoverers/Attributes/PlatformSpecificAttribute.cs deleted file mode 100644 index 8563306e14..0000000000 --- a/src/Common/tests/XunitTraitsDiscoverers/Attributes/PlatformSpecificAttribute.cs +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using System; -using Xunit.Sdk; - -namespace Xunit -{ - /// <summary> - /// Apply this attribute to your test method to specify this is a platform specific test. - /// </summary> - [TraitDiscoverer("Xunit.TraitDiscoverers.PlatformSpecificDiscoverer", "XunitTraitsDiscoverers")] - [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] - public class PlatformSpecificAttribute : Attribute, ITraitAttribute - { - public PlatformSpecificAttribute(PlatformID platform) { } - } -} diff --git a/src/Common/tests/XunitTraitsDiscoverers/Discoverers/ActiveIssueDiscoverer.cs b/src/Common/tests/XunitTraitsDiscoverers/Discoverers/ActiveIssueDiscoverer.cs deleted file mode 100644 index 75512bf606..0000000000 --- a/src/Common/tests/XunitTraitsDiscoverers/Discoverers/ActiveIssueDiscoverer.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using Xunit.Abstractions; -using Xunit.Sdk; - -namespace Xunit.TraitDiscoverers -{ - /// <summary> - /// This class discovers all of the tests and test classes that have - /// applied the ActiveIssue attribute - /// </summary> - public class ActiveIssueDiscoverer : ITraitDiscoverer - { - /// <summary> - /// Gets the trait values from the Category attribute. - /// </summary> - /// <param name="traitAttribute">The trait attribute containing the trait values.</param> - /// <returns>The trait values.</returns> - public IEnumerable<KeyValuePair<string, string>> GetTraits(IAttributeInfo traitAttribute) - { - IEnumerable<object> ctorArgs = traitAttribute.GetConstructorArguments(); - Debug.Assert(ctorArgs.Count() >= 2); - - string issue = ctorArgs.First().ToString(); - PlatformID platforms = (PlatformID)ctorArgs.Last(); - if ((platforms.HasFlag(PlatformID.Windows) && Interop.IsWindows) || - (platforms.HasFlag(PlatformID.Linux) && Interop.IsLinux) || - (platforms.HasFlag(PlatformID.OSX) && Interop.IsOSX)) - { - yield return new KeyValuePair<string, string>(XunitConstants.Category, XunitConstants.Failing); - yield return new KeyValuePair<string, string>(XunitConstants.ActiveIssue, issue); - } - - } - } -} diff --git a/src/Common/tests/XunitTraitsDiscoverers/Discoverers/OuterLoopTestsDiscoverer.cs b/src/Common/tests/XunitTraitsDiscoverers/Discoverers/OuterLoopTestsDiscoverer.cs deleted file mode 100644 index 3c1d46603c..0000000000 --- a/src/Common/tests/XunitTraitsDiscoverers/Discoverers/OuterLoopTestsDiscoverer.cs +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using System.Collections.Generic; -using Xunit.Abstractions; -using Xunit.Sdk; - -namespace Xunit.TraitDiscoverers -{ - /// <summary> - /// This class discovers all of the tests and test classes that have - /// applied the OuterLoop attribute - /// </summary> - public class OuterLoopTestsDiscoverer : ITraitDiscoverer - { - /// <summary> - /// Gets the trait values from the Category attribute. - /// </summary> - /// <param name="traitAttribute">The trait attribute containing the trait values.</param> - /// <returns>The trait values.</returns> - public IEnumerable<KeyValuePair<string, string>> GetTraits(IAttributeInfo traitAttribute) - { - yield return new KeyValuePair<string, string>("category", "OuterLoop"); - } - } -} diff --git a/src/Common/tests/XunitTraitsDiscoverers/Discoverers/PlatformSpecificDiscoverer.cs b/src/Common/tests/XunitTraitsDiscoverers/Discoverers/PlatformSpecificDiscoverer.cs deleted file mode 100644 index 829fbd2dfd..0000000000 --- a/src/Common/tests/XunitTraitsDiscoverers/Discoverers/PlatformSpecificDiscoverer.cs +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using System.Linq; -using System.Collections.Generic; -using Xunit.Abstractions; -using Xunit.Sdk; - -namespace Xunit.TraitDiscoverers -{ - /// <summary> - /// This class discovers all of the tests and test classes that have - /// applied the PlatformSpecific attribute - /// </summary> - public class PlatformSpecificDiscoverer : ITraitDiscoverer - { - /// <summary> - /// Gets the trait values from the Category attribute. - /// </summary> - /// <param name="traitAttribute">The trait attribute containing the trait values.</param> - /// <returns>The trait values.</returns> - public IEnumerable<KeyValuePair<string, string>> GetTraits(IAttributeInfo traitAttribute) - { - PlatformID platform = (PlatformID)traitAttribute.GetConstructorArguments().First(); - if (!platform.HasFlag(PlatformID.Windows)) - yield return new KeyValuePair<string, string>(XunitConstants.Category, XunitConstants.NonWindowsTest); - if (!platform.HasFlag(PlatformID.Linux)) - yield return new KeyValuePair<string, string>(XunitConstants.Category, XunitConstants.NonLinuxTest); - if (!platform.HasFlag(PlatformID.OSX)) - yield return new KeyValuePair<string, string>(XunitConstants.Category, XunitConstants.NonOSXTest); - } - } -} diff --git a/src/Common/tests/XunitTraitsDiscoverers/PlatformID.cs b/src/Common/tests/XunitTraitsDiscoverers/PlatformID.cs deleted file mode 100644 index 9f4d9bfd5b..0000000000 --- a/src/Common/tests/XunitTraitsDiscoverers/PlatformID.cs +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using System; -using Xunit.Sdk; - -namespace Xunit -{ - [Flags] - public enum PlatformID - { - Windows = 1, - Linux = 2, - OSX = 4, - AnyUnix = Linux | OSX, - Any = Windows | Linux | OSX - } -} diff --git a/src/Common/tests/XunitTraitsDiscoverers/XunitConstants.cs b/src/Common/tests/XunitTraitsDiscoverers/XunitConstants.cs deleted file mode 100644 index 93f3585daf..0000000000 --- a/src/Common/tests/XunitTraitsDiscoverers/XunitConstants.cs +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using System; -using Xunit.Sdk; - -namespace Xunit -{ - internal struct XunitConstants - { - public const string NonWindowsTest = "nonwindowstests"; - public const string NonLinuxTest = "nonlinuxtests"; - public const string NonOSXTest = "nonosxtests"; - public const string Category = "category"; - public const string Failing = "failing"; - public const string ActiveIssue = "activeissue"; - } -} diff --git a/src/Common/tests/XunitTraitsDiscoverers/XunitTraitsDiscoverers.csproj b/src/Common/tests/XunitTraitsDiscoverers/XunitTraitsDiscoverers.csproj deleted file mode 100644 index 654ba35949..0000000000 --- a/src/Common/tests/XunitTraitsDiscoverers/XunitTraitsDiscoverers.csproj +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <Import Project="..\Tests.props" /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}</ProjectGuid> - <OutputType>Library</OutputType> - <AssemblyName>XunitTraitsDiscoverers</AssemblyName> - <RootNamespace>Xunit.TraitDiscoverers</RootNamespace> - <CLSCompliant>false</CLSCompliant> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <!-- References are resolved from packages.config --> - <ItemGroup> - <Compile Include="..\..\src\Interop\Interop.PlatformDetection.cs"> - <Link>Interop.PlatformDetection.cs</Link> - </Compile> - <Compile Include="Attributes\ActiveIssueAttribute.cs" /> - <Compile Include="XunitConstants.cs" /> - <Compile Include="Discoverers\ActiveIssueDiscoverer.cs" /> - <Compile Include="Attributes\OuterLoopAttribute.cs" /> - <Compile Include="Discoverers\OuterLoopTestsDiscoverer.cs" /> - <Compile Include="Discoverers\PlatformSpecificDiscoverer.cs" /> - <Compile Include="PlatformID.cs" /> - <Compile Include="Attributes\PlatformSpecificAttribute.cs" /> - </ItemGroup> - <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> - </ItemGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file diff --git a/src/Common/tests/XunitTraitsDiscoverers/project.json b/src/Common/tests/XunitTraitsDiscoverers/project.json deleted file mode 100644 index 7c14aaad46..0000000000 --- a/src/Common/tests/XunitTraitsDiscoverers/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "dependencies": { - "System.Diagnostics.Contracts": "4.0.0-beta-22809", - "System.Diagnostics.Debug": "4.0.10-beta-22809", - "System.IO": "4.0.10-beta-22809", - "System.Linq": "4.0.0-beta-22809", - "System.Reflection": "4.0.10-beta-22809", - "System.Reflection.Primitives": "4.0.0-beta-22809", - "System.Runtime": "4.0.20-beta-22809", - "System.Runtime.Extensions": "4.0.10-beta-22809", - "System.Runtime.Handles": "4.0.0-beta-22809", - "System.Runtime.InteropServices": "4.0.20-beta-22809", - "System.Text.Encoding": "4.0.10-beta-22809", - "System.Threading": "4.0.10-beta-22809", - "System.Threading.Tasks": "4.0.10-beta-22809", - "xunit": "2.0.0-beta5-build2785", - "xunit.abstractions.netcore": "1.0.0-prerelease", - "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" - }, - "frameworks": { - "dnxcore50": {} - } -}
\ No newline at end of file diff --git a/src/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln b/src/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln index a291ee4306..535a4d70b7 100644 --- a/src/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln +++ b/src/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Primitives. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Win32.Primitives", "src\Microsoft.Win32.Primitives.csproj", "{8FFE99C0-22F8-4462-B839-970EAC1B3472}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{6DF80DBD-B979-4B4D-89F1-5C35273809A6}" ProjectSection(SolutionItems) = preProject ..\.nuget\packages.config = ..\.nuget\packages.config diff --git a/src/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj b/src/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj index e46ffb7d4e..d0dc782d59 100644 --- a/src/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj +++ b/src/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.csproj @@ -26,10 +26,6 @@ <Project>{8ffe99c0-22f8-4462-b839-970eac1b3472}</Project> <Name>Microsoft.Win32.Primitives</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> diff --git a/src/Microsoft.Win32.Primitives/tests/project.json b/src/Microsoft.Win32.Primitives/tests/project.json index cd16348458..26c83aeee3 100644 --- a/src/Microsoft.Win32.Primitives/tests/project.json +++ b/src/Microsoft.Win32.Primitives/tests/project.json @@ -5,7 +5,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Collections.Concurrent/System.Collections.Concurrent.sln b/src/System.Collections.Concurrent/System.Collections.Concurrent.sln index f7261f7ccf..1b4103ea7d 100644 --- a/src/System.Collections.Concurrent/System.Collections.Concurrent.sln +++ b/src/System.Collections.Concurrent/System.Collections.Concurrent.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Concurre EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Concurrent.Tests", "tests\System.Collections.Concurrent.Tests.csproj", "{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{47919FF5-DA40-4D99-AF2D-F560282AA913}" ProjectSection(SolutionItems) = preProject ..\.nuget\packages.config = ..\.nuget\packages.config @@ -28,10 +26,6 @@ Global {9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Debug|Any CPU.Build.0 = Debug|Any CPU {9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Release|Any CPU.ActiveCfg = Release|Any CPU {9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj b/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj index b80dda4dc5..6fc55bd108 100644 --- a/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj +++ b/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.csproj @@ -36,10 +36,6 @@ </ItemGroup> <!-- References are resolved from packages.config --> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.Collections.Concurrent.csproj"> <Project>{96AA2060-C846-4E56-9509-E8CB9C114C8F}</Project> <Name>System.Collections.Concurrent</Name> diff --git a/src/System.Collections.Concurrent/tests/project.json b/src/System.Collections.Concurrent/tests/project.json index d3653a0607..64b96afe8f 100644 --- a/src/System.Collections.Concurrent/tests/project.json +++ b/src/System.Collections.Concurrent/tests/project.json @@ -14,7 +14,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Collections.NonGeneric/System.Collections.NonGeneric.sln b/src/System.Collections.NonGeneric/System.Collections.NonGeneric.sln index a6d4cfa979..6ab4df68e3 100644 --- a/src/System.Collections.NonGeneric/System.Collections.NonGeneric.sln +++ b/src/System.Collections.NonGeneric/System.Collections.NonGeneric.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.NonGener EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.NonGeneric.Tests", "tests\System.Collections.NonGeneric.Tests.csproj", "{EE95AE39-845A-42D3-86D0-8065DBE56612}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -23,10 +21,6 @@ Global {EE95AE39-845A-42D3-86D0-8065DBE56612}.Debug|Any CPU.Build.0 = Debug|Any CPU {EE95AE39-845A-42D3-86D0-8065DBE56612}.Release|Any CPU.ActiveCfg = Release|Any CPU {EE95AE39-845A-42D3-86D0-8065DBE56612}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj b/src/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj index 75bffbb287..05078b24e1 100644 --- a/src/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj +++ b/src/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj @@ -146,10 +146,6 @@ </Compile> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.Collections.NonGeneric.csproj"> <Name>System.Collections.NonGeneric</Name> </ProjectReference> diff --git a/src/System.Collections.NonGeneric/tests/project.json b/src/System.Collections.NonGeneric/tests/project.json index f6d1257c1e..b52cec5072 100644 --- a/src/System.Collections.NonGeneric/tests/project.json +++ b/src/System.Collections.NonGeneric/tests/project.json @@ -15,7 +15,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Collections.Specialized/System.Collections.Specialized.sln b/src/System.Collections.Specialized/System.Collections.Specialized.sln index 08014a9b84..2e42b9b4e5 100644 --- a/src/System.Collections.Specialized/System.Collections.Specialized.sln +++ b/src/System.Collections.Specialized/System.Collections.Specialized.sln @@ -12,8 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{961859 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Specialized.Tests", "tests\System.Collections.Specialized.Tests.csproj", "{7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -28,10 +26,6 @@ Global {7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}.Debug|Any CPU.Build.0 = Debug|Any CPU {7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}.Release|Any CPU.ActiveCfg = Release|Any CPU {7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj b/src/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj index 07ecf0dc96..15ef08b53a 100644 --- a/src/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj +++ b/src/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj @@ -144,10 +144,6 @@ <Compile Include="StringEnumerator\ResetTests.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.Collections.Specialized.csproj"> <Project>{63634289-90d7-4947-8bf3-dbbe98d76c85}</Project> <Name>System.Collections.Specialized</Name> diff --git a/src/System.Collections.Specialized/tests/project.json b/src/System.Collections.Specialized/tests/project.json index 546c229c12..4ad6d732e4 100644 --- a/src/System.Collections.Specialized/tests/project.json +++ b/src/System.Collections.Specialized/tests/project.json @@ -15,7 +15,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Collections/System.Collections.sln b/src/System.Collections/System.Collections.sln index 068b594e56..ba6c42af53 100644 --- a/src/System.Collections/System.Collections.sln +++ b/src/System.Collections/System.Collections.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Tests", "tests\System.Collections.Tests.csproj", "{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections", "src\System.Collections.csproj", "{D5FF747F-7A0B-9003-885A-FE9A63E755E5}" EndProject Global diff --git a/src/System.Collections/tests/System.Collections.Tests.csproj b/src/System.Collections/tests/System.Collections.Tests.csproj index 2ee08cf00d..edbe8694ff 100644 --- a/src/System.Collections/tests/System.Collections.Tests.csproj +++ b/src/System.Collections/tests/System.Collections.Tests.csproj @@ -128,12 +128,6 @@ </ItemGroup> <!-- References are resolved from packages.config --> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <None Include="project.json" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> diff --git a/src/System.Collections/tests/project.json b/src/System.Collections/tests/project.json index bb399b5000..3dc67d871b 100644 --- a/src/System.Collections/tests/project.json +++ b/src/System.Collections/tests/project.json @@ -12,7 +12,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln b/src/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln index 59337c17e4..af2d57be10 100644 --- a/src/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln +++ b/src/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Annot EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Annotations.Tests", "tests\System.ComponentModel.Annotations.Tests.csproj", "{6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{3A3E1C22-FF83-4D70-A94A-6C130805E6BF}" ProjectSection(SolutionItems) = preProject ..\.nuget\packages.config = ..\.nuget\packages.config @@ -28,10 +26,6 @@ Global {6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}.Debug|Any CPU.Build.0 = Debug|Any CPU {6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}.Release|Any CPU.ActiveCfg = Release|Any CPU {6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj b/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj index ac57a5dc70..8b73465e81 100644 --- a/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj +++ b/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.csproj @@ -20,10 +20,6 @@ </ItemGroup> <!-- References are resolved from packages.config --> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.ComponentModel.EventBasedAsync.csproj"> <Project>{551A6340-8EEF-445E-A2A2-639CC23DBD36}</Project> <Name>System.ComponentModel.EventBasedAsync</Name> diff --git a/src/System.ComponentModel.EventBasedAsync/tests/project.json b/src/System.ComponentModel.EventBasedAsync/tests/project.json index f5ba694229..612cc3d6d9 100644 --- a/src/System.ComponentModel.EventBasedAsync/tests/project.json +++ b/src/System.ComponentModel.EventBasedAsync/tests/project.json @@ -6,7 +6,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln b/src/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln index e84d9f1589..0f6779a3ca 100644 --- a/src/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln +++ b/src/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln @@ -12,8 +12,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Primi EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.Primitives.Tests", "tests\System.ComponentModel.Primitives.Tests.csproj", "{C9534425-93FB-494F-8DD8-1E4E3E626FDE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -28,10 +26,6 @@ Global {C9534425-93FB-494F-8DD8-1E4E3E626FDE}.Debug|Any CPU.Build.0 = Debug|Any CPU {C9534425-93FB-494F-8DD8-1E4E3E626FDE}.Release|Any CPU.ActiveCfg = Release|Any CPU {C9534425-93FB-494F-8DD8-1E4E3E626FDE}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj b/src/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj index 1e757630cf..98ab943d76 100644 --- a/src/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj +++ b/src/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj @@ -19,10 +19,6 @@ </ItemGroup> <!-- References are resolved from packages.config --> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.ComponentModel.Primitives.csproj"> <Project>{F620F382-30D1-451E-B125-2A612F92068B}</Project> <Name>System.ComponentModel.Primitives</Name> diff --git a/src/System.ComponentModel.Primitives/tests/project.json b/src/System.ComponentModel.Primitives/tests/project.json index dac3f0d55a..dd9762e3e7 100644 --- a/src/System.ComponentModel.Primitives/tests/project.json +++ b/src/System.ComponentModel.Primitives/tests/project.json @@ -5,7 +5,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln b/src/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln index 134aec4939..c3de463a8f 100644 --- a/src/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln +++ b/src/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.TypeC EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ComponentModel.TypeConverter.Tests", "tests\System.ComponentModel.TypeConverter.Tests.csproj", "{3F0326A1-9E19-4A6C-95CE-63E65C9D2030}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -23,10 +21,6 @@ Global {3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Debug|Any CPU.Build.0 = Debug|Any CPU {3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Release|Any CPU.ActiveCfg = Release|Any CPU {3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj b/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj index 65badf629a..09a7de5205 100644 --- a/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj +++ b/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj @@ -52,10 +52,6 @@ <ProjectReference Include="..\src\System.ComponentModel.TypeConverter.csproj"> <Name>System.ComponentModel.TypeConverter</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> </ItemGroup> <ItemGroup> <None Include="project.json" /> diff --git a/src/System.ComponentModel.TypeConverter/tests/project.json b/src/System.ComponentModel.TypeConverter/tests/project.json index 943546200d..a9120cb265 100644 --- a/src/System.ComponentModel.TypeConverter/tests/project.json +++ b/src/System.ComponentModel.TypeConverter/tests/project.json @@ -10,7 +10,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.ComponentModel/tests/System.ComponentModel.Tests.csproj b/src/System.ComponentModel/tests/System.ComponentModel.Tests.csproj index 8036a02e25..bfe40e6a19 100644 --- a/src/System.ComponentModel/tests/System.ComponentModel.Tests.csproj +++ b/src/System.ComponentModel/tests/System.ComponentModel.Tests.csproj @@ -19,10 +19,6 @@ </ItemGroup> <!-- References are resolved from packages.config --> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.ComponentModel.csproj"> <Project>{AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}</Project> <Name>System.ComponentModel</Name> diff --git a/src/System.ComponentModel/tests/project.json b/src/System.ComponentModel/tests/project.json index 5b19baee4b..448e116059 100644 --- a/src/System.ComponentModel/tests/project.json +++ b/src/System.ComponentModel/tests/project.json @@ -4,7 +4,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Console/tests/System.Console.Tests.csproj b/src/System.Console/tests/System.Console.Tests.csproj index c44b13d1a4..9753914c36 100644 --- a/src/System.Console/tests/System.Console.Tests.csproj +++ b/src/System.Console/tests/System.Console.Tests.csproj @@ -28,10 +28,6 @@ <Compile Include="XunitAssemblyAttributes.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.Console.csproj"> <Project>{F9DF2357-81B4-4317-908E-512DA9395583}</Project> <Name>System.Console</Name> diff --git a/src/System.Console/tests/project.json b/src/System.Console/tests/project.json index 58137b57df..d98d6a2b7c 100644 --- a/src/System.Console/tests/project.json +++ b/src/System.Console/tests/project.json @@ -17,7 +17,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln b/src/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln index 67c2c218fa..a937700cb6 100644 --- a/src/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln +++ b/src/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Contracts.Tests", "tests\System.Diagnostics.Contracts.Tests.csproj", "{0C4E7FF1-54C6-49b7-9700-18F5F3EB8E65}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -17,10 +15,6 @@ Global {0C4E7FF1-54C6-49b7-9700-18F5F3EB8E65}.Debug|Any CPU.Build.0 = Debug|Any CPU {0C4E7FF1-54C6-49b7-9700-18F5F3EB8E65}.Release|Any CPU.ActiveCfg = Release|Any CPU {0C4E7FF1-54C6-49b7-9700-18F5F3EB8E65}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj b/src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj index f33f5c179c..ba18d117d6 100644 --- a/src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj +++ b/src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.csproj @@ -15,12 +15,6 @@ <None Include="project.json" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Compile Include="AssertTests.cs" /> <Compile Include="AssumeTests.cs" /> <Compile Include="ContractFailedTests.cs" /> diff --git a/src/System.Diagnostics.Contracts/tests/project.json b/src/System.Diagnostics.Contracts/tests/project.json index c66597c001..bcfd5698ee 100644 --- a/src/System.Diagnostics.Contracts/tests/project.json +++ b/src/System.Diagnostics.Contracts/tests/project.json @@ -7,7 +7,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Diagnostics.Debug/System.Diagnostics.Debug.sln b/src/System.Diagnostics.Debug/System.Diagnostics.Debug.sln index 082ead0a39..eca099744f 100644 --- a/src/System.Diagnostics.Debug/System.Diagnostics.Debug.sln +++ b/src/System.Diagnostics.Debug/System.Diagnostics.Debug.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Debug", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.Debug.Tests", "tests\System.Diagnostics.Debug.Tests.csproj", "{56F67E92-E606-435E-A00F-003CBFB26945}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{47919FF5-DA40-4D99-AF2D-F560282AA913}" ProjectSection(SolutionItems) = preProject ..\.nuget\packages.config = ..\.nuget\packages.config @@ -48,18 +46,6 @@ Global {56F67E92-E606-435E-A00F-003CBFB26945}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|Any CPU {56F67E92-E606-435E-A00F-003CBFB26945}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU {56F67E92-E606-435E-A00F-003CBFB26945}.Windows_Release|Any CPU.Build.0 = Windows_Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.ActiveCfg = Linux_Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.Build.0 = Linux_Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.ActiveCfg = Linux_Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.Build.0 = Linux_Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.ActiveCfg = OSX_Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.Build.0 = OSX_Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.ActiveCfg = OSX_Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.Build.0 = OSX_Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.Build.0 = Windows_Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj b/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj index 9c123b3458..10e7c65fa9 100644 --- a/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj +++ b/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj @@ -19,10 +19,6 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> </PropertyGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.Diagnostics.Debug.csproj"> <Project>{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}</Project> <Name>System.Diagnostics.Debug</Name> diff --git a/src/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln b/src/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln index a470d866dc..8a5e49e515 100644 --- a/src/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln +++ b/src/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln @@ -13,8 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestAssembly", "TestAssembl EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.FileVersionInfo.TestAssembly", "testAssembly\System.Diagnostics.FileVersionInfo.TestAssembly.csproj", "{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{2D0715BD-01EA-4E9D-AC88-DA5410C15183}" ProjectSection(SolutionItems) = preProject ..\.nuget\packages.config = ..\.nuget\packages.config @@ -66,18 +64,6 @@ Global {28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU {28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU {28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Windows_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests.csproj b/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests.csproj index 2f23a4215c..ad313b8e43 100644 --- a/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests.csproj +++ b/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests.csproj @@ -48,10 +48,6 @@ <Project>{28eb14be-3bc9-4543-aba6-a932424dfbd0}</Project> <Name>System.Diagnostics.FileVersionInfo.TestAssembly</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> </ItemGroup> <!-- Automatically added by VS --> <ItemGroup> diff --git a/src/System.Diagnostics.FileVersionInfo/tests/project.json b/src/System.Diagnostics.FileVersionInfo/tests/project.json index 91365fea3f..7b3cf51bae 100644 --- a/src/System.Diagnostics.FileVersionInfo/tests/project.json +++ b/src/System.Diagnostics.FileVersionInfo/tests/project.json @@ -14,7 +14,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests/System.Diagnostics.Process.Tests.csproj b/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests/System.Diagnostics.Process.Tests.csproj index a8faeb63fb..fef3ce91f6 100644 --- a/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests/System.Diagnostics.Process.Tests.csproj +++ b/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests/System.Diagnostics.Process.Tests.csproj @@ -32,10 +32,6 @@ <Project>{63634289-90d7-4947-8bf3-dbbe98d76c85}</Project> <Name>System.Diagnostics.Process</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\System.Diagnostics.Process.TestConsoleApp\System.Diagnostics.Process.TestConsoleApp.csproj"> <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> <Name>System.Diagnostics.Process.TestConsoleApp</Name> diff --git a/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests/project.json b/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests/project.json index 9d22e8c34a..41109656de 100644 --- a/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests/project.json +++ b/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests/project.json @@ -20,7 +20,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Globalization.Extensions/System.Globalization.Extensions.sln b/src/System.Globalization.Extensions/System.Globalization.Extensions.sln index 70fe812376..5d5ab7ec3c 100644 --- a/src/System.Globalization.Extensions/System.Globalization.Extensions.sln +++ b/src/System.Globalization.Extensions/System.Globalization.Extensions.sln @@ -12,8 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{961859 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Globalization.Extensions.Tests", "tests\System.Globalization.Extensions.Tests.csproj", "{BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Linux_Debug|Any CPU = Linux_Debug|Any CPU @@ -48,18 +46,6 @@ Global {BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU {BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU {BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}.Windows_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj b/src/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj index f50bf1003b..e346452512 100644 --- a/src/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj +++ b/src/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.csproj @@ -37,10 +37,6 @@ <Project>{2b96aa10-84c0-4927-8611-8d2474b990e8}</Project> <Name>System.Globalization.Extensions</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Globalization.Extensions/tests/project.json b/src/System.Globalization.Extensions/tests/project.json index ec86917ded..c09ce9b282 100644 --- a/src/System.Globalization.Extensions/tests/project.json +++ b/src/System.Globalization.Extensions/tests/project.json @@ -14,7 +14,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj b/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj index 8494dea119..0deab2a04e 100644 --- a/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj +++ b/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj @@ -12,10 +12,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.IO.Compression.ZipFile.csproj"> <Project>{A8CF61F0-56EA-4b5f-9375-0723DF4250C0}</Project> <Name>System.IO.Compression.ZipFile</Name> diff --git a/src/System.IO.Compression.ZipFile/tests/project.json b/src/System.IO.Compression.ZipFile/tests/project.json index 8081cd449f..ee63773fb7 100644 --- a/src/System.IO.Compression.ZipFile/tests/project.json +++ b/src/System.IO.Compression.ZipFile/tests/project.json @@ -21,7 +21,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj b/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj index fdc52a174c..4baa8335c3 100644 --- a/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj +++ b/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj @@ -15,10 +15,6 @@ <None Include="project.json" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.IO.Compression.csproj"> <Project>{5471BFE8-8071-466f-838E-5ADAA779E742}</Project> <Name>System.IO.Compression</Name> diff --git a/src/System.IO.Compression/tests/project.json b/src/System.IO.Compression/tests/project.json index 45144ba50c..7ad12f2baf 100644 --- a/src/System.IO.Compression/tests/project.json +++ b/src/System.IO.Compression/tests/project.json @@ -18,7 +18,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj b/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj index 0261091992..8c0cf2af22 100644 --- a/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj +++ b/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj @@ -27,10 +27,6 @@ <Project>{29c14ad7-dc03-45dc-897d-8dacc762707e}</Project> <Name>System.IO.FileSystem.DriveInfo</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.IO.FileSystem.DriveInfo/tests/project.json b/src/System.IO.FileSystem.DriveInfo/tests/project.json index e0019c732f..047aafc359 100644 --- a/src/System.IO.FileSystem.DriveInfo/tests/project.json +++ b/src/System.IO.FileSystem.DriveInfo/tests/project.json @@ -21,7 +21,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln b/src/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln index 6fc1c62772..79ce3a1504 100644 --- a/src/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln +++ b/src/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Primit EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Primitives.Tests", "tests\System.IO.FileSystem.Primitives.Tests.csproj", "{2EF7EFA5-F171-4CAB-8A29-32833949FD87}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Linux_Debug|Any CPU = Linux_Debug|Any CPU @@ -43,18 +41,6 @@ Global {2EF7EFA5-F171-4CAB-8A29-32833949FD87}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|Any CPU {2EF7EFA5-F171-4CAB-8A29-32833949FD87}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU {2EF7EFA5-F171-4CAB-8A29-32833949FD87}.Windows_Release|Any CPU.Build.0 = Windows_Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.ActiveCfg = Linux_Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.Build.0 = Linux_Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.ActiveCfg = Linux_Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.Build.0 = Linux_Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.ActiveCfg = OSX_Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.Build.0 = OSX_Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.ActiveCfg = OSX_Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.Build.0 = OSX_Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.Build.0 = Windows_Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj b/src/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj index 98265feeeb..971a535adf 100644 --- a/src/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj +++ b/src/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.csproj @@ -22,10 +22,6 @@ <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\System.IO.FileSystem.Primitives\src\System.IO.FileSystem.Primitives.csproj"> <Project>{6c05678e-394c-4cff-b453-a18e28c8f2c3}</Project> <Name>System.IO.FileSystem.Primitives</Name> diff --git a/src/System.IO.FileSystem.Primitives/tests/project.json b/src/System.IO.FileSystem.Primitives/tests/project.json index 5b19baee4b..448e116059 100644 --- a/src/System.IO.FileSystem.Primitives/tests/project.json +++ b/src/System.IO.FileSystem.Primitives/tests/project.json @@ -4,7 +4,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln b/src/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln index e43bc0a302..8f647b58d4 100644 --- a/src/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln +++ b/src/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln @@ -6,8 +6,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Watche EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Watcher.Tests", "tests\System.IO.FileSystem.Watcher.Tests.csproj", "{20411A66-C7A4-4941-8FA2-66308365FD22}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{4B06330D-B839-4D9B-AC32-D510B7AB9FB9}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{613515D7-B799-4EB8-B262-C54A2279C77B}" @@ -42,14 +40,6 @@ Global {20411A66-C7A4-4941-8FA2-66308365FD22}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU {20411A66-C7A4-4941-8FA2-66308365FD22}.Windows_Release|Any CPU.ActiveCfg = Debug|Any CPU {20411A66-C7A4-4941-8FA2-66308365FD22}.Windows_Release|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj b/src/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj index 6ffcf036ef..e8a112ac05 100644 --- a/src/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj +++ b/src/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.csproj @@ -40,12 +40,6 @@ <None Include="project.json" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> diff --git a/src/System.IO.FileSystem.Watcher/tests/project.json b/src/System.IO.FileSystem.Watcher/tests/project.json index d4d80c9118..cc3219cd74 100644 --- a/src/System.IO.FileSystem.Watcher/tests/project.json +++ b/src/System.IO.FileSystem.Watcher/tests/project.json @@ -17,7 +17,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.IO.FileSystem/System.IO.FileSystem.sln b/src/System.IO.FileSystem/System.IO.FileSystem.sln index 9b18462b98..0b01bb2208 100644 --- a/src/System.IO.FileSystem/System.IO.FileSystem.sln +++ b/src/System.IO.FileSystem/System.IO.FileSystem.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem", "src EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.Tests", "tests\System.IO.FileSystem.Tests.csproj", "{57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Linux_Debug|Any CPU = Linux_Debug|Any CPU @@ -43,18 +41,6 @@ Global {57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU {57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU {57E8F8D4-0766-4CC7-B3F9-B243B81DB6A5}.Windows_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj b/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj index 7435dd38af..a99b99de6d 100644 --- a/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj +++ b/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj @@ -24,10 +24,6 @@ <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.IO.FileSystem.csproj"> <Project>{879c23dc-d828-4dfb-8e92-abbc11b71035}</Project> <Name>System.IO.FileSystem</Name> diff --git a/src/System.IO.FileSystem/tests/project.json b/src/System.IO.FileSystem/tests/project.json index 206d8546fe..7e442ccaf6 100644 --- a/src/System.IO.FileSystem/tests/project.json +++ b/src/System.IO.FileSystem/tests/project.json @@ -19,7 +19,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln b/src/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln index f0bfe57141..8e82c65c3b 100644 --- a/src/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln +++ b/src/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln @@ -13,8 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.MemoryMappedViewA EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.MemoryMappedViewStream.Tests", "tests\MemoryMappedViewStream\System.IO.MemoryMappedViewStream.Tests.csproj", "{688496E1-A7B3-41AE-9E32-C6F1A1127F91}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Linux_Debug|Any CPU = Linux_Debug|Any CPU @@ -73,18 +71,6 @@ Global {688496E1-A7B3-41AE-9E32-C6F1A1127F91}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU {688496E1-A7B3-41AE-9E32-C6F1A1127F91}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU {688496E1-A7B3-41AE-9E32-C6F1A1127F91}.Windows_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.IO.MemoryMappedFiles/tests/MemoryMappedFile/System.IO.MemoryMappedFiles.Tests.csproj b/src/System.IO.MemoryMappedFiles/tests/MemoryMappedFile/System.IO.MemoryMappedFiles.Tests.csproj index 62b3f7740c..8a91f257e3 100644 --- a/src/System.IO.MemoryMappedFiles/tests/MemoryMappedFile/System.IO.MemoryMappedFiles.Tests.csproj +++ b/src/System.IO.MemoryMappedFiles/tests/MemoryMappedFile/System.IO.MemoryMappedFiles.Tests.csproj @@ -55,10 +55,6 @@ <Project>{16EE5522-F387-4C9E-9EF2-B5134B043F37}</Project> <Name>System.IO.MemoryMappedFiles</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.IO.MemoryMappedFiles/tests/MemoryMappedFile/project.json b/src/System.IO.MemoryMappedFiles/tests/MemoryMappedFile/project.json index 2d8d335261..9fefb0678c 100644 --- a/src/System.IO.MemoryMappedFiles/tests/MemoryMappedFile/project.json +++ b/src/System.IO.MemoryMappedFiles/tests/MemoryMappedFile/project.json @@ -20,7 +20,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.IO.MemoryMappedFiles/tests/MemoryMappedViewAccessor/System.IO.MemoryMappedViewAccessor.Tests.csproj b/src/System.IO.MemoryMappedFiles/tests/MemoryMappedViewAccessor/System.IO.MemoryMappedViewAccessor.Tests.csproj index f75ee6ec37..6efbeb1d94 100644 --- a/src/System.IO.MemoryMappedFiles/tests/MemoryMappedViewAccessor/System.IO.MemoryMappedViewAccessor.Tests.csproj +++ b/src/System.IO.MemoryMappedFiles/tests/MemoryMappedViewAccessor/System.IO.MemoryMappedViewAccessor.Tests.csproj @@ -52,10 +52,6 @@ <Project>{16EE5522-F387-4C9E-9EF2-B5134B043F37}</Project> <Name>System.IO.MemoryMappedFiles</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.IO.MemoryMappedFiles/tests/MemoryMappedViewAccessor/project.json b/src/System.IO.MemoryMappedFiles/tests/MemoryMappedViewAccessor/project.json index 2d8d335261..9fefb0678c 100644 --- a/src/System.IO.MemoryMappedFiles/tests/MemoryMappedViewAccessor/project.json +++ b/src/System.IO.MemoryMappedFiles/tests/MemoryMappedViewAccessor/project.json @@ -20,7 +20,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream/System.IO.MemoryMappedViewStream.Tests.csproj b/src/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream/System.IO.MemoryMappedViewStream.Tests.csproj index 71b6cecc9f..a3a2f94a63 100644 --- a/src/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream/System.IO.MemoryMappedViewStream.Tests.csproj +++ b/src/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream/System.IO.MemoryMappedViewStream.Tests.csproj @@ -51,10 +51,6 @@ <Project>{16EE5522-F387-4C9E-9EF2-B5134B043F37}</Project> <Name>System.IO.MemoryMappedFiles</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream/project.json b/src/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream/project.json index 2d8d335261..8a34c2ae72 100644 --- a/src/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream/project.json +++ b/src/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream/project.json @@ -20,7 +20,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.IO.Pipes/System.IO.Pipes.sln b/src/System.IO.Pipes/System.IO.Pipes.sln index ac22e31771..de5f405b90 100644 --- a/src/System.IO.Pipes/System.IO.Pipes.sln +++ b/src/System.IO.Pipes/System.IO.Pipes.sln @@ -12,8 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{1F3D70 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.Pipes.Tests", "tests\System.IO.Pipes.Tests.csproj", "{142469EC-D665-4FE2-845A-FDA69F9CC557}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Linux_Debug|Any CPU = Linux_Debug|Any CPU @@ -48,18 +46,6 @@ Global {142469EC-D665-4FE2-845A-FDA69F9CC557}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU {142469EC-D665-4FE2-845A-FDA69F9CC557}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU {142469EC-D665-4FE2-845A-FDA69F9CC557}.Windows_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj b/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj index 30bc3ff254..8fad885992 100644 --- a/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj +++ b/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.csproj @@ -39,10 +39,6 @@ <Project>{16ee5522-f387-4c9e-9ef2-b5134b043f37}</Project> <Name>System.IO.Pipes</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.IO.Pipes/tests/project.json b/src/System.IO.Pipes/tests/project.json index 70e631d0e5..50411c9285 100644 --- a/src/System.IO.Pipes/tests/project.json +++ b/src/System.IO.Pipes/tests/project.json @@ -14,7 +14,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Linq.Parallel/System.Linq.Parallel.sln b/src/System.Linq.Parallel/System.Linq.Parallel.sln index 63521ee670..1adcf3e5c9 100644 --- a/src/System.Linq.Parallel/System.Linq.Parallel.sln +++ b/src/System.Linq.Parallel/System.Linq.Parallel.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Parallel", "src EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Linq.Parallel.Tests", "tests\System.Linq.Parallel.Tests.csproj", "{A7074928-82C3-4739-88FE-9B528977950C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{47919FF5-DA40-4D99-AF2D-F560282AA913}" ProjectSection(SolutionItems) = preProject ..\.nuget\packages.config = ..\.nuget\packages.config @@ -28,10 +26,6 @@ Global {A7074928-82C3-4739-88FE-9B528977950C}.Debug|Any CPU.Build.0 = Debug|Any CPU {A7074928-82C3-4739-88FE-9B528977950C}.Release|Any CPU.ActiveCfg = Release|Any CPU {A7074928-82C3-4739-88FE-9B528977950C}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj b/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj index e577c69caa..1e061974bb 100644 --- a/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj +++ b/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.csproj @@ -63,10 +63,6 @@ </ItemGroup> <!-- References are resolved from packages.config --> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.Linq.Parallel.csproj"> <Project>{be28323e-327a-4e0f-b7f9-16ab7eab59dd}</Project> <Name>System.Linq.Parallel</Name> diff --git a/src/System.Linq.Parallel/tests/project.json b/src/System.Linq.Parallel/tests/project.json index ae2f318f3e..50637af4f7 100644 --- a/src/System.Linq.Parallel/tests/project.json +++ b/src/System.Linq.Parallel/tests/project.json @@ -15,7 +15,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Numerics.Vectors/System.Numerics.Vectors.sln b/src/System.Numerics.Vectors/System.Numerics.Vectors.sln index bb2ebb2a8b..2460cb5968 100644 --- a/src/System.Numerics.Vectors/System.Numerics.Vectors.sln +++ b/src/System.Numerics.Vectors/System.Numerics.Vectors.sln @@ -6,8 +6,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Numerics.Vectors", " EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Numerics.Vectors.Tests", "tests\System.Numerics.Vectors.Tests.csproj", "{A7074928-82C3-4739-88FE-9B528977950C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{D65B336B-658A-499D-9613-1731050D994F}" ProjectSection(SolutionItems) = preProject ..\.nuget\packages.config = ..\.nuget\packages.config @@ -27,10 +25,6 @@ Global {A7074928-82C3-4739-88FE-9B528977950C}.Debug|Any CPU.Build.0 = Debug|Any CPU {A7074928-82C3-4739-88FE-9B528977950C}.Release|Any CPU.ActiveCfg = Release|Any CPU {A7074928-82C3-4739-88FE-9B528977950C}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj b/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj index a6534b1d5b..93120af5e4 100644 --- a/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj +++ b/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.csproj @@ -45,10 +45,6 @@ <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.Numerics.Vectors.csproj"> <Project>{53134b0c-0d57-481b-b84e-d1991e8d54ff}</Project> <Name>System.Numerics.Vectors</Name> diff --git a/src/System.Numerics.Vectors/tests/project.json b/src/System.Numerics.Vectors/tests/project.json index 03d00cdc38..8ad0ddc1a5 100644 --- a/src/System.Numerics.Vectors/tests/project.json +++ b/src/System.Numerics.Vectors/tests/project.json @@ -21,7 +21,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.ObjectModel/System.ObjectModel.sln b/src/System.ObjectModel/System.ObjectModel.sln index af5bd45a1f..035fb544df 100644 --- a/src/System.ObjectModel/System.ObjectModel.sln +++ b/src/System.ObjectModel/System.ObjectModel.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ObjectModel", "src\S EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.ObjectModel.Tests", "tests\System.ObjectModel.Tests.csproj", "{82B54697-0251-47A1-8546-FC507D0F3B08}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -23,10 +21,6 @@ Global {82B54697-0251-47A1-8546-FC507D0F3B08}.Debug|Any CPU.Build.0 = Debug|Any CPU {82B54697-0251-47A1-8546-FC507D0F3B08}.Release|Any CPU.ActiveCfg = Release|Any CPU {82B54697-0251-47A1-8546-FC507D0F3B08}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.ObjectModel/tests/System.ObjectModel.Tests.csproj b/src/System.ObjectModel/tests/System.ObjectModel.Tests.csproj index 14d73e8d6a..e8536af517 100644 --- a/src/System.ObjectModel/tests/System.ObjectModel.Tests.csproj +++ b/src/System.ObjectModel/tests/System.ObjectModel.Tests.csproj @@ -33,10 +33,6 @@ </Compile> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.ObjectModel.csproj"> <Project>{F24D3391-2928-4E83-AADE-A4461E5CAE50}</Project> <Name>System.ObjectModel</Name> diff --git a/src/System.ObjectModel/tests/project.json b/src/System.ObjectModel/tests/project.json index a4b2b7d920..254693bb4a 100644 --- a/src/System.ObjectModel/tests/project.json +++ b/src/System.ObjectModel/tests/project.json @@ -11,7 +11,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Reflection.Metadata/System.Reflection.Metadata.sln b/src/System.Reflection.Metadata/System.Reflection.Metadata.sln index 51db6b7545..134bb46423 100644 --- a/src/System.Reflection.Metadata/System.Reflection.Metadata.sln +++ b/src/System.Reflection.Metadata/System.Reflection.Metadata.sln @@ -6,8 +6,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Metadata" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reflection.Metadata.Tests", "tests\System.Reflection.Metadata.Tests.csproj", "{7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{5C5F1FFD-CC57-4DFF-9CAF-0A2852323AD6}" ProjectSection(SolutionItems) = preProject ..\.nuget\packages.config = ..\.nuget\packages.config @@ -27,10 +25,6 @@ Global {7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Debug|Any CPU.Build.0 = Debug|Any CPU {7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Release|Any CPU.ActiveCfg = Release|Any CPU {7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj b/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj index 8d272b2930..f9d43aa292 100644 --- a/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj +++ b/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj @@ -33,10 +33,6 @@ </PropertyGroup> <!-- References are resolved from packages.config --> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.Reflection.Metadata.csproj"> <Project>{f3e433c8-352f-4944-bf7f-765ce435370d}</Project> <Name>System.Reflection.Metadata</Name> diff --git a/src/System.Reflection.Metadata/tests/project.json b/src/System.Reflection.Metadata/tests/project.json index 0f837e299e..aa5fcc5fec 100644 --- a/src/System.Reflection.Metadata/tests/project.json +++ b/src/System.Reflection.Metadata/tests/project.json @@ -26,7 +26,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Runtime.Environment/tests/System.Runtime.Environment.Tests.csproj b/src/System.Runtime.Environment/tests/System.Runtime.Environment.Tests.csproj index 8159f2f866..115f6539f9 100644 --- a/src/System.Runtime.Environment/tests/System.Runtime.Environment.Tests.csproj +++ b/src/System.Runtime.Environment/tests/System.Runtime.Environment.Tests.csproj @@ -21,10 +21,6 @@ <None Include="project.json" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.Runtime.Environment.csproj"> <Project>{f9df2357-81b4-4317-908e-512da9395583}</Project> <Name>System.Runtime.Environment</Name> diff --git a/src/System.Runtime.Environment/tests/project.json b/src/System.Runtime.Environment/tests/project.json index 57dc552296..adada74f2a 100644 --- a/src/System.Runtime.Environment/tests/project.json +++ b/src/System.Runtime.Environment/tests/project.json @@ -6,7 +6,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Runtime.Extensions/System.Runtime.Extensions.sln b/src/System.Runtime.Extensions/System.Runtime.Extensions.sln index a30a5da8ae..94295ba879 100644 --- a/src/System.Runtime.Extensions/System.Runtime.Extensions.sln +++ b/src/System.Runtime.Extensions/System.Runtime.Extensions.sln @@ -9,8 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{1CA59C ..\.nuget\packages.config = ..\.nuget\packages.config EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Extensions.CoreCLR", "src\System.Runtime.Extensions.CoreCLR.csproj", "{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}" EndProject Global @@ -107,64 +105,6 @@ Global {6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}.Windows_Release|x64.Build.0 = Release|Any CPU {6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}.Windows_Release|x86.ActiveCfg = Release|Any CPU {6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}.Windows_Release|x86.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|ARM.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|x64.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|x86.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|ARM.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|ARM.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|x64.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|x64.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|x86.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|x86.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|ARM.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|ARM.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|x64.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|x64.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|x86.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|x86.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|ARM.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|ARM.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|x64.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|x64.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|x86.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|x86.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|ARM.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|ARM.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|x64.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|x64.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|x86.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|x86.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|ARM.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|x64.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|x86.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|ARM.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|ARM.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|x64.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|x64.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|x86.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|x86.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|ARM.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|ARM.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|x64.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|x64.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|x86.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|x86.Build.0 = Release|Any CPU {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}.Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}.Debug|Any CPU.Build.0 = Windows_Debug|Any CPU {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}.Debug|ARM.ActiveCfg = Windows_Debug|Any CPU diff --git a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj index 9d34b3a1ca..31d48be113 100644 --- a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj +++ b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj @@ -56,10 +56,6 @@ <None Include="project.json" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.Runtime.Extensions.CoreCLR.csproj"> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> <OutputItemType>Content</OutputItemType> diff --git a/src/System.Runtime.Extensions/tests/project.json b/src/System.Runtime.Extensions/tests/project.json index a52f820ced..0b27e5b75a 100644 --- a/src/System.Runtime.Extensions/tests/project.json +++ b/src/System.Runtime.Extensions/tests/project.json @@ -11,7 +11,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj b/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj index d711e65c28..50e104392a 100644 --- a/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj +++ b/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.csproj @@ -11,10 +11,6 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <!-- Compile tests against the contract, but copy our local-built implementation for testing --> <ProjectReference Include="..\src\System.Runtime.Handles.CoreCLR.csproj"> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> diff --git a/src/System.Runtime.Handles/tests/project.json b/src/System.Runtime.Handles/tests/project.json index d2e4cf8fe4..a2c296a3e2 100644 --- a/src/System.Runtime.Handles/tests/project.json +++ b/src/System.Runtime.Handles/tests/project.json @@ -6,7 +6,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj b/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj index 3de7e06204..b2f1dbc4f5 100644 --- a/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj +++ b/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.csproj @@ -18,10 +18,6 @@ </PropertyGroup> <!-- References are resolved from packages.config --> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.Runtime.Numerics.csproj"> <Project>{d2c99d27-0bef-4319-adb3-05cbeba8f69b}</Project> <Name>System.Runtime.Numerics</Name> diff --git a/src/System.Runtime.Numerics/tests/project.json b/src/System.Runtime.Numerics/tests/project.json index 877321b94b..8f7e0ee3de 100644 --- a/src/System.Runtime.Numerics/tests/project.json +++ b/src/System.Runtime.Numerics/tests/project.json @@ -11,7 +11,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln b/src/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln index e3637a08bd..62b6e59294 100644 --- a/src/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln +++ b/src/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 12.0.30501.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Json.Tests", "tests\System.Runtime.Serialization.Json.Tests.csproj", "{701CB3BC-00DC-435D-BDE4-C5FC29A708A7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -14,8 +12,6 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj b/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj index 31ff5586a5..58c6e489e8 100644 --- a/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj +++ b/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.csproj @@ -34,10 +34,6 @@ <Project>{D62A6082-5229-4845-8BE9-75753E08C65A}</Project> <Name>System.Xml.XmlSerializer</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> </ItemGroup> <ItemGroup> <None Include="project.json" /> diff --git a/src/System.Runtime.Serialization.Json/tests/project.json b/src/System.Runtime.Serialization.Json/tests/project.json index e12d26f959..09d55a7c41 100644 --- a/src/System.Runtime.Serialization.Json/tests/project.json +++ b/src/System.Runtime.Serialization.Json/tests/project.json @@ -26,7 +26,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln b/src/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln index 1b6cd68f9a..95e492c83f 100644 --- a/src/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln +++ b/src/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 12.0.30501.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.Serialization.Xml.Tests", "tests\System.Runtime.Serialization.Xml.Tests.csproj", "{30CAB353-089E-4294-B23B-F2DD1D945654}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{9618597D-FDAE-42CB-B368-80DB80EA1E37}" ProjectSection(SolutionItems) = preProject .nuget\packages.config = .nuget\packages.config diff --git a/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj b/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj index 0093e231a2..889b374a56 100644 --- a/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj +++ b/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj @@ -36,10 +36,6 @@ <Project>{D62A6082-5229-4845-8BE9-75753E08C65A}</Project> <Name>System.Xml.XmlSerializer</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> </ItemGroup> <ItemGroup> <None Include="project.json" /> diff --git a/src/System.Runtime.Serialization.Xml/tests/project.json b/src/System.Runtime.Serialization.Xml/tests/project.json index e12d26f959..09d55a7c41 100644 --- a/src/System.Runtime.Serialization.Xml/tests/project.json +++ b/src/System.Runtime.Serialization.Xml/tests/project.json @@ -26,7 +26,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Runtime/System.Runtime.sln b/src/System.Runtime/System.Runtime.sln index f6a264062a..55626a1a56 100644 --- a/src/System.Runtime/System.Runtime.sln +++ b/src/System.Runtime/System.Runtime.sln @@ -9,8 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{1CA59C ..\.nuget\packages.config = ..\.nuget\packages.config EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Runtime.CoreCLR", "src\System.Runtime.CoreCLR.csproj", "{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Private.Uri.CoreCLR", "..\System.Private.Uri\src\System.Private.Uri.CoreCLR.csproj", "{4AC5343E-6E31-4BA5-A795-0493AE7E9008}" @@ -109,70 +107,6 @@ Global {7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}.Windows_Release|x64.Build.0 = Release|Any CPU {7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}.Windows_Release|x86.ActiveCfg = Release|Any CPU {7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}.Windows_Release|x86.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|ARM.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|ARM.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|x64.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|x64.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|x86.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|x86.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|ARM.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|ARM.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|x64.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|x64.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|x86.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|x86.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|ARM.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|ARM.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|x64.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|x64.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|x86.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|x86.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|ARM.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|ARM.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|x64.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|x64.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|x86.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|x86.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|ARM.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|ARM.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|x64.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|x64.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|x86.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|x86.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|ARM.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|ARM.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|x64.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|x64.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|x86.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|x86.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|ARM.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|ARM.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|x64.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|x64.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|x86.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|x86.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|ARM.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|ARM.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|x64.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|x64.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|x86.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|x86.Build.0 = Release|Any CPU {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}.Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}.Debug|Any CPU.Build.0 = Windows_Debug|Any CPU {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}.Debug|ARM.ActiveCfg = Windows_Debug|Any CPU diff --git a/src/System.Runtime/tests/System.Runtime.Tests.csproj b/src/System.Runtime/tests/System.Runtime.Tests.csproj index f8a85c41ec..cb68c0f022 100644 --- a/src/System.Runtime/tests/System.Runtime.Tests.csproj +++ b/src/System.Runtime/tests/System.Runtime.Tests.csproj @@ -92,10 +92,6 @@ <None Include="project.json" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <!-- Compile tests against the System.Runtime contract, but copy our local-built implementation for testing --> <ProjectReference Include="..\src\System.Runtime.CoreCLR.csproj"> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> diff --git a/src/System.Runtime/tests/project.json b/src/System.Runtime/tests/project.json index acb40ef8a5..49a66924b6 100644 --- a/src/System.Runtime/tests/project.json +++ b/src/System.Runtime/tests/project.json @@ -11,7 +11,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Security.SecureString/System.Security.SecureString.sln b/src/System.Security.SecureString/System.Security.SecureString.sln index a36e18fe15..7ffe9c60f8 100644 --- a/src/System.Security.SecureString/System.Security.SecureString.sln +++ b/src/System.Security.SecureString/System.Security.SecureString.sln @@ -12,8 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{FBCF7C EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.SecureString.Tests", "tests\System.Security.SecureString.Tests.csproj", "{69609238-62C7-479D-A8CE-709F41101D3C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Linux_Debug|Any CPU = Linux_Debug|Any CPU @@ -48,18 +46,6 @@ Global {69609238-62C7-479D-A8CE-709F41101D3C}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU {69609238-62C7-479D-A8CE-709F41101D3C}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU {69609238-62C7-479D-A8CE-709F41101D3C}.Windows_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj b/src/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj index ae4047eaec..118390460e 100644 --- a/src/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj +++ b/src/System.Security.SecureString/tests/System.Security.SecureString.Tests.csproj @@ -27,10 +27,6 @@ <Project>{A958BBDD-3238-4E58-AB7F-390AB6D88233}</Project> <Name>System.Security.SecureString</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> </ItemGroup> <ItemGroup> <None Include="project.json" /> diff --git a/src/System.Security.SecureString/tests/project.json b/src/System.Security.SecureString/tests/project.json index 244d65034f..7bccd09956 100644 --- a/src/System.Security.SecureString/tests/project.json +++ b/src/System.Security.SecureString/tests/project.json @@ -8,7 +8,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln b/src/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln index 65843f36a3..94dc08d525 100644 --- a/src/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln +++ b/src/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.CodePa EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Encoding.CodePages.Tests", "tests\System.Text.Encoding.CodePages.Tests.csproj", "{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Linux_Debug|Any CPU = Linux_Debug|Any CPU @@ -43,18 +41,6 @@ Global {9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU {9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU {9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Windows_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj b/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj index e89dae7962..203a1635b2 100644 --- a/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj +++ b/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.csproj @@ -19,10 +19,6 @@ </ItemGroup> <!-- References are resolved from packages.config --> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.Text.Encoding.CodePages.csproj"> <Project>{16EE6633-F557-5C9E-9EF3-B5334B044F47}</Project> <Name>System.Text.Encoding.CodePages</Name> diff --git a/src/System.Text.Encoding.CodePages/tests/project.json b/src/System.Text.Encoding.CodePages/tests/project.json index d74a7ba829..8765257ac4 100644 --- a/src/System.Text.Encoding.CodePages/tests/project.json +++ b/src/System.Text.Encoding.CodePages/tests/project.json @@ -10,7 +10,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Text.RegularExpressions/System.Text.RegularExpressions.sln b/src/System.Text.RegularExpressions/System.Text.RegularExpressions.sln index 96d710549d..106784b833 100644 --- a/src/System.Text.RegularExpressions/System.Text.RegularExpressions.sln +++ b/src/System.Text.RegularExpressions/System.Text.RegularExpressions.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.RegularExpressi EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.RegularExpressions.Tests", "tests\System.Text.RegularExpressions.Tests.csproj", "{94B106C2-D574-4392-80AB-3EE308A078DF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{C5A39CF5-01CB-4CD8-96A6-7D6E95EA5CCC}" ProjectSection(SolutionItems) = preProject ..\.nuget\packages.config = ..\.nuget\packages.config @@ -28,10 +26,6 @@ Global {94B106C2-D574-4392-80AB-3EE308A078DF}.Debug|Any CPU.Build.0 = Debug|Any CPU {94B106C2-D574-4392-80AB-3EE308A078DF}.Release|Any CPU.ActiveCfg = Release|Any CPU {94B106C2-D574-4392-80AB-3EE308A078DF}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj b/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj index 4446da48bd..f89610d412 100644 --- a/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj +++ b/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj @@ -55,10 +55,6 @@ <Compile Include="Support.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.Text.RegularExpressions.csproj"> <Project>{be28323e-327a-4e0f-b7f9-16ab7eab59dd}</Project> <Name>System.Text.RegularExpressions</Name> diff --git a/src/System.Text.RegularExpressions/tests/project.json b/src/System.Text.RegularExpressions/tests/project.json index 877321b94b..8f7e0ee3de 100644 --- a/src/System.Text.RegularExpressions/tests/project.json +++ b/src/System.Text.RegularExpressions/tests/project.json @@ -11,7 +11,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln b/src/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln index 53c3b1b272..38780488a3 100644 --- a/src/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln +++ b/src/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln @@ -12,8 +12,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Data EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Dataflow.Tests", "tests\System.Threading.Tasks.Dataflow.Tests.csproj", "{72E21903-0FBA-444E-9855-3B4F05DFC1F9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{3A3E1C22-FF83-4D70-A94A-6C130805E6BF}" ProjectSection(SolutionItems) = preProject ..\.nuget\packages.config = ..\.nuget\packages.config @@ -37,10 +35,6 @@ Global {72E21903-0FBA-444E-9855-3B4F05DFC1F9}.Debug|Any CPU.Build.0 = Debug|Any CPU {72E21903-0FBA-444E-9855-3B4F05DFC1F9}.Release|Any CPU.ActiveCfg = Release|Any CPU {72E21903-0FBA-444E-9855-3B4F05DFC1F9}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj b/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj index 18b19568dc..6f6c00dc60 100644 --- a/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj +++ b/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.csproj @@ -27,10 +27,6 @@ </Compile> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.Threading.Tasks.Dataflow.csproj"> <Project>{1dd0ff15-6234-4bd6-850a-317f05479554}</Project> <Name>System.Threading.Tasks.Dataflow</Name> diff --git a/src/System.Threading.Tasks.Dataflow/tests/project.json b/src/System.Threading.Tasks.Dataflow/tests/project.json index bbd05bfc76..94c9334f18 100644 --- a/src/System.Threading.Tasks.Dataflow/tests/project.json +++ b/src/System.Threading.Tasks.Dataflow/tests/project.json @@ -23,7 +23,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln b/src/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln index fd73754f27..abcc1a9534 100644 --- a/src/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln +++ b/src/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Para EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Threading.Tasks.Parallel.Tests", "tests\System.Threading.Tasks.Parallel.Tests.csproj", "{DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{47919FF5-DA40-4D99-AF2D-F560282AA913}" ProjectSection(SolutionItems) = preProject ..\.nuget\packages.config = ..\.nuget\packages.config @@ -28,10 +26,6 @@ Global {DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Debug|Any CPU.Build.0 = Debug|Any CPU {DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Release|Any CPU.ActiveCfg = Release|Any CPU {DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj b/src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj index 96e40ee263..9f158a2b91 100644 --- a/src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj +++ b/src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.csproj @@ -39,10 +39,6 @@ <Compile Include="XunitAssemblyAttributes.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.Threading.Tasks.Parallel.csproj"> <Project>{A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}</Project> <Name>System.Threading.Tasks.Parallel</Name> diff --git a/src/System.Threading.Tasks.Parallel/tests/project.json b/src/System.Threading.Tasks.Parallel/tests/project.json index 8fd7ecfd0b..cbe2593b5d 100644 --- a/src/System.Threading.Tasks.Parallel/tests/project.json +++ b/src/System.Threading.Tasks.Parallel/tests/project.json @@ -12,7 +12,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Threading/tests/System.Threading.Tests.csproj b/src/System.Threading/tests/System.Threading.Tests.csproj index 7776f255eb..3d572bf669 100644 --- a/src/System.Threading/tests/System.Threading.Tests.csproj +++ b/src/System.Threading/tests/System.Threading.Tests.csproj @@ -28,10 +28,6 @@ <None Include="project.json" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <!-- Compile tests against the System.Runtime contract, but copy our local-built implementation for testing --> <ProjectReference Include="..\src\System.Threading.CoreCLR.csproj"> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> diff --git a/src/System.Threading/tests/project.json b/src/System.Threading/tests/project.json index 5caedff60a..a34f54c7ea 100644 --- a/src/System.Threading/tests/project.json +++ b/src/System.Threading/tests/project.json @@ -13,7 +13,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln b/src/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln index 25fc6bd579..594add85c5 100644 --- a/src/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln +++ b/src/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln @@ -12,8 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CF6DAB EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.RW.CharCheckingReader.Tests", "tests\Readers\CharCheckingReader\System.Xml.RW.CharCheckingReader.Tests.csproj", "{6DC15D23-8213-4700-9815-AD8DEED1CE5F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModuleCore", "..\Common\tests\SystemXml\ModuleCore\ModuleCore.csproj", "{3CF0CC76-4CE0-460A-BA37-657CFED39AB0}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlCoreTest", "..\Common\tests\SystemXml\XmlCoreTest\XmlCoreTest.csproj", "{89701565-F68B-46D9-BD78-95B0F052C50B}" @@ -100,22 +98,6 @@ Global {6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU {6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU {6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Windows_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Linux_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.OSX_Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Windows_Release|Any CPU.Build.0 = Release|Any CPU {3CF0CC76-4CE0-460A-BA37-657CFED39AB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3CF0CC76-4CE0-460A-BA37-657CFED39AB0}.Debug|Any CPU.Build.0 = Debug|Any CPU {3CF0CC76-4CE0-460A-BA37-657CFED39AB0}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU diff --git a/src/System.Xml.ReaderWriter/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj b/src/System.Xml.ReaderWriter/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj index 0d0368ecfe..5c3db7cba3 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj +++ b/src/System.Xml.ReaderWriter/tests/Readers/CharCheckingReader/System.Xml.RW.CharCheckingReader.Tests.csproj @@ -34,10 +34,6 @@ <Project>{89701565-f68b-46d9-bd78-95b0f052c50b}</Project> <Name>XmlCoreTest</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\..\src\System.Xml.ReaderWriter.csproj"> <Project>{c559743a-762e-4d9d-b986-e77bdb97652e}</Project> <Name>System.Xml.ReaderWriter</Name> diff --git a/src/System.Xml.ReaderWriter/tests/Readers/CharCheckingReader/project.json b/src/System.Xml.ReaderWriter/tests/Readers/CharCheckingReader/project.json index afe809ed51..c7a5c1d6b7 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/CharCheckingReader/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/CharCheckingReader/project.json @@ -7,7 +7,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.ReaderWriter/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj b/src/System.Xml.ReaderWriter/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj index 08a414e078..61441176da 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj +++ b/src/System.Xml.ReaderWriter/tests/Readers/CustomReader/System.Xml.RW.CustomReader.Tests.csproj @@ -31,10 +31,6 @@ <Project>{89701565-f68b-46d9-bd78-95b0f052c50b}</Project> <Name>XmlCoreTest</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\..\src\System.Xml.ReaderWriter.csproj"> <Project>{c559743a-762e-4d9d-b986-e77bdb97652e}</Project> <Name>System.Xml.ReaderWriter</Name> diff --git a/src/System.Xml.ReaderWriter/tests/Readers/CustomReader/project.json b/src/System.Xml.ReaderWriter/tests/Readers/CustomReader/project.json index afe809ed51..e7fec9e912 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/CustomReader/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/CustomReader/project.json @@ -7,7 +7,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.ReaderWriter/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj b/src/System.Xml.ReaderWriter/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj index 1a93e59587..a3ef10cf39 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj +++ b/src/System.Xml.ReaderWriter/tests/Readers/FactoryReader/System.Xml.RW.FactoryReader.Tests.csproj @@ -33,10 +33,6 @@ <Project>{89701565-f68b-46d9-bd78-95b0f052c50b}</Project> <Name>XmlCoreTest</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\..\src\System.Xml.ReaderWriter.csproj"> <Project>{c559743a-762e-4d9d-b986-e77bdb97652e}</Project> <Name>System.Xml.ReaderWriter</Name> diff --git a/src/System.Xml.ReaderWriter/tests/Readers/FactoryReader/project.json b/src/System.Xml.ReaderWriter/tests/Readers/FactoryReader/project.json index afe809ed51..c7a5c1d6b7 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/FactoryReader/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/FactoryReader/project.json @@ -7,7 +7,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.ReaderWriter/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj b/src/System.Xml.ReaderWriter/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj index 9f3cc05d70..0a6dd31760 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj +++ b/src/System.Xml.ReaderWriter/tests/Readers/NameTable/System.Xml.RW.NameTable.Tests.csproj @@ -36,10 +36,6 @@ <Project>{89701565-f68b-46d9-bd78-95b0f052c50b}</Project> <Name>XmlCoreTest</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\..\src\System.Xml.ReaderWriter.csproj"> <Project>{c559743a-762e-4d9d-b986-e77bdb97652e}</Project> <Name>System.Xml.ReaderWriter</Name> diff --git a/src/System.Xml.ReaderWriter/tests/Readers/NameTable/project.json b/src/System.Xml.ReaderWriter/tests/Readers/NameTable/project.json index 20b51b655b..d9459bb57d 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/NameTable/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/NameTable/project.json @@ -8,7 +8,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.ReaderWriter/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj b/src/System.Xml.ReaderWriter/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj index fb89de58e7..c5d01fc291 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj +++ b/src/System.Xml.ReaderWriter/tests/Readers/ReaderSettings/System.Xml.RW.ReaderSettings.Tests.csproj @@ -51,10 +51,6 @@ <Project>{89701565-f68b-46d9-bd78-95b0f052c50b}</Project> <Name>XmlCoreTest</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\..\src\System.Xml.ReaderWriter.csproj"> <Project>{c559743a-762e-4d9d-b986-e77bdb97652e}</Project> <Name>System.Xml.ReaderWriter</Name> diff --git a/src/System.Xml.ReaderWriter/tests/Readers/ReaderSettings/project.json b/src/System.Xml.ReaderWriter/tests/Readers/ReaderSettings/project.json index 5b565abdba..d14774b3bd 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/ReaderSettings/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/ReaderSettings/project.json @@ -9,7 +9,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.ReaderWriter/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj b/src/System.Xml.ReaderWriter/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj index 68b6a7f016..2c0c1b88a6 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj +++ b/src/System.Xml.ReaderWriter/tests/Readers/SubtreeReader/System.Xml.RW.SubtreeReader.Tests.csproj @@ -31,10 +31,6 @@ <Project>{89701565-f68b-46d9-bd78-95b0f052c50b}</Project> <Name>XmlCoreTest</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\..\src\System.Xml.ReaderWriter.csproj"> <Project>{c559743a-762e-4d9d-b986-e77bdb97652e}</Project> <Name>System.Xml.ReaderWriter</Name> diff --git a/src/System.Xml.ReaderWriter/tests/Readers/SubtreeReader/project.json b/src/System.Xml.ReaderWriter/tests/Readers/SubtreeReader/project.json index afe809ed51..c7a5c1d6b7 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/SubtreeReader/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/SubtreeReader/project.json @@ -7,7 +7,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.ReaderWriter/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj b/src/System.Xml.ReaderWriter/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj index cb61a6831b..fa88e2ebb0 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj +++ b/src/System.Xml.ReaderWriter/tests/Readers/WrappedReader/System.Xml.RW.WrappedReader.Tests.csproj @@ -31,10 +31,6 @@ <Project>{89701565-f68b-46d9-bd78-95b0f052c50b}</Project> <Name>XmlCoreTest</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\..\src\System.Xml.ReaderWriter.csproj"> <Project>{c559743a-762e-4d9d-b986-e77bdb97652e}</Project> <Name>System.Xml.ReaderWriter</Name> diff --git a/src/System.Xml.ReaderWriter/tests/Readers/WrappedReader/project.json b/src/System.Xml.ReaderWriter/tests/Readers/WrappedReader/project.json index 6260d074c5..4d5ed27714 100644 --- a/src/System.Xml.ReaderWriter/tests/Readers/WrappedReader/project.json +++ b/src/System.Xml.ReaderWriter/tests/Readers/WrappedReader/project.json @@ -8,7 +8,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.ReaderWriter/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj b/src/System.Xml.ReaderWriter/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj index ad5691fdaa..7aca6f755e 100644 --- a/src/System.Xml.ReaderWriter/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj +++ b/src/System.Xml.ReaderWriter/tests/Writers/RwFactory/System.Xml.RW.RwFactory.Tests.csproj @@ -40,10 +40,6 @@ <Project>{89701565-f68b-46d9-bd78-95b0f052c50b}</Project> <Name>XmlCoreTest</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\..\..\System.Xml.XDocument\src\System.Xml.XDocument.csproj"> <Project>{442c5a88-29c2-4b00-b1df-730d646d3861}</Project> <Name>System.Xml.XDocument</Name> diff --git a/src/System.Xml.ReaderWriter/tests/Writers/RwFactory/project.json b/src/System.Xml.ReaderWriter/tests/Writers/RwFactory/project.json index 6a23099830..53fa63d1fa 100644 --- a/src/System.Xml.ReaderWriter/tests/Writers/RwFactory/project.json +++ b/src/System.Xml.ReaderWriter/tests/Writers/RwFactory/project.json @@ -12,7 +12,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj b/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj index 9e4a275766..dc9c69501f 100644 --- a/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj +++ b/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj @@ -67,10 +67,6 @@ <Project>{89701565-f68b-46d9-bd78-95b0f052c50b}</Project> <Name>XmlCoreTest</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\..\src\System.Xml.ReaderWriter.csproj"> <Project>{c559743a-762e-4d9d-b986-e77bdb97652e}</Project> <Name>System.Xml.ReaderWriter</Name> diff --git a/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/project.json b/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/project.json index 1005386cb5..a8064b36c3 100644 --- a/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/project.json +++ b/src/System.Xml.ReaderWriter/tests/Writers/XmlWriterApi/project.json @@ -12,7 +12,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.ReaderWriter/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj b/src/System.Xml.ReaderWriter/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj index 2b2d31369a..2947c79ba9 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj +++ b/src/System.Xml.ReaderWriter/tests/XmlConvert/System.Xml.RW.XmlConvert.Tests.csproj @@ -63,10 +63,6 @@ <Project>{89701565-f68b-46d9-bd78-95b0f052c50b}</Project> <Name>XmlCoreTest</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\src\System.Xml.ReaderWriter.csproj"> <Project>{c559743a-762e-4d9d-b986-e77bdb97652e}</Project> <Name>System.Xml.ReaderWriter</Name> diff --git a/src/System.Xml.ReaderWriter/tests/XmlConvert/project.json b/src/System.Xml.ReaderWriter/tests/XmlConvert/project.json index 19b427efb4..7812d0233e 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlConvert/project.json +++ b/src/System.Xml.ReaderWriter/tests/XmlConvert/project.json @@ -10,7 +10,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.ReaderWriter/tests/XmlReader/ReadContentAs/System.Xml.RW.XmlReader.ReadContentAs.Tests.csproj b/src/System.Xml.ReaderWriter/tests/XmlReader/ReadContentAs/System.Xml.RW.XmlReader.ReadContentAs.Tests.csproj index 2183d64f6b..002788918e 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlReader/ReadContentAs/System.Xml.RW.XmlReader.ReadContentAs.Tests.csproj +++ b/src/System.Xml.ReaderWriter/tests/XmlReader/ReadContentAs/System.Xml.RW.XmlReader.ReadContentAs.Tests.csproj @@ -72,10 +72,6 @@ <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\..\src\System.Xml.ReaderWriter.csproj"> <Project>{c559743a-762e-4d9d-b986-e77bdb97652e}</Project> <Name>System.Xml.ReaderWriter</Name> diff --git a/src/System.Xml.ReaderWriter/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj b/src/System.Xml.ReaderWriter/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj index 886bd6f38e..bdef2eb76a 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj +++ b/src/System.Xml.ReaderWriter/tests/XmlReader/Tests/System.Xml.RW.XmlReader.Tests.csproj @@ -23,10 +23,6 @@ <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\..\src\System.Xml.ReaderWriter.csproj"> <Project>{c559743a-762e-4d9d-b986-e77bdb97652e}</Project> <Name>System.Xml.ReaderWriter</Name> diff --git a/src/System.Xml.ReaderWriter/tests/XmlReader/Tests/project.json b/src/System.Xml.ReaderWriter/tests/XmlReader/Tests/project.json index 5c7ab3149b..dac218f33c 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlReader/Tests/project.json +++ b/src/System.Xml.ReaderWriter/tests/XmlReader/Tests/project.json @@ -9,7 +9,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.ReaderWriter/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj b/src/System.Xml.ReaderWriter/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj index c3d7ff819d..90f2051b86 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj +++ b/src/System.Xml.ReaderWriter/tests/XmlReader/XmlResolver/System.Xml.RW.XmlSystemPathResolver.Tests.csproj @@ -22,10 +22,6 @@ <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\..\src\System.Xml.ReaderWriter.csproj"> <Project>{c559743a-762e-4d9d-b986-e77bdb97652e}</Project> <Name>System.Xml.ReaderWriter</Name> diff --git a/src/System.Xml.ReaderWriter/tests/XmlReader/XmlResolver/project.json b/src/System.Xml.ReaderWriter/tests/XmlReader/XmlResolver/project.json index 457ad7802c..155f758fc8 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlReader/XmlResolver/project.json +++ b/src/System.Xml.ReaderWriter/tests/XmlReader/XmlResolver/project.json @@ -13,7 +13,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.ReaderWriter/tests/XmlWriter/System.Xml.RW.XmlWriter.Tests.csproj b/src/System.Xml.ReaderWriter/tests/XmlWriter/System.Xml.RW.XmlWriter.Tests.csproj index 171424877b..8c4656eb26 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlWriter/System.Xml.RW.XmlWriter.Tests.csproj +++ b/src/System.Xml.ReaderWriter/tests/XmlWriter/System.Xml.RW.XmlWriter.Tests.csproj @@ -25,10 +25,6 @@ <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\..\System.Text.Encoding.CodePages\src\System.Text.Encoding.CodePages.csproj"> <Project>{16ee6633-f557-5c9e-9ef3-b5334b044f47}</Project> <Name>System.Text.Encoding.CodePages</Name> diff --git a/src/System.Xml.ReaderWriter/tests/XmlWriter/project.json b/src/System.Xml.ReaderWriter/tests/XmlWriter/project.json index 1cb7b87e7d..59fdbc4f01 100644 --- a/src/System.Xml.ReaderWriter/tests/XmlWriter/project.json +++ b/src/System.Xml.ReaderWriter/tests/XmlWriter/project.json @@ -12,7 +12,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.XDocument/System.Xml.XDocument.sln b/src/System.Xml.XDocument/System.Xml.XDocument.sln index b72fbd330f..cb8e081088 100644 --- a/src/System.Xml.XDocument/System.Xml.XDocument.sln +++ b/src/System.Xml.XDocument/System.Xml.XDocument.sln @@ -4,8 +4,6 @@ VisualStudioVersion = 12.0.30723.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XDocument", "src\System.Xml.XDocument.csproj", "{442C5A88-29C2-4B00-B1DF-730D646D3861}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XDocument.Axes.Tests", "tests\axes\System.Xml.XDocument.Axes.Tests.csproj", "{6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XDocument.Common", "tests\XDocument.Common\XDocument.Common.csproj", "{52666206-B6C9-49FA-A1D7-D0A0C68807B0}" @@ -118,7 +116,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A} = {2B620568-877B-4A96-919B-F24B0B3E761D} {6D9B0285-5E8A-4C20-9C53-9E2084EF64C4} = {2B620568-877B-4A96-919B-F24B0B3E761D} {52666206-B6C9-49FA-A1D7-D0A0C68807B0} = {2B620568-877B-4A96-919B-F24B0B3E761D} {C560E194-5B14-4112-ABC6-3208491E53E6} = {2B620568-877B-4A96-919B-F24B0B3E761D} diff --git a/src/System.Xml.XDocument/tests/Properties/System.Xml.XDocument.Properties.Tests.csproj b/src/System.Xml.XDocument/tests/Properties/System.Xml.XDocument.Properties.Tests.csproj index 0df446ea2c..67392f348f 100644 --- a/src/System.Xml.XDocument/tests/Properties/System.Xml.XDocument.Properties.Tests.csproj +++ b/src/System.Xml.XDocument/tests/Properties/System.Xml.XDocument.Properties.Tests.csproj @@ -35,10 +35,6 @@ <Project>{466d87df-bdec-4e6c-bacd-317d79b8edbe}</Project> <Name>XmlDiff</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\src\System.Xml.XDocument.csproj"> <Project>{442c5a88-29c2-4b00-b1df-730d646d3861}</Project> <Name>System.Xml.XDocument</Name> diff --git a/src/System.Xml.XDocument/tests/Properties/project.json b/src/System.Xml.XDocument/tests/Properties/project.json index 52dd2c4870..c845858542 100644 --- a/src/System.Xml.XDocument/tests/Properties/project.json +++ b/src/System.Xml.XDocument/tests/Properties/project.json @@ -14,7 +14,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.XDocument/tests/SDMSample/System.Xml.XDocument.SDMSample.Tests.csproj b/src/System.Xml.XDocument/tests/SDMSample/System.Xml.XDocument.SDMSample.Tests.csproj index 3bf623c7b2..a2a64a099c 100644 --- a/src/System.Xml.XDocument/tests/SDMSample/System.Xml.XDocument.SDMSample.Tests.csproj +++ b/src/System.Xml.XDocument/tests/SDMSample/System.Xml.XDocument.SDMSample.Tests.csproj @@ -41,10 +41,6 @@ <Project>{466d87df-bdec-4e6c-bacd-317d79b8edbe}</Project> <Name>XmlDiff</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\src\System.Xml.XDocument.csproj"> <Project>{442c5a88-29c2-4b00-b1df-730d646d3861}</Project> <Name>System.Xml.XDocument</Name> diff --git a/src/System.Xml.XDocument/tests/SDMSample/project.json b/src/System.Xml.XDocument/tests/SDMSample/project.json index 9c848bb4b1..cb1aa2d19f 100644 --- a/src/System.Xml.XDocument/tests/SDMSample/project.json +++ b/src/System.Xml.XDocument/tests/SDMSample/project.json @@ -13,7 +13,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.XDocument/tests/Streaming/System.Xml.XDocument.Streaming.Tests.csproj b/src/System.Xml.XDocument/tests/Streaming/System.Xml.XDocument.Streaming.Tests.csproj index 9e7f27418e..2da438ab13 100644 --- a/src/System.Xml.XDocument/tests/Streaming/System.Xml.XDocument.Streaming.Tests.csproj +++ b/src/System.Xml.XDocument/tests/Streaming/System.Xml.XDocument.Streaming.Tests.csproj @@ -30,10 +30,6 @@ <Project>{466d87df-bdec-4e6c-bacd-317d79b8edbe}</Project> <Name>XmlDiff</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\src\System.Xml.XDocument.csproj"> <Project>{442c5a88-29c2-4b00-b1df-730d646d3861}</Project> <Name>System.Xml.XDocument</Name> diff --git a/src/System.Xml.XDocument/tests/Streaming/project.json b/src/System.Xml.XDocument/tests/Streaming/project.json index c570ddfe63..4948d68dae 100644 --- a/src/System.Xml.XDocument/tests/Streaming/project.json +++ b/src/System.Xml.XDocument/tests/Streaming/project.json @@ -12,7 +12,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.XDocument/tests/TreeManipulation/System.Xml.XDocument.TreeManipulation.Tests.csproj b/src/System.Xml.XDocument/tests/TreeManipulation/System.Xml.XDocument.TreeManipulation.Tests.csproj index 5d3cc64ea9..50f215b0f2 100644 --- a/src/System.Xml.XDocument/tests/TreeManipulation/System.Xml.XDocument.TreeManipulation.Tests.csproj +++ b/src/System.Xml.XDocument/tests/TreeManipulation/System.Xml.XDocument.TreeManipulation.Tests.csproj @@ -69,10 +69,6 @@ <Project>{466d87df-bdec-4e6c-bacd-317d79b8edbe}</Project> <Name>XmlDiff</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\src\System.Xml.XDocument.csproj"> <Project>{442c5a88-29c2-4b00-b1df-730d646d3861}</Project> <Name>System.Xml.XDocument</Name> diff --git a/src/System.Xml.XDocument/tests/TreeManipulation/project.json b/src/System.Xml.XDocument/tests/TreeManipulation/project.json index 21beae3eb0..4406fc246d 100644 --- a/src/System.Xml.XDocument/tests/TreeManipulation/project.json +++ b/src/System.Xml.XDocument/tests/TreeManipulation/project.json @@ -13,7 +13,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.XDocument/tests/XDocument.Common/XDocument.Common.csproj b/src/System.Xml.XDocument/tests/XDocument.Common/XDocument.Common.csproj index 00031209ab..97f3ae8adc 100644 --- a/src/System.Xml.XDocument/tests/XDocument.Common/XDocument.Common.csproj +++ b/src/System.Xml.XDocument/tests/XDocument.Common/XDocument.Common.csproj @@ -35,10 +35,6 @@ <Project>{466d87df-bdec-4e6c-bacd-317d79b8edbe}</Project> <Name>XmlDiff</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\src\System.Xml.XDocument.csproj"> <Project>{442c5a88-29c2-4b00-b1df-730d646d3861}</Project> <Name>System.Xml.XDocument</Name> diff --git a/src/System.Xml.XDocument/tests/XDocument.Common/project.json b/src/System.Xml.XDocument/tests/XDocument.Common/project.json index fe9ae089d2..069ab87bd8 100644 --- a/src/System.Xml.XDocument/tests/XDocument.Common/project.json +++ b/src/System.Xml.XDocument/tests/XDocument.Common/project.json @@ -10,7 +10,12 @@ "System.Collections": "4.0.10-beta-22809", "System.IO": "4.0.10-beta-22809", "System.Console": "4.0.0-beta-22809", - "System.Diagnostics.Debug": "4.0.10-beta-22809" + "System.Diagnostics.Debug": "4.0.10-beta-22809", + "xunit": "2.0.0-beta5-build2785", + "xunit.abstractions.netcore": "1.0.0-prerelease", + "xunit.assert": "2.0.0-beta5-build2785", + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj b/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj index 3e885ad524..411fc5c2d2 100644 --- a/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj +++ b/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj @@ -31,10 +31,6 @@ <Compile Include="util.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\src\System.Xml.XDocument.csproj"> <Project>{442c5a88-29c2-4b00-b1df-730d646d3861}</Project> <Name>System.Xml.XDocument</Name> diff --git a/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/project.json b/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/project.json index 8efa7f75df..0b6e629289 100644 --- a/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/project.json +++ b/src/System.Xml.XDocument/tests/XDocument.Test.ModuleCore/project.json @@ -7,7 +7,12 @@ "System.Collections": "4.0.10-beta-22809", "System.Text.Encoding": "4.0.10-beta-22809", "System.IO": "4.0.10-beta-22809", - "System.Console": "4.0.0-beta-22809" + "System.Console": "4.0.0-beta-22809", + "xunit": "2.0.0-beta5-build2785", + "xunit.abstractions.netcore": "1.0.0-prerelease", + "xunit.assert": "2.0.0-beta5-build2785", + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.XDocument/tests/events/System.Xml.XDocument.Events.Tests.csproj b/src/System.Xml.XDocument/tests/events/System.Xml.XDocument.Events.Tests.csproj index 2f4cf76f6c..58177e7143 100644 --- a/src/System.Xml.XDocument/tests/events/System.Xml.XDocument.Events.Tests.csproj +++ b/src/System.Xml.XDocument/tests/events/System.Xml.XDocument.Events.Tests.csproj @@ -34,10 +34,6 @@ <Project>{89701565-f68b-46d9-bd78-95b0f052c50b}</Project> <Name>XmlCoreTest</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\src\System.Xml.XDocument.csproj"> <Project>{442c5a88-29c2-4b00-b1df-730d646d3861}</Project> <Name>System.Xml.XDocument</Name> diff --git a/src/System.Xml.XDocument/tests/events/project.json b/src/System.Xml.XDocument/tests/events/project.json index e8b0a4a4a1..b3167d6cd2 100644 --- a/src/System.Xml.XDocument/tests/events/project.json +++ b/src/System.Xml.XDocument/tests/events/project.json @@ -9,7 +9,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.XDocument/tests/misc/System.Xml.XDocument.Misc.Tests.csproj b/src/System.Xml.XDocument/tests/misc/System.Xml.XDocument.Misc.Tests.csproj index 26a26301fb..a346b13665 100644 --- a/src/System.Xml.XDocument/tests/misc/System.Xml.XDocument.Misc.Tests.csproj +++ b/src/System.Xml.XDocument/tests/misc/System.Xml.XDocument.Misc.Tests.csproj @@ -34,10 +34,6 @@ <Project>{466d87df-bdec-4e6c-bacd-317d79b8edbe}</Project> <Name>XmlDiff</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\src\System.Xml.XDocument.csproj"> <Project>{442c5a88-29c2-4b00-b1df-730d646d3861}</Project> <Name>System.Xml.XDocument</Name> diff --git a/src/System.Xml.XDocument/tests/misc/project.json b/src/System.Xml.XDocument/tests/misc/project.json index 732eecc959..983d893eb8 100644 --- a/src/System.Xml.XDocument/tests/misc/project.json +++ b/src/System.Xml.XDocument/tests/misc/project.json @@ -12,7 +12,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.XDocument/tests/xNodeBuilder/System.Xml.XDocument.xNodeBuilder.Tests.csproj b/src/System.Xml.XDocument/tests/xNodeBuilder/System.Xml.XDocument.xNodeBuilder.Tests.csproj index d1de1e6526..2d987b6b2e 100644 --- a/src/System.Xml.XDocument/tests/xNodeBuilder/System.Xml.XDocument.xNodeBuilder.Tests.csproj +++ b/src/System.Xml.XDocument/tests/xNodeBuilder/System.Xml.XDocument.xNodeBuilder.Tests.csproj @@ -42,10 +42,6 @@ <Project>{466d87df-bdec-4e6c-bacd-317d79b8edbe}</Project> <Name>XmlDiff</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\src\System.Xml.XDocument.csproj"> <Project>{442c5a88-29c2-4b00-b1df-730d646d3861}</Project> <Name>System.Xml.XDocument</Name> diff --git a/src/System.Xml.XDocument/tests/xNodeBuilder/project.json b/src/System.Xml.XDocument/tests/xNodeBuilder/project.json index 7006dc0ed3..875ddb1acc 100644 --- a/src/System.Xml.XDocument/tests/xNodeBuilder/project.json +++ b/src/System.Xml.XDocument/tests/xNodeBuilder/project.json @@ -15,7 +15,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.XDocument/tests/xNodeReader/System.Xml.XDocument.xNodeReader.Tests.csproj b/src/System.Xml.XDocument/tests/xNodeReader/System.Xml.XDocument.xNodeReader.Tests.csproj index 59cb3dcace..55ba94bfee 100644 --- a/src/System.Xml.XDocument/tests/xNodeReader/System.Xml.XDocument.xNodeReader.Tests.csproj +++ b/src/System.Xml.XDocument/tests/xNodeReader/System.Xml.XDocument.xNodeReader.Tests.csproj @@ -45,10 +45,6 @@ <Project>{466d87df-bdec-4e6c-bacd-317d79b8edbe}</Project> <Name>XmlDiff</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\src\System.Xml.XDocument.csproj"> <Project>{442c5a88-29c2-4b00-b1df-730d646d3861}</Project> <Name>System.Xml.XDocument</Name> diff --git a/src/System.Xml.XDocument/tests/xNodeReader/project.json b/src/System.Xml.XDocument/tests/xNodeReader/project.json index bcbafa5600..ed9070057c 100644 --- a/src/System.Xml.XDocument/tests/xNodeReader/project.json +++ b/src/System.Xml.XDocument/tests/xNodeReader/project.json @@ -12,7 +12,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln b/src/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln index 680613210c..5fffc2ae88 100644 --- a/src/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln +++ b/src/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln @@ -6,8 +6,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XDocument" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XDocument.Tests", "tests\System.Xml.XPath.XDocument.Tests.csproj", "{10D52320-17B7-476E-BBD2-A1064DD38CBF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CF6DABDD-5158-4CAF-88B0-B823EE173E53}" ProjectSection(SolutionItems) = preProject .nuget\packages.config = .nuget\packages.config @@ -39,10 +37,6 @@ Global {17CB2E3C-2904-4241-94DB-3894D24F35DA}.Debug|Any CPU.Build.0 = Debug|Any CPU {17CB2E3C-2904-4241-94DB-3894D24F35DA}.Release|Any CPU.ActiveCfg = Release|Any CPU {17CB2E3C-2904-4241-94DB-3894D24F35DA}.Release|Any CPU.Build.0 = Release|Any CPU - {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Xml.XPath.XDocument/tests/System.Xml.XPath.XDocument.Tests.csproj b/src/System.Xml.XPath.XDocument/tests/System.Xml.XPath.XDocument.Tests.csproj index af3c955168..d283fdbf80 100644 --- a/src/System.Xml.XPath.XDocument/tests/System.Xml.XPath.XDocument.Tests.csproj +++ b/src/System.Xml.XPath.XDocument/tests/System.Xml.XPath.XDocument.Tests.csproj @@ -208,10 +208,6 @@ </EmbeddedResource> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\..\System.Xml.XPath.XmlDocument\src\System.Xml.XPath.XmlDocument.csproj"> <Project>{17cb2e3c-2904-4241-94db-3894d24f35da}</Project> <Name>System.Xml.XPath.XmlDocument</Name> diff --git a/src/System.Xml.XPath.XDocument/tests/project.json b/src/System.Xml.XPath.XDocument/tests/project.json index e8b366b37d..60c1e04f41 100644 --- a/src/System.Xml.XPath.XDocument/tests/project.json +++ b/src/System.Xml.XPath.XDocument/tests/project.json @@ -15,7 +15,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.XPath.XmlDocument/System.Xml.XPath.XmlDocument.sln b/src/System.Xml.XPath.XmlDocument/System.Xml.XPath.XmlDocument.sln index 60ae0425ac..fc878ce3e4 100644 --- a/src/System.Xml.XPath.XmlDocument/System.Xml.XPath.XmlDocument.sln +++ b/src/System.Xml.XPath.XmlDocument/System.Xml.XPath.XmlDocument.sln @@ -10,8 +10,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XmlDocumen EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.XmlDocument.Tests", "tests\System.Xml.XPath.XmlDocument.Tests.csproj", "{7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CF6DABDD-5158-4CAF-88B0-B823EE173E53}" ProjectSection(SolutionItems) = preProject .nuget\packages.config = .nuget\packages.config @@ -31,10 +29,6 @@ Global {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Debug|Any CPU.Build.0 = Debug|Any CPU {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Release|Any CPU.ActiveCfg = Release|Any CPU {7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Xml.XPath.XmlDocument/tests/System.Xml.XPath.XmlDocument.Tests.csproj b/src/System.Xml.XPath.XmlDocument/tests/System.Xml.XPath.XmlDocument.Tests.csproj index 12f363be64..2e17375b4f 100644 --- a/src/System.Xml.XPath.XmlDocument/tests/System.Xml.XPath.XmlDocument.Tests.csproj +++ b/src/System.Xml.XPath.XmlDocument/tests/System.Xml.XPath.XmlDocument.Tests.csproj @@ -206,10 +206,6 @@ </EmbeddedResource> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.Xml.XPath.XmlDocument.csproj"> <Project>{17cb2e3c-2904-4241-94db-3894d24f35da}</Project> <Name>System.Xml.XPath.XmlDocument</Name> diff --git a/src/System.Xml.XPath.XmlDocument/tests/project.json b/src/System.Xml.XPath.XmlDocument/tests/project.json index 7a3b613c31..7bba0aa710 100644 --- a/src/System.Xml.XPath.XmlDocument/tests/project.json +++ b/src/System.Xml.XPath.XmlDocument/tests/project.json @@ -15,7 +15,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.XPath/System.Xml.XPath.sln b/src/System.Xml.XPath/System.Xml.XPath.sln index 95f2039a45..b2eb3b24e5 100644 --- a/src/System.Xml.XPath/System.Xml.XPath.sln +++ b/src/System.Xml.XPath/System.Xml.XPath.sln @@ -6,8 +6,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath", "src\Sys EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XPath.Tests", "tests\System.Xml.XPath.Tests.csproj", "{D0DF902A-2486-4A38-B7A7-232B9B6590E1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CF6DABDD-5158-4CAF-88B0-B823EE173E53}" ProjectSection(SolutionItems) = preProject .nuget\packages.config = .nuget\packages.config @@ -27,10 +25,6 @@ Global {D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Debug|Any CPU.Build.0 = Debug|Any CPU {D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Release|Any CPU.ActiveCfg = Release|Any CPU {D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Xml.XPath/tests/System.Xml.XPath.Tests.csproj b/src/System.Xml.XPath/tests/System.Xml.XPath.Tests.csproj index 546a6f1371..9bddc89552 100644 --- a/src/System.Xml.XPath/tests/System.Xml.XPath.Tests.csproj +++ b/src/System.Xml.XPath/tests/System.Xml.XPath.Tests.csproj @@ -206,10 +206,6 @@ </EmbeddedResource> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.Xml.XPath.csproj"> <Project>{be28323e-327a-4e0f-b7f9-16ab7eab59dd}</Project> <Name>System.Xml.XPath</Name> diff --git a/src/System.Xml.XPath/tests/project.json b/src/System.Xml.XPath/tests/project.json index 08435c626d..ea366243e9 100644 --- a/src/System.Xml.XPath/tests/project.json +++ b/src/System.Xml.XPath/tests/project.json @@ -13,7 +13,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.XmlDocument/System.Xml.XmlDocument.sln b/src/System.Xml.XmlDocument/System.Xml.XmlDocument.sln index cf6775ac27..4283edcc8f 100644 --- a/src/System.Xml.XmlDocument/System.Xml.XmlDocument.sln +++ b/src/System.Xml.XmlDocument/System.Xml.XmlDocument.sln @@ -6,8 +6,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlDocument", "s EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlDocument.Tests", "tests\System.Xml.XmlDocument.Tests.csproj", "{7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CF6DABDD-5158-4CAF-88B0-B823EE173E53}" ProjectSection(SolutionItems) = preProject .nuget\packages.config = .nuget\packages.config @@ -27,10 +25,6 @@ Global {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Debug|Any CPU.Build.0 = Debug|Any CPU {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Release|Any CPU.ActiveCfg = Release|Any CPU {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Release|Any CPU.Build.0 = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Xml.XmlDocument/tests/System.Xml.XmlDocument.Tests.csproj b/src/System.Xml.XmlDocument/tests/System.Xml.XmlDocument.Tests.csproj index 839188bc08..13710c9f0d 100644 --- a/src/System.Xml.XmlDocument/tests/System.Xml.XmlDocument.Tests.csproj +++ b/src/System.Xml.XmlDocument/tests/System.Xml.XmlDocument.Tests.csproj @@ -102,10 +102,6 @@ <Compile Include="XmlTextTests\SplitTextTests.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> <ProjectReference Include="..\src\System.Xml.XmlDocument.csproj"> <Project>{16EE5522-F387-4C9E-9EF2-B5134B043F37}</Project> <Name>System.Xml.XmlDocument</Name> diff --git a/src/System.Xml.XmlDocument/tests/project.json b/src/System.Xml.XmlDocument/tests/project.json index e99d2b4d48..d179733e37 100644 --- a/src/System.Xml.XmlDocument/tests/project.json +++ b/src/System.Xml.XmlDocument/tests/project.json @@ -7,7 +7,8 @@ "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", "xunit.core.netcore": "1.0.1-prerelease", - "xunit.runner.visualstudio": "0.99.9-build1021" + "xunit.runner.visualstudio": "0.99.9-build1021", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} diff --git a/src/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln b/src/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln index 31f5c5ec31..f22f165dd4 100644 --- a/src/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln +++ b/src/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln @@ -12,8 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{961859 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Xml.XmlSerializer.Tests", "tests\System.Xml.XmlSerializer.Tests.csproj", "{4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "..\Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -28,10 +26,6 @@ Global {4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}.Debug|Any CPU.Build.0 = Debug|Any CPU {4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}.Release|Any CPU.ActiveCfg = Debug|Any CPU {4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}.Release|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.csproj b/src/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.csproj index 1626834965..2329323d5a 100644 --- a/src/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.csproj +++ b/src/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.csproj @@ -34,10 +34,6 @@ <Project>{D62A6082-5229-4845-8BE9-75753E08C65A}</Project> <Name>System.Xml.XmlSerializer</Name> </ProjectReference> - <ProjectReference Include="$(CommonTestPath)\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj"> - <Project>{be8ed8c1-c314-4c4e-a929-64c9c8b3552a}</Project> - <Name>XunitTraitsDiscoverers</Name> - </ProjectReference> </ItemGroup> <ItemGroup> <None Include="project.json" /> diff --git a/src/System.Xml.XmlSerializer/tests/project.json b/src/System.Xml.XmlSerializer/tests/project.json index 36b86afd96..a2abd4e74b 100644 --- a/src/System.Xml.XmlSerializer/tests/project.json +++ b/src/System.Xml.XmlSerializer/tests/project.json @@ -26,7 +26,8 @@ "xunit": "2.0.0-beta5-build2785", "xunit.abstractions.netcore": "1.0.0-prerelease", "xunit.assert": "2.0.0-beta5-build2785", - "xunit.core.netcore": "1.0.1-prerelease" + "xunit.core.netcore": "1.0.1-prerelease", + "xunit.netcore.extensions": "1.0.0-prerelease-*" }, "frameworks": { "dnxcore50": {} |