Skip to content

Commit 4ddf58d

Browse files
stgatesstgates
committed
Fixing incorrect Boost version NuGet package number, and removing unnecessary OpenSSL warning suppression.
1 parent b221a47 commit 4ddf58d

File tree

9 files changed

+81
-71
lines changed

9 files changed

+81
-71
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,13 @@
2020
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />
2121
<ImportGroup Label="PropertySheets">
2222
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
23-
<Import Project="$(PackagesRoot)\boost.1.58.0\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.58.0\build\native\boost.targets')" />
24-
<Import Project="$(PackagesRoot)\boost_system-vc120.1.58.0\build\native\boost_system-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc120.1.58.0\build\native\boost_system-vc120.targets')" />
25-
<Import Project="$(PackagesRoot)\boost_date_time-vc120.1.58.0\build\native\boost_date_time-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc120.1.58.0\build\native\boost_date_time-vc120.targets')" />
26-
<Import Project="$(PackagesRoot)\boost_regex-vc120.1.58.0\build\native\boost_regex-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc120.1.58.0\build\native\boost_regex-vc120.targets')" />
23+
<Import Project="$(PackagesRoot)\boost.1.58.0.0\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.58.0.0\build\native\boost.targets')" />
24+
<Import Project="$(PackagesRoot)\boost_system-vc120.1.58.0.0\build\native\boost_system-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc120.1.58.0.0\build\native\boost_system-vc120.targets')" />
25+
<Import Project="$(PackagesRoot)\boost_date_time-vc120.1.58.0.0\build\native\boost_date_time-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc120.1.58.0.0\build\native\boost_date_time-vc120.targets')" />
26+
<Import Project="$(PackagesRoot)\boost_regex-vc120.1.58.0.0\build\native\boost_regex-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc120.1.58.0.0\build\native\boost_regex-vc120.targets')" />
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')" />
29-
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.1.0.2.0\build\native\openssl.targets')" />
30-
<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.targets')" />
29+
<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')" />
3130
</ImportGroup>
3231
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
3332
<DebugFileSuffix>d</DebugFileSuffix>
@@ -48,17 +47,18 @@
4847
<RuntimeLibrary Condition="'$(Configuration)'=='Debug'">MultiThreadedDebugDLL</RuntimeLibrary>
4948
<RuntimeLibrary Condition="'$(Configuration)'=='Release'">MultiThreadedDLL</RuntimeLibrary>
5049
<WholeProgramOptimization Condition="'$(Configuration)'=='Release'">true</WholeProgramOptimization>
50+
51+
<!-- Disable warning about decorated name length exceeded, name was truncated. This is due to Boost.Asio and Websocket++ templates. -->
52+
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
53+
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
54+
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
55+
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
56+
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
57+
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
5158
</ClCompile>
5259
<Link>
5360
<AdditionalDependencies>Winhttp.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
5461
<LinkTimeCodeGeneration Condition="'$(Configuration)'=='Release'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
55-
56-
<!-- We are statically linking against an OpenSSL lib which statically links against the CRT, avoid warning -->
57-
<IgnoreSpecificDefaultLibraries Condition="'$(Configuration)'=='Debug'">LIBCMTD</IgnoreSpecificDefaultLibraries>
58-
<IgnoreSpecificDefaultLibraries Condition="'$(Configuration)'=='Release'">LIBCMT</IgnoreSpecificDefaultLibraries>
59-
<!-- The OpenSSL package doesn't include pdbs so suppress the warning, otherwise one is emitted per object file -->
60-
<!-- This is just complaining we don't have debug information for OpenSSL -->
61-
<AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
6262
</Link>
6363
</ItemDefinitionGroup>
6464
<Import Project="..\common.vcxitems" Label="Shared" Condition="Exists('..\common.vcxitems')" />

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

