diff options
author | Jose <jose@zeroc.com> | 2019-07-22 10:15:26 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2019-07-22 10:15:26 +0200 |
commit | 026ffd63e404100926323bc4d77274637655d090 (patch) | |
tree | 7a9960c28b35cc5284450db409ada01b5f4587a4 /php | |
parent | Merge remote-tracking branch 'origin/3.7' into swift (diff) | |
download | ice-026ffd63e404100926323bc4d77274637655d090.tar.bz2 ice-026ffd63e404100926323bc4d77274637655d090.tar.xz ice-026ffd63e404100926323bc4d77274637655d090.zip |
Update Ice version to 3.7.3
Diffstat (limited to 'php')
-rw-r--r-- | php/README.md | 2 | ||||
-rw-r--r-- | php/msbuild/ice.props | 2 | ||||
-rw-r--r-- | php/msbuild/ice.tests.props | 2 | ||||
-rw-r--r-- | php/msbuild/zeroc.ice.php7.1.nuspec | 4 | ||||
-rw-r--r-- | php/msbuild/zeroc.ice.php7.2.nuspec | 4 | ||||
-rw-r--r-- | php/msbuild/zeroc.ice.php7.3.nuspec | 4 | ||||
-rw-r--r-- | php/src/php7/msbuild/php_ice.vcxproj | 8 |
7 files changed, 13 insertions, 13 deletions
diff --git a/php/README.md b/php/README.md index 1ae1b937359..2914e663061 100644 --- a/php/README.md +++ b/php/README.md @@ -335,5 +335,5 @@ The enclosing directory also needs to be accessible. For example: ``` [1]: https://zeroc.com/distributions/ice -[2]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.2 +[2]: https://doc.zeroc.com/display/Rel/Supported+Platforms+for+Ice+3.7.3 [3]: https://github.com/zeroc-ice/ice-builder-visualstudio diff --git a/php/msbuild/ice.props b/php/msbuild/ice.props index 973ff3b097a..3742758d9b8 100644 --- a/php/msbuild/ice.props +++ b/php/msbuild/ice.props @@ -19,7 +19,7 @@ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir> <IceBuilderPhpProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Php.props</IceBuilderPhpProps> <IceBuilderPhpTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Php.targets</IceBuilderPhpTargets> - <IceToolsPath Condition="'$(ICE_BIN_DIST)' == 'cpp'">$(MSBuildThisFileDirectory)/packages/zeroc.ice.$(DefaultPlatformsToolSet).3.7.2/tools</IceToolsPath> + <IceToolsPath Condition="'$(ICE_BIN_DIST)' == 'cpp'">$(MSBuildThisFileDirectory)/packages/zeroc.ice.$(DefaultPlatformsToolSet).3.7.3/tools</IceToolsPath> </PropertyGroup> <ItemGroup> diff --git a/php/msbuild/ice.tests.props b/php/msbuild/ice.tests.props index 1c575363c45..a26b7afb6f4 100644 --- a/php/msbuild/ice.tests.props +++ b/php/msbuild/ice.tests.props @@ -15,7 +15,7 @@ <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir> <IceBuilderPhpProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Php.props</IceBuilderPhpProps> <IceBuilderPhpTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Php.targets</IceBuilderPhpTargets> - <IceToolsPath Condition="'$(ICE_BIN_DIST)' == 'cpp'">$(MSBuildThisFileDirectory)/packages/zeroc.ice.v140.3.7.2/tools</IceToolsPath> + <IceToolsPath Condition="'$(ICE_BIN_DIST)' == 'cpp'">$(MSBuildThisFileDirectory)/packages/zeroc.ice.v140.3.7.3/tools</IceToolsPath> </PropertyGroup> <Target Name="Build"/> <Target Name="Clean"/> diff --git a/php/msbuild/zeroc.ice.php7.1.nuspec b/php/msbuild/zeroc.ice.php7.1.nuspec index 1c3ab75aedf..8074d1d7be4 100644 --- a/php/msbuild/zeroc.ice.php7.1.nuspec +++ b/php/msbuild/zeroc.ice.php7.1.nuspec @@ -3,7 +3,7 @@ <metadata> <id>zeroc.ice.php7.1</id> <title>ZeroC Ice for PHP 7.1</title> - <version>3.7.2</version> + <version>3.7.3</version> <authors>ZeroC</authors> <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright> <license type="expression">GPL-2.0-only</license> @@ -11,7 +11,7 @@ <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Ice for PHP SDK. Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description> - <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</releaseNotes> + <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.3+Release+Notes</releaseNotes> <tags>ice</tags> </metadata> </package> diff --git a/php/msbuild/zeroc.ice.php7.2.nuspec b/php/msbuild/zeroc.ice.php7.2.nuspec index 5f8f261c639..bfcb8f27007 100644 --- a/php/msbuild/zeroc.ice.php7.2.nuspec +++ b/php/msbuild/zeroc.ice.php7.2.nuspec @@ -3,7 +3,7 @@ <metadata> <id>zeroc.ice.php7.2</id> <title>ZeroC Ice for PHP 7.2</title> - <version>3.7.2</version> + <version>3.7.3</version> <authors>ZeroC</authors> <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright> <license type="expression">GPL-2.0-only</license> @@ -11,7 +11,7 @@ <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Ice for PHP SDK. Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description> - <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</releaseNotes> + <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.3+Release+Notes</releaseNotes> <tags>ice</tags> </metadata> </package> diff --git a/php/msbuild/zeroc.ice.php7.3.nuspec b/php/msbuild/zeroc.ice.php7.3.nuspec index 75f9d5b0097..8d41a5f010f 100644 --- a/php/msbuild/zeroc.ice.php7.3.nuspec +++ b/php/msbuild/zeroc.ice.php7.3.nuspec @@ -3,7 +3,7 @@ <metadata> <id>zeroc.ice.php7.3</id> <title>ZeroC Ice for PHP 7.3</title> - <version>3.7.2</version> + <version>3.7.3</version> <authors>ZeroC</authors> <copyright>Copyright (c) ZeroC, Inc. All rights reserved</copyright> <license type="expression">GPL-2.0-only</license> @@ -11,7 +11,7 @@ <iconUrl>https://zeroc.com/images/logos/zeroc/zeroc_logo-64x64.png</iconUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> <description>Ice for PHP SDK. Ice is a comprehensive RPC framework that helps you network your software with minimal effort.</description> - <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.2+Release+Notes</releaseNotes> + <releaseNotes>https://doc.zeroc.com/display/Rel/Ice+3.7.3+Release+Notes</releaseNotes> <tags>ice</tags> </metadata> </package> diff --git a/php/src/php7/msbuild/php_ice.vcxproj b/php/src/php7/msbuild/php_ice.vcxproj index 87851ae9d94..24a3ac5c55a 100644 --- a/php/src/php7/msbuild/php_ice.vcxproj +++ b/php/src/php7/msbuild/php_ice.vcxproj @@ -1,6 +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\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') And '$(ICE_BIN_DIST)' == 'cpp'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') And '$(ICE_BIN_DIST)' == 'cpp'" /> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -243,7 +243,7 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') And '$(ICE_BIN_DIST)' == 'cpp'" /> + <Import Project="..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') And '$(ICE_BIN_DIST)' == 'cpp'" /> <Import Project="..\..\..\msbuild\packages\php-7.1-nts.7.1.17\build\native\php-7.1-nts.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.1-nts.7.1.17\build\native\php-7.1-nts.targets')" /> <Import Project="..\..\..\msbuild\packages\php-7.1-ts.7.1.17\build\native\php-7.1-ts.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.1-ts.7.1.17\build\native\php-7.1-ts.targets')" /> <Import Project="..\..\..\msbuild\packages\php-7.2-nts.7.2.8\build\native\php-7.2-nts.targets" Condition="Exists('..\..\..\msbuild\packages\php-7.2-nts.7.2.8\build\native\php-7.2-nts.targets')" /> @@ -256,8 +256,8 @@ <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\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.2\build\native\zeroc.ice.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.props'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v140.3.7.3\build\native\zeroc.ice.v140.targets'))" /> <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.1-nts.7.1.17\build\native\php-7.1-nts.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.1-nts.7.1.17\build\native\php-7.1-nts.targets'))" /> <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.1-ts.7.1.17\build\native\php-7.1-ts.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.1-ts.7.1.17\build\native\php-7.1-ts.targets'))" /> <Error Condition="!Exists('..\..\..\msbuild\packages\php-7.2-nts.7.2.8\build\native\php-7.2-nts.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\php-7.2-nts.7.2.8\build\native\php-7.2-nts.targets'))" /> |