Skip to content

Commit 7b2b775

Browse files
committed
Updating to newer version of Boost prerelease packages.
1 parent d98ebd9 commit 7b2b775

File tree

5 files changed

+10
-14
lines changed

5 files changed

+10
-14
lines changed

Release/src/build/vs12/casablanca120.vcxproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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">
5-
<ProjectGuid>{1014C621-BC2D-4813-B8C1-6D83AD6F9249}</ProjectGuid>
5+
<ProjectGuid>{01A76234-E6E8-4332-9FE2-1E12C34621BE}</ProjectGuid>
66
<Keyword>Win32Proj</Keyword>
77
<SccProjectName>SAK</SccProjectName>
88
<SccAuxPath>SAK</SccAuxPath>
@@ -59,7 +59,6 @@
5959
<Link>
6060
<AdditionalDependencies>Winhttp.lib;httpapi.lib;bcrypt.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
6161
<LinkTimeCodeGeneration Condition="'$(Configuration)'=='Release'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
62-
6362
<!-- We are statically linking against an OpenSSL lib which statically links against the CRT, avoid warning -->
6463
<IgnoreSpecificDefaultLibraries Condition="'$(Configuration)'=='Debug'">LIBCMTD</IgnoreSpecificDefaultLibraries>
6564
<IgnoreSpecificDefaultLibraries Condition="'$(Configuration)'=='Release'">LIBCMT</IgnoreSpecificDefaultLibraries>

Release/src/build/vs14/casablanca140.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
<ImportGroup Label="PropertySheets">
2626
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
2727
<Import Project="$(PackagesRoot)\boost.1.57.0.0\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.57.0.0\build\native\boost.targets')" />
28-
<Import Project="$(PackagesRoot)\boost_system-vc140.1.57.0-vc140ctp60\build\native\boost_system-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc140.1.57.0-vc140ctp60\build\native\boost_system-vc140.targets')" />
28+
<Import Project="$(PackagesRoot)\boost_system-vc140.1.57.0-vc140ctp61\build\native\boost_system-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc140.1.57.0-vc140ctp60\build\native\boost_system-vc140.targets')" />
2929
<Import Project="$(PackagesRoot)\zlib.v140.win32.msvcp.static.md.1.2.8-vc140ctp6\build\native\zlib.v140.win32.msvcp.static.md.targets" Condition="Exists('$(PackagesRoot)\zlib.v140.win32.msvcp.static.md.1.2.8-vc140ctp6\build\native\zlib.v140.win32.msvcp.static.md.targets')" />
3030
<Import Project="$(PackagesRoot)\openssl.v140.win32.msvcp.static.md.1.0.1-vc140ctp6\build\native\openssl.v140.win32.msvcp.static.md.targets" Condition="Exists('$(PackagesRoot)\openssl.v140.win32.msvcp.static.md.1.0.1-vc140ctp6\build\native\openssl.v140.win32.msvcp.static.md.targets')" />
31-
<Import Project="$(PackagesRoot)\boost_date_time-vc140.1.57.0-vc140ctp60\build\native\boost_date_time-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc140.1.57.0-vc140ctp60\build\native\boost_date_time-vc140.targets')" />
32-
<Import Project="$(PackagesRoot)\boost_regex-vc140.1.57.0-vc140ctp60\build\native\boost_regex-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc140.1.57.0-vc140ctp60\build\native\boost_regex-vc140.targets')" />
31+
<Import Project="$(PackagesRoot)\boost_date_time-vc140.1.57.0-vc140ctp61\build\native\boost_date_time-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc140.1.57.0-vc140ctp61\build\native\boost_date_time-vc140.targets')" />
32+
<Import Project="$(PackagesRoot)\boost_regex-vc140.1.57.0-vc140ctp61\build\native\boost_regex-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc140.1.57.0-vc140ctp61\build\native\boost_regex-vc140.targets')" />
3333
</ImportGroup>
3434
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
3535
<DebugFileSuffix>d</DebugFileSuffix>
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="boost" version="1.57.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
4-
<package id="boost_date_time-vc140" version="1.57.0-vc140ctp60" targetFramework="Native" developmentDependency="true" userInstalled="true" />
5-
<package id="boost_regex-vc140" version="1.57.0-vc140ctp60" targetFramework="Native" developmentDependency="true" userInstalled="true" />
6-
<package id="boost_system-vc140" version="1.57.0-vc140ctp60" targetFramework="native" developmentDependency="true" userInstalled="true" />
74
<package id="openssl.v140.win32.msvcp.static.md" version="1.0.1-vc140ctp6" targetFramework="native" developmentDependency="true" userInstalled="true" />
85
<package id="zlib.v140.win32.msvcp.static.md" version="1.2.8-vc140ctp6" targetFramework="native" developmentDependency="true" userInstalled="true" />
96
</packages>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="boost" version="1.57.0" targetFramework="native" developmentDependency="true" userInstalled="true" />
4-
<package id="boost_date_time-vc140" version="1.57.0-vc140ctp60" targetFramework="Native" developmentDependency="true" userInstalled="true" />
5-
<package id="boost_system-vc140" version="1.57.0-vc140ctp60" targetFramework="native" developmentDependency="true" userInstalled="true" />
6-
<package id="boost_regex-vc140" version="1.57.0-vc140ctp60" targetFramework="Native" developmentDependency="true" userInstalled="true" />
4+
<package id="boost_date_time-vc140" version="1.57.0-vc140ctp61" targetFramework="Native" developmentDependency="true" userInstalled="true" />
5+
<package id="boost_system-vc140" version="1.57.0-vc140ctp61" targetFramework="native" developmentDependency="true" userInstalled="true" />
6+
<package id="boost_regex-vc140" version="1.57.0-vc140ctp61" targetFramework="Native" developmentDependency="true" userInstalled="true" />
77
</packages>

Release/tests/functional/websockets/utilities/vs14/websockets_test_utilities140.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@
143143
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
144144
<ImportGroup Label="ExtensionTargets">
145145
<Import Project="$(PackagesRoot)\boost.1.57.0.0\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.57.0.0\build\native\boost.targets')" />
146-
<Import Project="$(PackagesRoot)\boost_system-vc140.1.57.0-vc140ctp60\build\native\boost_system-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc140.1.57.0-vc140ctp60\build\native\boost_system-vc140.targets')" />
147-
<Import Project="$(PackagesRoot)\boost_date_time-vc140.1.57.0-vc140ctp60\build\native\boost_date_time-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc140.1.57.0-vc140ctp60\build\native\boost_date_time-vc140.targets')" />
148-
<Import Project="$(PackagesRoot)\boost_regex-vc140.1.57.0-vc140ctp60\build\native\boost_regex-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc140.1.57.0-vc140ctp60\build\native\boost_regex-vc140.targets')" />
146+
<Import Project="$(PackagesRoot)\boost_system-vc140.1.57.0-vc140ctp61\build\native\boost_system-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_system-vc140.1.57.0-vc140ctp61\build\native\boost_system-vc140.targets')" />
147+
<Import Project="$(PackagesRoot)\boost_date_time-vc140.1.57.0-vc140ctp61\build\native\boost_date_time-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-vc140.1.57.0-vc140ctp61\build\native\boost_date_time-vc140.targets')" />
148+
<Import Project="$(PackagesRoot)\boost_regex-vc140.1.57.0-vc140ctp61\build\native\boost_regex-vc140.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc140.1.57.0-vc140ctp61\build\native\boost_regex-vc140.targets')" />
149149
</ImportGroup>
150150
</Project>

0 commit comments

Comments
 (0)