Skip to content
This repository
Browse code

Added some missing OAuth files to the .NET4 and Silverlight projects

  • Loading branch information...
commit 3e42ddc9a244b69749ddf3a8d97784402a2b8f52 1 parent 3f2e43c
Pedro Lamas PedroLamas authored
3  RestSharp.Net4/RestSharp.Net4.csproj
@@ -53,6 +53,9 @@
53 53 <Compile Include="..\restsharp\authenticators\NtlmAuthenticator.cs">
54 54 <Link>Authenticators\NtlmAuthenticator.cs</Link>
55 55 </Compile>
  56 + <Compile Include="..\RestSharp\Authenticators\OAuth1Authenticator.cs">
  57 + <Link>Authenticators\OAuth1Authenticator.cs</Link>
  58 + </Compile>
56 59 <Compile Include="..\restsharp\authenticators\OAuth2Authenticator.cs">
57 60 <Link>Authenticators\OAuth2Authenticator.cs</Link>
58 61 </Compile>
57 RestSharp.Silverlight/RestSharp.Silverlight.csproj
@@ -72,9 +72,63 @@
72 72 <Compile Include="..\RestSharp\Authenticators\NtlmAuthenticator.cs">
73 73 <Link>Authenticators\NtlmAuthenticator.cs</Link>
74 74 </Compile>
  75 + <Compile Include="..\RestSharp\Authenticators\OAuth1Authenticator.cs">
  76 + <Link>Authenticators\OAuth1Authenticator.cs</Link>
  77 + </Compile>
75 78 <Compile Include="..\RestSharp\Authenticators\OAuth2Authenticator.cs">
76 79 <Link>Authenticators\OAuth2Authenticator.cs</Link>
77 80 </Compile>
  81 + <Compile Include="..\restsharp\authenticators\oauth\extensions\CollectionExtensions.cs">
  82 + <Link>Authenticators\OAuth\Extensions\CollectionExtensions.cs</Link>
  83 + </Compile>
  84 + <Compile Include="..\restsharp\authenticators\oauth\extensions\OAuthExtensions.cs">
  85 + <Link>Authenticators\OAuth\Extensions\OAuthExtensions.cs</Link>
  86 + </Compile>
  87 + <Compile Include="..\restsharp\authenticators\oauth\extensions\StringExtensions.cs">
  88 + <Link>Authenticators\OAuth\Extensions\StringExtensions.cs</Link>
  89 + </Compile>
  90 + <Compile Include="..\restsharp\authenticators\oauth\extensions\TimeExtensions.cs">
  91 + <Link>Authenticators\OAuth\Extensions\TimeExtensions.cs</Link>
  92 + </Compile>
  93 + <Compile Include="..\restsharp\authenticators\oauth\HttpPostParameter.cs">
  94 + <Link>Authenticators\OAuth\HttpPostParameter.cs</Link>
  95 + </Compile>
  96 + <Compile Include="..\restsharp\authenticators\oauth\HttpPostParameterType.cs">
  97 + <Link>Authenticators\OAuth\HttpPostParameterType.cs</Link>
  98 + </Compile>
  99 + <Compile Include="..\restsharp\authenticators\oauth\OAuthParameterHandling.cs">
  100 + <Link>Authenticators\OAuth\OAuthParameterHandling.cs</Link>
  101 + </Compile>
  102 + <Compile Include="..\restsharp\authenticators\oauth\OAuthSignatureMethod.cs">
  103 + <Link>Authenticators\OAuth\OAuthSignatureMethod.cs</Link>
  104 + </Compile>
  105 + <Compile Include="..\restsharp\authenticators\oauth\OAuthSignatureTreatment.cs">
  106 + <Link>Authenticators\OAuth\OAuthSignatureTreatment.cs</Link>
  107 + </Compile>
  108 + <Compile Include="..\restsharp\authenticators\oauth\OAuthTools.cs">
  109 + <Link>Authenticators\OAuth\OAuthTools.cs</Link>
  110 + </Compile>
  111 + <Compile Include="..\restsharp\authenticators\oauth\OAuthType.cs">
  112 + <Link>Authenticators\OAuth\OAuthType.cs</Link>
  113 + </Compile>
  114 + <Compile Include="..\restsharp\authenticators\oauth\OAuthWebQueryInfo.cs">
  115 + <Link>Authenticators\OAuth\OAuthWebQueryInfo.cs</Link>
  116 + </Compile>
  117 + <Compile Include="..\restsharp\authenticators\oauth\OAuthWorkflow.cs">
  118 + <Link>Authenticators\OAuth\OAuthWorkflow.cs</Link>
  119 + </Compile>
  120 + <Compile Include="..\restsharp\authenticators\oauth\WebPair.cs">
  121 + <Link>Authenticators\OAuth\WebPair.cs</Link>
  122 + </Compile>
  123 + <Compile Include="..\restsharp\authenticators\oauth\WebPairCollection.cs">
  124 + <Link>Authenticators\OAuth\WebPairCollection.cs</Link>
  125 + </Compile>
  126 + <Compile Include="..\restsharp\authenticators\oauth\WebParameter.cs">
  127 + <Link>Authenticators\OAuth\WebParameter.cs</Link>
  128 + </Compile>
  129 + <Compile Include="..\restsharp\authenticators\oauth\WebParameterCollection.cs">
  130 + <Link>Authenticators\OAuth\WebParameterCollection.cs</Link>
  131 + </Compile>
78 132 <Compile Include="..\RestSharp\Authenticators\SimpleAuthenticator.cs">
79 133 <Link>Authenticators\SimpleAuthenticator.cs</Link>
80 134 </Compile>
@@ -212,6 +266,9 @@
212 266 <ItemGroup>
213 267 <None Include="packages.config" />
214 268 </ItemGroup>
  269 + <ItemGroup>
  270 + <Folder Include="Authenticators\NewFolder1\" />
  271 + </ItemGroup>
215 272 <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
216 273 <ProjectExtensions>
217 274 <VisualStudio>
8 RestSharp/Authenticators/OAuth/Extensions/CollectionExtensions.cs
@@ -3,12 +3,6 @@
3 3 using System.Collections.Specialized;
4 4 using System.Text;
5 5
6   -#if SILVERLIGHT
7   -using Hammock.Silverlight.Compat;
8   -#else
9   -
10   -#endif
11   -
12 6 namespace RestSharp.Authenticators.OAuth.Extensions
13 7 {
14 8 internal static class CollectionExtensions
@@ -55,7 +49,7 @@ public static void ForEach<T>(this IEnumerable<T> items, Action<T> action)
55 49 }
56 50 }
57 51
58   -#if !WINDOWS_PHONE
  52 +#if !WINDOWS_PHONE && !SILVERLIGHT
59 53
60 54 public static void AddRange(this IDictionary<string, string> collection, NameValueCollection range)
61 55 {
14 RestSharp/Authenticators/OAuth/Extensions/StringExtensions.cs
@@ -5,18 +5,6 @@
5 5 using System.Text;
6 6 using System.Text.RegularExpressions;
7 7
8   -#if SILVERLIGHT && !WindowsPhone
9   -using System.Windows.Browser;
10   -#endif
11   -
12   -#if WindowsPhone
13   -using System.Web;
14   -#endif
15   -
16   -#if !SILVERLIGHT
17   -
18   -#endif
19   -
20 8 namespace RestSharp.Authenticators.OAuth.Extensions
21 9 {
22 10 internal static class StringExtensions
@@ -116,7 +104,7 @@ public static string PercentEncode(this string s)
116 104 }
117 105
118 106 private const RegexOptions Options =
119   -#if SILVERLIGHT
  107 +#if !WINDOWS_PHONE && !SILVERLIGHT
120 108 RegexOptions.Compiled | RegexOptions.IgnoreCase;
121 109 #else
122 110 RegexOptions.IgnoreCase;
2  RestSharp/Authenticators/OAuth/OAuthWorkflow.cs
... ... @@ -1,7 +1,7 @@
1 1 using System;
2 2 using System.Collections.Generic;
3 3 using RestSharp.Authenticators.OAuth.Extensions;
4   -#if !WINDOWS_PHONE
  4 +#if !WINDOWS_PHONE && !SILVERLIGHT
5 5 using RestSharp.Contrib;
6 6 #endif
7 7
2  RestSharp/Authenticators/OAuth/WebPairCollection.cs
@@ -30,7 +30,7 @@ public WebPairCollection(IEnumerable<WebPair> parameters)
30 30 _parameters = new List<WebPair>(parameters);
31 31 }
32 32
33   -#if !WINDOWS_PHONE
  33 +#if !WINDOWS_PHONE && !SILVERLIGHT
34 34 public WebPairCollection(NameValueCollection collection) : this()
35 35 {
36 36 AddCollection(collection);
8 RestSharp/Authenticators/OAuth/WebParameterCollection.cs
... ... @@ -1,12 +1,6 @@
1 1 using System.Collections.Generic;
2 2 using System.Collections.Specialized;
3 3
4   -#if !SILVERLIGHT
5   -
6   -#else
7   -using Hammock.Silverlight.Compat;
8   -#endif
9   -
10 4 namespace RestSharp.Authenticators.OAuth
11 5 {
12 6 internal class WebParameterCollection : WebPairCollection
@@ -16,7 +10,7 @@ public WebParameterCollection(IEnumerable<WebPair> parameters)
16 10 {
17 11 }
18 12
19   -#if !WINDOWS_PHONE
  13 +#if !WINDOWS_PHONE && !SILVERLIGHT
20 14 public WebParameterCollection(NameValueCollection collection) : base(collection)
21 15 {
22 16 }
2  RestSharp/Authenticators/OAuth1Authenticator.cs
@@ -6,6 +6,8 @@
6 6
7 7 #if WINDOWS_PHONE
8 8 using System.Net;
  9 +#elif SILVERLIGHT
  10 +using System.Windows.Browser;
9 11 #else
10 12 using RestSharp.Contrib;
11 13 #endif

0 comments on commit 3e42ddc

Please sign in to comment.
Something went wrong with that request. Please try again.