summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj12
-rw-r--r--cpp/src/Ice/msbuild/ice++11/packages.config6
-rw-r--r--cpp/src/Ice/msbuild/ice/ice.vcxproj12
-rw-r--r--cpp/src/Ice/msbuild/ice/packages.config6
-rw-r--r--cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj12
-rw-r--r--cpp/src/IcePatch2Lib/msbuild/packages.config6
6 files changed, 27 insertions, 27 deletions
diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
index 7a80014912e..43a4d184488 100644
--- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
+++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
@@ -1762,17 +1762,17 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<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.4\build\native\bzip2.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.4\build\native\bzip2.v141.targets')" />
+ <Import Project="..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.5\build\native\bzip2.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.5\build\native\bzip2.v120.targets')" />
+ <Import Project="..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.5\build\native\bzip2.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.5\build\native\bzip2.v141.targets')" />
+ <Import Project="..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.5\build\native\bzip2.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.5\build\native\bzip2.v140.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.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.4\build\native\bzip2.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.4\build\native\bzip2.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.5\build\native\bzip2.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.5\build\native\bzip2.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.5\build\native\bzip2.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.5\build\native\bzip2.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.5\build\native\bzip2.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.5\build\native\bzip2.v140.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 8bac60f4310..38a32852ede 100644
--- a/cpp/src/Ice/msbuild/ice++11/packages.config
+++ b/cpp/src/Ice/msbuild/ice++11/packages.config
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<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.4" targetFramework="native" />
+ <package id="bzip2.v120" version="1.0.6.5" targetFramework="native" />
+ <package id="bzip2.v140" version="1.0.6.5" targetFramework="native" />
+ <package id="bzip2.v141" version="1.0.6.5" 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 6498c971cf4..1b58c041157 100644
--- a/cpp/src/Ice/msbuild/ice/ice.vcxproj
+++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj
@@ -1769,17 +1769,17 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<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.4\build\native\bzip2.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.4\build\native\bzip2.v141.targets')" />
+ <Import Project="..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.5\build\native\bzip2.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.5\build\native\bzip2.v120.targets')" />
+ <Import Project="..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.5\build\native\bzip2.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.5\build\native\bzip2.v140.targets')" />
+ <Import Project="..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.5\build\native\bzip2.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.5\build\native\bzip2.v141.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.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.4\build\native\bzip2.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.4\build\native\bzip2.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.5\build\native\bzip2.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v120.1.0.6.5\build\native\bzip2.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.5\build\native\bzip2.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.5\build\native\bzip2.v140.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.5\build\native\bzip2.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.5\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 8bac60f4310..38a32852ede 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.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.4" targetFramework="native" />
+ <package id="bzip2.v120" version="1.0.6.5" targetFramework="native" />
+ <package id="bzip2.v140" version="1.0.6.5" targetFramework="native" />
+ <package id="bzip2.v141" version="1.0.6.5" 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 c862cc4f507..48cb5894916 100644
--- a/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj
+++ b/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj
@@ -196,17 +196,17 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<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.4\build\native\bzip2.v141.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v141.1.0.6.4\build\native\bzip2.v141.targets')" />
+ <Import Project="..\..\..\msbuild\packages\bzip2.v120.1.0.6.5\build\native\bzip2.v120.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v120.1.0.6.5\build\native\bzip2.v120.targets')" />
+ <Import Project="..\..\..\msbuild\packages\bzip2.v141.1.0.6.5\build\native\bzip2.v141.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v141.1.0.6.5\build\native\bzip2.v141.targets')" />
+ <Import Project="..\..\..\msbuild\packages\bzip2.v140.1.0.6.5\build\native\bzip2.v140.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v140.1.0.6.5\build\native\bzip2.v140.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.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.4\build\native\bzip2.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v141.1.0.6.4\build\native\bzip2.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\bzip2.v120.1.0.6.5\build\native\bzip2.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v120.1.0.6.5\build\native\bzip2.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\bzip2.v141.1.0.6.5\build\native\bzip2.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v141.1.0.6.5\build\native\bzip2.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\bzip2.v140.1.0.6.5\build\native\bzip2.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\bzip2.v140.1.0.6.5\build\native\bzip2.v140.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 8bac60f4310..38a32852ede 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.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.4" targetFramework="native" />
+ <package id="bzip2.v120" version="1.0.6.5" targetFramework="native" />
+ <package id="bzip2.v140" version="1.0.6.5" targetFramework="native" />
+ <package id="bzip2.v141" version="1.0.6.5" targetFramework="native" />
</packages> \ No newline at end of file