Skip to content

Commit 64806c4

Browse files
committed
Upgrade xUnit runtime packages to latest stable version (v2.3.0)
- part of #65 - remove `xUnit` meta-package: delay introduction of analyzers temporarily - remove `xunit.core` package from Microsoft.TestCommon permanently - not needed for xUnit extensions
1 parent 62cc8b3 commit 64806c4

File tree

55 files changed

+438
-359
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+438
-359
lines changed

test/Microsoft.AspNet.Facebook.Test/Microsoft.AspNet.Facebook.Test.csproj

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\xunit.core.2.3.0\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.props')" />
34
<Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
45
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Runtime.sln))\tools\WebStack.settings.targets" />
56
<PropertyGroup>
@@ -35,19 +36,19 @@
3536
<Reference Include="System.Web" />
3637
<Reference Include="System.Xml" />
3738
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
38-
<HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
39+
<HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
3940
<Private>True</Private>
4041
</Reference>
41-
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
42+
<Reference Include="xunit.assert, Version=2.3.0.3820, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
43+
<HintPath>..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
4344
<Private>True</Private>
4445
</Reference>
45-
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
46-
<HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
46+
<Reference Include="xunit.core, Version=2.3.0.3820, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
47+
<HintPath>..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll</HintPath>
4748
<Private>True</Private>
4849
</Reference>
49-
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
50-
<HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
50+
<Reference Include="xunit.execution.desktop, Version=2.3.0.3820, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
51+
<HintPath>..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll</HintPath>
5152
<Private>True</Private>
5253
</Reference>
5354
</ItemGroup>
@@ -133,7 +134,10 @@
133134
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
134135
</PropertyGroup>
135136
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
137+
<Error Condition="!Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.0\build\xunit.core.props'))" />
138+
<Error Condition="!Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.0\build\xunit.core.targets'))" />
136139
</Target>
140+
<Import Project="..\..\packages\xunit.core.2.3.0\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.targets')" />
137141
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
138142
Other similar extension points exist, see Microsoft.Common.targets.
139143
<Target Name="BeforeBuild">

test/Microsoft.AspNet.Facebook.Test/packages.config

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
<package id="Facebook" version="6.4.2" targetFramework="net452" />
55
<package id="Moq" version="4.7.142" targetFramework="net452" />
66
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
7-
<package id="xunit" version="2.1.0" targetFramework="net452" />
8-
<package id="xunit.abstractions" version="2.0.0" targetFramework="net452" />
9-
<package id="xunit.assert" version="2.1.0" targetFramework="net452" />
10-
<package id="xunit.core" version="2.1.0" targetFramework="net452" />
11-
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net452" />
12-
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net452" />
7+
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
8+
<package id="xunit.assert" version="2.3.0" targetFramework="net452" />
9+
<package id="xunit.core" version="2.3.0" targetFramework="net452" />
10+
<package id="xunit.extensibility.core" version="2.3.0" targetFramework="net452" />
11+
<package id="xunit.extensibility.execution" version="2.3.0" targetFramework="net452" />
1312
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net452" />
1413
</packages>

test/Microsoft.TestCommon/Microsoft.TestCommon.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@
2121
<Reference Include="System.Xml" />
2222
<Reference Include="System.Xml.Linq" />
2323
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
24-
<HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
24+
<HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
2525
<Private>True</Private>
2626
</Reference>
27-
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
28-
<HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
27+
<Reference Include="xunit.assert, Version=2.3.0.3820, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
28+
<HintPath>..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
2929
<Private>True</Private>
3030
</Reference>
31-
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
32-
<HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
31+
<Reference Include="xunit.core, Version=2.3.0.3820, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
32+
<HintPath>..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll</HintPath>
3333
<Private>True</Private>
3434
</Reference>
35-
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
36-
<HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
35+
<Reference Include="xunit.execution.desktop, Version=2.3.0.3820, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
36+
<HintPath>..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
3939
</ItemGroup>
Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="xunit" version="2.1.0" targetFramework="net452" />
4-
<package id="xunit.abstractions" version="2.0.0" targetFramework="net452" />
5-
<package id="xunit.assert" version="2.1.0" targetFramework="net452" />
6-
<package id="xunit.core" version="2.1.0" targetFramework="net452" />
7-
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net452" />
8-
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net452" />
3+
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
4+
<package id="xunit.assert" version="2.3.0" targetFramework="net452" />
5+
<package id="xunit.extensibility.core" version="2.3.0" targetFramework="net452" />
6+
<package id="xunit.extensibility.execution" version="2.3.0" targetFramework="net452" />
97
</packages>

test/Microsoft.Web.Helpers.Test/Microsoft.Web.Helpers.Test.csproj

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\xunit.core.2.3.0\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.props')" />
34
<Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
45
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Runtime.sln))\tools\WebStack.settings.targets" />
56
<PropertyGroup>
@@ -25,19 +26,19 @@
2526
<Reference Include="System.Configuration" />
2627
<Reference Include="System.Web" />
2728
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
28-
<HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
29+
<HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
2930
<Private>True</Private>
3031
</Reference>
31-
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
32-
<HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
32+
<Reference Include="xunit.assert, Version=2.3.0.3820, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
33+
<HintPath>..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
3334
<Private>True</Private>
3435
</Reference>
35-
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
36-
<HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
36+
<Reference Include="xunit.core, Version=2.3.0.3820, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
37+
<HintPath>..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll</HintPath>
3738
<Private>True</Private>
3839
</Reference>
39-
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
40-
<HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
40+
<Reference Include="xunit.execution.desktop, Version=2.3.0.3820, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
41+
<HintPath>..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll</HintPath>
4142
<Private>True</Private>
4243
</Reference>
4344
</ItemGroup>
@@ -97,5 +98,8 @@
9798
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
9899
</PropertyGroup>
99100
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
101+
<Error Condition="!Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.0\build\xunit.core.props'))" />
102+
<Error Condition="!Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.0\build\xunit.core.targets'))" />
100103
</Target>
104+
<Import Project="..\..\packages\xunit.core.2.3.0\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.targets')" />
101105
</Project>

test/Microsoft.Web.Helpers.Test/packages.config

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
<packages>
33
<package id="Castle.Core" version="4.2.1" targetFramework="net452" />
44
<package id="Moq" version="4.7.142" targetFramework="net452" />
5-
<package id="xunit" version="2.1.0" targetFramework="net452" />
6-
<package id="xunit.abstractions" version="2.0.0" targetFramework="net452" />
7-
<package id="xunit.assert" version="2.1.0" targetFramework="net452" />
8-
<package id="xunit.core" version="2.1.0" targetFramework="net452" />
9-
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net452" />
10-
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net452" />
5+
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
6+
<package id="xunit.assert" version="2.3.0" targetFramework="net452" />
7+
<package id="xunit.core" version="2.3.0" targetFramework="net452" />
8+
<package id="xunit.extensibility.core" version="2.3.0" targetFramework="net452" />
9+
<package id="xunit.extensibility.execution" version="2.3.0" targetFramework="net452" />
1110
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net452" />
1211
</packages>

test/Microsoft.Web.Mvc.Test/Microsoft.Web.Mvc.Test.csproj

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\xunit.core.2.3.0\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.props')" />
34
<Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
45
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Runtime.sln))\tools\WebStack.settings.targets" />
56
<PropertyGroup>
@@ -36,19 +37,19 @@
3637
<Reference Include="System.Web.Abstractions" />
3738
<Reference Include="System.Web.Routing" />
3839
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
39-
<HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
40+
<HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
4041
<Private>True</Private>
4142
</Reference>
42-
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
43-
<HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
43+
<Reference Include="xunit.assert, Version=2.3.0.3820, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
44+
<HintPath>..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
4445
<Private>True</Private>
4546
</Reference>
46-
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
47-
<HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
47+
<Reference Include="xunit.core, Version=2.3.0.3820, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
48+
<HintPath>..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll</HintPath>
4849
<Private>True</Private>
4950
</Reference>
50-
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
51-
<HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
51+
<Reference Include="xunit.execution.desktop, Version=2.3.0.3820, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
52+
<HintPath>..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll</HintPath>
5253
<Private>True</Private>
5354
</Reference>
5455
</ItemGroup>
@@ -164,5 +165,8 @@
164165
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
165166
</PropertyGroup>
166167
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
168+
<Error Condition="!Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.0\build\xunit.core.props'))" />
169+
<Error Condition="!Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.0\build\xunit.core.targets'))" />
167170
</Target>
171+
<Import Project="..\..\packages\xunit.core.2.3.0\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.targets')" />
168172
</Project>

test/Microsoft.Web.Mvc.Test/packages.config

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
<package id="Castle.Core" version="4.2.1" targetFramework="net452" />
44
<package id="Moq" version="4.7.142" targetFramework="net452" />
55
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
6-
<package id="xunit" version="2.1.0" targetFramework="net452" />
7-
<package id="xunit.abstractions" version="2.0.0" targetFramework="net452" />
8-
<package id="xunit.assert" version="2.1.0" targetFramework="net452" />
9-
<package id="xunit.core" version="2.1.0" targetFramework="net452" />
10-
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net452" />
11-
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net452" />
6+
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
7+
<package id="xunit.assert" version="2.3.0" targetFramework="net452" />
8+
<package id="xunit.core" version="2.3.0" targetFramework="net452" />
9+
<package id="xunit.extensibility.core" version="2.3.0" targetFramework="net452" />
10+
<package id="xunit.extensibility.execution" version="2.3.0" targetFramework="net452" />
1211
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net452" />
1312
</packages>

0 commit comments

Comments
 (0)