summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj4
-rw-r--r--cpp/src/Ice/msbuild/ice++11/packages.config2
-rw-r--r--cpp/src/Ice/msbuild/ice/ice.vcxproj4
-rw-r--r--cpp/src/Ice/msbuild/ice/packages.config2
-rw-r--r--cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj4
-rw-r--r--cpp/src/IcePatch2Lib/msbuild/packages.config2
6 files changed, 9 insertions, 9 deletions
diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
index 7b4dc9d91ae..105a82d0007 100644
--- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
+++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
@@ -1765,7 +1765,7 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets')" />
<Import Project="..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets')" />
- <Import Project="..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.3\build\native\bzip2.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.3\build\native\bzip2.v141.targets')" />
+ <Import Project="..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.4\build\native\bzip2.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.4\build\native\bzip2.v141.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -1773,7 +1773,7 @@
</PropertyGroup>
<Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets'))" />
<Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets'))" />
- <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.3\build\native\bzip2.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.3\build\native\bzip2.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.4\build\native\bzip2.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.4\build\native\bzip2.v141.targets'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
diff --git a/cpp/src/Ice/msbuild/ice++11/packages.config b/cpp/src/Ice/msbuild/ice++11/packages.config
index 7c589499779..8bac60f4310 100644
--- a/cpp/src/Ice/msbuild/ice++11/packages.config
+++ b/cpp/src/Ice/msbuild/ice++11/packages.config
@@ -2,5 +2,5 @@
<packages>
<package id="bzip2.v120" version="1.0.6.4" targetFramework="native" />
<package id="bzip2.v140" version="1.0.6.4" targetFramework="native" />
- <package id="bzip2.v141" version="1.0.6.3" targetFramework="native" />
+ <package id="bzip2.v141" version="1.0.6.4" targetFramework="native" />
</packages> \ No newline at end of file
diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj b/cpp/src/Ice/msbuild/ice/ice.vcxproj
index f60cb6113c9..8493a124364 100644
--- a/cpp/src/Ice/msbuild/ice/ice.vcxproj
+++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj
@@ -1772,7 +1772,7 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets')" />
<Import Project="..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets')" />
- <Import Project="..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.3\build\native\bzip2.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.3\build\native\bzip2.v141.targets')" />
+ <Import Project="..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.4\build\native\bzip2.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.4\build\native\bzip2.v141.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -1780,7 +1780,7 @@
</PropertyGroup>
<Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets'))" />
<Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets'))" />
- <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.3\build\native\bzip2.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.3\build\native\bzip2.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.4\build\native\bzip2.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.4\build\native\bzip2.v141.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 7c589499779..8bac60f4310 100644
--- a/cpp/src/Ice/msbuild/ice/packages.config
+++ b/cpp/src/Ice/msbuild/ice/packages.config
@@ -2,5 +2,5 @@
<packages>
<package id="bzip2.v120" version="1.0.6.4" targetFramework="native" />
<package id="bzip2.v140" version="1.0.6.4" targetFramework="native" />
- <package id="bzip2.v141" version="1.0.6.3" targetFramework="native" />
+ <package id="bzip2.v141" version="1.0.6.4" targetFramework="native" />
</packages> \ No newline at end of file
diff --git a/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj b/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj
index 041c98fccd9..a63d41c521b 100644
--- a/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj
+++ b/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj
@@ -199,7 +199,7 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets')" />
- <Import Project="..\..\..\msbuild\packages\bzip2.v141.1.0.6.3\build\native\bzip2.v141.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v141.1.0.6.3\build\native\bzip2.v141.targets')" />
+ <Import Project="..\..\..\msbuild\packages\bzip2.v141.1.0.6.4\build\native\bzip2.v141.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v141.1.0.6.4\build\native\bzip2.v141.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -207,7 +207,7 @@
</PropertyGroup>
<Error Condition="!Exists('..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v140.1.0.6.4\build\native\bzip2.v140.targets'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v120.1.0.6.4\build\native\bzip2.v120.targets'))" />
- <Error Condition="!Exists('..\..\..\msbuild\packages\bzip2.v141.1.0.6.3\build\native\bzip2.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v141.1.0.6.3\build\native\bzip2.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\bzip2.v141.1.0.6.4\build\native\bzip2.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v141.1.0.6.4\build\native\bzip2.v141.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 7c589499779..8bac60f4310 100644
--- a/cpp/src/IcePatch2Lib/msbuild/packages.config
+++ b/cpp/src/IcePatch2Lib/msbuild/packages.config
@@ -2,5 +2,5 @@
<packages>
<package id="bzip2.v120" version="1.0.6.4" targetFramework="native" />
<package id="bzip2.v140" version="1.0.6.4" targetFramework="native" />
- <package id="bzip2.v141" version="1.0.6.3" targetFramework="native" />
+ <package id="bzip2.v141" version="1.0.6.4" targetFramework="native" />
</packages> \ No newline at end of file