diff options
10 files changed, 47 insertions, 41 deletions
diff --git a/cpp/msbuild/ice.proj b/cpp/msbuild/ice.proj index bec650f5c18..2ddf2ec81cc 100644 --- a/cpp/msbuild/ice.proj +++ b/cpp/msbuild/ice.proj @@ -34,7 +34,7 @@ <IceConfiguration Condition="$(Configuration.Contains('Debug'))">Debug</IceConfiguration> </PropertyGroup> - <PropertyGroup Condition="'$(DefaultPlatformToolset)' == 'v141' OR '$(DefaultPlatformToolset)' == 'v140' OR '$(DefaultPlatformToolset)' == 'v120'"> + <PropertyGroup Condition="'$(DefaultPlatformToolset)' == 'v142' OR '$(DefaultPlatformToolset)' == 'v141' OR '$(DefaultPlatformToolset)' == 'v140' OR '$(DefaultPlatformToolset)' == 'v120'"> <OpenSSL>yes</OpenSSL> </PropertyGroup> 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 diff --git a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj index 4bc38898c7b..325e944b41d 100644 --- a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/clientopenssl.vcxproj @@ -89,9 +89,10 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <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.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> <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" /> @@ -354,8 +355,9 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <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.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/test/IceSSL/configuration/msbuild/clientopenssl/packages.config b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config index 88b5723a617..a7dffa413f4 100644 --- a/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/clientopenssl/packages.config @@ -3,7 +3,8 @@ <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> - <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.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 diff --git a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config index 88b5723a617..a7dffa413f4 100644 --- a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config +++ b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/packages.config @@ -3,7 +3,8 @@ <package id="zeroc.ice.v120" version="3.7.4" targetFramework="native" /> <package id="zeroc.ice.v140" version="3.7.4" targetFramework="native" /> <package id="zeroc.icebuilder.msbuild" version="5.0.4" targetFramework="native" /> - <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.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 diff --git a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj index e8add6f1d4e..0cc082c8870 100644 --- a/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj +++ b/cpp/test/IceSSL/configuration/msbuild/serveropenssl/serveropenssl.vcxproj @@ -89,9 +89,10 @@ <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.4\build\native\zeroc.ice.v140.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" /> <Import Project="..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets" Condition="Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" /> - <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.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> <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" /> @@ -360,8 +361,9 @@ <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets') and '$(ICE_BIN_DIST)' == 'all'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.4\build\native\zeroc.ice.v120.targets'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.props'))" /> <Error Condition="!Exists('..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\msbuild\packages\zeroc.icebuilder.msbuild.5.0.4\build\zeroc.icebuilder.msbuild.targets'))" /> - <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.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/scripts/tests/IceSSL/configuration.py b/scripts/tests/IceSSL/configuration.py index 3c93d223d07..8bcea7ad39d 100644 --- a/scripts/tests/IceSSL/configuration.py +++ b/scripts/tests/IceSSL/configuration.py @@ -56,7 +56,7 @@ class ConfigurationTestCase(ClientServerTestCase): def getOpenSSLCommand(self, current): if isinstance(platform, Windows): return os.path.join(current.testsuite.getPath(), "..", "..", "..", "msbuild", "packages", - "zeroc.openssl.v140.1.0.2.6", "build", "native", "bin", "Win32", "Release", + "zeroc.openssl.v140.1.1.1", "build", "native", "bin", "Win32", "Release", "openssl.exe") else: return "openssl" |