Skip to content

Commit 7b29a64

Browse files
ras0219-msftras0219-msft
committed
WIP
1 parent cfd9ebe commit 7b29a64

File tree

5 files changed

+61
-51
lines changed

5 files changed

+61
-51
lines changed

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@
5858
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5959
<ImportGroup Label="ExtensionSettings" />
6060
<ImportGroup Label="PropertySheets" />
61-
<PropertyGroup Label="UserMacros">
62-
<NuGetPackageImportStamp>378b82c3</NuGetPackageImportStamp>
63-
</PropertyGroup>
61+
<PropertyGroup Label="UserMacros" />
6462
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
6563
</PropertyGroup>
6664
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -119,14 +117,14 @@
119117
<Import Project="..\android.vcxitems" Label="Shared" Condition="Exists('..\android.vcxitems')" />
120118
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
121119
<ImportGroup Label="ExtensionTargets">
122-
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
123-
<Import Project="$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets')" />
120+
<Import Project="..\..\..\..\packages\openssl-android.1.0.2.0\build\native\openssl-android.targets" Condition="Exists('..\..\..\..\packages\openssl-android.1.0.2.0\build\native\openssl-android.targets')" />
121+
<Import Project="..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets" Condition="Exists('..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets')" />
124122
</ImportGroup>
125123
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
126124
<PropertyGroup>
127125
<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>
128126
</PropertyGroup>
129-
<Error Condition="!Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets'))" />
130-
<Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets'))" />
127+
<Error Condition="!Exists('..\..\..\..\packages\openssl-android.1.0.2.0\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\openssl-android.1.0.2.0\build\native\openssl-android.targets'))" />
128+
<Error Condition="!Exists('..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets'))" />
131129
</Target>
132130
</Project>

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="boost" version="1.55.0.16" targetFramework="Native" />
4-
<package id="boost_atomic-android" version="1.55.0.1" targetFramework="native" />
5-
<package id="boost_chrono-android" version="1.55.0.1" targetFramework="native" />
6-
<package id="boost_date_time-android" version="1.55.0.1" targetFramework="native" />
7-
<package id="boost_filesystem-android" version="1.55.0.1" targetFramework="native" />
8-
<package id="boost_system-android" version="1.55.0.1" targetFramework="native" />
9-
<package id="boost_thread-android" version="1.55.0.1" targetFramework="native" />
3+
<package id="boost" version="1.59.0.0" targetFramework="native" />
104
<package id="openssl-android" version="1.0.2.0" targetFramework="native" />
115
</packages>

