Upgraded Twilio.WindowsPhone to WP7.1

- Changed project to target Windows Phone 7.1
- Removed SL3-WP7 from NuGet package
- Upgraded RestSharp dependency to 104.1

Twilio.nuspec

@@ -1,48 +1,50 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package>
-	<metadata>
-		<id>Twilio</id>
-		<version>3.5.4</version>
-		<authors>Twilio</authors>
-		<description>Twilio REST API helper library</description>
-		<language>en-US</language>
-		<projectUrl>http://github.com/twilio/twilio-csharp</projectUrl>
-		<iconUrl>http://www.twilio.com/packages/company/img/logos_downloadable_round.png</iconUrl>
-		<licenseUrl>https://github.com/twilio/twilio-csharp/blob/master/LICENSE.txt</licenseUrl>
-		<tags>REST SMS voice telephony phone twilio twiml ASPNETWEBPAGES</tags>
-		<dependencies>
-			<dependency id="Newtonsoft.Json" />
-			<dependency id="RestSharp" />
-		</dependencies>
-		<releaseNotes>
-      * 3.5.4 - Fixed package to support Mango tooling
-      * 3.5.3 - Added paging properties to UsageRecord API
-      * 3.5.2 - Adding Usage Capability
-      Enabled NuGet package restore in the solution
-      Updated project NuGet references
-      * 3.5.1 - Updated RestSharp
-      * 3.5.0 - Adding Queue Capability
-      * 3.4.5 - Fixing package fail
-      * 3.4.4 - Changed SMS message length validation
-      * 3.4.3 - Added and updated some XML Doc Comments
-      Added SmsStatusCallback property
-      Fixed number transfer bug
-      Fixed CallListOptions bug
-      Updated to latest versions of RestSharp and Json.NET
-      * 3.4.2 - Updated references to resolve issues with RestSharp and JSON.NET
-      * 3.4.0 - Add CallOptions.Record to enable full-call recording
-      * 3.3.7 - Another package-only fix. Assembly version is still 3.3.6
-      * 3.3.6 - Fix corrupt package.
-      * 3.3.5 - Bind against JSON.Net 4.0.8.
-      * 3.3.3 - Fixed RestException never being populated. Updated to JSON.NET 4.0.7
-      * 3.3.2 - Resolve NuGet assembly issue with RestSharp
-      * 3.3.1 - Compatibility with latest version of RestSharp
-      * 3.3.0 - Restored paging information for list resource responses.
-      Restructured REST API objects to match JSON datastructures instead of XML.
-      Fixed incorrect StatusCallback parameter name for IncomingPhoneNumber and Application.
-      Fixed incorrect paging parameter name.
-
-      * 3.2.3 - Added 'extension' parameter to the AddOutgoingCallerIds method
-    </releaseNotes>
-	</metadata>
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+	<metadata>
+		<id>Twilio</id>
+		<version>3.5.5</version>
+		<authors>Twilio</authors>
+		<description>Twilio REST API helper library</description>
+		<language>en-US</language>
+		<projectUrl>http://github.com/twilio/twilio-csharp</projectUrl>
+		<iconUrl>http://www.twilio.com/packages/company/img/logos_downloadable_round.png</iconUrl>
+		<licenseUrl>https://github.com/twilio/twilio-csharp/blob/master/LICENSE.txt</licenseUrl>
+		<tags>REST SMS voice telephony phone twilio twiml ASPNETWEBPAGES</tags>
+		<dependencies>
+			<dependency id="Newtonsoft.Json" />
+			<dependency id="RestSharp" />
+		</dependencies>
+		<releaseNotes>
+      * 3.5.5 - Removed support for Windows Phone 7.0 SDK
+      Added support for Windows Phone 7.1 SDK
+      * 3.5.4 - Fixed package to support Mango tooling
+      * 3.5.3 - Added paging properties to UsageRecord API
+      * 3.5.2 - Adding Usage Capability
+      Enabled NuGet package restore in the solution
+      Updated project NuGet references
+      * 3.5.1 - Updated RestSharp
+      * 3.5.0 - Adding Queue Capability
+      * 3.4.5 - Fixing package fail
+      * 3.4.4 - Changed SMS message length validation
+      * 3.4.3 - Added and updated some XML Doc Comments
+      Added SmsStatusCallback property
+      Fixed number transfer bug
+      Fixed CallListOptions bug
+      Updated to latest versions of RestSharp and Json.NET
+      * 3.4.2 - Updated references to resolve issues with RestSharp and JSON.NET
+      * 3.4.0 - Add CallOptions.Record to enable full-call recording
+      * 3.3.7 - Another package-only fix. Assembly version is still 3.3.6
+      * 3.3.6 - Fix corrupt package.
+      * 3.3.5 - Bind against JSON.Net 4.0.8.
+      * 3.3.3 - Fixed RestException never being populated. Updated to JSON.NET 4.0.7
+      * 3.3.2 - Resolve NuGet assembly issue with RestSharp
+      * 3.3.1 - Compatibility with latest version of RestSharp
+      * 3.3.0 - Restored paging information for list resource responses.
+      Restructured REST API objects to match JSON datastructures instead of XML.
+      Fixed incorrect StatusCallback parameter name for IncomingPhoneNumber and Application.
+      Fixed incorrect paging parameter name.
+
+      * 3.2.3 - Added 'extension' parameter to the AddOutgoingCallerIds method
+    </releaseNotes>
+	</metadata>
 </package>

