Change ApplicationTypeRevision=2.0 for VS Update3 to use the clang 3_8

toolset.
jasonsandlin · Oct 5, 2016 · 5214d5e · 5214d5e
1 parent 0cc46e8
commit 5214d5e
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 17 deletions.
diff --git a/Release/src/build/vs14.android/casablanca140.android.vcxproj b/Release/src/build/vs14.android/casablanca140.android.vcxproj
@@ -26,7 +26,7 @@
     <ProjectGuid>{AFB49019-965B-4C10-BAFF-C86C16D58010}</ProjectGuid>
     <Keyword>Android</Keyword>
     <ApplicationType>Android</ApplicationType>
-    <ApplicationTypeRevision>1.0</ApplicationTypeRevision>
+    <ApplicationTypeRevision>2.0</ApplicationTypeRevision>
     <ProjectName>cpprestsdk140.android</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/.../vs14.android/TestRunner.android.NativeActivity/TestRunner.android.NativeActivity.vcxproj b/.../vs14.android/TestRunner.android.NativeActivity/TestRunner.android.NativeActivity.vcxproj
@@ -257,7 +257,7 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <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')" />
+    <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')" />
     <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.2\build\native\boost_atomic-android.targets" Condition="Exists('$(PackagesRoot)\boost_atomic-android.1.55.0.2\build\native\boost_atomic-android.targets')" />
     <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 @@
     <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)\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'))" />
+    <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'))" />
     <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.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'))" />
     <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'))" />

diff --git a/Release/tests/common/UnitTestpp/vs14.android/UnitTestpp140.android.vcxproj b/Release/tests/common/UnitTestpp/vs14.android/UnitTestpp140.android.vcxproj
@@ -95,7 +95,7 @@
     <ProjectGuid>{3EFD8540-A54D-4900-887E-F856162535A0}</ProjectGuid>
     <Keyword>Android</Keyword>
     <ApplicationType>Android</ApplicationType>
-    <ApplicationTypeRevision>1.0</ApplicationTypeRevision>
+    <ApplicationTypeRevision>2.0</ApplicationTypeRevision>
     <ProjectName>UnitTestpp140.android</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/Release/tests/common/utilities/vs14.android/CommonUtilities140.android.vcxproj b/Release/tests/common/utilities/vs14.android/CommonUtilities140.android.vcxproj
@@ -46,7 +46,7 @@
     <ProjectGuid>{7C4E6E33-42E2-4472-9319-DDE7564F3DAE}</ProjectGuid>
     <Keyword>Android</Keyword>
     <ApplicationType>Android</ApplicationType>
-    <ApplicationTypeRevision>1.0</ApplicationTypeRevision>
+    <ApplicationTypeRevision>2.0</ApplicationTypeRevision>
     <ProjectName>CommonUtilities140.android</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/Release/tests/functional/http/client/vs14.android/HttpClient140_test.android.vcxproj b/Release/tests/functional/http/client/vs14.android/HttpClient140_test.android.vcxproj
@@ -64,7 +64,7 @@
     <ProjectGuid>{0EE481DA-A97F-4831-9119-C65EB2D7B4DA}</ProjectGuid>
     <Keyword>Android</Keyword>
     <ApplicationType>Android</ApplicationType>
-    <ApplicationTypeRevision>1.0</ApplicationTypeRevision>
+    <ApplicationTypeRevision>2.0</ApplicationTypeRevision>
     <ProjectName>HttpClient140_test.android</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/Release/tests/functional/http/client/vs14.android/packages.config b/Release/tests/functional/http/client/vs14.android/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="boost" version="1.55.0.16" targetFramework="Native" />
-  <package id="openssl-android" version="1.0.2.0" targetFramework="Native" />
+  <package id="openssl-android" version="1.0.2.1" targetFramework="Native" />
 </packages>
diff --git a/Release/tests/functional/http/listener/vs14.android/HttpListener140_test.android.vcxproj b/Release/tests/functional/http/listener/vs14.android/HttpListener140_test.android.vcxproj
@@ -56,7 +56,7 @@
     <ProjectGuid>{2B00D1C0-1A93-4A32-8932-C3CC43ACFF45}</ProjectGuid>
     <Keyword>Android</Keyword>
     <ApplicationType>Android</ApplicationType>
-    <ApplicationTypeRevision>1.0</ApplicationTypeRevision>
+    <ApplicationTypeRevision>2.0</ApplicationTypeRevision>
     <ProjectName>HttpListener140_test.android</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/Release/tests/functional/http/utilities/vs14.android/HttpTestUtilities140.android.vcxproj b/Release/tests/functional/http/utilities/vs14.android/HttpTestUtilities140.android.vcxproj
@@ -52,7 +52,7 @@
     <ProjectGuid>{B444EE47-1340-4A74-820D-CDD55F9F22F7}</ProjectGuid>
     <Keyword>Android</Keyword>
     <ApplicationType>Android</ApplicationType>
