diff options
| author | Jose <jose@zeroc.com> | 2023-03-13 12:53:28 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2023-03-13 12:55:51 +0100 |
| commit | c6250e85f55ddc9df6f2ef0c80b488d628dc549a (patch) | |
| tree | f78377314be539e33c25e9d54d37c82e846e31c2 /cpp/test | |
| parent | Handle CompletionException thrown from dispatch future (#1464) (diff) | |
| download | ice-c6250e85f55ddc9df6f2ef0c80b488d628dc549a.tar.bz2 ice-c6250e85f55ddc9df6f2ef0c80b488d628dc549a.tar.xz ice-c6250e85f55ddc9df6f2ef0c80b488d628dc549a.zip | |
Update OpenSSL packages used by windows builds
Diffstat (limited to 'cpp/test')
4 files changed, 30 insertions, 30 deletions
diff --git a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj index 62596e8b2e2..85d994145df 100644 --- a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj @@ -89,11 +89,11 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.9\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.9\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.9\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.9\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1.2\build\native\zeroc.openssl.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1.2\build\native\zeroc.openssl.v120.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1.2\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1.2\build\native\zeroc.openssl.v140.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1.2\build\native\zeroc.openssl.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1.2\build\native\zeroc.openssl.v141.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1.2\build\native\zeroc.openssl.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1.2\build\native\zeroc.openssl.v142.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v143.1.1.1.2\build\native\zeroc.openssl.v143.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v143.1.1.1.2\build\native\zeroc.openssl.v143.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1.3\build\native\zeroc.openssl.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1.3\build\native\zeroc.openssl.v120.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1.3\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1.3\build\native\zeroc.openssl.v140.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1.3\build\native\zeroc.openssl.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1.3\build\native\zeroc.openssl.v141.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1.3\build\native\zeroc.openssl.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1.3\build\native\zeroc.openssl.v142.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -356,10 +356,10 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.9\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.9\build\native\zeroc.ice.v120.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1.2\build\native\zeroc.openssl.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1.2\build\native\zeroc.openssl.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1.2\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1.2\build\native\zeroc.openssl.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1.2\build\native\zeroc.openssl.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1.2\build\native\zeroc.openssl.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1.2\build\native\zeroc.openssl.v142.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1.2\build\native\zeroc.openssl.v142.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v143.1.1.1.2\build\native\zeroc.openssl.v143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v143.1.1.1.2\build\native\zeroc.openssl.v143.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1.3\build\native\zeroc.openssl.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1.3\build\native\zeroc.openssl.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1.3\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1.3\build\native\zeroc.openssl.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1.3\build\native\zeroc.openssl.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1.3\build\native\zeroc.openssl.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1.3\build\native\zeroc.openssl.v142.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1.3\build\native\zeroc.openssl.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config index 2793ef3f735..c1c22aa58a6 100644 --- a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config @@ -3,9 +3,9 @@ <package id="zeroc.ice.v120" version="3.7.9" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.9" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.9" targetFramework="native" /> - <package id="zeroc.openssl.v120" version="1.1.1.2" targetFramework="native" /> - <package id="zeroc.openssl.v140" version="1.1.1.2" targetFramework="native" /> - <package id="zeroc.openssl.v141" version="1.1.1.2" targetFramework="native" /> - <package id="zeroc.openssl.v142" version="1.1.1.2" targetFramework="native" /> - <package id="zeroc.openssl.v143" version="1.1.1.2" targetFramework="native" /> + <package id="zeroc.openssl.v120" version="1.1.1.3" targetFramework="native" /> + <package id="zeroc.openssl.v140" version="1.1.1.3" targetFramework="native" /> + <package id="zeroc.openssl.v141" version="1.1.1.3" targetFramework="native" /> + <package id="zeroc.openssl.v142" version="1.1.1.3" targetFramework="native" /> + <package id="zeroc.openssl.v143" version="1.1.1.3" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config index 2793ef3f735..c1c22aa58a6 100644 --- a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config @@ -3,9 +3,9 @@ <package id="zeroc.ice.v120" version="3.7.9" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.9" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.9" targetFramework="native" /> - <package id="zeroc.openssl.v120" version="1.1.1.2" targetFramework="native" /> - <package id="zeroc.openssl.v140" version="1.1.1.2" targetFramework="native" /> - <package id="zeroc.openssl.v141" version="1.1.1.2" targetFramework="native" /> - <package id="zeroc.openssl.v142" version="1.1.1.2" targetFramework="native" /> - <package id="zeroc.openssl.v143" version="1.1.1.2" targetFramework="native" /> + <package id="zeroc.openssl.v120" version="1.1.1.3" targetFramework="native" /> + <package id="zeroc.openssl.v140" version="1.1.1.3" targetFramework="native" /> + <package id="zeroc.openssl.v141" version="1.1.1.3" targetFramework="native" /> + <package id="zeroc.openssl.v142" version="1.1.1.3" targetFramework="native" /> + <package id="zeroc.openssl.v143" version="1.1.1.3" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj index 739fc23b4e6..005159edcbf 100644 --- a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj @@ -89,11 +89,11 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.9\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.9\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.9\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.9\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1.2\build\native\zeroc.openssl.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1.2\build\native\zeroc.openssl.v120.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1.2\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1.2\build\native\zeroc.openssl.v140.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1.2\build\native\zeroc.openssl.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1.2\build\native\zeroc.openssl.v141.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1.2\build\native\zeroc.openssl.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1.2\build\native\zeroc.openssl.v142.targets')" /> - <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v143.1.1.1.2\build\native\zeroc.openssl.v143.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v143.1.1.1.2\build\native\zeroc.openssl.v143.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1.3\build\native\zeroc.openssl.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1.3\build\native\zeroc.openssl.v120.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1.3\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1.3\build\native\zeroc.openssl.v140.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1.3\build\native\zeroc.openssl.v141.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1.3\build\native\zeroc.openssl.v141.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1.3\build\native\zeroc.openssl.v142.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1.3\build\native\zeroc.openssl.v142.targets')" /> + <Import Project="..\..\..\..\..\msbuild\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets')" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> @@ -362,10 +362,10 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.9\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.9\build\native\zeroc.ice.v120.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.9\build\zeroc.icebuilder.msbuild.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1.2\build\native\zeroc.openssl.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1.2\build\native\zeroc.openssl.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1.2\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1.2\build\native\zeroc.openssl.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1.2\build\native\zeroc.openssl.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1.2\build\native\zeroc.openssl.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1.2\build\native\zeroc.openssl.v142.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1.2\build\native\zeroc.openssl.v142.targets'))" /> - <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v143.1.1.1.2\build\native\zeroc.openssl.v143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v143.1.1.1.2\build\native\zeroc.openssl.v143.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1.3\build\native\zeroc.openssl.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1.3\build\native\zeroc.openssl.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1.3\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1.3\build\native\zeroc.openssl.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1.3\build\native\zeroc.openssl.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1.3\build\native\zeroc.openssl.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1.3\build\native\zeroc.openssl.v142.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1.3\build\native\zeroc.openssl.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.openssl.v143.1.1.1.3\build\native\zeroc.openssl.v143.targets'))" /> </Target> </Project>
\ No newline at end of file |