Skip to content

Commit bad8797

Browse files
stgatesstgates
committed
Updating Windows OpenSSL dependency to 1.0.2d.
1 parent bb0bf05 commit bad8797

File tree

6 files changed

+40
-15
lines changed

6 files changed

+40
-15
lines changed

‎Release/src/build/vs12.xp/casablanca120.xp.vcxproj

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,15 @@
3434
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets')" />
3535
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets')" />
3636
<Import Project="$(PackagesRoot)\zlib.v120.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('$(PackagesRoot)\zlib.v120.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.static.rt-dyn.targets')" />
37+
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets')" />
38+
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets')" />
3739
</ImportGroup>
3840
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
3941
<DebugFileSuffix>d</DebugFileSuffix>
4042
</PropertyGroup>
4143
<PropertyGroup>
4244
<TargetName>$(CppRestBaseFileName)120$(DebugFileSuffix)_xp_$(CppRestSDKVersionFileSuffix)</TargetName>
45+
<NuGetPackageImportStamp>58b07c0c</NuGetPackageImportStamp>
4346
</PropertyGroup>
4447
<ItemGroup>
4548
<None Include="packages.config" />
@@ -54,7 +57,6 @@
5457
<RuntimeLibrary Condition="'$(Configuration)'=='Debug'">MultiThreadedDebugDLL</RuntimeLibrary>
5558
<RuntimeLibrary Condition="'$(Configuration)'=='Release'">MultiThreadedDLL</RuntimeLibrary>
5659
<WholeProgramOptimization Condition="'$(Configuration)'=='Release'">true</WholeProgramOptimization>
57-
5860
<!-- Disable warning about decorated name length exceeded, name was truncated. This is due to Boost.Asio and Websocket++ templates. -->
5961
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
6062
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -71,4 +73,11 @@
7173
<Import Project="..\common.vcxitems" Label="Shared" Condition="Exists('..\common.vcxitems')" />
7274
<Import Project="..\win32.vcxitems" Label="Shared" Condition="Exists('..\win32.vcxitems')" />
7375
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
76+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
77+
<PropertyGroup>
78+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
79+
</PropertyGroup>
80+
<Error Condition="!Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets'))" />
81+
<Error Condition="!Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets'))" />
82+
</Target>
7483
</Project>

‎Release/src/build/vs12.xp/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<package id="boost_regex-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
77
<package id="boost_system-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
88
<package id="boost_thread-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
9-
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x64" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
10-
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x86" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
11-
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn" version="1.0.2.0" targetFramework="Native" developmentDependency="true" />
9+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn" version="1.0.2.1" targetFramework="Native" developmentDependency="true" />
10+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x64" version="1.0.2.1" targetFramework="Native" developmentDependency="true" />
11+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x86" version="1.0.2.1" targetFramework="Native" developmentDependency="true" />
1212
<package id="zlib.v120.windesktop.msvcstl.static.rt-dyn" version="1.2.8.8" targetFramework="Native" developmentDependency="true" />
1313
</packages>

‎Release/src/build/vs12/casablanca120.vcxproj

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,15 @@
2727
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets')" />
2828
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets')" />
2929
<Import Project="$(PackagesRoot)\zlib.v120.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('$(PackagesRoot)\zlib.v120.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v120.windesktop.msvcstl.static.rt-dyn.targets')" />
30+
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets')" />
31+
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets')" />
3032
</ImportGroup>
3133
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
3234
<DebugFileSuffix>d</DebugFileSuffix>
3335
</PropertyGroup>
3436
<PropertyGroup>
3537
<TargetName>$(CppRestBaseFileName)120$(DebugFileSuffix)_$(CppRestSDKVersionFileSuffix)</TargetName>
36-
<NuGetPackageImportStamp>d5171ca1</NuGetPackageImportStamp>
38+
<NuGetPackageImportStamp>1af61e94</NuGetPackageImportStamp>
3739
<CharacterSet>Unicode</CharacterSet>
3840
</PropertyGroup>
3941
<ItemGroup>
@@ -67,4 +69,11 @@
6769
<Import Project="..\common.vcxitems" Label="Shared" Condition="Exists('..\common.vcxitems')" />
6870
<Import Project="..\win32.vcxitems" Label="Shared" Condition="Exists('..\win32.vcxitems')" />
6971
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
72+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
73+
<PropertyGroup>
74+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
75+
</PropertyGroup>
76+
<Error Condition="!Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x86.targets'))" />
77+
<Error Condition="!Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.x64.targets'))" />
78+
</Target>
7079
</Project>