package.cmd

@@ -1,59 +1,59 @@
-tools\nuget.exe update -self
-
-rd download /s /q
-
-if not exist download mkdir download
-if not exist download\WindowsPhone mkdir download\WindowsPhone
-if not exist download\Silverlight mkdir download\Silverlight
-if not exist download\package mkdir download\package
-if not exist download\package\twilio mkdir download\package\twilio
-if not exist download\package\twiliomvc mkdir download\package\twiliomvc
-if not exist download\package\twiliotwiml mkdir download\package\twiliotwiml
-if not exist download\package\twiliowebmatrix mkdir download\package\twiliowebmatrix
-if not exist download\package\twilioclient mkdir download\package\twilioclient
-
-if not exist download\package\twilio\lib mkdir download\package\twilio\lib
-if not exist download\package\twilio\lib\3.5 mkdir download\package\twilio\lib\3.5
-if not exist download\package\twilio\lib\SL3-WP7 mkdir download\package\twilio\lib\SL3-WP7
-if not exist download\package\twilio\lib\SL4-WINDOWSPHONE71 mkdir download\package\twilio\lib\SL4-WINDOWSPHONE71
-if not exist download\package\twilio\lib\SL4 mkdir download\package\twilio\lib\SL4
-
-if not exist download\package\twiliomvc\lib mkdir download\package\twiliomvc\lib
-if not exist download\package\twiliomvc\lib\3.5 mkdir download\package\twiliomvc\lib\3.5
-
-if not exist download\package\twiliotwiml\lib mkdir download\package\twiliotwiml\lib
-if not exist download\package\twiliotwiml\lib\3.5 mkdir download\package\twiliotwiml\lib\3.5
-
-if not exist download\package\twiliowebmatrix\lib mkdir download\package\twiliowebmatrix\lib
-if not exist download\package\twiliowebmatrix\lib\3.5 mkdir download\package\twiliowebmatrix\lib\3.5
-
-if not exist download\package\twilioclient\lib mkdir download\package\twilioclient\lib
-if not exist download\package\twilioclient\lib\3.5 mkdir download\package\twilioclient\lib\3.5
-
-tools\ilmerge.exe /lib:src\Twilio.Api\bin\Release /internalize /ndebug /v2 /out:download\Twilio.Api.dll Twilio.Api.dll RestSharp.dll
-tools\ilmerge.exe /lib:src\Twilio.Api.Silverlight\bin\Release /internalize /ndebug /targetplatform:v4,"C:\Program Files (x86)\Microsoft Silverlight\4.1.10111.0" /out:download\Twilio.Api.Silverlight.dll RestSharp.Silverlight.dll
-
-copy src\Twilio.Api\bin\Release\*.* download
-copy src\Twilio.Api.Silverlight\bin\Release\*.* download\Silverlight\
-copy src\Twilio.Api.WindowsPhone\bin\Release\*.* download\WindowsPhone\
-copy src\Twilio.Mvc\bin\Release\*.* download
-copy src\Twilio.Twiml\bin\Release\*.* download
-copy src\Twilio.WebMatrix\bin\Release\*.* download
-copy src\Twilio.Client.Capability\bin\Release\*.* download
-copy LICENSE.txt download
-
-copy src\Twilio.Api\bin\Release\Twilio.Api.* download\package\twilio\lib\3.5\
-copy src\Twilio.Api.Silverlight\bin\Release\Twilio.Api.Silverlight.* download\package\twilio\lib\SL4\
-copy src\Twilio.Api.WindowsPhone\bin\Release\Twilio.Api.WindowsPhone.* download\package\twilio\lib\SL3-WP7\
-copy src\Twilio.Api.WindowsPhone\bin\Release\Twilio.Api.WindowsPhone.* download\package\twilio\lib\SL4-WINDOWSPHONE71\
-
-copy src\Twilio.Mvc\bin\Release\Twilio.Mvc.* download\package\twiliomvc\lib\3.5\
-copy src\Twilio.Twiml\bin\Release\Twilio.Twiml.* download\package\twiliotwiml\lib\3.5\
-copy src\Twilio.WebMatrix\bin\Release\Twilio.WebMatrix.* download\package\twiliowebmatrix\lib\3.5\
-copy src\Twilio.Client.Capability\bin\Release\Twilio.Client.Capability.* download\package\twilioclient\lib\3.5\
-
-tools\nuget.exe pack Twilio.nuspec -BasePath download\package\twilio -o download
-tools\nuget.exe pack Twilio.Mvc.nuspec -BasePath download\package\twiliomvc -o download
-tools\nuget.exe pack Twilio.TwiML.nuspec -BasePath download\package\twiliotwiml -o download
-tools\nuget.exe pack Twilio.WebMatrix.nuspec -BasePath download\package\twiliowebmatrix -o download
+tools\nuget.exe update -self
+
+rd download /s /q
+
+if not exist download mkdir download
+if not exist download\WindowsPhone mkdir download\WindowsPhone
+if not exist download\Silverlight mkdir download\Silverlight
+if not exist download\package mkdir download\package
+if not exist download\package\twilio mkdir download\package\twilio
+if not exist download\package\twiliomvc mkdir download\package\twiliomvc
+if not exist download\package\twiliotwiml mkdir download\package\twiliotwiml
+if not exist download\package\twiliowebmatrix mkdir download\package\twiliowebmatrix
+if not exist download\package\twilioclient mkdir download\package\twilioclient
+
+if not exist download\package\twilio\lib mkdir download\package\twilio\lib
+if not exist download\package\twilio\lib\3.5 mkdir download\package\twilio\lib\3.5
+REM if not exist download\package\twilio\lib\SL3-WP7 mkdir download\package\twilio\lib\SL3-WP7
+if not exist download\package\twilio\lib\SL4-WINDOWSPHONE71 mkdir download\package\twilio\lib\SL4-WINDOWSPHONE71
+if not exist download\package\twilio\lib\SL4 mkdir download\package\twilio\lib\SL4
+
+if not exist download\package\twiliomvc\lib mkdir download\package\twiliomvc\lib
+if not exist download\package\twiliomvc\lib\3.5 mkdir download\package\twiliomvc\lib\3.5
+
+if not exist download\package\twiliotwiml\lib mkdir download\package\twiliotwiml\lib
+if not exist download\package\twiliotwiml\lib\3.5 mkdir download\package\twiliotwiml\lib\3.5
+
+if not exist download\package\twiliowebmatrix\lib mkdir download\package\twiliowebmatrix\lib
+if not exist download\package\twiliowebmatrix\lib\3.5 mkdir download\package\twiliowebmatrix\lib\3.5
+
+if not exist download\package\twilioclient\lib mkdir download\package\twilioclient\lib
+if not exist download\package\twilioclient\lib\3.5 mkdir download\package\twilioclient\lib\3.5
+
+tools\ilmerge.exe /lib:src\Twilio.Api\bin\Release /internalize /ndebug /v2 /out:download\Twilio.Api.dll Twilio.Api.dll RestSharp.dll
+tools\ilmerge.exe /lib:src\Twilio.Api.Silverlight\bin\Release /internalize /ndebug /targetplatform:v4,"C:\Program Files (x86)\Microsoft Silverlight\4.1.10111.0" /out:download\Twilio.Api.Silverlight.dll RestSharp.Silverlight.dll
+
+copy src\Twilio.Api\bin\Release\*.* download
+copy src\Twilio.Api.Silverlight\bin\Release\*.* download\Silverlight\
+copy src\Twilio.Api.WindowsPhone\bin\Release\*.* download\WindowsPhone\
+copy src\Twilio.Mvc\bin\Release\*.* download
+copy src\Twilio.Twiml\bin\Release\*.* download
+copy src\Twilio.WebMatrix\bin\Release\*.* download
+copy src\Twilio.Client.Capability\bin\Release\*.* download
+copy LICENSE.txt download
+
+copy src\Twilio.Api\bin\Release\Twilio.Api.* download\package\twilio\lib\3.5\
+copy src\Twilio.Api.Silverlight\bin\Release\Twilio.Api.Silverlight.* download\package\twilio\lib\SL4\
+REM copy src\Twilio.Api.WindowsPhone\bin\Release\Twilio.Api.WindowsPhone.* download\package\twilio\lib\SL3-WP7\
+copy src\Twilio.Api.WindowsPhone\bin\Release\Twilio.Api.WindowsPhone.* download\package\twilio\lib\SL4-WINDOWSPHONE71\
+
+copy src\Twilio.Mvc\bin\Release\Twilio.Mvc.* download\package\twiliomvc\lib\3.5\
+copy src\Twilio.Twiml\bin\Release\Twilio.Twiml.* download\package\twiliotwiml\lib\3.5\
+copy src\Twilio.WebMatrix\bin\Release\Twilio.WebMatrix.* download\package\twiliowebmatrix\lib\3.5\
+copy src\Twilio.Client.Capability\bin\Release\Twilio.Client.Capability.* download\package\twilioclient\lib\3.5\
+
+tools\nuget.exe pack Twilio.nuspec -BasePath download\package\twilio -o download
+tools\nuget.exe pack Twilio.Mvc.nuspec -BasePath download\package\twiliomvc -o download
+tools\nuget.exe pack Twilio.TwiML.nuspec -BasePath download\package\twiliotwiml -o download
+tools\nuget.exe pack Twilio.WebMatrix.nuspec -BasePath download\package\twiliowebmatrix -o download
 tools\nuget.exe pack Twilio.Client.nuspec -BasePath download\package\twilioclient -o download

