summaryrefslogtreecommitdiff
path: root/php/src
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2017-05-01 16:09:41 +0200
committerJose <jose@zeroc.com>2017-05-01 16:09:41 +0200
commitb98b9d11e856380b15a8dc26ef1843f44efadb7e (patch)
tree8a1a76304cc60bdff84075a1c900ff683fd5fab1 /php/src
parentUse ToolsVersion 4.0 for Visual Studio 2010 compatibility (diff)
downloadice-b98b9d11e856380b15a8dc26ef1843f44efadb7e.tar.bz2
ice-b98b9d11e856380b15a8dc26ef1843f44efadb7e.tar.xz
ice-b98b9d11e856380b15a8dc26ef1843f44efadb7e.zip
Fix (ICE-7782) - Update to PHP 7.1 on Windows
Diffstat (limited to 'php/src')
-rw-r--r--php/src/php7/msbuild/packages.config1
-rw-r--r--php/src/php7/msbuild/php_ice.vcxproj4
2 files changed, 5 insertions, 0 deletions
diff --git a/php/src/php7/msbuild/packages.config b/php/src/php7/msbuild/packages.config
index ec638c9b14b..94281940acc 100644
--- a/php/src/php7/msbuild/packages.config
+++ b/php/src/php7/msbuild/packages.config
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="php-7.0.v140" version="7.0.13" targetFramework="native" />
+ <package id="php-7.1.v140" version="7.1.4.1" targetFramework="native" />
</packages> \ No newline at end of file
diff --git a/php/src/php7/msbuild/php_ice.vcxproj b/php/src/php7/msbuild/php_ice.vcxproj
index abf0a509fe8..4fadb6a46d8 100644
--- a/php/src/php7/msbuild/php_ice.vcxproj
+++ b/php/src/php7/msbuild/php_ice.vcxproj
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.props" Condition="Exists('..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.props')" />
<Import Project="..\..\..\msbuild\packages\php-7.0.v140.7.0.13\build\native\php-7.0.v140.props" Condition="Exists('..\..\..\msbuild\packages\php-7.0.v140.7.0.13\build\native\php-7.0.v140.props')" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -237,6 +238,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\..\msbuild\packages\php-7.0.v140.7.0.13\build\native\php-7.0.v140.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.0.v140.7.0.13\build\native\php-7.0.v140.targets')" />
+ <Import Project="..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -244,5 +246,7 @@
</PropertyGroup>
<Error Condition="!Exists('..\..\..\msbuild\packages\php-7.0.v140.7.0.13\build\native\php-7.0.v140.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.0.v140.7.0.13\build\native\php-7.0.v140.props'))" />
<Error Condition="!Exists('..\..\..\msbuild\packages\php-7.0.v140.7.0.13\build\native\php-7.0.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.0.v140.7.0.13\build\native\php-7.0.v140.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.props'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.1.v140.7.1.4.1\build\native\php-7.1.v140.targets'))" />
</Target>
</Project> \ No newline at end of file