Skip to content

Commit 45d0607

Browse files
author
michael.hallett
committed
added support for .net 4.6, added additional sln files, renamed core project to include framework edition, trying to bring back support for windows phone 7.1 and the compact framework
1 parent 7350717 commit 45d0607

21 files changed

+1447
-53
lines changed

.nuget/Signed/RestSharp.Build.dll

0 Bytes
Binary file not shown.

RestSharp.2015.sln

Lines changed: 277 additions & 0 deletions
Large diffs are not rendered by default.

RestSharp.All.sln

Lines changed: 451 additions & 0 deletions
Large diffs are not rendered by default.

RestSharp.Build/RestSharp.Build.Signed.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProductVersion>8.0.30703</ProductVersion>
77
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{CCC30138-3D68-44D8-AF1A-D22F769EE8DC}</ProjectGuid>
8+
<ProjectGuid>{60CF35B5-ABE3-47E4-BA0C-0ABAF1618475}</ProjectGuid>
99
<OutputType>Library</OutputType>
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>RestSharp.Build</RootNamespace>

RestSharp.IntegrationTests/RestSharp.IntegrationTests.Signed.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProductVersion>9.0.30729</ProductVersion>
77
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{47D3EBB9-0300-4AF8-BAC5-740D51454A63}</ProjectGuid>
8+
<ProjectGuid>{3AC3B97E-D5AF-4462-BF5D-0EC28F4619C6}</ProjectGuid>
99
<OutputType>Library</OutputType>
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>RestSharp.IntegrationTests</RootNamespace>
@@ -98,7 +98,7 @@
9898
</ItemGroup>
9999
<ItemGroup>
100100
<ProjectReference Include="..\RestSharp.Net4\RestSharp.Net4.Signed.csproj">
101-
<Project>{5ff943a5-260f-4042-b4ce-c4977bad4ebb}</Project>
101+
<Project>{ed71eee1-29e5-437a-a4c7-06da0ec1aa92}</Project>
102102
<Name>RestSharp.Net4.Signed</Name>
103103
</ProjectReference>
104104
</ItemGroup>

RestSharp.Net4/RestSharp.Net4.Signed.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProductVersion>8.0.30703</ProductVersion>
77
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{5FF943A5-260F-4042-B4CE-C4977BAD4EBB}</ProjectGuid>
8+
<ProjectGuid>{ED71EEE1-29E5-437A-A4C7-06DA0EC1AA92}</ProjectGuid>
99
<OutputType>Library</OutputType>
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>RestSharp</RootNamespace>

RestSharp.Net452/RestSharp.Net452.Signed.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProductVersion>8.0.30703</ProductVersion>
77
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{BD61DB80-63AC-4BFD-8232-A5C4DD9B8110}</ProjectGuid>
8+
<ProjectGuid>{F4C74773-8D8E-4A7D-977B-DE985B4D49D9}</ProjectGuid>
99
<OutputType>Library</OutputType>
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>RestSharp</RootNamespace>
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+

2+
namespace RestSharp.Extensions
3+
{
4+
public static partial class RestClientExtensions
5+
{
6+
public static RestResponse<dynamic> ExecuteDynamic(this IRestClient client, IRestRequest request)
7+
{
8+
var response = client.Execute<dynamic>(request);
9+
var generic = (RestResponse<dynamic>)response;
10+
dynamic content = SimpleJson.DeserializeObject(response.Content);
11+
12+
generic.Data = content;
13+
14+
return generic;
15+
}
16+
}
17+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
5+
// General Information about an assembly is controlled through the following
6+
// set of attributes. Change these attribute values to modify the information
7+
// associated with an assembly.
8+
[assembly: AssemblyTitle("RestSharp")]
9+
10+
// Setting ComVisible to false makes the types in this assembly not visible
11+
// to COM components. If you need to access a type in this assembly from
12+
// COM, set the ComVisible attribute to true on that type.
13+
[assembly: ComVisible(false)]
14+
15+
// The following GUID is for the ID of the typelib if this project is exposed to COM
16+
[assembly: Guid("97044cbf-6c9d-4b08-87e3-bf30fbde1933")]
17+
18+
#if SIGNED
19+
[assembly: InternalsVisibleTo("RestSharp.IntegrationTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fda57af14a288d46e3efea89617037585c4de57159cd536ca6dff792ea1d6addc665f2fccb4285413d9d44db5a1be87cb82686db200d16325ed9c42c89cd4824d8cc447f7cee2ac000924c3bceeb1b7fcb5cc1a3901785964d48ce14172001084134f4dcd9973c3776713b595443b1064bb53e2eeb924969244d354e46495e9d"),
20+
InternalsVisibleTo("RestSharp.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fda57af14a288d46e3efea89617037585c4de57159cd536ca6dff792ea1d6addc665f2fccb4285413d9d44db5a1be87cb82686db200d16325ed9c42c89cd4824d8cc447f7cee2ac000924c3bceeb1b7fcb5cc1a3901785964d48ce14172001084134f4dcd9973c3776713b595443b1064bb53e2eeb924969244d354e46495e9d")]
21+
#else
22+
[assembly: InternalsVisibleTo("RestSharp.IntegrationTests"),
23+
InternalsVisibleTo("RestSharp.Tests")]
24+
#endif
Lines changed: 301 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,301 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProductVersion>8.0.30703</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{BD61DB80-63AC-4BFD-8232-A5C4DD9B8110}</ProjectGuid>
9+
<OutputType>Library</OutputType>
10+
<AppDesignerFolder>Properties</AppDesignerFolder>
11+
<RootNamespace>RestSharp</RootNamespace>
12+
<AssemblyName>RestSharp</AssemblyName>
13+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
14+
<FileAlignment>512</FileAlignment>
15+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
16+
<RestorePackages>true</RestorePackages>
17+
<TargetFrameworkProfile />
18+
</PropertyGroup>
19+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20+
<DebugSymbols>true</DebugSymbols>
21+
<DebugType>full</DebugType>
22+
<Optimize>false</Optimize>
23+
<OutputPath>bin\DebugSigned\</OutputPath>
24+
<IntermediateOutputPath>obj\DebugSigned\</IntermediateOutputPath>
25+
<DefineConstants>TRACE;DEBUG;FRAMEWORK, NET4, SIGNED</DefineConstants>
26+
<ErrorReport>prompt</ErrorReport>
27+
<WarningLevel>4</WarningLevel>
28+
<DocumentationFile>bin\DebugSigned\RestSharp.xml</DocumentationFile>
29+
<NoWarn>1591,1584,1572,1574,1658</NoWarn>
30+
<Prefer32Bit>false</Prefer32Bit>
31+
</PropertyGroup>
32+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
33+
<DebugType>pdbonly</DebugType>
34+
<Optimize>true</Optimize>
35+
<OutputPath>bin\ReleaseSigned\</OutputPath>
36+
<IntermediateOutputPath>obj\ReleaseSigned\</IntermediateOutputPath>
37+
<DefineConstants>TRACE;FRAMEWORK, NET4, SIGNED</DefineConstants>
38+
<ErrorReport>prompt</ErrorReport>
39+
<WarningLevel>4</WarningLevel>
40+
<DocumentationFile>bin\ReleaseSigned\RestSharp.xml</DocumentationFile>
41+
<NoWarn>1591,1573,1658,1584,1574,1572</NoWarn>
42+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
43+
<Prefer32Bit>false</Prefer32Bit>
44+
</PropertyGroup>
45+
<PropertyGroup>
46+
<SignAssembly>true</SignAssembly>
47+
</PropertyGroup>
48+
<PropertyGroup>
49+
<AssemblyOriginatorKeyFile>..\RestSharp.snk</AssemblyOriginatorKeyFile>
50+
</PropertyGroup>
51+
<PropertyGroup>
52+
<DelaySign>false</DelaySign>
53+
</PropertyGroup>
54+
<ItemGroup>
55+
<Reference Include="System" />
56+
<Reference Include="System.Core" />
57+
<Reference Include="System.Xml.Linq" />
58+
<Reference Include="System.Data.DataSetExtensions" />
59+
<Reference Include="Microsoft.CSharp" />
60+
<Reference Include="System.Data" />
61+
<Reference Include="System.Xml" />
62+
</ItemGroup>
63+
<ItemGroup>
64+
<Compile Include="..\restsharp\authenticators\HttpBasicAuthenticator.cs">
65+
<Link>Authenticators\HttpBasicAuthenticator.cs</Link>
66+
</Compile>
67+
<Compile Include="..\restsharp\authenticators\IAuthenticator.cs">
68+
<Link>Authenticators\IAuthenticator.cs</Link>
69+
</Compile>
70+
<Compile Include="..\RestSharp\Authenticators\JwtAuthenticator.cs">
71+
<Link>Authenticators\JwtAuthenticator.cs</Link>
72+
</Compile>
73+
<Compile Include="..\restsharp\authenticators\NtlmAuthenticator.cs">
74+
<Link>Authenticators\NtlmAuthenticator.cs</Link>
75+
</Compile>
76+
<Compile Include="..\RestSharp\Authenticators\OAuth1Authenticator.cs">
77+
<Link>Authenticators\OAuth1Authenticator.cs</Link>
78+
</Compile>
79+
<Compile Include="..\restsharp\authenticators\OAuth2Authenticator.cs">
80+
<Link>Authenticators\OAuth2Authenticator.cs</Link>
81+
</Compile>
82+
<Compile Include="..\restsharp\authenticators\oauth\extensions\CollectionExtensions.cs">
83+
<Link>Authenticators\OAuth\Extensions\CollectionExtensions.cs</Link>
84+
</Compile>
85+
<Compile Include="..\restsharp\authenticators\oauth\extensions\OAuthExtensions.cs">
86+
<Link>Authenticators\OAuth\Extensions\OAuthExtensions.cs</Link>
87+
</Compile>
88+
<Compile Include="..\restsharp\authenticators\oauth\extensions\StringExtensions.cs">
89+
<Link>Authenticators\OAuth\Extensions\StringExtensions.cs</Link>
90+
</Compile>
91+
<Compile Include="..\restsharp\authenticators\oauth\extensions\TimeExtensions.cs">
92+
<Link>Authenticators\OAuth\Extensions\TimeExtensions.cs</Link>
93+
</Compile>
94+
<Compile Include="..\restsharp\authenticators\oauth\HttpPostParameter.cs">
95+
<Link>Authenticators\OAuth\HttpPostParameter.cs</Link>
96+
</Compile>
97+
<Compile Include="..\restsharp\authenticators\oauth\HttpPostParameterType.cs">
98+
<Link>Authenticators\OAuth\HttpPostParameterType.cs</Link>
99+
</Compile>
100+
<Compile Include="..\restsharp\authenticators\oauth\OAuthParameterHandling.cs">
101+
<Link>Authenticators\OAuth\OAuthParameterHandling.cs</Link>
102+
</Compile>
103+
<Compile Include="..\restsharp\authenticators\oauth\OAuthSignatureMethod.cs">
104+
<Link>Authenticators\OAuth\OAuthSignatureMethod.cs</Link>
105+
</Compile>
106+
<Compile Include="..\restsharp\authenticators\oauth\OAuthSignatureTreatment.cs">
107+
<Link>Authenticators\OAuth\OAuthSignatureTreatment.cs</Link>
108+
</Compile>
109+
<Compile Include="..\restsharp\authenticators\oauth\OAuthTools.cs">
110+
<Link>Authenticators\OAuth\OAuthTools.cs</Link>
111+
</Compile>
112+
<Compile Include="..\restsharp\authenticators\oauth\OAuthType.cs">
113+
<Link>Authenticators\OAuth\OAuthType.cs</Link>
114+
</Compile>
115+
<Compile Include="..\restsharp\authenticators\oauth\OAuthWebQueryInfo.cs">
116+
<Link>Authenticators\OAuth\OAuthWebQueryInfo.cs</Link>
117+
</Compile>
118+
<Compile Include="..\restsharp\authenticators\oauth\OAuthWorkflow.cs">
119+
<Link>Authenticators\OAuth\OAuthWorkflow.cs</Link>
120+
</Compile>
121+
<Compile Include="..\restsharp\authenticators\oauth\WebPair.cs">
122+
<Link>Authenticators\OAuth\WebPair.cs</Link>
123+
</Compile>
124+
<Compile Include="..\restsharp\authenticators\oauth\WebPairCollection.cs">
125+
<Link>Authenticators\OAuth\WebPairCollection.cs</Link>
126+
</Compile>
127+
<Compile Include="..\restsharp\authenticators\oauth\WebParameter.cs">
128+
<Link>Authenticators\OAuth\WebParameter.cs</Link>
129+
</Compile>
130+
<Compile Include="..\restsharp\authenticators\oauth\WebParameterCollection.cs">
131+
<Link>Authenticators\OAuth\WebParameterCollection.cs</Link>
132+
</Compile>
133+
<Compile Include="..\restsharp\authenticators\SimpleAuthenticator.cs">
134+
<Link>Authenticators\SimpleAuthenticator.cs</Link>
135+
</Compile>
136+
<Compile Include="..\restsharp\deserializers\DeserializeAsAttribute.cs">
137+
<Link>Deserializers\DeserializeAsAttribute.cs</Link>
138+
</Compile>
139+
<Compile Include="..\restsharp\deserializers\DotNetXmlDeserializer.cs">
140+
<Link>Deserializers\DotNetXmlDeserializer.cs</Link>
141+
</Compile>
142+
<Compile Include="..\restsharp\deserializers\IDeserializer.cs">
143+
<Link>Deserializers\IDeserializer.cs</Link>
144+
</Compile>
145+
<Compile Include="..\restsharp\deserializers\JsonDeserializer.cs">
146+
<Link>Deserializers\JsonDeserializer.cs</Link>
147+
</Compile>
148+
<Compile Include="..\restsharp\deserializers\XmlAttributeDeserializer.cs">
149+
<Link>Deserializers\XmlAttributeDeserializer.cs</Link>
150+
</Compile>
151+
<Compile Include="..\restsharp\deserializers\XmlDeserializer.cs">
152+
<Link>Deserializers\XmlDeserializer.cs</Link>
153+
</Compile>
154+
<Compile Include="..\RestSharp\Enum.cs">
155+
<Link>Enum.cs</Link>
156+
</Compile>
157+
<Compile Include="..\restsharp\extensions\MiscExtensions.cs">
158+
<Link>Extensions\MiscExtensions.cs</Link>
159+
</Compile>
160+
<Compile Include="..\RestSharp\Extensions\MonoHttp\Helpers.cs">
161+
<Link>Extensions\MonoHttp\Helpers.cs</Link>
162+
</Compile>
163+
<Compile Include="..\RestSharp\Extensions\MonoHttp\HtmlEncoder.cs">
164+
<Link>Extensions\MonoHttp\HtmlEncoder.cs</Link>
165+
</Compile>
166+
<Compile Include="..\RestSharp\Extensions\MonoHttp\HttpUtility.cs">
167+
<Link>Extensions\MonoHttp\HttpUtility.cs</Link>
168+
</Compile>
169+
<Compile Include="..\restsharp\extensions\ReflectionExtensions.cs">
170+
<Link>Extensions\ReflectionExtensions.cs</Link>
171+
</Compile>
172+
<Compile Include="..\restsharp\extensions\ResponseExtensions.cs">
173+
<Link>Extensions\ResponseExtensions.cs</Link>
174+
</Compile>
175+
<Compile Include="..\RestSharp\Extensions\ResponseStatusExtensions.cs">
176+
<Link>Extensions\ResponseStatusExtensions.cs</Link>
177+
</Compile>
178+
<Compile Include="..\restsharp\extensions\StringExtensions.cs">
179+
<Link>Extensions\StringExtensions.cs</Link>
180+
</Compile>
181+
<Compile Include="..\restsharp\extensions\XmlExtensions.cs">
182+
<Link>Extensions\XmlExtensions.cs</Link>
183+
</Compile>
184+
<Compile Include="..\RestSharp\FileParameter.cs">
185+
<Link>FileParameter.cs</Link>
186+
</Compile>
187+
<Compile Include="..\RestSharp\Http.Async.cs">
188+
<Link>Http.Async.cs</Link>
189+
</Compile>
190+
<Compile Include="..\RestSharp\Http.cs">
191+
<Link>Http.cs</Link>
192+
</Compile>
193+
<Compile Include="..\RestSharp\Http.Sync.cs">
194+
<Link>Http.Sync.cs</Link>
195+
</Compile>
196+
<Compile Include="..\RestSharp\HttpCookie.cs">
197+
<Link>HttpCookie.cs</Link>
198+
</Compile>
199+
<Compile Include="..\RestSharp\HttpFile.cs">
200+
<Link>HttpFile.cs</Link>
201+
</Compile>
202+
<Compile Include="..\RestSharp\HttpHeader.cs">
203+
<Link>HttpHeader.cs</Link>
204+
</Compile>
205+
<Compile Include="..\RestSharp\HttpParameter.cs">
206+
<Link>HttpParameter.cs</Link>
207+
</Compile>
208+
<Compile Include="..\RestSharp\HttpResponse.cs">
209+
<Link>HttpResponse.cs</Link>
210+
</Compile>
211+
<Compile Include="..\RestSharp\IHttp.cs">
212+
<Link>IHttp.cs</Link>
213+
</Compile>
214+
<Compile Include="..\RestSharp\IHttpFactory.cs">
215+
<Link>IHttpFactory.cs</Link>
216+
</Compile>
217+
<Compile Include="..\RestSharp\IHttpResponse.cs">
218+
<Link>IHttpResponse.cs</Link>
219+
</Compile>
220+
<Compile Include="..\RestSharp\IRestClient.cs">
221+
<Link>IRestClient.cs</Link>
222+
</Compile>
223+
<Compile Include="..\RestSharp\IRestRequest.cs">
224+
<Link>IRestRequest.cs</Link>
225+
</Compile>
226+
<Compile Include="..\RestSharp\IRestResponse.cs">
227+
<Link>IRestResponse.cs</Link>
228+
</Compile>
229+
<Compile Include="..\RestSharp\Parameter.cs">
230+
<Link>Parameter.cs</Link>
231+
</Compile>
232+
<Compile Include="..\RestSharp\RestClient.Async.cs">
233+
<Link>RestClient.Async.cs</Link>
234+
</Compile>
235+
<Compile Include="..\RestSharp\RestClient.cs">
236+
<Link>RestClient.cs</Link>
237+
</Compile>
238+
<Compile Include="..\RestSharp\RestClient.Sync.cs">
239+
<Link>RestClient.Sync.cs</Link>
240+
</Compile>
241+
<Compile Include="..\RestSharp\RestClientExtensions.cs">
242+
<Link>RestClientExtensions.cs</Link>
243+
</Compile>
244+
<Compile Include="..\RestSharp\RestRequest.cs">
245+
<Link>RestRequest.cs</Link>
246+
</Compile>
247+
<Compile Include="..\RestSharp\RestRequestAsyncHandle.cs">
248+
<Link>RestRequestAsyncHandle.cs</Link>
249+
</Compile>
250+
<Compile Include="..\RestSharp\RestResponse.cs">
251+
<Link>RestResponse.cs</Link>
252+
</Compile>
253+
<Compile Include="..\RestSharp\RestResponseCookie.cs">
254+
<Link>RestResponseCookie.cs</Link>
255+
</Compile>
256+
<Compile Include="..\restsharp\serializers\DotNetXmlSerializer.cs">
257+
<Link>Serializers\DotNetXmlSerializer.cs</Link>
258+
</Compile>
259+
<Compile Include="..\restsharp\serializers\ISerializer.cs">
260+
<Link>Serializers\ISerializer.cs</Link>
261+
</Compile>
262+
<Compile Include="..\restsharp\serializers\JsonSerializer.cs">
263+
<Link>Serializers\JsonSerializer.cs</Link>
264+
</Compile>
265+
<Compile Include="..\restsharp\serializers\SerializeAsAttribute.cs">
266+
<Link>Serializers\SerializeAsAttribute.cs</Link>
267+
</Compile>
268+
<Compile Include="..\restsharp\serializers\XmlSerializer.cs">
269+
<Link>Serializers\XmlSerializer.cs</Link>
270+
</Compile>
271+
<Compile Include="..\RestSharp\SharedAssemblyInfo.cs">
272+
<Link>SharedAssemblyInfo.cs</Link>
273+
</Compile>
274+
<Compile Include="..\restsharp\validation\Require.cs">
275+
<Link>Validation\Require.cs</Link>
276+
</Compile>
277+
<Compile Include="..\restsharp\SimpleJson.cs">
278+
<Link>SimpleJson.cs</Link>
279+
</Compile>
280+
<Compile Include="..\restsharp\validation\Validate.cs">
281+
<Link>Validation\Validate.cs</Link>
282+
</Compile>
283+
<Compile Include="Extensions\RestClientExtensions.cs" />
284+
<Compile Include="Properties\AssemblyInfo.cs" />
285+
</ItemGroup>
286+
<ItemGroup>
287+
<None Include="..\RestSharp.snk">
288+
<Link>RestSharp.snk</Link>
289+
</None>
290+
<None Include="packages.config" />
291+
</ItemGroup>
292+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
293+
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
294+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
295+
Other similar extension points exist, see Microsoft.Common.targets.
296+
<Target Name="BeforeBuild">
297+
</Target>
298+
<Target Name="AfterBuild">
299+
</Target>
300+
-->
301+
</Project>

0 commit comments

Comments
 (0)