Skip to content

Commit dc63114

Browse files
committedJan 17, 2011
Mono solution and misc clean up
1 parent 5c5789e commit dc63114

File tree

4 files changed

+58
-11
lines changed

4 files changed

+58
-11
lines changed
 

‎RestSharp.Mono.sln

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 11.00
3+
# Visual Studio 2010
4+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp", "RestSharp\RestSharp.csproj", "{2ECECFBF-5F3E-40EE-A963-72336DC7ABE2}"
5+
EndProject
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.Tests", "RestSharp.Tests\RestSharp.Tests.csproj", "{1464E4AC-18BB-4F23-8A0B-68196F9E1871}"
7+
EndProject
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{E709A928-A45C-4622-A35C-CCD8EE44CA80}"
9+
ProjectSection(SolutionItems) = preProject
10+
restsharp.nuspec = restsharp.nuspec
11+
EndProjectSection
12+
EndProject
13+
Global
14+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
15+
Debug|Any CPU = Debug|Any CPU
16+
Debug|Mixed Platforms = Debug|Mixed Platforms
17+
Debug|x86 = Debug|x86
18+
Release|Any CPU = Release|Any CPU
19+
Release|Mixed Platforms = Release|Mixed Platforms
20+
Release|x86 = Release|x86
21+
EndGlobalSection
22+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
23+
{1464E4AC-18BB-4F23-8A0B-68196F9E1871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24+
{1464E4AC-18BB-4F23-8A0B-68196F9E1871}.Debug|Any CPU.Build.0 = Debug|Any CPU
25+
{1464E4AC-18BB-4F23-8A0B-68196F9E1871}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
26+
{1464E4AC-18BB-4F23-8A0B-68196F9E1871}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
27+
{1464E4AC-18BB-4F23-8A0B-68196F9E1871}.Debug|x86.ActiveCfg = Debug|Any CPU
28+
{1464E4AC-18BB-4F23-8A0B-68196F9E1871}.Release|Any CPU.ActiveCfg = Release|Any CPU
29+
{1464E4AC-18BB-4F23-8A0B-68196F9E1871}.Release|Any CPU.Build.0 = Release|Any CPU
30+
{1464E4AC-18BB-4F23-8A0B-68196F9E1871}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
31+
{1464E4AC-18BB-4F23-8A0B-68196F9E1871}.Release|Mixed Platforms.Build.0 = Release|Any CPU
32+
{1464E4AC-18BB-4F23-8A0B-68196F9E1871}.Release|x86.ActiveCfg = Release|Any CPU
33+
{2ECECFBF-5F3E-40EE-A963-72336DC7ABE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34+
{2ECECFBF-5F3E-40EE-A963-72336DC7ABE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
35+
{2ECECFBF-5F3E-40EE-A963-72336DC7ABE2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
36+
{2ECECFBF-5F3E-40EE-A963-72336DC7ABE2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
37+
{2ECECFBF-5F3E-40EE-A963-72336DC7ABE2}.Debug|x86.ActiveCfg = Debug|Any CPU
38+
{2ECECFBF-5F3E-40EE-A963-72336DC7ABE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
39+
{2ECECFBF-5F3E-40EE-A963-72336DC7ABE2}.Release|Any CPU.Build.0 = Release|Any CPU
40+
{2ECECFBF-5F3E-40EE-A963-72336DC7ABE2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
41+
{2ECECFBF-5F3E-40EE-A963-72336DC7ABE2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
42+
{2ECECFBF-5F3E-40EE-A963-72336DC7ABE2}.Release|x86.ActiveCfg = Release|Any CPU
43+
EndGlobalSection
44+
GlobalSection(NestedProjects) = preSolution
45+
EndGlobalSection
46+
GlobalSection(MonoDevelopProperties) = preSolution
47+
StartupItem = RestSharp\RestSharp.csproj
48+
EndGlobalSection
49+
GlobalSection(SolutionProperties) = preSolution
50+
HideSolutionNode = FALSE
51+
EndGlobalSection
52+
EndGlobal

‎RestSharp/Deserializers/XmlDeserializer.cs

-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ private void PopulateListFromElements(Type t, IEnumerable<XElement> elements, IL
211211
private object HandleListDerivative(object x, XElement root, string propName, Type type)
212212
{
213213
Type t;
214-
Type[] genericArgs = type.GetGenericArguments();
215214

216215
if (type.IsGenericType)
217216
{

‎RestSharp/Http.Sync.cs

-2
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,6 @@ private void WriteMultipartFormData(HttpWebRequest webRequest)
164164
{
165165
foreach (var file in Files)
166166
{
167-
var fileName = file.FileName;
168-
var contentType = file.ContentType;
169167
// Add just the first part of this param, since we will write the file data directly to the Stream
170168
string header = GetMultipartFileHeader (file);
171169

‎RestSharp/RestSharp.csproj

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -54,17 +54,10 @@
5454
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
5555
</PropertyGroup>
5656
<ItemGroup>
57-
<Reference Include="Newtonsoft.Json, Version=3.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
58-
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>..\References\Newtonsoft.Json.dll</HintPath>
60-
</Reference>
6157
<Reference Include="System" />
6258
<Reference Include="System.Core">
6359
<RequiredTargetFramework>3.5</RequiredTargetFramework>
6460
</Reference>
65-
<Reference Include="System.Json">
66-
<HintPath>..\References\System.Json.dll</HintPath>
67-
</Reference>
6861
<Reference Include="System.ServiceModel.Web">
6962
<RequiredTargetFramework>3.5</RequiredTargetFramework>
7063
</Reference>
@@ -73,6 +66,10 @@
7366
</Reference>
7467
<Reference Include="System.Data" />
7568
<Reference Include="System.Xml" />
69+
<Reference Include="Newtonsoft.Json, Version=3.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
70+
<SpecificVersion>False</SpecificVersion>
71+
<HintPath>..\References\Newtonsoft.Json.dll</HintPath>
72+
</Reference>
7673
</ItemGroup>
7774
<ItemGroup>
7875
<Compile Include="Authenticators\NtlmAuthenticator.cs" />
@@ -165,6 +162,7 @@
165162
</BootstrapperPackage>
166163
</ItemGroup>
167164
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
165+
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
168166
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
169167
Other similar extension points exist, see Microsoft.Common.targets.
170168
<Target Name="BeforeBuild">

0 commit comments

Comments
 (0)
Please sign in to comment.