diff options
| author | Jose <jose@zeroc.com> | 2017-03-16 09:32:08 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-03-16 09:32:08 +0100 |
| commit | f94a46d599d23fe1eaaef0df09746a0f8545a617 (patch) | |
| tree | 30092f6fbbf32d4afd41c19b71fe0fb91224b8b6 /cpp/src | |
| parent | Fixed C++ Windows Ice/background build failure (diff) | |
| download | ice-f94a46d599d23fe1eaaef0df09746a0f8545a617.tar.bz2 ice-f94a46d599d23fe1eaaef0df09746a0f8545a617.tar.xz ice-f94a46d599d23fe1eaaef0df09746a0f8545a617.zip | |
Update expat Nuget packages
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceXML/msbuild/icexml.vcxproj | 12 | ||||
| -rw-r--r-- | cpp/src/IceXML/msbuild/packages.config | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/cpp/src/IceXML/msbuild/icexml.vcxproj b/cpp/src/IceXML/msbuild/icexml.vcxproj index de301b6ccfa..68a9c93fe6d 100644 --- a/cpp/src/IceXML/msbuild/icexml.vcxproj +++ b/cpp/src/IceXML/msbuild/icexml.vcxproj @@ -96,17 +96,17 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\expat.v120.2.1.0.3\build\native\expat.v120.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v120.2.1.0.3\build\native\expat.v120.targets')" /> - <Import Project="..\..\..\msbuild\packages\expat.v140.2.1.0.3\build\native\expat.v140.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v140.2.1.0.3\build\native\expat.v140.targets')" /> - <Import Project="..\..\..\msbuild\packages\expat.v141.2.1.0.3\build\native\expat.v141.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v141.2.1.0.3\build\native\expat.v141.targets')" /> + <Import Project="..\..\..\msbuild\packages\expat.v120.2.1.0.4\build\native\expat.v120.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v120.2.1.0.4\build\native\expat.v120.targets')" /> + <Import Project="..\..\..\msbuild\packages\expat.v140.2.1.0.4\build\native\expat.v140.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v140.2.1.0.4\build\native\expat.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\expat.v141.2.1.0.4\build\native\expat.v141.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v141.2.1.0.4\build\native\expat.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\expat.v120.2.1.0.3\build\native\expat.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v120.2.1.0.3\build\native\expat.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v140.2.1.0.3\build\native\expat.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v140.2.1.0.3\build\native\expat.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v141.2.1.0.3\build\native\expat.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v141.2.1.0.3\build\native\expat.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v120.2.1.0.4\build\native\expat.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v120.2.1.0.4\build\native\expat.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v140.2.1.0.4\build\native\expat.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v140.2.1.0.4\build\native\expat.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\expat.v141.2.1.0.4\build\native\expat.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\expat.v141.2.1.0.4\build\native\expat.v141.targets'))" /> </Target> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" /> </Project>
\ No newline at end of file diff --git a/cpp/src/IceXML/msbuild/packages.config b/cpp/src/IceXML/msbuild/packages.config index 9e37df47d65..b1fac55dd86 100644 --- a/cpp/src/IceXML/msbuild/packages.config +++ b/cpp/src/IceXML/msbuild/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="expat.v120" version="2.1.0.3" targetFramework="native" /> - <package id="expat.v140" version="2.1.0.3" targetFramework="native" /> - <package id="expat.v141" version="2.1.0.3" targetFramework="native" /> + <package id="expat.v120" version="2.1.0.4" targetFramework="native" /> + <package id="expat.v140" version="2.1.0.4" targetFramework="native" /> + <package id="expat.v141" version="2.1.0.4" targetFramework="native" /> </packages>
\ No newline at end of file |