diff options
| author | Bertrand Le Roy <beleroy@microsoft.com> | 2018-04-24 22:50:20 +0300 |
|---|---|---|
| committer | Bertrand Le Roy <beleroy@microsoft.com> | 2018-04-24 22:50:20 +0300 |
| commit | 4af9f77cac61dac8758e45e517d5afec306c585e (patch) | |
| tree | df2b566691d4b467a882ebbd9d16868c4de08562 /Xamarin.PropertyEditing.Tests | |
| parent | d0b1e4d0377552c6a46ff215952c8dc44105773a (diff) | |
Look for Nunit props in both relevant places for side-by-side and designer-integrated configurations.
Diffstat (limited to 'Xamarin.PropertyEditing.Tests')
| -rw-r--r-- | Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj b/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj index ec7ff1f..0a0541c 100644 --- a/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj +++ b/Xamarin.PropertyEditing.Tests/Xamarin.PropertyEditing.Tests.csproj @@ -1,6 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props')" /> + <Choose> + <When Condition="Exists('..\..\..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props')"> + <PropertyGroup> + <NunitImportPath>..\..\..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props</NunitImportPath> + </PropertyGroup> + </When> + <Otherwise> + <PropertyGroup> + <NunitImportPath>..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props</NunitImportPath> + </PropertyGroup> + </Otherwise> + </Choose> + <Import Project="$(NunitImportPath)" Condition="Exists($(NunitImportPath))" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -136,6 +148,6 @@ <PropertyGroup> <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> </PropertyGroup> - <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props'))" /> + <Error Condition="!Exists($(NunitImportPath))" Text="$([System.String]::Format('$(ErrorText)', $(NunitImportPath)))" /> </Target> </Project>
\ No newline at end of file |