diff options
Diffstat (limited to 'cpp/test/Ice/exceptions/msbuild/uwp')
4 files changed, 40 insertions, 40 deletions
diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj index ae298d913e9..e80ab62c412 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/client/client.vcxproj @@ -1,6 +1,6 @@ <?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.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' != ''" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,9 +78,9 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets') and '$(ICE_BIN_DIST)' != ''" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets') and '$(ICE_BIN_DIST)' != ''" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets') and '$(ICE_BIN_DIST)' != ''" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -218,15 +218,15 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(ICE_BIN_DIST)' != ''"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(ICE_BIN_DIST)' == 'all'"> <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.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj index b66c1dca44e..4f01992a4e2 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/collocated/collocated.vcxproj @@ -1,6 +1,6 @@ <?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.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' != ''" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,9 +78,9 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets') and '$(ICE_BIN_DIST)' != ''" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets') and '$(ICE_BIN_DIST)' != ''" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets') and '$(ICE_BIN_DIST)' != ''" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -250,15 +250,15 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(ICE_BIN_DIST)' != ''"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(ICE_BIN_DIST)' == 'all'"> <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.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj index e37a49df761..52feb13d76b 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/server/server.vcxproj @@ -1,6 +1,6 @@ <?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.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' != ''" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,9 +78,9 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets') and '$(ICE_BIN_DIST)' != ''" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets') and '$(ICE_BIN_DIST)' != ''" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets') and '$(ICE_BIN_DIST)' != ''" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -254,15 +254,15 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(ICE_BIN_DIST)' != ''"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(ICE_BIN_DIST)' == 'all'"> <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.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> diff --git a/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj index 32b7614ebfe..074f5b63430 100644 --- a/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj @@ -1,6 +1,6 @@ <?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.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' != ''" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' == 'all'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> <Configuration>Debug</Configuration> @@ -78,9 +78,9 @@ <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets') and '$(ICE_BIN_DIST)' != ''" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets') and '$(ICE_BIN_DIST)' != ''" /> - <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets') and '$(ICE_BIN_DIST)' != ''" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" /> + <Import Project="..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets" Condition="Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -255,15 +255,15 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(ICE_BIN_DIST)' != ''"> + <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild" Condition="'$(ICE_BIN_DIST)' == 'all'"> <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.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props'))" /> - <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' != ''" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.arm.3.7.0-alpha4\build\native\zeroc.ice.uwp.arm.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x64.3.7.0-alpha4\build\native\zeroc.ice.uwp.x64.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.x86.3.7.0-alpha4\build\native\zeroc.ice.uwp.x86.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props'))" /> + <Error Condition="!Exists('..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.3.7.0-alpha4\build\native\zeroc.ice.uwp.props'))" /> </Target> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> |