summaryrefslogtreecommitdiff
path: root/cpp/src/icegriddb
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-02-08 18:32:13 +0100
committerJose <jose@zeroc.com>2018-02-08 18:32:13 +0100
commit4fe93b575e36a2d0735543ae7dd4450757f48daf (patch)
tree95d08a2a6ebc831f89fa8fc057cf55fd17f52d2f /cpp/src/icegriddb
parentMerge branch '3.7' of github.com:zeroc-ice/ice into 3.7 (diff)
downloadice-4fe93b575e36a2d0735543ae7dd4450757f48daf.tar.bz2
ice-4fe93b575e36a2d0735543ae7dd4450757f48daf.tar.xz
ice-4fe93b575e36a2d0735543ae7dd4450757f48daf.zip
Update msbuild projects to use 5.0.2 builder
Diffstat (limited to 'cpp/src/icegriddb')
-rw-r--r--cpp/src/icegriddb/msbuild/icegriddb.vcxproj8
-rw-r--r--cpp/src/icegriddb/msbuild/packages.config2
2 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj
index c324f3ce3ed..dfe1256d847 100644
--- a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj
+++ b/cpp/src/icegriddb/msbuild/icegriddb.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.1\build\zeroc.icebuilder.msbuild.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props')" />
+ <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')" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -263,7 +263,7 @@
<Import Project="..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets')" />
<Import Project="..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" />
- <Import Project="..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets')" />
+ <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')" />
</ImportGroup>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -273,7 +273,7 @@
<Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v120.0.9.19.3\build\native\lmdb.v120.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets'))" />
- <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.props'))" />
- <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.1\build\zeroc.icebuilder.msbuild.targets'))" />
+ <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'))" />
</Target>
</Project> \ No newline at end of file
diff --git a/cpp/src/icegriddb/msbuild/packages.config b/cpp/src/icegriddb/msbuild/packages.config
index 4deefe20cb4..b6a144c9105 100644
--- a/cpp/src/icegriddb/msbuild/packages.config
+++ b/cpp/src/icegriddb/msbuild/packages.config
@@ -3,5 +3,5 @@
<package id="lmdb.v120" version="0.9.19.3" targetFramework="native" />
<package id="lmdb.v140" version="0.9.19.3" targetFramework="native" />
<package id="lmdb.v141" version="0.9.19.3" targetFramework="native" />
- <package id="zeroc.icebuilder.msbuild" version="5.0.1" targetFramework="native" />
+ <package id="zeroc.icebuilder.msbuild" version="5.0.2" targetFramework="native" />
</packages> \ No newline at end of file