Skip to content

Commit 5214d5e

Browse files
committed
Change ApplicationTypeRevision=2.0 for VS Update3 to use the clang 3_8
toolset.
1 parent 0cc46e8 commit 5214d5e

File tree

16 files changed

+17
-17
lines changed

16 files changed

+17
-17
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<ProjectGuid>{AFB49019-965B-4C10-BAFF-C86C16D58010}</ProjectGuid>
2727
<Keyword>Android</Keyword>
2828
<ApplicationType>Android</ApplicationType>
29-
<ApplicationTypeRevision>1.0</ApplicationTypeRevision>
29+
<ApplicationTypeRevision>2.0</ApplicationTypeRevision>
3030
<ProjectName>cpprestsdk140.android</ProjectName>
3131
</PropertyGroup>
3232
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@
257257
</ItemGroup>
258258
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
259259
<ImportGroup Label="ExtensionTargets">
260-
<Import Project="$(PackagesRoot)\openssl-android.1.0.2.1\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" />
260+
<Import Project="$(PackagesRoot)\openssl-android.1.0.2.1\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.2.1\build\native\openssl-android.targets')" />
261261
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
262262
<Import Project="$(PackagesRoot)\boost_atomic-android.1.55.0.2\build\native\boost_atomic-android.targets" Condition="Exists('$(PackagesRoot)\boost_atomic-android.1.55.0.2\build\native\boost_atomic-android.targets')" />
263263
<Import Project="$(PackagesRoot)\boost_thread-android.1.55.0.2\build\native\boost_thread-android.targets" Condition="Exists('$(PackagesRoot)\boost_thread-android.1.55.0.2\build\native\boost_thread-android.targets')" />
@@ -271,7 +271,7 @@
271271
<PropertyGroup>
272272
<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>
273273
</PropertyGroup>
274-
<Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.2.1\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets'))" />
274+
<Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.2.1\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.2.1\build\native\openssl-android.targets'))" />
275275
<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'))" />
276276
<Error Condition="!Exists('$(PackagesRoot)\boost_atomic-android.1.55.0.2\build\native\boost_atomic-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_atomic-android.1.55.0.2\build\native\boost_atomic-android.targets'))" />
277277
<Error Condition="!Exists('$(PackagesRoot)\boost_thread-android.1.55.0.2\build\native\boost_thread-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_thread-android.1.55.0.2\build\native\boost_thread-android.targets'))" />

Release/tests/common/UnitTestpp/vs14.android/UnitTestpp140.android.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<ProjectGuid>{3EFD8540-A54D-4900-887E-F856162535A0}</ProjectGuid>
9696
<Keyword>Android</Keyword>
9797
<ApplicationType>Android</ApplicationType>
98-
<ApplicationTypeRevision>1.0</ApplicationTypeRevision>
98+
<ApplicationTypeRevision>2.0</ApplicationTypeRevision>
9999
<ProjectName>UnitTestpp140.android</ProjectName>
100100
</PropertyGroup>
101101
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

Release/tests/common/utilities/vs14.android/CommonUtilities140.android.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<ProjectGuid>{7C4E6E33-42E2-4472-9319-DDE7564F3DAE}</ProjectGuid>
4747
<Keyword>Android</Keyword>
4848
<ApplicationType>Android</ApplicationType>
49-
<ApplicationTypeRevision>1.0</ApplicationTypeRevision>
49+
<ApplicationTypeRevision>2.0</ApplicationTypeRevision>
5050
<ProjectName>CommonUtilities140.android</ProjectName>
5151
</PropertyGroup>
5252
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

Release/tests/functional/http/client/vs14.android/HttpClient140_test.android.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<ProjectGuid>{0EE481DA-A97F-4831-9119-C65EB2D7B4DA}</ProjectGuid>
6565
<Keyword>Android</Keyword>
6666
<ApplicationType>Android</ApplicationType>
67-
<ApplicationTypeRevision>1.0</ApplicationTypeRevision>
67+
<ApplicationTypeRevision>2.0</ApplicationTypeRevision>
6868
<ProjectName>HttpClient140_test.android</ProjectName>
6969
</PropertyGroup>
7070
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="boost" version="1.55.0.16" targetFramework="Native" />
4-
<package id="openssl-android" version="1.0.2.0" targetFramework="Native" />
4+
<package id="openssl-android" version="1.0.2.1" targetFramework="Native" />
55
</packages>

Release/tests/functional/http/listener/vs14.android/HttpListener140_test.android.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<ProjectGuid>{2B00D1C0-1A93-4A32-8932-C3CC43ACFF45}</ProjectGuid>
5757
<Keyword>Android</Keyword>
5858
<ApplicationType>Android</ApplicationType>
59-
<ApplicationTypeRevision>1.0</ApplicationTypeRevision>
59+
<ApplicationTypeRevision>2.0</ApplicationTypeRevision>
6060
<ProjectName>HttpListener140_test.android</ProjectName>
6161
</PropertyGroup>
6262
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