-    <ApplicationTypeRevision>1.0</ApplicationTypeRevision>
+    <ApplicationTypeRevision>2.0</ApplicationTypeRevision>
     <ProjectName>HttpTestUtilities140.android</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/Release/tests/functional/json/vs14.android/JSON140_test.android.vcxproj b/Release/tests/functional/json/vs14.android/JSON140_test.android.vcxproj
@@ -50,7 +50,7 @@
     <ProjectGuid>{169555EF-8A80-405E-A815-CFE70028CA45}</ProjectGuid>
     <Keyword>Android</Keyword>
     <ApplicationType>Android</ApplicationType>
-    <ApplicationTypeRevision>1.0</ApplicationTypeRevision>
+    <ApplicationTypeRevision>2.0</ApplicationTypeRevision>
     <ProjectName>JSON140_test.android</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/Release/tests/functional/pplx/pplx_test/vs14.android/pplx140_test.android.vcxproj b/Release/tests/functional/pplx/pplx_test/vs14.android/pplx140_test.android.vcxproj
@@ -45,7 +45,7 @@
     <ProjectGuid>{DF670B4E-692C-424E-BCFD-F63D34FE5CD3}</ProjectGuid>
     <Keyword>Android</Keyword>
     <ApplicationType>Android</ApplicationType>
-    <ApplicationTypeRevision>1.0</ApplicationTypeRevision>
+    <ApplicationTypeRevision>2.0</ApplicationTypeRevision>
     <ProjectName>pplx140_test.android</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/Release/tests/functional/streams/vs14.android/streams140_test.android.vcxproj b/Release/tests/functional/streams/vs14.android/streams140_test.android.vcxproj
@@ -49,7 +49,7 @@
     <ProjectGuid>{B9DA540F-95F7-485E-ADF4-C94A17BFA1EB}</ProjectGuid>
     <Keyword>Android</Keyword>
     <ApplicationType>Android</ApplicationType>
-    <ApplicationTypeRevision>1.0</ApplicationTypeRevision>
+    <ApplicationTypeRevision>2.0</ApplicationTypeRevision>
     <ProjectName>streams140_test.android</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/Release/tests/functional/uri/vs14.android/Uri140_test.android.vcxproj b/Release/tests/functional/uri/vs14.android/Uri140_test.android.vcxproj
@@ -52,7 +52,7 @@
     <ProjectGuid>{63569C1A-A168-442A-B160-76D0256803AF}</ProjectGuid>
     <Keyword>Android</Keyword>
     <ApplicationType>Android</ApplicationType>
-    <ApplicationTypeRevision>1.0</ApplicationTypeRevision>
+    <ApplicationTypeRevision>2.0</ApplicationTypeRevision>
     <ProjectName>Uri140_test.android</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/Release/tests/functional/utils/vs14.android/Utils140_test.android.vcxproj b/Release/tests/functional/utils/vs14.android/Utils140_test.android.vcxproj
@@ -48,7 +48,7 @@
     <ProjectGuid>{423FCE6D-7400-4C09-9038-4438FBB089D4}</ProjectGuid>
     <Keyword>Android</Keyword>
     <ApplicationType>Android</ApplicationType>
-    <ApplicationTypeRevision>1.0</ApplicationTypeRevision>
+    <ApplicationTypeRevision>2.0</ApplicationTypeRevision>
     <ProjectName>Utils140_test.android</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/.../tests/functional/websockets/client/vs14.android/websocketsclient140_test.android.vcxproj b/.../tests/functional/websockets/client/vs14.android/websocketsclient140_test.android.vcxproj
@@ -50,7 +50,7 @@
     <ProjectGuid>{3E8466B1-7CBC-489D-8E6B-5E45BAB4D627}</ProjectGuid>
     <Keyword>Android</Keyword>
     <ApplicationType>Android</ApplicationType>
-    <ApplicationTypeRevision>1.0</ApplicationTypeRevision>
+    <ApplicationTypeRevision>2.0</ApplicationTypeRevision>
     <ProjectName>websocketsclient140_test.android</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/Release/tests/functional/websockets/utilities/vs14.android/packages.config b/Release/tests/functional/websockets/utilities/vs14.android/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="boost" version="1.55.0.16" targetFramework="Native" />
-  <package id="openssl-android" version="1.0.2.0" targetFramework="Native" />
+  <package id="openssl-android" version="1.0.2.1" targetFramework="Native" />
 </packages>
diff --git a/...functional/websockets/utilities/vs14.android/websockets_test_utilities140.android.vcxproj b/...functional/websockets/utilities/vs14.android/websockets_test_utilities140.android.vcxproj
@@ -44,7 +44,7 @@
     <ProjectGuid>{0149E1C2-FBF3-48B6-9996-D6753F689DFB}</ProjectGuid>
     <Keyword>Android</Keyword>
     <ApplicationType>Android</ApplicationType>
-    <ApplicationTypeRevision>1.0</ApplicationTypeRevision>
+    <ApplicationTypeRevision>2.0</ApplicationTypeRevision>
     <ProjectName>websockets_test_utilities140.android</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />