Skip to content

Commit bb85860

Browse files
blowfishproblowfishpro
committed
Update Xunit
1 parent 9a9bd67 commit bb85860

4 files changed

Lines changed: 52 additions & 6 deletions

File tree

‎ModuleManagerTests/ModuleManagerTests.csproj‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" />
34
<Import Project="..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props" Condition="Exists('..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props')" />
45
<Import Project="..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" />
56
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -59,8 +60,18 @@
5960
<Reference Include="System.Data" />
6061
<Reference Include="System.Xml" />
6162
<Reference Include="UnityEngine" />
62-
<Reference Include="xunit, Version=1.9.2.1705, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
63-
<HintPath>..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
63+
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
64+
<HintPath>..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll</HintPath>
65+
<Private>True</Private>
66+
</Reference>
67+
<Reference Include="xunit.assert, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
68+
<HintPath>..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
69+
</Reference>
70+
<Reference Include="xunit.core, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
71+
<HintPath>..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll</HintPath>
72+
</Reference>
73+
<Reference Include="xunit.execution.desktop, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
74+
<HintPath>..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll</HintPath>
6475
</Reference>
6576
</ItemGroup>
6677
<ItemGroup>
@@ -126,12 +137,18 @@
126137
<Name>TestUtils</Name>
127138
</ProjectReference>
128139
</ItemGroup>
140+
<ItemGroup>
141+
<Analyzer Include="..\packages\xunit.analyzers.0.10.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
142+
</ItemGroup>
129143
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
130144
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
131145
<PropertyGroup>
132146
<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>
133147
</PropertyGroup>
134148
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props'))" />
135149
<Error Condition="!Exists('..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props'))" />
150+
<Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.props'))" />
151+
<Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.targets'))" />
136152
</Target>
153+
<Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" />
137154
</Project>

‎ModuleManagerTests/packages.config‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44
<package id="NSubstitute" version="3.1.0" targetFramework="net471" />
55
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net471" />
66
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net471" />
7-
<package id="xunit" version="1.9.2" targetFramework="net35" />
7+
<package id="xunit" version="2.4.1" targetFramework="net471" />
8+
<package id="xunit.abstractions" version="2.0.3" targetFramework="net471" />
9+
<package id="xunit.analyzers" version="0.10.0" targetFramework="net471" />
10+
<package id="xunit.assert" version="2.4.1" targetFramework="net471" />
11+
<package id="xunit.core" version="2.4.1" targetFramework="net471" />
12+
<package id="xunit.extensibility.core" version="2.4.1" targetFramework="net471" />
13+
<package id="xunit.extensibility.execution" version="2.4.1" targetFramework="net471" />
814
<package id="xunit.runner.console" version="2.4.1" targetFramework="net35" developmentDependency="true" requireReinstallation="true" />
915
<package id="xunit.runner.visualstudio" version="2.4.1" targetFramework="net35" developmentDependency="true" />
1016
</packages>

‎TestUtilsTests/TestUtilsTests.csproj‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" />
34
<Import Project="..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props" Condition="Exists('..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props')" />
45
<Import Project="..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" />
56
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -45,8 +46,18 @@
4546
<Reference Include="System.Data" />
4647
<Reference Include="System.Xml" />
4748
<Reference Include="UnityEngine" />
48-
<Reference Include="xunit, Version=1.9.2.1705, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
49-
<HintPath>..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
49+
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
50+
<HintPath>..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll</HintPath>
51+
<Private>True</Private>
52+
</Reference>
53+
<Reference Include="xunit.assert, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
54+
<HintPath>..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
55+
</Reference>
56+
<Reference Include="xunit.core, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
57+
<HintPath>..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll</HintPath>
58+
</Reference>
59+
<Reference Include="xunit.execution.desktop, Version=2.4.1.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
60+
<HintPath>..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll</HintPath>
5061
</Reference>
5162
</ItemGroup>
5263
<ItemGroup>
@@ -67,12 +78,18 @@
6778
<ItemGroup>
6879
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
6980
</ItemGroup>
81+
<ItemGroup>
82+
<Analyzer Include="..\packages\xunit.analyzers.0.10.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
83+
</ItemGroup>
7084
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7185
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
7286
<PropertyGroup>
7387
<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>
7488
</PropertyGroup>
7589
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props'))" />
7690
<Error Condition="!Exists('..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.console.2.4.1\build\xunit.runner.console.props'))" />
91+
<Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.props'))" />
92+
<Error Condition="!Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.4.1\build\xunit.core.targets'))" />
7793
</Target>
94+
<Import Project="..\packages\xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('..\packages\xunit.core.2.4.1\build\xunit.core.targets')" />
7895
</Project>

‎TestUtilsTests/packages.config‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="xunit" version="1.9.2" targetFramework="net35" />
3+
<package id="xunit" version="2.4.1" targetFramework="net471" />
4+
<package id="xunit.abstractions" version="2.0.3" targetFramework="net471" />
5+
<package id="xunit.analyzers" version="0.10.0" targetFramework="net471" />
6+
<package id="xunit.assert" version="2.4.1" targetFramework="net471" />
7+
<package id="xunit.core" version="2.4.1" targetFramework="net471" />
8+
<package id="xunit.extensibility.core" version="2.4.1" targetFramework="net471" />
9+
<package id="xunit.extensibility.execution" version="2.4.1" targetFramework="net471" />
410
<package id="xunit.runner.console" version="2.4.1" targetFramework="net35" developmentDependency="true" requireReinstallation="true" />
511
<package id="xunit.runner.visualstudio" version="2.4.1" targetFramework="net35" developmentDependency="true" />
612
</packages>

0 commit comments

Comments
 (0)