summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-02-12 18:20:19 +0100
committerJose <jose@zeroc.com>2018-02-12 18:20:19 +0100
commit6dfb98af6a6b19acc11e8f55da7a6b225952df83 (patch)
tree039896dabb97d0d09f19e10522da64a5e94bfd5b /cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd
parentEnsure Ice::Connection::setAdapter fails if the adapter is deactivated (ICE-8... (diff)
downloadice-6dfb98af6a6b19acc11e8f55da7a6b225952df83.tar.bz2
ice-6dfb98af6a6b19acc11e8f55da7a6b225952df83.tar.xz
ice-6dfb98af6a6b19acc11e8f55da7a6b225952df83.zip
Update MSBuild project to use 5.0.3 zeroc.icebuilder.msbuild packagev3.7.1-netcore-beta1
Diffstat (limited to 'cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd')
-rw-r--r--cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/packages.config2
-rw-r--r--cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj8
2 files changed, 5 insertions, 5 deletions
diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/packages.config b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/packages.config
index 42a0901c739..bf943cb96a2 100644
--- a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/packages.config
+++ b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/packages.config
@@ -6,5 +6,5 @@
<package id="zeroc.ice.uwp.v141" version="3.7.1" targetFramework="native" />
<package id="zeroc.ice.uwp.v141.x64" version="3.7.1" targetFramework="native" />
<package id="zeroc.ice.uwp.v141.x86" version="3.7.1" targetFramework="native" />
- <package id="zeroc.icebuilder.msbuild" version="5.0.2" targetFramework="native" />
+ <package id="zeroc.icebuilder.msbuild" version="5.0.3" targetFramework="native" />
</packages> \ No newline at end of file
diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj
index 65f7501f8f1..791ada4b1e9 100644
--- a/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj
+++ b/cpp/test/Ice/slicing/exceptions/msbuild/uwp/serveramd/serveramd.vcxproj
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props')" />
+ <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.props')" />
<Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" />
<Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.3.7.1\build\native\zeroc.ice.uwp.v141.props') and '$(ICE_BIN_DIST)' == 'all'" />
<ItemGroup Label="ProjectConfigurations">
@@ -80,7 +80,7 @@
<Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v141.x86.3.7.1\build\native\zeroc.ice.uwp.v141.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
<Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" />
<Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" />
- <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets')" />
+ <Import Project="..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.targets')" />
</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" />
@@ -387,7 +387,7 @@
<Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x64.3.7.1\build\native\zeroc.ice.uwp.v140.x64.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.x86.3.7.1\build\native\zeroc.ice.uwp.v140.x86.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.ice.uwp.v140.3.7.1\build\native\zeroc.ice.uwp.v140.props'))" />
- <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.props'))" />
- <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.2\build\zeroc.icebuilder.msbuild.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.props'))" />
+ <Error Condition="!Exists('..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.3\build\zeroc.icebuilder.msbuild.targets'))" />
</Target>
</Project> \ No newline at end of file