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/src | |
| 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/src')
4 files changed, 27 insertions, 27 deletions
diff --git a/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj b/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj index ca378d15465..697aeab9772 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj +++ b/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj @@ -108,19 +108,19 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <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.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> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\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\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.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/src/IceSSL/msbuild/icesslopenssl++11/packages.config b/cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config index fed4a4782e1..c06c10d64f8 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config +++ b/cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <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.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/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj b/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj index fa7bf91719f..a101583fb83 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj +++ b/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj @@ -113,21 +113,21 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <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> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\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\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/src/IceSSL/msbuild/icesslopenssl/packages.config b/cpp/src/IceSSL/msbuild/icesslopenssl/packages.config index 59f4be25bb9..0952e1002fb 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl/packages.config +++ b/cpp/src/IceSSL/msbuild/icesslopenssl/packages.config @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <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 |