Fix BCLTests projects to use xunit.execution.dotnet.dll from mono

This commit is contained in:
Alexander Köplinger 2019-05-23 20:19:57 +02:00
Родитель c7e1b1e21f
Коммит 42b4b383b7
4 изменённых файлов: 22 добавлений и 18 удалений

Просмотреть файл

@ -51,11 +51,11 @@
<PackageReference Include="System.Buffers" Version="4.5.0" />
<PackageReference Include="System.Memory" Version="4.5.2" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.analyzers" Version="0.10.0" />
<PackageReference Include="xunit.extensibility.core" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.utility" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.core" Version="2.4.0" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.0" />
<PackageReference Include="xunit.runner.utility" Version="2.4.0" />
</ItemGroup>
<ItemGroup>
<Reference Include="System">
@ -74,9 +74,12 @@
<Reference Include="nunitlite">
<HintPath>%DOWNLOAD PATH%\nunitlite.dll</HintPath>
</Reference>
<Reference Include="Xunit.NetCore.Extensions">
<HintPath>%DOWNLOAD PATH%\tests\Xunit.NetCore.Extensions.dll</HintPath>
</Reference>
<Reference Include="Xunit.NetCore.Extensions">
<HintPath>%DOWNLOAD PATH%\tests\Xunit.NetCore.Extensions.dll</HintPath>
</Reference>
<Reference Include="xunit.execution.dotnet">
<HintPath>%DOWNLOAD PATH%\tests\xunit.execution.dotnet.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
%REFERENCES%
@ -165,6 +168,4 @@
%CONTENT RESOURCES%
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
<Import Project="..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets" Condition="Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets')" />
</Project>

Просмотреть файл

@ -135,6 +135,7 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.TVOS" />
<Reference Include="nunitlite">
@ -143,7 +144,9 @@
<Reference Include="Xunit.NetCore.Extensions">
<HintPath>%DOWNLOAD PATH%\ios-bcl\monotouch\tests\Xunit.NetCore.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="xunit.execution.dotnet">
<HintPath>%DOWNLOAD PATH%\ios-bcl\monotouch\tests\xunit.execution.dotnet.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
%REFERENCES%
@ -246,6 +249,4 @@
%CONTENT RESOURCES%
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\TVOS\Xamarin.TVOS.CSharp.targets" />
<Import Project="..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets" Condition="Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets')" />
</Project>

Просмотреть файл

@ -141,6 +141,7 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.WatchOS" />
<Reference Include="nunitlite">
@ -149,7 +150,9 @@
<Reference Include="Xunit.NetCore.Extensions">
<HintPath>%DOWNLOAD PATH%\ios-bcl\monotouch\tests\Xunit.NetCore.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="xunit.execution.dotnet">
<HintPath>%DOWNLOAD PATH%\ios-bcl\monotouch\tests\xunit.execution.dotnet.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
%REFERENCES%
@ -235,6 +238,4 @@
<Folder Include="TestRunner.xUnit\" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\WatchOS\Xamarin.WatchOS.AppExtension.CSharp.targets" />
<Import Project="..\..\..\packages\xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('..\..\..\packages\xunit.core.2.4.1\build\xunit.core.targets')" />
<Import Project="..\..\..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
</Project>

Просмотреть файл

@ -148,6 +148,7 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
<Reference Include="nunitlite">
@ -156,7 +157,9 @@
<Reference Include="Xunit.NetCore.Extensions">
<HintPath>%DOWNLOAD PATH%\ios-bcl\monotouch\tests\Xunit.NetCore.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="xunit.execution.dotnet">
<HintPath>%DOWNLOAD PATH%\ios-bcl\monotouch\tests\xunit.execution.dotnet.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
%REFERENCES%
@ -259,6 +262,4 @@
%CONTENT RESOURCES%
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets" Condition="Exists('..\..\..\packages\xunit.core.2.4.0\build\xunit.core.targets')" />
</Project>