Release/tests/functional/http/utilities/vs14.android/HttpTestUtilities140.android.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<ProjectGuid>{B444EE47-1340-4A74-820D-CDD55F9F22F7}</ProjectGuid>
5353
<Keyword>Android</Keyword>
5454
<ApplicationType>Android</ApplicationType>
55-
<ApplicationTypeRevision>1.0</ApplicationTypeRevision>
55+
<ApplicationTypeRevision>2.0</ApplicationTypeRevision>
5656
<ProjectName>HttpTestUtilities140.android</ProjectName>
5757
</PropertyGroup>
5858
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

Release/tests/functional/json/vs14.android/JSON140_test.android.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<ProjectGuid>{169555EF-8A80-405E-A815-CFE70028CA45}</ProjectGuid>
5151
<Keyword>Android</Keyword>
5252
<ApplicationType>Android</ApplicationType>
53-
<ApplicationTypeRevision>1.0</ApplicationTypeRevision>
53+
<ApplicationTypeRevision>2.0</ApplicationTypeRevision>
5454
<ProjectName>JSON140_test.android</ProjectName>
5555
</PropertyGroup>
5656
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

Release/tests/functional/pplx/pplx_test/vs14.android/pplx140_test.android.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<ProjectGuid>{DF670B4E-692C-424E-BCFD-F63D34FE5CD3}</ProjectGuid>
4646
<Keyword>Android</Keyword>
4747
<ApplicationType>Android</ApplicationType>
48-
<ApplicationTypeRevision>1.0</ApplicationTypeRevision>
48+
<ApplicationTypeRevision>2.0</ApplicationTypeRevision>
4949
<ProjectName>pplx140_test.android</ProjectName>
5050
</PropertyGroup>
5151
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<ProjectGuid>{B9DA540F-95F7-485E-ADF4-C94A17BFA1EB}</ProjectGuid>
5050
<Keyword>Android</Keyword>
5151
<ApplicationType>Android</ApplicationType>
52-
<ApplicationTypeRevision>1.0</ApplicationTypeRevision>
52+
<ApplicationTypeRevision>2.0</ApplicationTypeRevision>
5353
<ProjectName>streams140_test.android</ProjectName>
5454
</PropertyGroup>
5555
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

Release/tests/functional/uri/vs14.android/Uri140_test.android.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<ProjectGuid>{63569C1A-A168-442A-B160-76D0256803AF}</ProjectGuid>
5353
<Keyword>Android</Keyword>
5454
<ApplicationType>Android</ApplicationType>
55-
<ApplicationTypeRevision>1.0</ApplicationTypeRevision>
55+
<ApplicationTypeRevision>2.0</ApplicationTypeRevision>
5656
<ProjectName>Uri140_test.android</ProjectName>
5757
</PropertyGroup>
5858
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

Release/tests/functional/utils/vs14.android/Utils140_test.android.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<ProjectGuid>{423FCE6D-7400-4C09-9038-4438FBB089D4}</ProjectGuid>
4949
<Keyword>Android</Keyword>
5050
<ApplicationType>Android</ApplicationType>
51-
<ApplicationTypeRevision>1.0</ApplicationTypeRevision>
51+
<ApplicationTypeRevision>2.0</ApplicationTypeRevision>
5252
<ProjectName>Utils140_test.android</ProjectName>
5353
</PropertyGroup>
5454
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

Release/tests/functional/websockets/client/vs14.android/websocketsclient140_test.android.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<ProjectGuid>{3E8466B1-7CBC-489D-8E6B-5E45BAB4D627}</ProjectGuid>
5151
<Keyword>Android</Keyword>
5252
<ApplicationType>Android</ApplicationType>
53-
<ApplicationTypeRevision>1.0</ApplicationTypeRevision>
53+
<ApplicationTypeRevision>2.0</ApplicationTypeRevision>
5454
<ProjectName>websocketsclient140_test.android</ProjectName>
5555
</PropertyGroup>
5656
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="boost" version="1.55.0.16" targetFramework="Native" />
4-
<package id="openssl-android" version="1.0.2.0" targetFramework="Native" />
4+
<package id="openssl-android" version="1.0.2.1" targetFramework="Native" />
55
</packages>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<ProjectGuid>{0149E1C2-FBF3-48B6-9996-D6753F689DFB}</ProjectGuid>
4545
<Keyword>Android</Keyword>
4646
<ApplicationType>Android</ApplicationType>
47-
<ApplicationTypeRevision>1.0</ApplicationTypeRevision>
47+
<ApplicationTypeRevision>2.0</ApplicationTypeRevision>
4848
<ProjectName>websockets_test_utilities140.android</ProjectName>
4949
</PropertyGroup>
5050
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

0 commit comments

Comments
 (0)