Skip to content

Commit bd7e09d

Browse files
ras0219-msftras0219-msft
committed
Fixup package references to use PackagesRoot
1 parent 294c7c5 commit bd7e09d

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,14 @@
117117
<Import Project="..\android.vcxitems" Label="Shared" Condition="Exists('..\android.vcxitems')" />
118118
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
119119
<ImportGroup Label="ExtensionTargets">
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.55.0.16\build\native\boost.targets" Condition="Exists('..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets')" />
120+
<Import Project="$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" />
121+
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.59.0.0\build\native\boost.targets')" />
122122
</ImportGroup>
123123
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
124124
<PropertyGroup>
125125
<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>
126126
</PropertyGroup>
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.55.0.16\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\boost.1.59.0.0\build\native\boost.targets'))" />
127+
<Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets'))" />
128+
<Error Condition="!Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost.1.59.0.0\build\native\boost.targets'))" />
129129
</Target>
130130
</Project>

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -253,28 +253,28 @@
253253
</ItemGroup>
254254
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
255255
<ImportGroup Label="ExtensionTargets">
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.55.0.16\build\native\boost.targets" Condition="Exists('..\..\..\..\..\..\packages\boost.1.55.0.16\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\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')" />
260-
<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')" />
261-
<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')" />
262-
<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')" />
263-
<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')" />
264-
<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')" />
256+
<Import Project="$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" />
257+
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
258+
<Import Project="$(PackagesRoot)\boost_atomic-android.1.55.0.1\build\native\boost_atomic-android.targets" Condition="Exists('$(PackagesRoot)\boost_atomic-android.1.55.0.1\build\native\boost_atomic-android.targets')" />
259+
<Import Project="$(PackagesRoot)\boost_thread-android.1.55.0.1\build\native\boost_thread-android.targets" Condition="Exists('$(PackagesRoot)\boost_thread-android.1.55.0.1\build\native\boost_thread-android.targets')" />
260+
<Import Project="$(PackagesRoot)\boost_system-android.1.55.0.1\build\native\boost_system-android.targets" Condition="Exists('$(PackagesRoot)\boost_system-android.1.55.0.1\build\native\boost_system-android.targets')" />
261+
<Import Project="$(PackagesRoot)\boost_random-android.1.55.0.1\build\native\boost_random-android.targets" Condition="Exists('$(PackagesRoot)\boost_random-android.1.55.0.1\build\native\boost_random-android.targets')" />
262+
<Import Project="$(PackagesRoot)\boost_filesystem-android.1.55.0.1\build\native\boost_filesystem-android.targets" Condition="Exists('$(PackagesRoot)\boost_filesystem-android.1.55.0.1\build\native\boost_filesystem-android.targets')" />
263+
<Import Project="$(PackagesRoot)\boost_date_time-android.1.55.0.1\build\native\boost_date_time-android.targets" Condition="Exists('$(PackagesRoot)\boost_date_time-android.1.55.0.1\build\native\boost_date_time-android.targets')" />
264+
<Import Project="$(PackagesRoot)\boost_chrono-android.1.55.0.1\build\native\boost_chrono-android.targets" Condition="Exists('$(PackagesRoot)\boost_chrono-android.1.55.0.1\build\native\boost_chrono-android.targets')" />
265265
</ImportGroup>
266266
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
267267
<PropertyGroup>
268268
<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>
269269
</PropertyGroup>
270-
<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'))" />
271-
<Error Condition="!Exists('..\..\..\..\..\..\packages\boost.1.55.0.16\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\boost.1.55.0.16\build\native\boost.targets'))" />
272-
<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'))" />
273-
<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'))" />
274-
<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'))" />
275-
<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'))" />
276-
<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'))" />
277-
<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'))" />
278-
<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'))" />
270+
<Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets'))" />
271+
<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'))" />
272+
<Error Condition="!Exists('$(PackagesRoot)\boost_atomic-android.1.55.0.1\build\native\boost_atomic-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_atomic-android.1.55.0.1\build\native\boost_atomic-android.targets'))" />
273+
<Error Condition="!Exists('$(PackagesRoot)\boost_thread-android.1.55.0.1\build\native\boost_thread-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_thread-android.1.55.0.1\build\native\boost_thread-android.targets'))" />
274+
<Error Condition="!Exists('$(PackagesRoot)\boost_system-android.1.55.0.1\build\native\boost_system-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_system-android.1.55.0.1\build\native\boost_system-android.targets'))" />
275+
<Error Condition="!Exists('$(PackagesRoot)\boost_random-android.1.55.0.1\build\native\boost_random-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_random-android.1.55.0.1\build\native\boost_random-android.targets'))" />
276+
<Error Condition="!Exists('$(PackagesRoot)\boost_filesystem-android.1.55.0.1\build\native\boost_filesystem-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_filesystem-android.1.55.0.1\build\native\boost_filesystem-android.targets'))" />
277+
<Error Condition="!Exists('$(PackagesRoot)\boost_date_time-android.1.55.0.1\build\native\boost_date_time-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_date_time-android.1.55.0.1\build\native\boost_date_time-android.targets'))" />
278+
<Error Condition="!Exists('$(PackagesRoot)\boost_chrono-android.1.55.0.1\build\native\boost_chrono-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_chrono-android.1.55.0.1\build\native\boost_chrono-android.targets'))" />
279279
</Target>
280280
</Project>

0 commit comments

Comments
 (0)