diff options
Diffstat (limited to 'cpp/test/Common/msbuild/testcommon.vcxproj')
| -rw-r--r-- | cpp/test/Common/msbuild/testcommon.vcxproj | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/cpp/test/Common/msbuild/testcommon.vcxproj b/cpp/test/Common/msbuild/testcommon.vcxproj index 3ac4af2b10f..6bffec9a5c1 100644 --- a/cpp/test/Common/msbuild/testcommon.vcxproj +++ b/cpp/test/Common/msbuild/testcommon.vcxproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> <Import Project="..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Cpp11-Debug|Win32"> <Configuration>Cpp11-Debug</Configuration> @@ -173,18 +173,22 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets') and '$(UseBinDist)' == 'yes'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.targets') and '$(UseBinDist)' == 'yes'" /> </ImportGroup> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(UseBinDist)' == 'yes'"> - <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('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props'))" /> - </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText> </PropertyGroup> <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" /> </Target> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> + <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('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha3\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.props'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.targets') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha3\build\native\zeroc.ice.v120.targets'))" /> + </Target> </Project>
\ No newline at end of file |