Merge pull request #273 from PedroLamas/master

Fixes issue #270
restsharp · May 9, 2012 · ff296b9 · ff296b9
2 parents 3f2e43c + 3e42ddc
commit ff296b9
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 29 deletions.
diff --git a/RestSharp.Net4/RestSharp.Net4.csproj b/RestSharp.Net4/RestSharp.Net4.csproj
@@ -53,6 +53,9 @@
     <Compile Include="..\restsharp\authenticators\NtlmAuthenticator.cs">
       <Link>Authenticators\NtlmAuthenticator.cs</Link>
     </Compile>
+    <Compile Include="..\RestSharp\Authenticators\OAuth1Authenticator.cs">
+      <Link>Authenticators\OAuth1Authenticator.cs</Link>
+    </Compile>
     <Compile Include="..\restsharp\authenticators\OAuth2Authenticator.cs">
       <Link>Authenticators\OAuth2Authenticator.cs</Link>
     </Compile>

diff --git a/RestSharp.Silverlight/RestSharp.Silverlight.csproj b/RestSharp.Silverlight/RestSharp.Silverlight.csproj
@@ -72,9 +72,63 @@
     <Compile Include="..\RestSharp\Authenticators\NtlmAuthenticator.cs">
       <Link>Authenticators\NtlmAuthenticator.cs</Link>
     </Compile>
+    <Compile Include="..\RestSharp\Authenticators\OAuth1Authenticator.cs">
+      <Link>Authenticators\OAuth1Authenticator.cs</Link>
+    </Compile>
     <Compile Include="..\RestSharp\Authenticators\OAuth2Authenticator.cs">
       <Link>Authenticators\OAuth2Authenticator.cs</Link>
     </Compile>
+    <Compile Include="..\restsharp\authenticators\oauth\extensions\CollectionExtensions.cs">
+      <Link>Authenticators\OAuth\Extensions\CollectionExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\restsharp\authenticators\oauth\extensions\OAuthExtensions.cs">
+      <Link>Authenticators\OAuth\Extensions\OAuthExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\restsharp\authenticators\oauth\extensions\StringExtensions.cs">
+      <Link>Authenticators\OAuth\Extensions\StringExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\restsharp\authenticators\oauth\extensions\TimeExtensions.cs">
+      <Link>Authenticators\OAuth\Extensions\TimeExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\restsharp\authenticators\oauth\HttpPostParameter.cs">
+      <Link>Authenticators\OAuth\HttpPostParameter.cs</Link>
+    </Compile>
+    <Compile Include="..\restsharp\authenticators\oauth\HttpPostParameterType.cs">
+      <Link>Authenticators\OAuth\HttpPostParameterType.cs</Link>
+    </Compile>
+    <Compile Include="..\restsharp\authenticators\oauth\OAuthParameterHandling.cs">
+      <Link>Authenticators\OAuth\OAuthParameterHandling.cs</Link>
+    </Compile>
+    <Compile Include="..\restsharp\authenticators\oauth\OAuthSignatureMethod.cs">
+      <Link>Authenticators\OAuth\OAuthSignatureMethod.cs</Link>
+    </Compile>
+    <Compile Include="..\restsharp\authenticators\oauth\OAuthSignatureTreatment.cs">
+      <Link>Authenticators\OAuth\OAuthSignatureTreatment.cs</Link>
+    </Compile>
+    <Compile Include="..\restsharp\authenticators\oauth\OAuthTools.cs">
+      <Link>Authenticators\OAuth\OAuthTools.cs</Link>
+    </Compile>
+    <Compile Include="..\restsharp\authenticators\oauth\OAuthType.cs">
+      <Link>Authenticators\OAuth\OAuthType.cs</Link>
+    </Compile>
+    <Compile Include="..\restsharp\authenticators\oauth\OAuthWebQueryInfo.cs">
+      <Link>Authenticators\OAuth\OAuthWebQueryInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\restsharp\authenticators\oauth\OAuthWorkflow.cs">
+      <Link>Authenticators\OAuth\OAuthWorkflow.cs</Link>
+    </Compile>
+    <Compile Include="..\restsharp\authenticators\oauth\WebPair.cs">
+      <Link>Authenticators\OAuth\WebPair.cs</Link>
+    </Compile>
+    <Compile Include="..\restsharp\authenticators\oauth\WebPairCollection.cs">
+      <Link>Authenticators\OAuth\WebPairCollection.cs</Link>
+    </Compile>
+    <Compile Include="..\restsharp\authenticators\oauth\WebParameter.cs">
+      <Link>Authenticators\OAuth\WebParameter.cs</Link>
+    </Compile>
+    <Compile Include="..\restsharp\authenticators\oauth\WebParameterCollection.cs">
+      <Link>Authenticators\OAuth\WebParameterCollection.cs</Link>
+    </Compile>
     <Compile Include="..\RestSharp\Authenticators\SimpleAuthenticator.cs">
       <Link>Authenticators\SimpleAuthenticator.cs</Link>
     </Compile>
