Skip to content

Commit df16d59

Browse files
stgatesstgates
committed
Fixing a bunch of stale boost NuGet package references, and a couple of UWP test project file errors.
1 parent 9c59737 commit df16d59

File tree

10 files changed

+15
-29
lines changed

10 files changed

+15
-29
lines changed

‎Release/tests/functional/pplx/pplx_test/dirs.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818

1919
<ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
20-
<ProjectFile Include="VS12.winrt\pplx140_test.winrt.vcxproj" />
20+
<ProjectFile Include="VS12.winrt\pplx120_test.winrt.vcxproj" />
2121
</ItemGroup>
2222

2323
<Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />

‎Release/tests/functional/streams/stdstream_tests.cpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525
#include "cpprest/rawptrstream.h"
2626
#include "cpprest/filestream.h"
2727
#include "cpprest/producerconsumerstream.h"
28-
#if !defined(_MSC_VER) || (_MSC_VER < 1900)
29-
// Do not include boost in dev14
28+
3029
#include <boost/interprocess/streams/bufferstream.hpp>
31-
#endif
3230

3331
#if defined(__cplusplus_winrt)
3432
using namespace Windows::Storage;
@@ -788,8 +786,7 @@ TEST(sync_on_async_close_with_exception)
788786
VERIFY_ARE_EQUAL(std::ios::badbit, outputStream.rdstate());
789787
}
790788
}
791-
#if !defined(_MSC_VER) || (_MSC_VER < 1900)
792-
// Do not include tests which use boost with dev14
789+
793790
TEST(ostream_full_throw_exception)
794791
{
795792
char tgt_buffer[5];
@@ -809,7 +806,7 @@ TEST(ostream_full_throw_exception)
809806

810807
VERIFY_THROWS(astream.read_to_end(os_streambuf).get(), std::exception);
811808
}
812-
#endif
809+
813810
}
814811
}}}
815812

‎Release/tests/functional/streams/vs12.winrt/streams120_test.winrt.vcxproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,7 @@
236236
</ItemGroup>
237237
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
238238
<ImportGroup Label="ExtensionTargets">
239-
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
240-
<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')" />
239+
<Import Project="$(PackagesRoot)\boost.1.58.0.0\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.58.0.0\build\native\boost.targets')" />
241240
</ImportGroup>
242241
<Target Name="StripAppContainer" AfterTargets="Build">
243242
<CallTarget Targets="StripAppContainerOnProjectDll" />

‎Release/tests/functional/streams/vs12.xp/streams120_test.xp.vcxproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@
158158
</ItemGroup>
159159
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
160160
<ImportGroup Label="ExtensionTargets">
161-
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
162-
<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')" />
161+
<Import Project="$(PackagesRoot)\boost.1.58.0.0\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.58.0.0\build\native\boost.targets')" />
163162
</ImportGroup>
164163
</Project>

‎Release/tests/functional/streams/vs12/streams120_test.vcxproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@
211211
</ItemGroup>
212212
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
213213
<ImportGroup Label="ExtensionTargets">
214-
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
215-
<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')" />
214+
<Import Project="$(PackagesRoot)\boost.1.58.0.0\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.58.0.0\build\native\boost.targets')" />
216215
</ImportGroup>
217216
</Project>

‎Release/tests/functional/streams/vs14.uwp/streams140_test.uwp.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
</ItemGroup>
126126
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
127127
<ImportGroup Label="ExtensionTargets">
128-
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
128+
<Import Project="$(PackagesRoot)\boost.1.58.0.0\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.58.0.0\build\native\boost.targets')" />
129129
</ImportGroup>
130130
<Target Name="StripAppContainer" AfterTargets="Build">
131131
<CallTarget Targets="StripAppContainerOnProjectDll" />

‎Release/tests/functional/streams/vs14/streams140_test.vcxproj‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,14 +212,8 @@
212212
<Project>{1014c621-bc2d-4813-b8c1-6d83ad6f9249}</Project>
213213
</ProjectReference>
214214
</ItemGroup>
215-
<ItemGroup>
216-
<None Include="packages.config" />
217-
</ItemGroup>
218215
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
219-
<!-- To be reenabled when we have an updated boost package
220216
<ImportGroup Label="ExtensionTargets">
221-
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
222-
<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')" />
217+
<Import Project="$(PackagesRoot)\boost.1.58.0.0\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.58.0.0\build\native\boost.targets')" />
223218
</ImportGroup>
224-
-->
225219
</Project>

‎Release/tests/functional/uri/vs14.uwp/Uri140_test.uwp.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5252
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Tests.Settings" />
5353

54-
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
54+
<ItemDefinitionGroup>
5555
<ClCompile>
5656
<PrecompiledHeader>Use</PrecompiledHeader>
5757
<PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