‎Release/src/build/vs12/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<package id="boost_regex-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
77
<package id="boost_system-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
88
<package id="boost_thread-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
9-
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x64" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
10-
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x86" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
11-
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn" version="1.0.2.0" targetFramework="Native" developmentDependency="true" />
9+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn" version="1.0.2.1" targetFramework="Native" developmentDependency="true" />
10+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x64" version="1.0.2.1" targetFramework="Native" developmentDependency="true" />
11+
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x86" version="1.0.2.1" targetFramework="Native" developmentDependency="true" />
1212
<package id="zlib.v120.windesktop.msvcstl.static.rt-dyn" version="1.2.8.8" targetFramework="Native" developmentDependency="true" />
1313
</packages>

‎Release/src/build/vs14/casablanca140.vcxproj

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@
2727
<Import Project="$(PackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.0\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.x86.targets" Condition="Exists('$(PackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.0\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.x86.targets')" />
2828
<Import Project="$(PackagesRoot)\boost_date_time-vc140.1.58.0-vs140rc\build\native\boost_date_time-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc140.1.58.0-vs140rc\build\native\boost_date_time-vc140.targets')" />
2929
<Import Project="$(PackagesRoot)\boost_regex-vc140.1.58.0-vs140rc\build\native\boost_regex-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc140.1.58.0-vs140rc\build\native\boost_regex-vc140.targets')" />
30+
<Import Project="$(PackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.targets" Condition="Exists('$(PackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.targets')" />
31+
<Import Project="$(PackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.x86.targets" Condition="Exists('$(PackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.x86.targets')" />
3032
</ImportGroup>
3133
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
3234
<DebugFileSuffix>d</DebugFileSuffix>
3335
</PropertyGroup>
3436
<PropertyGroup>
3537
<TargetName>$(CppRestBaseFileName)140$(DebugFileSuffix)_$(CppRestSDKVersionFileSuffix)</TargetName>
36-
<NuGetPackageImportStamp>eec97f90</NuGetPackageImportStamp>
3738
</PropertyGroup>
3839
<ItemGroup>
3940
<None Include="packages.config">
@@ -50,8 +51,7 @@
5051
<RuntimeLibrary Condition="'$(Configuration)'=='Debug'">MultiThreadedDebugDLL</RuntimeLibrary>
5152
<RuntimeLibrary Condition="'$(Configuration)'=='Release'">MultiThreadedDLL</RuntimeLibrary>
5253
<WholeProgramOptimization Condition="'$(Configuration)'=='Release'">true</WholeProgramOptimization>
53-
54-
<!-- Disable warning about decorated name length exceeded, name was truncated. This is due to Boost.Asio and Websocket++ templates. -->
54+
<!-- Disable warning about decorated name length exceeded, name was truncated. This is due to Boost.Asio and Websocket++ templates. -->
5555
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
5656
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
5757
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -67,4 +67,11 @@
6767
<Import Project="..\common.vcxitems" Label="Shared" Condition="Exists('..\common.vcxitems')" />
6868
<Import Project="..\win32.vcxitems" Label="Shared" Condition="Exists('..\win32.vcxitems')" />
6969
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
70+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
71+
<PropertyGroup>
72+
<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>
73+
</PropertyGroup>
74+
<Error Condition="!Exists('$(PackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.1\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.targets'))" />
75+
<Error Condition="!Exists('$(PackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.x86.1.0.2.1\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.x86.targets'))" />
76+
</Target>
7077
</Project>

‎Release/src/build/vs14/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="boost" version="1.58.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
4-
<package id="boost_system-vc140" version="1.58.0-vs140rc" targetFramework="native" developmentDependency="true" userInstalled="true" />
54
<package id="boost_date_time-vc140" version="1.58.0-vs140rc" targetFramework="native" developmentDependency="true" userInstalled="true" />
65
<package id="boost_regex-vc140" version="1.58.0-vs140rc" targetFramework="native" developmentDependency="true" userInstalled="true" />
7-
<package id="openssl.v140.windesktop.msvcstl.static.rt-dyn" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
8-
<package id="openssl.v140.windesktop.msvcstl.static.rt-dyn.x64" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
9-
<package id="openssl.v140.windesktop.msvcstl.static.rt-dyn.x86" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
6+
<package id="boost_system-vc140" version="1.58.0-vs140rc" targetFramework="native" developmentDependency="true" userInstalled="true" />
7+
<package id="openssl.v140.windesktop.msvcstl.static.rt-dyn" version="1.0.2.1" targetFramework="native" userInstalled="true" />
8+
<package id="openssl.v140.windesktop.msvcstl.static.rt-dyn.x64" version="1.0.2.1" targetFramework="native" userInstalled="true" />
9+
<package id="openssl.v140.windesktop.msvcstl.static.rt-dyn.x86" version="1.0.2.1" targetFramework="native" userInstalled="true" />
1010
<package id="zlib.v140.windesktop.msvcstl.static.rt-dyn" version="1.2.8.8" targetFramework="native" developmentDependency="true" userInstalled="true" />
1111
</packages>

0 commit comments

Comments
 (0)