diff options
Diffstat (limited to 'cpp/src')
6 files changed, 16 insertions, 17 deletions
diff --git a/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj b/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj index 9d78cf5be4a..7f485476695 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj +++ b/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj @@ -110,7 +110,7 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.2\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.2\build\native\zeroc.openssl.v140.targets')" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.4\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.4\build\native\zeroc.openssl.v140.targets')" /> </ImportGroup> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" /> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> @@ -123,6 +123,6 @@ <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.2\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.2\build\native\zeroc.openssl.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.4\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.4\build\native\zeroc.openssl.v140.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj.filters b/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj.filters index aa9d1871ef4..b93125e12cf 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj.filters +++ b/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj.filters @@ -55,7 +55,7 @@ </Filter> </ItemGroup> <ItemGroup> - <ResourceCompile Include="..\..\IceSSL.rc"> + <ResourceCompile Include="..\..\IceSSLOpenSSL.rc"> <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> diff --git a/cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config b/cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config index 29ce24f5b42..652a5310ab0 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config +++ b/cpp/src/IceSSL/msbuild/icesslopenssl++11/packages.config @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.openssl.v140" version="1.0.2.2" targetFramework="native" /> + <package id="zeroc.openssl.v140" version="1.0.2.4" 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 15039bdc2a3..36b7c68692a 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj +++ b/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj @@ -72,7 +72,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderHeaderOutputDir>$(Ice_SrcRootDir)\include\generated\cpp98\$(Platform)\$(Configuration)\IceSSL\</IceBuilderHeaderOutputDir> <IceBuilderBaseDirectoryForGeneratedInclude>IceSSL</IceBuilderBaseDirectoryForGeneratedInclude> - <NuGetPackageImportStamp>e0e507ac</NuGetPackageImportStamp> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -116,8 +115,8 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.2\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.2\build\native\zeroc.openssl.v140.targets')" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.3\build\native\zeroc.openssl.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.3\build\native\zeroc.openssl.v120.targets')" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.4\build\native\zeroc.openssl.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.4\build\native\zeroc.openssl.v120.targets')" /> + <Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.4\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.4\build\native\zeroc.openssl.v140.targets')" /> </ImportGroup> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" /> <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> @@ -130,7 +129,7 @@ <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.2\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.2\build\native\zeroc.openssl.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.3\build\native\zeroc.openssl.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.3\build\native\zeroc.openssl.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.4\build\native\zeroc.openssl.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.4\build\native\zeroc.openssl.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.4\build\native\zeroc.openssl.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.4\build\native\zeroc.openssl.v140.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj.filters b/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj.filters index ada1ef4134a..ba897fac5cd 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj.filters +++ b/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj.filters @@ -55,24 +55,24 @@ </Filter> </ItemGroup> <ItemGroup> - <ResourceCompile Include="..\..\IceSSL.rc"> + <ResourceCompile Include="..\..\IceSSLOpenSSL.rc"> <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\OpenSSLCertificate.cpp"> + <ClCompile Include="..\..\OpenSSLEngine.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\OpenSSLEngine.cpp"> + <ClCompile Include="..\..\OpenSSLTransceiverI.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\OpenSSLPlugin.cpp"> + <ClCompile Include="..\..\OpenSSLUtil.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\OpenSSLTransceiverI.cpp"> + <ClCompile Include="..\..\OpenSSLCertificateI.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\OpenSSLUtil.cpp"> + <ClCompile Include="..\..\OpenSSLPluginI.cpp"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> diff --git a/cpp/src/IceSSL/msbuild/icesslopenssl/packages.config b/cpp/src/IceSSL/msbuild/icesslopenssl/packages.config index d23499d38cb..1401fd383d1 100644 --- a/cpp/src/IceSSL/msbuild/icesslopenssl/packages.config +++ b/cpp/src/IceSSL/msbuild/icesslopenssl/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="zeroc.openssl.v120" version="1.0.2.3" targetFramework="Native" /> - <package id="zeroc.openssl.v140" version="1.0.2.2" targetFramework="native" /> + <package id="zeroc.openssl.v120" version="1.0.2.4" targetFramework="native" /> + <package id="zeroc.openssl.v140" version="1.0.2.4" targetFramework="native" /> </packages>
\ No newline at end of file |