Lines changed: 5 additions & 5 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" />
4-
<package id="boost_chrono-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
5-
<package id="boost_date_time-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
6-
<package id="boost_regex-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
7-
<package id="boost_system-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
8-
<package id="boost_thread-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
4+
<package id="boost_chrono-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
5+
<package id="boost_date_time-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
6+
<package id="boost_regex-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
7+
<package id="boost_system-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
8+
<package id="boost_thread-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
99
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x64" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
1010
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x86" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
1111
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn" version="1.0.2.0" targetFramework="Native" developmentDependency="true" />

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

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,13 @@
2020
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />
2121
<ImportGroup Label="PropertySheets">
2222
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
23-
<Import Project="$(PackagesRoot)\boost.1.58.0\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.58.0\build\native\boost.targets')" />
24-
<Import Project="$(PackagesRoot)\boost_system-vc120.1.58.0\build\native\boost_system-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc120.1.58.0\build\native\boost_system-vc120.targets')" />
25-
<Import Project="$(PackagesRoot)\boost_date_time-vc120.1.58.0\build\native\boost_date_time-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc120.1.58.0\build\native\boost_date_time-vc120.targets')" />
26-
<Import Project="$(PackagesRoot)\boost_regex-vc120.1.58.0\build\native\boost_regex-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc120.1.58.16\build\native\boost_regex-vc120.targets')" />
23+
<Import Project="$(PackagesRoot)\boost.1.58.0.0\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.58.0.0\build\native\boost.targets')" />
24+
<Import Project="$(PackagesRoot)\boost_system-vc120.1.58.0.0\build\native\boost_system-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc120.1.58.0.0\build\native\boost_system-vc120.targets')" />
25+
<Import Project="$(PackagesRoot)\boost_date_time-vc120.1.58.0.0\build\native\boost_date_time-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc120.1.58.0.0\build\native\boost_date_time-vc120.targets')" />
26+
<Import Project="$(PackagesRoot)\boost_regex-vc120.1.58.0.0\build\native\boost_regex-vc120.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc120.1.58.0.0\build\native\boost_regex-vc120.targets')" />
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')" />
29-
<Import Project="$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.1.0.2.0\build\native\openssl.v120.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('$(PackagesRoot)\openssl.v120.windesktop.msvcstl.static.rt-dyn.1.0.2.0\build\native\openssl.targets')" />
30-
<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.targets')" />
29+
<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')" />
3130
</ImportGroup>
3231
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
3332
<DebugFileSuffix>d</DebugFileSuffix>
@@ -52,16 +51,18 @@
5251
<RuntimeLibrary Condition="'$(Configuration)'=='Debug'">MultiThreadedDebugDLL</RuntimeLibrary>
5352
<RuntimeLibrary Condition="'$(Configuration)'=='Release'">MultiThreadedDLL</RuntimeLibrary>
5453
<WholeProgramOptimization Condition="'$(Configuration)'=='Release'">true</WholeProgramOptimization>
54+
55+
<!-- Disable warning about decorated name length exceeded, name was truncated. This is due to Boost.Asio and Websocket++ templates. -->
56+
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
57+
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
58+
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
59+
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
60+
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
61+
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4503;%(DisableSpecificWarnings)</DisableSpecificWarnings>
5562
</ClCompile>
5663
<Link>
5764
<AdditionalDependencies>Winhttp.lib;httpapi.lib;bcrypt.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
5865
<LinkTimeCodeGeneration Condition="'$(Configuration)'=='Release'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
59-
<!-- We are statically linking against an OpenSSL lib which statically links against the CRT, avoid warning -->
60-
<IgnoreSpecificDefaultLibraries Condition="'$(Configuration)'=='Debug'">LIBCMTD</IgnoreSpecificDefaultLibraries>
61-
<IgnoreSpecificDefaultLibraries Condition="'$(Configuration)'=='Release'">LIBCMT</IgnoreSpecificDefaultLibraries>
62-
<!-- The OpenSSL package doesn't include pdbs so suppress the warning, otherwise one is emitted per object file -->
63-
<!-- This is just complaining we don't have debug information for OpenSSL -->
64-
<AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
6566
</Link>
6667
</ItemDefinitionGroup>
6768
<Import Project="..\common.vcxitems" Label="Shared" Condition="Exists('..\common.vcxitems')" />

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="boost" version="1.58.0" targetFramework="Native" developmentDependency="true" />
4-
<package id="boost_chrono-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
5-
<package id="boost_date_time-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
6-
<package id="boost_regex-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
7-
<package id="boost_system-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
8-
<package id="boost_thread-vc120" version="1.58.0" targetFramework="Native" developmentDependency="true" />
3+
<package id="boost" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
4+
<package id="boost_chrono-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
5+
<package id="boost_date_time-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
6+
<package id="boost_regex-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
7+
<package id="boost_system-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
8+
<package id="boost_thread-vc120" version="1.58.0.0" targetFramework="Native" developmentDependency="true" />
99
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x64" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
1010
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn.x86" version="1.0.2.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
1111
<package id="openssl.v120.windesktop.msvcstl.static.rt-dyn" version="1.0.2.0" targetFramework="Native" developmentDependency="true" />

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<Import Project="$(PackagesRoot)\zlib.v140.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v140.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('$(PackagesRoot)\zlib.v140.windesktop.msvcstl.static.rt-dyn.1.2.8.8\build\native\zlib.v140.windesktop.msvcstl.static.rt-dyn.targets')" />
2626
<Import Project="$(PackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.1.0.2.0\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.0\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.x64.targets')" />
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')" />
28-
<Import Project="$(PackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.1.0.2.0\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('$(PackagesRoot)\openssl.v140.windesktop.msvcstl.static.rt-dyn.1.0.2.0\build\native\openssl.v140.windesktop.msvcstl.static.rt-dyn.targets')" />
2928
<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')" />
3029
<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')" />
3130
</ImportGroup>
@@ -63,12 +62,6 @@
6362
<Link>
6463
<AdditionalDependencies>Winhttp.lib;httpapi.lib;bcrypt.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
6564
<LinkTimeCodeGeneration Condition="'$(Configuration)'=='Release'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
66-
<!-- We are statically linking against an OpenSSL lib which statically links against the CRT, avoid warning -->
67-
<IgnoreSpecificDefaultLibraries Condition="'$(Configuration)'=='Debug'">LIBCMTD</IgnoreSpecificDefaultLibraries>
68-
<IgnoreSpecificDefaultLibraries Condition="'$(Configuration)'=='Release'">LIBCMT</IgnoreSpecificDefaultLibraries>
69-
<!-- The OpenSSL package doesn't include pdbs so suppress the warning, otherwise one is emitted per object file -->
70-
<!-- This is just complaining we don't have debug information for OpenSSL -->
71-
<AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
7265
</Link>
7366
</ItemDefinitionGroup>
7467
<Import Project="..\common.vcxitems" Label="Shared" Condition="Exists('..\common.vcxitems')" />

0 commit comments

Comments
 (0)