Updating version in Nuget packages, and adding x86 support for Android NuGet package.

Author: stgates

Release/nuget/cpprestsdk.android.nuspec

@@ -2,7 +2,7 @@
 <package>
     <metadata>
         <id>cpprestsdk.android</id>
-        <version>2.3.0.1</version>
+        <version>2.4.0</version>
         <title>C++ REST SDK - Android</title>
         <authors>casablancacore</authors>
         <owners>Microsoft, Visual C++</owners>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <summary>The C++ REST SDK is a cross-platform, modern, and asynchronous library that enables developers to access and author connected applications</summary>
         <description>This library is a Microsoft effort to support cloud-based client-server communication in native code using a modern asynchronous C++ API design. The C++ REST SDK (codename "Casablanca") is a project to start exploring how to best support C++ developers who want to take advantage of the radical shift in software architecture that cloud computing represents.</description>
-        <releaseNotes>Release of C++ Rest SDK 2.3.0 libraries for android.</releaseNotes>
+        <releaseNotes>Release of C++ Rest SDK 2.4.0 libraries for android.</releaseNotes>
         <copyright>Copyright 2014</copyright>
         <tags>REST, native, C++, JSON, Casablanca, Http, Uri, WebSockets, android</tags>
         <dependencies>
@@ -32,8 +32,10 @@
         <file src="..\include\**\*" target="\build\native\include\" />
 
         <!-- clang-3.4 -->
-        <file src="..\..\Binaries\ARM\Release\cpprest140_android_2_3.a" target="\build\native\lib\arm\libcpprest-clang_3_4-gnustl-2_3.a" />
-        <file src="..\..\Binaries\ARM\Debug\cpprest140d_android_2_3.a" target="\build\native\lib\arm\libcpprest-clang_3_4-d-gnustl-2_3.a" />
+        <file src="..\..\Binaries\ARM\Release\cpprest140_android_2_4.a" target="\build\native\lib\arm\libcpprest-clang_3_4-gnustl-2_4.a" />
+        <file src="..\..\Binaries\ARM\Debug\cpprest140d_android_2_4.a" target="\build\native\lib\arm\libcpprest-clang_3_4-d-gnustl-2_4.a" />
+        <file src="..\..\Binaries\x86\Release\cpprest140_android_2_4.a" target="\build\native\lib\x86\libcpprest-clang_3_4-gnustl-2_4.a" />
+        <file src="..\..\Binaries\x86\Debug\cpprest140d_android_2_4.a" target="\build\native\lib\x86\libcpprest-clang_3_4-d-gnustl-2_4.a" />
 
         <!-- Including license for WebSocket++ -->
         <file src="..\libs\websocketpp\COPYING" target="\license\websocketpp\COPYING" />

Release/nuget/cpprestsdk.android.targets

@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <CppRestSDKVersionMajor>2</CppRestSDKVersionMajor>
-    <CppRestSDKVersionMinor>3</CppRestSDKVersionMinor>
+    <CppRestSDKVersionMinor>4</CppRestSDKVersionMinor>
     <CppRestSDKVersionRevision>0</CppRestSDKVersionRevision>
     <CppRestSDKVersionFileSuffix>$(CppRestSDKVersionMajor)_$(CppRestSDKVersionMinor)</CppRestSDKVersionFileSuffix>
   </PropertyGroup>
@@ -29,6 +29,7 @@
   </ItemGroup>
 
   <Target Name="cpprestsdk_android_PreLink" BeforeTargets="@(CppRestSDKTargetDependencies);Link" DependsOnTargets="$(ComputeLinkInputsTargets)">
+  
     <!-- ARM and Clang and GNUSTL and Debug -->
     <ItemGroup Condition="'$(Platform)' == 'ARM' And '$(PlatformToolset)' == 'Clang_3_4' And ('$(UseOfStl)' == 'gnustl_shared' Or '$(UseOfStl)' == 'gnustl_static') And '$(UseDebugLibraries)' == 'true'">
       <Link Include="$(MSBuildThisFileDirectory)lib\arm\libcpprest-clang_3_4-d-gnustl-$(CppRestSDKVersionFileSuffix).a" />
@@ -38,6 +39,15 @@
       <Link Include="$(MSBuildThisFileDirectory)lib\arm\libcpprest-clang_3_4-gnustl-$(CppRestSDKVersionFileSuffix).a" />
     </ItemGroup>
 
+    <!-- x86 and Clang and GNUSTL and Debug -->
+    <ItemGroup Condition="'$(Platform)' == 'x86' And '$(PlatformToolset)' == 'Clang_3_4' And ('$(UseOfStl)' == 'gnustl_shared' Or '$(UseOfStl)' == 'gnustl_static') And '$(UseDebugLibraries)' == 'true'">
+      <Link Include="$(MSBuildThisFileDirectory)lib\x86\libcpprest-clang_3_4-d-gnustl-$(CppRestSDKVersionFileSuffix).a" />
+    </ItemGroup>
+    <!-- x86 and Clang and GNUSTL and Release -->
+    <ItemGroup Condition="'$(Platform)' == 'x86' And '$(PlatformToolset)' == 'Clang_3_4' And ('$(UseOfStl)' == 'gnustl_shared' Or '$(UseOfStl)' == 'gnustl_static') And '$(UseDebugLibraries)' != 'true'">
+      <Link Include="$(MSBuildThisFileDirectory)lib\x86\libcpprest-clang_3_4-gnustl-$(CppRestSDKVersionFileSuffix).a" />
+    </ItemGroup>
+    
     <Error
         Condition="'$(PlatformToolset)' != 'Clang_3_4'"
         Text="The cpprestsdk.android NuGet package only contains binaries for Clang 3.4."
@@ -46,9 +56,5 @@
         Condition="'$(UseOfStl)' != 'gnustl_shared' And '$(UseOfStl)' != 'gnustl_static'"
         Text="cpprestsdk requires linking against the gnustl. Please set Project Properties -> Configuration Properties -> General -> Use of STL to be 'gnustl_static'."
         />
-    <Error
-        Condition="'$(Platform)' != 'ARM'"
-        Text="The cpprestsdk.android NuGet package only contains binaries for the ARM architecture."
-        />
   </Target>
 </Project>