Merge pull request #418 from restsharp/silverlight-fixes

haacked · haacked · commit 9c8d1cdb4941 · 2013-09-10T10:15:57.000-07:00
Silverlight fixes
diff --git a/RestSharp.IntegrationTests/RestSharp.IntegrationTests.csproj b/RestSharp.IntegrationTests/RestSharp.IntegrationTests.csproj
@@ -39,6 +39,7 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Release\RestSharp.IntegrationTests.xml</DocumentationFile>
+    <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/RestSharp.Net4/RestSharp.Net4.csproj b/RestSharp.Net4/RestSharp.Net4.csproj
@@ -33,6 +33,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release\RestSharp.xml</DocumentationFile>
+    <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/RestSharp.Silverlight/RestSharp.Silverlight.csproj b/RestSharp.Silverlight/RestSharp.Silverlight.csproj
@@ -48,6 +48,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>Bin\Release\RestSharp.Silverlight.xml</DocumentationFile>
+    <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
diff --git a/RestSharp.Tests/RestSharp.Tests.csproj b/RestSharp.Tests/RestSharp.Tests.csproj
@@ -53,7 +53,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\Release\RestSharp.Tests.xml</DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Build.Framework" />
diff --git a/RestSharp.WindowsPhone/RestSharp.WindowsPhone.csproj b/RestSharp.WindowsPhone/RestSharp.WindowsPhone.csproj
@@ -43,6 +43,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>Bin\Release\RestSharp.WindowsPhone.xml</DocumentationFile>
+    <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
diff --git a/RestSharp/Deserializers/XmlDeserializer.cs b/RestSharp/Deserializers/XmlDeserializer.cs
@@ -263,6 +263,7 @@ private void Map(object x, XElement root)
 
 		private static bool TryGetFromString(string inputString, out object result, Type type)
 		{
+#if !SILVERLIGHT
 			var converter = TypeDescriptor.GetConverter(type);
 			if (converter.CanConvertFrom(typeof(string)))
 			{
@@ -271,6 +272,10 @@ private static bool TryGetFromString(string inputString, out object result, Type
 			}
 			result = null;
 			return false;
+#else
+			result = null;
+			return false;
+#endif
 		}
 
 		private void PopulateListFromElements(Type t, IEnumerable<XElement> elements, IList list)
diff --git a/RestSharp/RestSharp.csproj b/RestSharp/RestSharp.csproj
@@ -56,6 +56,7 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Release\RestSharp.xml</DocumentationFile>
+    <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Build.Framework" />

Original file line number	Diff line number	Diff line change
`@@ -263,6 +263,7 @@ private void Map(object x, XElement root)`
`263`	`263`
`264`	`264`	`private static bool TryGetFromString(string inputString, out object result, Type type)`
`265`	`265`	`{`
	`266`	`+#if !SILVERLIGHT`
`266`	`267`	`var converter = TypeDescriptor.GetConverter(type);`
`267`	`268`	`if (converter.CanConvertFrom(typeof(string)))`
`268`	`269`	`{`
`@@ -271,6 +272,10 @@ private static bool TryGetFromString(string inputString, out object result, Type`
`271`	`272`	`}`
`272`	`273`	`result = null;`
`273`	`274`	`return false;`
	`275`	`+#else`
	`276`	`+ result = null;`
	`277`	`+ return false;`
	`278`	`+#endif`
`274`	`279`	`}`
`275`	`280`
`276`	`281`	`private void PopulateListFromElements(Type t, IEnumerable<XElement> elements, IList list)`