Skip to content

Commit 787db05

Browse files
qdotqdot
committed
test: Remove references to xunit
We're using nunit now, but xunit still has dependencies in some files. Remove those.
1 parent 1493366 commit 787db05

5 files changed

Lines changed: 7 additions & 26 deletions

File tree

‎Buttplug.Apps.KiirooEmulatorGUI.Test/Buttplug.Apps.KiirooEmulatorGUI.Test.csproj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
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.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -84,10 +83,4 @@
8483
<AdditionalFiles Include="..\Buttplug.ProjectFiles\stylecop.json" />
8584
</ItemGroup>
8685
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
87-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
88-
<PropertyGroup>
89-
<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>
90-
</PropertyGroup>
91-
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props'))" />
92-
</Target>
9386
</Project>

‎Buttplug.Apps.KiirooEmulatorGUI.Test/packages.config‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,4 @@
33
<package id="NLog" version="4.5.0-rc03" targetFramework="net452" />
44
<package id="NUnit" version="3.9.0" targetFramework="net452" />
55
<package id="StyleCop.Analyzers" version="1.1.0-beta004" targetFramework="net452" developmentDependency="true" />
6-
<package id="xunit" version="2.2.0" targetFramework="net452" />
7-
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
8-
<package id="xunit.assert" version="2.2.0" targetFramework="net452" />
9-
<package id="xunit.core" version="2.2.0" targetFramework="net452" />
10-
<package id="xunit.extensibility.core" version="2.2.0" targetFramework="net452" />
11-
<package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net452" />
12-
<package id="xunit.runner.console" version="2.2.0" targetFramework="net452" developmentDependency="true" />
13-
<package id="xunit.runner.visualstudio" version="2.2.0" targetFramework="net452" developmentDependency="true" />
146
</packages>

‎Buttplug.Apps.WebsocketServerGUI.Test/Buttplug.Apps.WebsocketServerGUI.Test.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?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.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -88,6 +87,5 @@
8887
<PropertyGroup>
8988
<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>
9089
</PropertyGroup>
91-
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props'))" />
9290
</Target>
93-
</Project>
91+
</Project>

‎Buttplug.Client.Test/Buttplug.Client.Test.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?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.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -99,6 +98,5 @@
9998
<PropertyGroup>
10099
<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>
101100
</PropertyGroup>
102-
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props'))" />
103101
</Target>
104-
</Project>
102+
</Project>

‎Buttplug.Server.Test/Buttplug.Server.Test.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
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.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -72,7 +71,9 @@
7271
<Compile Include="Properties\AssemblyInfo.cs" />
7372
</ItemGroup>
7473
<ItemGroup>
75-
<None Include="app.config" />
74+
<None Include="app.config">
75+
<SubType>Designer</SubType>
76+
</None>
7677
<None Include="packages.config" />
7778
</ItemGroup>
7879
<ItemGroup>
@@ -100,6 +101,5 @@
100101
<PropertyGroup>
101102
<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>
102103
</PropertyGroup>
103-
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.2.0\build\net20\xunit.runner.visualstudio.props'))" />
104104
</Target>
105105
</Project>

0 commit comments

Comments
 (0)