diff options
| author | Jose <jose@zeroc.com> | 2017-06-21 19:45:26 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-06-21 19:45:26 +0200 |
| commit | c4a0249b7bc81ba78179c5fc19e11cf3840991a9 (patch) | |
| tree | f8f98fef60b30655ae8a24d14534ca38b3670d4d /cpp | |
| parent | Revert NuGet changes to preserve timestmap, NuGet pack screw timestamp anyway (diff) | |
| download | ice-c4a0249b7bc81ba78179c5fc19e11cf3840991a9.tar.bz2 ice-c4a0249b7bc81ba78179c5fc19e11cf3840991a9.tar.xz ice-c4a0249b7bc81ba78179c5fc19e11cf3840991a9.zip | |
slice2php build failure
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/slice2php/msbuild/packages.config | 8 | ||||
| -rw-r--r-- | cpp/src/slice2php/msbuild/slice2php.vcxproj | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/cpp/src/slice2php/msbuild/packages.config b/cpp/src/slice2php/msbuild/packages.config index 1b69beb84ad..8386dfda383 100644 --- a/cpp/src/slice2php/msbuild/packages.config +++ b/cpp/src/slice2php/msbuild/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="mcpp.v100" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v120" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v140" version="2.7.2.16" targetFramework="native" /> - <package id="mcpp.v141" version="2.7.2.16" targetFramework="native" /> + <package id="mcpp.v100" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v120" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v141" version="2.7.2.17" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/src/slice2php/msbuild/slice2php.vcxproj b/cpp/src/slice2php/msbuild/slice2php.vcxproj index cd73b48a7d5..30a4e50268b 100644 --- a/cpp/src/slice2php/msbuild/slice2php.vcxproj +++ b/cpp/src/slice2php/msbuild/slice2php.vcxproj @@ -120,13 +120,19 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" /> </ImportGroup> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\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\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.16\build\native\mcpp.v100.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.17\build\native\mcpp.v100.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets'))" /> </Target> </Project>
\ No newline at end of file |