Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@ras0219-msft
ras0219-msft committed Oct 13, 2015
1 parent cfd9ebe commit 7b29a64
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 51 deletions.
12 changes: 5 additions & 7 deletions Release/src/build/vs14.android/casablanca140.android.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings" />
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
<NuGetPackageImportStamp>378b82c3</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
Expand Down Expand Up @@ -119,14 +117,14 @@
<Import Project="..\android.vcxitems" Label="Shared" Condition="Exists('..\android.vcxitems')" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
<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')" />
<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')" />
<Import Project="..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets" Condition="Exists('..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<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'))" />
<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'))" />
<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'))" />
<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'))" />
</Target>
</Project>
8 changes: 1 addition & 7 deletions Release/src/build/vs14.android/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="boost" version="1.55.0.16" targetFramework="Native" />
<package id="boost_atomic-android" version="1.55.0.1" targetFramework="native" />
<package id="boost_chrono-android" version="1.55.0.1" targetFramework="native" />
<package id="boost_date_time-android" version="1.55.0.1" targetFramework="native" />
<package id="boost_filesystem-android" version="1.55.0.1" targetFramework="native" />
<package id="boost_system-android" version="1.55.0.1" targetFramework="native" />
<package id="boost_thread-android" version="1.55.0.1" targetFramework="native" />
<package id="boost" version="1.59.0.0" targetFramework="native" />
<package id="openssl-android" version="1.0.2.0" targetFramework="native" />
</packages>
44 changes: 23 additions & 21 deletions .../vs14.android/TestRunner.android.NativeActivity/TestRunner.android.NativeActivity.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Tests.Settings" />
<PropertyGroup Label="UserMacros">
<NuGetPackageImportStamp>f2020e02</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" />
Expand Down Expand Up @@ -255,28 +253,32 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
<Import Project="..\..\..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets" Condition="Exists('..\..\..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets')" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
<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')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<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'))" />
<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'))" />
<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'))" />
<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'))" />
<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'))" />
<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'))" />
<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'))" />
<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'))" />
<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'))" />
<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'))" />
<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'))" />
<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'))" />
<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'))" />
<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'))" />
<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'))" />
<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'))" />
<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'))" />
<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'))" />
<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'))" />
<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'))" />
</Target>
</Project>
22 changes: 11 additions & 11 deletions ...se/tests/common/TestRunner/vs14.android/TestRunner.android.NativeActivity/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="boost" version="1.55.0.16" targetFramework="Native" />
<package id="boost_atomic-android" version="1.55.0.0" targetFramework="Native" />
<package id="boost_chrono-android" version="1.55.0.0" targetFramework="Native" />
<package id="boost_date_time-android" version="1.55.0.0" targetFramework="Native" />
<package id="boost_filesystem-android" version="1.55.0.0" targetFramework="Native" />
<package id="boost_locale-android" version="1.55.0.0" targetFramework="Native" />
<package id="boost_random-android" version="1.55.0.0" targetFramework="Native" />
<package id="boost_system-android" version="1.55.0.0" targetFramework="Native" />
<package id="boost_thread-android" version="1.55.0.0" targetFramework="Native" />
<package id="libiconv-android" version="1.13.1.0" targetFramework="Native" />
<package id="openssl-android" version="1.0.1.0" targetFramework="Native" />
<package id="boost" version="1.59.0.0" targetFramework="native" />
<package id="boost_atomic-android" version="1.55.0.1" targetFramework="native" />
<package id="boost_chrono-android" version="1.55.0.1" targetFramework="native" />
<package id="boost_date_time-android" version="1.55.0.1" targetFramework="native" />
<package id="boost_filesystem-android" version="1.55.0.1" targetFramework="native" />
<package id="boost_locale-android" version="1.55.0.1" targetFramework="native" />
<package id="boost_random-android" version="1.55.0.1" targetFramework="native" />
<package id="boost_system-android" version="1.55.0.1" targetFramework="native" />
<package id="boost_thread-android" version="1.55.0.1" targetFramework="native" />
<package id="libiconv-android" version="1.13.1.1" targetFramework="native" />
<package id="openssl-android" version="1.0.2.0" targetFramework="native" />
</packages>
Loading

0 comments on commit 7b29a64

Please sign in to comment.