Skip to content

Commit 3aabdb3

Browse files
stgatesstgates
committed
Adding references to OpenSSL and zlib NuGet packages for Windows desktop.
1 parent 608043e commit 3aabdb3

13 files changed

+48
-4
lines changed

‎Release/src/build/vs11.xp/casablanca110.xp.vcxproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
<Import Project="$(PackagesRoot)\boost_regex-vc110.1.55.0.16\build\native\boost_regex-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc110.1.55.0.16\build\native\boost_regex-vc110.targets')" />
2828
<Import Project="$(PackagesRoot)\boost_chrono-vc110.1.55.0.16\build\native\boost_chrono-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_chrono-vc110.1.55.0.16\build\native\boost_chrono-vc110.targets')" />
2929
<Import Project="$(PackagesRoot)\boost_random-vc110.1.55.0.16\build\native\boost_random-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_random-vc110.1.55.0.16\build\native\boost_random-vc110.targets')" />
30+
<Import Project="$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.props" Condition="Exists('$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.props')" />
31+
<Import Project="$(PackagesRoot)\zlib.redist.1.2.8.7\build\native\zlib.redist.targets" Condition="Exists('$(PackagesRoot)\zlib.redist.1.2.8.7\build\native\zlib.redist.targets')" />
32+
<Import Project="$(PackagesRoot)\zlib.1.2.8.7\build\native\zlib.targets" Condition="Exists('$(PackagesRoot)\zlib.1.2.8.7\build\native\zlib.targets')" />
33+
<Import Project="$(PackagesRoot)\openssl.redist.1.0.1.25\build\native\openssl.redist.targets" Condition="Exists('$(PackagesRoot)\openssl.redist.1.0.1.25\build\native\openssl.redist.targets')" />
34+
<Import Project="$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.targets" Condition="Exists('$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.targets')" />
3035
</ImportGroup>
3136
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
3237
<DebugFileSuffix>d</DebugFileSuffix>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@
1212
<package id="boost_thread-vc110" version="1.55.0.16" targetFramework="Native" />
1313
<package id="boost_thread-vc120" version="1.55.0.16" targetFramework="Native" />
1414
<package id="boost_random-vc110" version="1.55.0.16" targetFramework="Native" />
15+
<package id="openssl" version="1.0.1.25" targetFramework="Native" />
16+
<package id="openssl.redist" version="1.0.1.25" targetFramework="Native" />
17+
<package id="zlib" version="1.2.8.7" targetFramework="Native" />
18+
<package id="zlib.redist" version="1.2.8.7" targetFramework="Native" />
1519
</packages>

