diff options
| author | Jose <jose@zeroc.com> | 2020-07-28 14:41:42 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2020-07-28 14:41:42 +0200 |
| commit | 70981e6a189fa8dff61ef5affdc81974473a9feb (patch) | |
| tree | f3dd14414b243b5c6b5c92f6cfc51dd1c2b5eaa3 /cpp/src | |
| parent | Bump lodash from 4.17.15 to 4.17.19 in /js (#958) (diff) | |
| download | ice-70981e6a189fa8dff61ef5affdc81974473a9feb.tar.bz2 ice-70981e6a189fa8dff61ef5affdc81974473a9feb.tar.xz ice-70981e6a189fa8dff61ef5affdc81974473a9feb.zip | |
Updates Windows build to OpenSSL 1.1.1g
Diffstat (limited to 'cpp/src')
4 files changed, 21 insertions, 21 deletions
diff --git a/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj b/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj index e26d55ed50e..841ab602902 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj +++ b/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj @@ -108,17 +108,17 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.0.2.6\build\native\zeroc.openssl.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.0.2.6\build\native\zeroc.openssl.v142.targets')" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1\build\native\zeroc.openssl.v140.targets')" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1\build\native\zeroc.openssl.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1\build\native\zeroc.openssl.v141.targets')" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1\build\native\zeroc.openssl.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1\build\native\zeroc.openssl.v142.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.0.2.6\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.0.2.6\build\native\zeroc.openssl.v142.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.0.2.6\build\native\zeroc.openssl.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1\build\native\zeroc.openssl.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1\build\native\zeroc.openssl.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1\build\native\zeroc.openssl.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1\build\native\zeroc.openssl.v142.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1\build\native\zeroc.openssl.v142.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 122584ec944..2078cd1bc66 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config +++ b/cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.openssl.v140" version="1.0.2.6" targetFramework="native" /> - <package id="zeroc.openssl.v141" version="1.0.2.6" targetFramework="native" /> - <package id="zeroc.openssl.v142" version="1.0.2.6" targetFramework="native" /> + <package id="zeroc.openssl.v140" version="1.1.1" targetFramework="native" /> + <package id="zeroc.openssl.v141" version="1.1.1" targetFramework="native" /> + <package id="zeroc.openssl.v142" version="1.1.1" 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 4b6782738f6..9ff5f9f7d56 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj +++ b/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj @@ -113,19 +113,19 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.0.2.6\build\native\zeroc.openssl.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.0.2.6\build\native\zeroc.openssl.v142.targets')" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1\build\native\zeroc.openssl.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1\build\native\zeroc.openssl.v120.targets')" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1\build\native\zeroc.openssl.v140.targets')" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1\build\native\zeroc.openssl.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1\build\native\zeroc.openssl.v141.targets')" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1\build\native\zeroc.openssl.v142.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1\build\native\zeroc.openssl.v142.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.0.2.6\build\native\zeroc.openssl.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.6\build\native\zeroc.openssl.v120.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.6\build\native\zeroc.openssl.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.0.2.6\build\native\zeroc.openssl.v141.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.0.2.6\build\native\zeroc.openssl.v142.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.0.2.6\build\native\zeroc.openssl.v142.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1\build\native\zeroc.openssl.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.1.1\build\native\zeroc.openssl.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.1.1\build\native\zeroc.openssl.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1\build\native\zeroc.openssl.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v141.1.1.1\build\native\zeroc.openssl.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1\build\native\zeroc.openssl.v142.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v142.1.1.1\build\native\zeroc.openssl.v142.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 9d0fc9c8b67..e98431deeff 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl/packages.config +++ b/cpp/src/IceSSL/msbuild/icesslopenssl/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.openssl.v120" version="1.0.2.6" targetFramework="native" /> - <package id="zeroc.openssl.v140" version="1.0.2.6" targetFramework="native" /> - <package id="zeroc.openssl.v141" version="1.0.2.6" targetFramework="native" /> - <package id="zeroc.openssl.v142" version="1.0.2.6" targetFramework="native" /> + <package id="zeroc.openssl.v120" version="1.1.1" targetFramework="native" /> + <package id="zeroc.openssl.v140" version="1.1.1" targetFramework="native" /> + <package id="zeroc.openssl.v141" version="1.1.1" targetFramework="native" /> + <package id="zeroc.openssl.v142" version="1.1.1" targetFramework="native" /> </packages>
\ No newline at end of file |