‎Release/tests/common/TestRunner/vs14.android/TestRunner.android.NativeActivity/TestRunner.android.NativeActivity.vcxproj

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@
6363
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6464
</ImportGroup>
6565
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Tests.Settings" />
66-
<PropertyGroup Label="UserMacros">
67-
<NuGetPackageImportStamp>f2020e02</NuGetPackageImportStamp>
68-
</PropertyGroup>
66+
<PropertyGroup Label="UserMacros" />
6967
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" />
7068
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" />
7169
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" />
@@ -255,28 +253,32 @@
255253
</ItemGroup>
256254
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
257255
<ImportGroup Label="ExtensionTargets">
258-
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
259-
<Import Project="$(PackagesRoot)\boost_atomic-android.1.55.0.0\build\native\boost_atomic-android.targets" Condition="Exists('$(PackagesRoot)\boost_atomic-android.1.55.0.0\build\native\boost_atomic-android.targets')" />
260-
<Import Project="$(PackagesRoot)\boost_chrono-android.1.55.0.0\build\native\boost_chrono-android.targets" Condition="Exists('$(PackagesRoot)\boost_chrono-android.1.55.0.0\build\native\boost_chrono-android.targets')" />
261-
<Import Project="$(PackagesRoot)\boost_date_time-android.1.55.0.0\build\native\boost_date_time-android.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-android.1.55.0.0\build\native\boost_date_time-android.targets')" />
262-
<Import Project="$(PackagesRoot)\boost_filesystem-android.1.55.0.0\build\native\boost_filesystem-android.targets" Condition="Exists('$(PackagesRoot)\boost_filesystem-android.1.55.0.0\build\native\boost_filesystem-android.targets')" />
263-
<Import Project="$(PackagesRoot)\boost_system-android.1.55.0.0\build\native\boost_system-android.targets" Condition="Exists('$(PackagesRoot)\boost_system-android.1.55.0.0\build\native\boost_system-android.targets')" />
264-
<Import Project="$(PackagesRoot)\boost_thread-android.1.55.0.0\build\native\boost_thread-android.targets" Condition="Exists('$(PackagesRoot)\boost_thread-android.1.55.0.0\build\native\boost_thread-android.targets')" />
265-
<Import Project="$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets')" />
266-
<Import Project="$(PackagesRoot)\boost_random-android.1.55.0.0\build\native\boost_random-android.targets" Condition="Exists('$(PackagesRoot)\boost_random-android.1.55.0.0\build\native\boost_random-android.targets')" />
256+
<Import Project="..\..\..\..\..\..\packages\openssl-android.1.0.2.0\build\native\openssl-android.targets" Condition="Exists('..\..\..\..\..\..\packages\openssl-android.1.0.2.0\build\native\openssl-android.targets')" />
257+
<Import Project="..\..\..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets" Condition="Exists('..\..\..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets')" />
258+
<Import Project="..\..\..\..\..\..\packages\boost_atomic-android.1.55.0.1\build\native\boost_atomic-android.targets" Condition="Exists('..\..\..\..\..\..\packages\boost_atomic-android.1.55.0.1\build\native\boost_atomic-android.targets')" />
259+
<Import Project="..\..\..\..\..\..\packages\libiconv-android.1.13.1.1\build\native\libiconv-android.targets" Condition="Exists('..\..\..\..\..\..\packages\libiconv-android.1.13.1.1\build\native\libiconv-android.targets')" />
260+
<Import Project="..\..\..\..\..\..\packages\boost_thread-android.1.55.0.1\build\native\boost_thread-android.targets" Condition="Exists('..\..\..\..\..\..\packages\boost_thread-android.1.55.0.1\build\native\boost_thread-android.targets')" />
261+
<Import Project="..\..\..\..\..\..\packages\boost_system-android.1.55.0.1\build\native\boost_system-android.targets" Condition="Exists('..\..\..\..\..\..\packages\boost_system-android.1.55.0.1\build\native\boost_system-android.targets')" />
262+
<Import Project="..\..\..\..\..\..\packages\boost_random-android.1.55.0.1\build\native\boost_random-android.targets" Condition="Exists('..\..\..\..\..\..\packages\boost_random-android.1.55.0.1\build\native\boost_random-android.targets')" />
263+
<Import Project="..\..\..\..\..\..\packages\boost_locale-android.1.55.0.1\build\native\boost_locale-android.targets" Condition="Exists('..\..\..\..\..\..\packages\boost_locale-android.1.55.0.1\build\native\boost_locale-android.targets')" />
264+
<Import Project="..\..\..\..\..\..\packages\boost_filesystem-android.1.55.0.1\build\native\boost_filesystem-android.targets" Condition="Exists('..\..\..\..\..\..\packages\boost_filesystem-android.1.55.0.1\build\native\boost_filesystem-android.targets')" />
265+
<Import Project="..\..\..\..\..\..\packages\boost_date_time-android.1.55.0.1\build\native\boost_date_time-android.targets" Condition="Exists('..\..\..\..\..\..\packages\boost_date_time-android.1.55.0.1\build\native\boost_date_time-android.targets')" />
266+
<Import Project="..\..\..\..\..\..\packages\boost_chrono-android.1.55.0.1\build\native\boost_chrono-android.targets" Condition="Exists('..\..\..\..\..\..\packages\boost_chrono-android.1.55.0.1\build\native\boost_chrono-android.targets')" />
267267
</ImportGroup>
268268
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
269269
<PropertyGroup>
270270
<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>
271271
</PropertyGroup>
272-
<Error Condition="!Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets'))" />
273-
<Error Condition="!Exists('$(PackagesRoot)\boost_atomic-android.1.55.0.0\build\native\boost_atomic-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_atomic-android.1.55.0.0\build\native\boost_atomic-android.targets'))" />
274-
<Error Condition="!Exists('$(PackagesRoot)\boost_chrono-android.1.55.0.0\build\native\boost_chrono-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_chrono-android.1.55.0.0\build\native\boost_chrono-android.targets'))" />
275-
<Error Condition="!Exists('$(PackagesRoot)\boost_date_time-android.1.55.0.0\build\native\boost_date_time-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_date_time-android.1.55.0.0\build\native\boost_date_time-android.targets'))" />
276-
<Error Condition="!Exists('$(PackagesRoot)\boost_filesystem-android.1.55.0.0\build\native\boost_filesystem-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_filesystem-android.1.55.0.0\build\native\boost_filesystem-android.targets'))" />
277-
<Error Condition="!Exists('$(PackagesRoot)\boost_system-android.1.55.0.0\build\native\boost_system-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_system-android.1.55.0.0\build\native\boost_system-android.targets'))" />
278-
<Error Condition="!Exists('$(PackagesRoot)\boost_thread-android.1.55.0.0\build\native\boost_thread-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_thread-android.1.55.0.0\build\native\boost_thread-android.targets'))" />
279-
<Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets'))" />
280-
<Error Condition="!Exists('$(PackagesRoot)\boost_random-android.1.55.0.0\build\native\boost_random-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_random-android.1.55.0.0\build\native\boost_random-android.targets'))" />
272+
<Error Condition="!Exists('..\..\..\..\..\..\packages\openssl-android.1.0.2.0\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\openssl-android.1.0.2.0\build\native\openssl-android.targets'))" />
273+
<Error Condition="!Exists('..\..\..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets'))" />
274+
<Error Condition="!Exists('..\..\..\..\..\..\packages\boost_atomic-android.1.55.0.1\build\native\boost_atomic-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\boost_atomic-android.1.55.0.1\build\native\boost_atomic-android.targets'))" />
275+
<Error Condition="!Exists('..\..\..\..\..\..\packages\libiconv-android.1.13.1.1\build\native\libiconv-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\libiconv-android.1.13.1.1\build\native\libiconv-android.targets'))" />
276+
<Error Condition="!Exists('..\..\..\..\..\..\packages\boost_thread-android.1.55.0.1\build\native\boost_thread-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\boost_thread-android.1.55.0.1\build\native\boost_thread-android.targets'))" />
277+
<Error Condition="!Exists('..\..\..\..\..\..\packages\boost_system-android.1.55.0.1\build\native\boost_system-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\boost_system-android.1.55.0.1\build\native\boost_system-android.targets'))" />
278+
<Error Condition="!Exists('..\..\..\..\..\..\packages\boost_random-android.1.55.0.1\build\native\boost_random-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\boost_random-android.1.55.0.1\build\native\boost_random-android.targets'))" />
279+
<Error Condition="!Exists('..\..\..\..\..\..\packages\boost_locale-android.1.55.0.1\build\native\boost_locale-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\boost_locale-android.1.55.0.1\build\native\boost_locale-android.targets'))" />
280+
<Error Condition="!Exists('..\..\..\..\..\..\packages\boost_filesystem-android.1.55.0.1\build\native\boost_filesystem-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\boost_filesystem-android.1.55.0.1\build\native\boost_filesystem-android.targets'))" />
281+
<Error Condition="!Exists('..\..\..\..\..\..\packages\boost_date_time-android.1.55.0.1\build\native\boost_date_time-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\boost_date_time-android.1.55.0.1\build\native\boost_date_time-android.targets'))" />
282+
<Error Condition="!Exists('..\..\..\..\..\..\packages\boost_chrono-android.1.55.0.1\build\native\boost_chrono-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\boost_chrono-android.1.55.0.1\build\native\boost_chrono-android.targets'))" />
281283
</Target>
282284
</Project>