src/Twilio.Api.WindowsPhone/Twilio.Api.WindowsPhone.csproj

@@ -13,7 +13,7 @@
     <AssemblyName>Twilio.Api.WindowsPhone</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
-    <TargetFrameworkProfile>WindowsPhone</TargetFrameworkProfile>
+    <TargetFrameworkProfile>WindowsPhone71</TargetFrameworkProfile>
     <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
     <SilverlightApplication>false</SilverlightApplication>
     <ValidateXaml>true</ValidateXaml>
@@ -59,12 +59,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.4.5.10\lib\sl3-wp\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.4.5.10\lib\sl4-windowsphone71\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="RestSharp.WindowsPhone, Version=102.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\RestSharp.102.7\lib\sl3-wp\RestSharp.WindowsPhone.dll</HintPath>
+    <Reference Include="RestSharp.WindowsPhone">
+      <HintPath>..\packages\RestSharp.104.1\lib\sl4-wp71\RestSharp.WindowsPhone.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows" />
     <Reference Include="system" />
@@ -308,15 +307,11 @@
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>-->
-
   <Target Name="AfterBuild" Condition=" '$(Configuration)' == 'ReleaseWithPackage' ">
-    <MakeDir Directories="$(MSBuildProjectDirectory)..\..\..\Download\package\twilio\lib\SL3-WP7" />
     <MakeDir Directories="$(MSBuildProjectDirectory)..\..\..\Download\package\twilio\lib\SL4-WINDOWSPHONE71" />
     <CreateItem Include="$(TargetDir)\$(ProjectName).*">
-      <Output TaskParameter="Include" ItemName="FilesToCopy"/>
+      <Output TaskParameter="Include" ItemName="FilesToCopy" />
     </CreateItem>
-    <Copy SourceFiles="@(FilesToCopy)" DestinationFolder="$(MSBuildProjectDirectory)..\..\..\download\package\twilio\lib\SL3-WP7\" />
     <Copy SourceFiles="@(FilesToCopy)" DestinationFolder="$(MSBuildProjectDirectory)..\..\..\download\package\twilio\lib\SL4-WINDOWSPHONE71\" />
   </Target>
-
 </Project>

src/Twilio.Api.WindowsPhone/packages.config

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="4.5.10" />
-  <package id="RestSharp" version="102.7" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="4.5.10" targetFramework="sl40-wp71" />
+  <package id="RestSharp" version="104.1" targetFramework="sl40-wp71" />
 </packages>