‎Release/tests/functional/websockets/client/vs14.uwp/websocketsclient140_test.uwp.vcxproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4343
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Tests.Settings" />
4444

45-
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
45+
<ItemDefinitionGroup>
4646
<ClCompile>
4747
<PrecompiledHeader>Use</PrecompiledHeader>
4848
<PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -58,8 +58,6 @@
5858
</Link>
5959
</ItemDefinitionGroup>
6060

61-
<!-- TODO <AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories> -->
62-
6361
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
6462
<ClCompile>
6563
<Optimization>Disabled</Optimization>

‎Release/tests/functional/websockets/utilities/vs12.winrt/websockets_test_utilities120.winrt.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<SubSystem>Windows</SubSystem>
7676
<GenerateDebugInformation>true</GenerateDebugInformation>
7777
<AdditionalLibraryDirectories>$(VCINSTALLDIR)\lib\store;$(OutDir);%(AdditionalLibraryDirectories);</AdditionalLibraryDirectories>
78-
<AdditionalDependencies>msvcrtd.lib;msvcprtd.lib;vccorlibd.lib;RuntimeObject.lib;Ws2_32.lib;Mswsock.lib;libboost_system-vc120-mt-gd-1_55.lib;%(AdditionalDependencies)</AdditionalDependencies>
78+
<AdditionalDependencies>msvcrtd.lib;msvcprtd.lib;vccorlibd.lib;RuntimeObject.lib;Ws2_32.lib;Mswsock.lib;libboost_system-vc120-mt-gd-1_58.lib;%(AdditionalDependencies)</AdditionalDependencies>
7979
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
8080
</Link>
8181
</ItemDefinitionGroup>
@@ -94,7 +94,7 @@
9494
<SubSystem>Windows</SubSystem>
9595
<GenerateDebugInformation>true</GenerateDebugInformation>
9696
<AdditionalLibraryDirectories>$(VCINSTALLDIR)\lib\store\amd64;$(OutDir);%(AdditionalLibraryDirectories);</AdditionalLibraryDirectories>
97-
<AdditionalDependencies>msvcrtd.lib;msvcprtd.lib;vccorlibd.lib;RuntimeObject.lib;Ws2_32.lib;Mswsock.lib;libboost_system-vc120-mt-gd-1_55.lib;%(AdditionalDependencies)</AdditionalDependencies>
97+
<AdditionalDependencies>msvcrtd.lib;msvcprtd.lib;vccorlibd.lib;RuntimeObject.lib;Ws2_32.lib;Mswsock.lib;libboost_system-vc120-mt-gd-1_58.lib;%(AdditionalDependencies)</AdditionalDependencies>
9898
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
9999
</Link>
100100
</ItemDefinitionGroup>
@@ -117,7 +117,7 @@
117117
<EnableCOMDATFolding>true</EnableCOMDATFolding>
118118
<OptimizeReferences>true</OptimizeReferences>
119119
<AdditionalLibraryDirectories>$(VCINSTALLDIR)\lib\store;$(OutDir);%(AdditionalLibraryDirectories);</AdditionalLibraryDirectories>
120-
<AdditionalDependencies>msvcrt.lib;msvcprt.lib;vccorlib.lib;RuntimeObject.lib;Ws2_32.lib;Mswsock.lib;libboost_system-vc120-mt-1_55.lib;%(AdditionalDependencies)</AdditionalDependencies>
120+
<AdditionalDependencies>msvcrt.lib;msvcprt.lib;vccorlib.lib;RuntimeObject.lib;Ws2_32.lib;Mswsock.lib;libboost_system-vc120-mt-1_58.lib;%(AdditionalDependencies)</AdditionalDependencies>
121121
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
122122
</Link>
123123
</ItemDefinitionGroup>
@@ -140,7 +140,7 @@
140140
<EnableCOMDATFolding>true</EnableCOMDATFolding>
141141
<OptimizeReferences>true</OptimizeReferences>
142142
<AdditionalLibraryDirectories>$(VCINSTALLDIR)\lib\store\amd64;$(OutDir);%(AdditionalLibraryDirectories);</AdditionalLibraryDirectories>
143-
<AdditionalDependencies>msvcrt.lib;msvcprt.lib;vccorlib.lib;RuntimeObject.lib;Ws2_32.lib;Mswsock.lib;libboost_system-vc120-mt-1_55.lib;%(AdditionalDependencies)</AdditionalDependencies>
143+
<AdditionalDependencies>msvcrt.lib;msvcprt.lib;vccorlib.lib;RuntimeObject.lib;Ws2_32.lib;Mswsock.lib;libboost_system-vc120-mt-1_58.lib;%(AdditionalDependencies)</AdditionalDependencies>
144144
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
145145
</Link>
146146
</ItemDefinitionGroup>

0 commit comments

Comments
 (0)