‎Release/tests/common/TestRunner/vs14.android/TestRunner.android.NativeActivity/packages.config

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="boost" version="1.55.0.16" targetFramework="Native" />
4-
<package id="boost_atomic-android" version="1.55.0.0" targetFramework="Native" />
5-
<package id="boost_chrono-android" version="1.55.0.0" targetFramework="Native" />
6-
<package id="boost_date_time-android" version="1.55.0.0" targetFramework="Native" />
7-
<package id="boost_filesystem-android" version="1.55.0.0" targetFramework="Native" />
8-
<package id="boost_locale-android" version="1.55.0.0" targetFramework="Native" />
9-
<package id="boost_random-android" version="1.55.0.0" targetFramework="Native" />
10-
<package id="boost_system-android" version="1.55.0.0" targetFramework="Native" />
11-
<package id="boost_thread-android" version="1.55.0.0" targetFramework="Native" />
12-
<package id="libiconv-android" version="1.13.1.0" targetFramework="Native" />
13-
<package id="openssl-android" version="1.0.1.0" targetFramework="Native" />
3+
<package id="boost" version="1.59.0.0" targetFramework="native" />
4+
<package id="boost_atomic-android" version="1.55.0.1" targetFramework="native" />
5+
<package id="boost_chrono-android" version="1.55.0.1" targetFramework="native" />
6+
<package id="boost_date_time-android" version="1.55.0.1" targetFramework="native" />
7+
<package id="boost_filesystem-android" version="1.55.0.1" targetFramework="native" />
8+
<package id="boost_locale-android" version="1.55.0.1" targetFramework="native" />
9+
<package id="boost_random-android" version="1.55.0.1" targetFramework="native" />
10+
<package id="boost_system-android" version="1.55.0.1" targetFramework="native" />
11+
<package id="boost_thread-android" version="1.55.0.1" targetFramework="native" />
12+
<package id="libiconv-android" version="1.13.1.1" targetFramework="native" />
13+
<package id="openssl-android" version="1.0.2.0" targetFramework="native" />
1414
</packages>

0 commit comments

Comments
 (0)