@@ -212,6 +266,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Authenticators\NewFolder1\" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>

diff --git a/RestSharp/Authenticators/OAuth/Extensions/CollectionExtensions.cs b/RestSharp/Authenticators/OAuth/Extensions/CollectionExtensions.cs
@@ -3,12 +3,6 @@
 using System.Collections.Specialized;
 using System.Text;
 
-#if SILVERLIGHT
-using Hammock.Silverlight.Compat;
-#else
-
-#endif
-
 namespace RestSharp.Authenticators.OAuth.Extensions
 {
 	internal static class CollectionExtensions
@@ -55,7 +49,7 @@ public static void ForEach<T>(this IEnumerable<T> items, Action<T> action)
 			}
 		}
 
-#if !WINDOWS_PHONE
+#if !WINDOWS_PHONE && !SILVERLIGHT
 
 		public static void AddRange(this IDictionary<string, string> collection, NameValueCollection range)
 		{

diff --git a/RestSharp/Authenticators/OAuth/Extensions/StringExtensions.cs b/RestSharp/Authenticators/OAuth/Extensions/StringExtensions.cs
@@ -5,18 +5,6 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-#if SILVERLIGHT && !WindowsPhone
-using System.Windows.Browser;
-#endif
-
-#if WindowsPhone
-using System.Web;
-#endif
-
-#if !SILVERLIGHT
-
-#endif
-
 namespace RestSharp.Authenticators.OAuth.Extensions
 {
 	internal static class StringExtensions
@@ -116,7 +104,7 @@ public static string PercentEncode(this string s)
 		}
 
 		private const RegexOptions Options =
-#if SILVERLIGHT
+#if !WINDOWS_PHONE && !SILVERLIGHT
 			RegexOptions.Compiled | RegexOptions.IgnoreCase;
 #else
 			RegexOptions.IgnoreCase;

diff --git a/RestSharp/Authenticators/OAuth/OAuthWorkflow.cs b/RestSharp/Authenticators/OAuth/OAuthWorkflow.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using RestSharp.Authenticators.OAuth.Extensions;
-#if !WINDOWS_PHONE
+#if !WINDOWS_PHONE && !SILVERLIGHT
 using RestSharp.Contrib;
 #endif
 

diff --git a/RestSharp/Authenticators/OAuth/WebPairCollection.cs b/RestSharp/Authenticators/OAuth/WebPairCollection.cs
@@ -30,7 +30,7 @@ public WebPairCollection(IEnumerable<WebPair> parameters)
 			_parameters = new List<WebPair>(parameters);
 		}
 
-#if !WINDOWS_PHONE
+#if !WINDOWS_PHONE && !SILVERLIGHT
 		public WebPairCollection(NameValueCollection collection) : this()
 		{
 			AddCollection(collection);

diff --git a/RestSharp/Authenticators/OAuth/WebParameterCollection.cs b/RestSharp/Authenticators/OAuth/WebParameterCollection.cs
@@ -1,12 +1,6 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 
-#if !SILVERLIGHT
-
-#else
-using Hammock.Silverlight.Compat;
-#endif
-
 namespace RestSharp.Authenticators.OAuth
 {
 	internal class WebParameterCollection : WebPairCollection
@@ -16,7 +10,7 @@ public WebParameterCollection(IEnumerable<WebPair> parameters)
 		{
 		}
 
-#if !WINDOWS_PHONE
+#if !WINDOWS_PHONE && !SILVERLIGHT
 		public WebParameterCollection(NameValueCollection collection) : base(collection)
 		{
 		}

diff --git a/RestSharp/Authenticators/OAuth1Authenticator.cs b/RestSharp/Authenticators/OAuth1Authenticator.cs
@@ -6,6 +6,8 @@
 
 #if WINDOWS_PHONE
 using System.Net;
+#elif SILVERLIGHT
+using System.Windows.Browser;
 #else
 using RestSharp.Contrib;
 #endif