‎Release/src/build/vs11/casablanca110.vcxproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
<Import Project="$(PackagesRoot)\boost_thread-vc110.1.55.0.16\build\native\boost_thread-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_thread-vc110.1.55.0.16\build\native\boost_thread-vc110.targets')" />
2828
<Import Project="$(PackagesRoot)\boost_chrono-vc110.1.55.0.16\build\native\boost_chrono-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_chrono-vc110.1.55.0.16\build\native\boost_chrono-vc110.targets')" />
2929
<Import Project="$(PackagesRoot)\boost_random-vc110.1.55.0.16\build\native\boost_random-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_random-vc110.1.55.0.16\build\native\boost_random-vc110.targets')" />
30+
<Import Project="$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.props" Condition="Exists('$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.props')" />
31+
<Import Project="$(PackagesRoot)\zlib.redist.1.2.8.7\build\native\zlib.redist.targets" Condition="Exists('$(PackagesRoot)\zlib.redist.1.2.8.7\build\native\zlib.redist.targets')" />
32+
<Import Project="$(PackagesRoot)\zlib.1.2.8.7\build\native\zlib.targets" Condition="Exists('$(PackagesRoot)\zlib.1.2.8.7\build\native\zlib.targets')" />
33+
<Import Project="$(PackagesRoot)\openssl.redist.1.0.1.25\build\native\openssl.redist.targets" Condition="Exists('$(PackagesRoot)\openssl.redist.1.0.1.25\build\native\openssl.redist.targets')" />
34+
<Import Project="$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.targets" Condition="Exists('$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.targets')" />
3035
</ImportGroup>
3136
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
3237
<DebugFileSuffix>d</DebugFileSuffix>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@
1212
<package id="boost_thread-vc110" version="1.55.0.16" targetFramework="Native" />
1313
<package id="boost_thread-vc120" version="1.55.0.16" targetFramework="Native" />
1414
<package id="boost_random-vc110" version="1.55.0.16" targetFramework="Native" />
15+
<package id="openssl" version="1.0.1.25" targetFramework="Native" />
16+
<package id="openssl.redist" version="1.0.1.25" targetFramework="Native" />
17+
<package id="zlib" version="1.2.8.7" targetFramework="Native" />
18+
<package id="zlib.redist" version="1.2.8.7" targetFramework="Native" />
1519
</packages>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424
<Import Project="$(PackagesRoot)\boost_system-vc120.1.55.0.16\build\native\boost_system-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc120.1.55.0.16\build\native\boost_system-vc120.targets')" />
2525
<Import Project="$(PackagesRoot)\boost_date_time-vc120.1.55.0.16\build\native\boost_date_time-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc120.1.55.0.16\build\native\boost_date_time-vc120.targets')" />
2626
<Import Project="$(PackagesRoot)\boost_regex-vc120.1.55.0.16\build\native\boost_regex-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc120.1.55.0.16\build\native\boost_regex-vc120.targets')" />
27+
<Import Project="$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.props" Condition="Exists('$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.props')" />
28+
<Import Project="$(PackagesRoot)\zlib.redist.1.2.8.7\build\native\zlib.redist.targets" Condition="Exists('$(PackagesRoot)\zlib.redist.1.2.8.7\build\native\zlib.redist.targets')" />
29+
<Import Project="$(PackagesRoot)\zlib.1.2.8.7\build\native\zlib.targets" Condition="Exists('$(PackagesRoot)\zlib.1.2.8.7\build\native\zlib.targets')" />
30+
<Import Project="$(PackagesRoot)\openssl.redist.1.0.1.25\build\native\openssl.redist.targets" Condition="Exists('$(PackagesRoot)\openssl.redist.1.0.1.25\build\native\openssl.redist.targets')" />
31+
<Import Project="$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.targets" Condition="Exists('$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.targets')" />
2732
</ImportGroup>
2833
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
2934
<DebugFileSuffix>d</DebugFileSuffix>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@
1212
<package id="boost_thread-vc110" version="1.55.0.16" targetFramework="Native" />
1313
<package id="boost_thread-vc120" version="1.55.0.16" targetFramework="Native" />
1414
<package id="boost_random-vc110" version="1.55.0.16" targetFramework="Native" />
15+
<package id="openssl" version="1.0.1.25" targetFramework="Native" />
16+
<package id="openssl.redist" version="1.0.1.25" targetFramework="Native" />
17+
<package id="zlib" version="1.2.8.7" targetFramework="Native" />
18+
<package id="zlib.redist" version="1.2.8.7" targetFramework="Native" />
1519
</packages>

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\version.props" />
44
<PropertyGroup Label="Globals">
@@ -24,12 +24,18 @@
2424
<Import Project="$(PackagesRoot)\boost_system-vc120.1.55.0.16\build\native\boost_system-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc120.1.55.0.16\build\native\boost_system-vc120.targets')" />
2525
<Import Project="$(PackagesRoot)\boost_date_time-vc120.1.55.0.16\build\native\boost_date_time-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc120.1.55.0.16\build\native\boost_date_time-vc120.targets')" />
2626
<Import Project="$(PackagesRoot)\boost_regex-vc120.1.55.0.16\build\native\boost_regex-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc120.1.55.0.16\build\native\boost_regex-vc120.targets')" />
27+
<Import Project="$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.props" Condition="Exists('$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.props')" />
28+
<Import Project="$(PackagesRoot)\zlib.redist.1.2.8.7\build\native\zlib.redist.targets" Condition="Exists('$(PackagesRoot)\zlib.redist.1.2.8.7\build\native\zlib.redist.targets')" />
29+
<Import Project="$(PackagesRoot)\zlib.1.2.8.7\build\native\zlib.targets" Condition="Exists('$(PackagesRoot)\zlib.1.2.8.7\build\native\zlib.targets')" />
30+
<Import Project="$(PackagesRoot)\openssl.redist.1.0.1.25\build\native\openssl.redist.targets" Condition="Exists('$(PackagesRoot)\openssl.redist.1.0.1.25\build\native\openssl.redist.targets')" />
31+
<Import Project="$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.targets" Condition="Exists('$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.targets')" />
2732
</ImportGroup>
2833
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
2934
<DebugFileSuffix>d</DebugFileSuffix>
3035
</PropertyGroup>
3136
<PropertyGroup>
3237
<TargetName>$(CppRestBaseFileName)120$(DebugFileSuffix)_$(CppRestSDKVersionFileSuffix)</TargetName>
38+
<NuGetPackageImportStamp>14a7e89e</NuGetPackageImportStamp>
3339
</PropertyGroup>
3440
<ItemGroup>
3541
<None Include="packages.config">
@@ -38,7 +44,7 @@
3844
</ItemGroup>
3945
<ItemDefinitionGroup>
4046
<ClCompile>
41-
<PreprocessorDefinitions>_ASYNCRT_EXPORT;AZURESTORAGESERVICES_EXPORTS;_PPLX_EXPORT;WIN32;_MBCS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
47+
<PreprocessorDefinitions>_ASYNCRT_EXPORT;_PPLX_EXPORT;WIN32;_MBCS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
4248
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;$(WebsocketppIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
4349
<PrecompiledHeader>Use</PrecompiledHeader>
4450
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
@@ -50,4 +56,4 @@
5056
</ItemDefinitionGroup>
5157
<Import Project="../sources.proj" />
5258
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
53-
</Project>
59+
</Project>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@
55
<package id="boost_chrono-vc120" version="1.55.0.16" targetFramework="Native" />
66
<package id="boost_date_time-vc110" version="1.55.0.16" targetFramework="Native" />
77
<package id="boost_date_time-vc120" version="1.55.0.16" targetFramework="Native" />
8+
<package id="boost_random-vc110" version="1.55.0.16" targetFramework="Native" />
89
<package id="boost_regex-vc110" version="1.55.0.16" targetFramework="Native" />
910
<package id="boost_regex-vc120" version="1.55.0.16" targetFramework="Native" />
1011
<package id="boost_system-vc110" version="1.55.0.16" targetFramework="Native" />
1112
<package id="boost_system-vc120" version="1.55.0.16" targetFramework="Native" />
1213
<package id="boost_thread-vc110" version="1.55.0.16" targetFramework="Native" />
1314
<package id="boost_thread-vc120" version="1.55.0.16" targetFramework="Native" />
14-
<package id="boost_random-vc110" version="1.55.0.16" targetFramework="Native" />
15+
<package id="openssl" version="1.0.1.25" targetFramework="Native" />
16+
<package id="openssl.redist" version="1.0.1.25" targetFramework="Native" />
17+
<package id="zlib" version="1.2.8.7" targetFramework="Native" />
18+
<package id="zlib.redist" version="1.2.8.7" targetFramework="Native" />
1519
</packages>

‎Release/tests/functional/websockets/client/authentication_tests.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ TEST_FIXTURE(uri_address, auth_with_credentials, "Ignore", "245")
8686
}
8787
#endif
8888

89+
// Server certificate verification isn't implemented on Windows desktop yet.
90+
#if !defined(_MS_WINDOWS) || defined(__cplusplus_winrt)
8991
TEST_FIXTURE(uri_address, ssl_test)
9092
{
9193
websocket_client client;
@@ -108,6 +110,7 @@ TEST_FIXTURE(uri_address, ssl_test)
108110
receive_task.wait();
109111
client.close().wait();
110112
}
113+
#endif
111114

112115
} // SUITE(authentication_tests)
113116

‎Release/tests/functional/websockets/client/vs11.xp/websocketsclient110_test.xp.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@
136136
<ClInclude Include="..\websocket_client_tests.h" />
137137
</ItemGroup>
138138
<ItemGroup>
139+
<ClCompile Include="..\authentication_tests.cpp" />
139140
<ClCompile Include="..\client_construction.cpp" />
140141
<ClCompile Include="..\close_tests.cpp" />
141142
<ClCompile Include="..\error_tests.cpp" />

0 commit comments

Comments
 (0)