summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2019-10-09 22:28:39 +0200
committerJose <jose@zeroc.com>2019-10-09 22:29:10 +0200
commit02d459179f87971c17c83abcc3a34716b7f09515 (patch)
tree17631df013e20268c38ee1f39254b76a8dafad1b /cpp
parentFix C# strong name sign failures (diff)
downloadice-02d459179f87971c17c83abcc3a34716b7f09515.tar.bz2
ice-02d459179f87971c17c83abcc3a34716b7f09515.tar.xz
ice-02d459179f87971c17c83abcc3a34716b7f09515.zip
Update expat packages
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/IceXML/msbuild/icexml.vcxproj16
-rw-r--r--cpp/src/IceXML/msbuild/packages.config8
2 files changed, 12 insertions, 12 deletions
diff --git a/cpp/src/IceXML/msbuild/icexml.vcxproj b/cpp/src/IceXML/msbuild/icexml.vcxproj
index 899c917c403..8608e386c80 100644
--- a/cpp/src/IceXML/msbuild/icexml.vcxproj
+++ b/cpp/src/IceXML/msbuild/icexml.vcxproj
@@ -96,19 +96,19 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
- <Import Project="..\..\..\msbuild\packages\expat.v120.2.2.7\build\native\expat.v120.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v120.2.2.7\build\native\expat.v120.targets')" />
- <Import Project="..\..\..\msbuild\packages\expat.v140.2.2.7\build\native\expat.v140.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v140.2.2.7\build\native\expat.v140.targets')" />
- <Import Project="..\..\..\msbuild\packages\expat.v141.2.2.7\build\native\expat.v141.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v141.2.2.7\build\native\expat.v141.targets')" />
- <Import Project="..\..\..\msbuild\packages\expat.v142.2.2.7\build\native\expat.v142.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v142.2.2.7\build\native\expat.v142.targets')" />
+ <Import Project="..\..\..\msbuild\packages\expat.v120.2.2.9\build\native\expat.v120.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v120.2.2.9\build\native\expat.v120.targets')" />
+ <Import Project="..\..\..\msbuild\packages\expat.v140.2.2.9\build\native\expat.v140.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v140.2.2.9\build\native\expat.v140.targets')" />
+ <Import Project="..\..\..\msbuild\packages\expat.v141.2.2.9\build\native\expat.v141.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v141.2.2.9\build\native\expat.v141.targets')" />
+ <Import Project="..\..\..\msbuild\packages\expat.v142.2.2.9\build\native\expat.v142.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v142.2.2.9\build\native\expat.v142.targets')" />
</ImportGroup>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<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\expat.v120.2.2.7\build\native\expat.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v120.2.2.7\build\native\expat.v120.targets'))" />
- <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v140.2.2.7\build\native\expat.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v140.2.2.7\build\native\expat.v140.targets'))" />
- <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v141.2.2.7\build\native\expat.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v141.2.2.7\build\native\expat.v141.targets'))" />
- <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v142.2.2.7\build\native\expat.v142.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v142.2.2.7\build\native\expat.v142.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v120.2.2.9\build\native\expat.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v120.2.2.9\build\native\expat.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v140.2.2.9\build\native\expat.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v140.2.2.9\build\native\expat.v140.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v141.2.2.9\build\native\expat.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v141.2.2.9\build\native\expat.v141.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v142.2.2.9\build\native\expat.v142.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v142.2.2.9\build\native\expat.v142.targets'))" />
</Target>
</Project> \ No newline at end of file
diff --git a/cpp/src/IceXML/msbuild/packages.config b/cpp/src/IceXML/msbuild/packages.config
index 1b1bbf027c3..cc05fb7380c 100644
--- a/cpp/src/IceXML/msbuild/packages.config
+++ b/cpp/src/IceXML/msbuild/packages.config
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="expat.v120" version="2.2.7" targetFramework="native" />
- <package id="expat.v140" version="2.2.7" targetFramework="native" />
- <package id="expat.v141" version="2.2.7" targetFramework="native" />
- <package id="expat.v142" version="2.2.7" targetFramework="native" />
+ <package id="expat.v120" version="2.2.9" targetFramework="native" />
+ <package id="expat.v140" version="2.2.9" targetFramework="native" />
+ <package id="expat.v141" version="2.2.9" targetFramework="native" />
+ <package id="expat.v142" version="2.2.9" targetFramework="native" />
</packages> \ No newline at end of file