diff options
| author | Jose <jose@zeroc.com> | 2017-06-09 16:08:39 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-06-09 16:08:39 +0200 |
| commit | 93e3fba6ae62db2f74f7418168446b975089ac6f (patch) | |
| tree | 677dc6f3e7669fddb5bc38567699b8522657b956 /cpp/src | |
| parent | Fix for ICE-7841 - increased retry count, minor binding test fix (diff) | |
| download | ice-93e3fba6ae62db2f74f7418168446b975089ac6f.tar.bz2 ice-93e3fba6ae62db2f74f7418168446b975089ac6f.tar.xz ice-93e3fba6ae62db2f74f7418168446b975089ac6f.zip | |
Fix (ICE-8000) - VS 2010 failure downloading missing bzi2p symbols
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/msbuild/ice/ice.vcxproj | 4 | ||||
| -rw-r--r-- | cpp/src/Ice/msbuild/ice/packages.config | 2 | ||||
| -rw-r--r-- | cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj | 4 | ||||
| -rw-r--r-- | cpp/src/IcePatch2Lib/msbuild/packages.config | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj b/cpp/src/Ice/msbuild/ice/ice.vcxproj index 5fbcd874564..9ca5d869fe4 100644 --- a/cpp/src/Ice/msbuild/ice/ice.vcxproj +++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj @@ -1772,19 +1772,19 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\..\msbuild\packages\bzip2.v100.1.0.6.7\build\native\bzip2.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v100.1.0.6.7\build\native\bzip2.v100.targets')" /> <Import Project="..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.7\build\native\bzip2.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.7\build\native\bzip2.v120.targets')" /> <Import Project="..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.7\build\native\bzip2.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.7\build\native\bzip2.v140.targets')" /> <Import Project="..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.7\build\native\bzip2.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.7\build\native\bzip2.v141.targets')" /> + <Import Project="..\..\..\..\msbuild\packages\bzip2.v100.1.0.6.8\build\native\bzip2.v100.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v100.1.0.6.8\build\native\bzip2.v100.targets')" /> </ImportGroup> <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\bzip2.v100.1.0.6.7\build\native\bzip2.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v100.1.0.6.7\build\native\bzip2.v100.targets'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.7\build\native\bzip2.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.7\build\native\bzip2.v120.targets'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.7\build\native\bzip2.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.7\build\native\bzip2.v140.targets'))" /> <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.7\build\native\bzip2.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.7\build\native\bzip2.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v100.1.0.6.8\build\native\bzip2.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v100.1.0.6.8\build\native\bzip2.v100.targets'))" /> </Target> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" /> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> diff --git a/cpp/src/Ice/msbuild/ice/packages.config b/cpp/src/Ice/msbuild/ice/packages.config index 6391aa33bdf..05abba0a0e5 100644 --- a/cpp/src/Ice/msbuild/ice/packages.config +++ b/cpp/src/Ice/msbuild/ice/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="bzip2.v100" version="1.0.6.7" targetFramework="native" /> + <package id="bzip2.v100" version="1.0.6.8" targetFramework="native" /> <package id="bzip2.v120" version="1.0.6.7" targetFramework="native" /> <package id="bzip2.v140" version="1.0.6.7" targetFramework="native" /> <package id="bzip2.v141" version="1.0.6.7" targetFramework="native" /> diff --git a/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj b/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj index f18e1ae6800..fca8f789b38 100644 --- a/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj +++ b/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj @@ -199,19 +199,19 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\bzip2.v100.1.0.6.7\build\native\bzip2.v100.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v100.1.0.6.7\build\native\bzip2.v100.targets')" /> <Import Project="..\..\..\msbuild\packages\bzip2.v120.1.0.6.7\build\native\bzip2.v120.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v120.1.0.6.7\build\native\bzip2.v120.targets')" /> <Import Project="..\..\..\msbuild\packages\bzip2.v140.1.0.6.7\build\native\bzip2.v140.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v140.1.0.6.7\build\native\bzip2.v140.targets')" /> <Import Project="..\..\..\msbuild\packages\bzip2.v141.1.0.6.7\build\native\bzip2.v141.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v141.1.0.6.7\build\native\bzip2.v141.targets')" /> + <Import Project="..\..\..\msbuild\packages\bzip2.v100.1.0.6.8\build\native\bzip2.v100.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v100.1.0.6.8\build\native\bzip2.v100.targets')" /> </ImportGroup> <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\bzip2.v100.1.0.6.7\build\native\bzip2.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v100.1.0.6.7\build\native\bzip2.v100.targets'))" /> <Error Condition="!Exists('..\..\..\msbuild\packages\bzip2.v120.1.0.6.7\build\native\bzip2.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v120.1.0.6.7\build\native\bzip2.v120.targets'))" /> <Error Condition="!Exists('..\..\..\msbuild\packages\bzip2.v140.1.0.6.7\build\native\bzip2.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v140.1.0.6.7\build\native\bzip2.v140.targets'))" /> <Error Condition="!Exists('..\..\..\msbuild\packages\bzip2.v141.1.0.6.7\build\native\bzip2.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v141.1.0.6.7\build\native\bzip2.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\bzip2.v100.1.0.6.8\build\native\bzip2.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v100.1.0.6.8\build\native\bzip2.v100.targets'))" /> </Target> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" /> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> diff --git a/cpp/src/IcePatch2Lib/msbuild/packages.config b/cpp/src/IcePatch2Lib/msbuild/packages.config index 6391aa33bdf..05abba0a0e5 100644 --- a/cpp/src/IcePatch2Lib/msbuild/packages.config +++ b/cpp/src/IcePatch2Lib/msbuild/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="bzip2.v100" version="1.0.6.7" targetFramework="native" /> + <package id="bzip2.v100" version="1.0.6.8" targetFramework="native" /> <package id="bzip2.v120" version="1.0.6.7" targetFramework="native" /> <package id="bzip2.v140" version="1.0.6.7" targetFramework="native" /> <package id="bzip2.v141" version="1.0.6.7" targetFramework="native" /> |