Merge pull request ServiceStack#80 from Aurimas86/patch-1

mythz · mythz · commit 0366e5fb92b0 · 2012-02-28T21:55:27.000-08:00
Type.GetType fails with typeName argument in silverlight
diff --git a/src/ServiceStack.Text/AssemblyUtils.cs b/src/ServiceStack.Text/AssemblyUtils.cs
@@ -28,9 +28,10 @@ public static class AssemblyUtils
         /// <returns></returns>
         public static Type FindType(string typeName)
         {
+#if !SILVERLIGHT
             var type = Type.GetType(typeName);
             if (type != null) return type;
-
+#endif
             var typeDef = new AssemblyTypeDefinition(typeName);
             if (!String.IsNullOrEmpty(typeDef.AssemblyName))
             {

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,10 @@ public static class AssemblyUtils`
`28`	`28`	`/// <returns></returns>`
`29`	`29`	`public static Type FindType(string typeName)`
`30`	`30`	`{`
	`31`	`+#if !SILVERLIGHT`
`31`	`32`	`var type = Type.GetType(typeName);`
`32`	`33`	`if (type != null) return type;`
`33`		`-`
	`34`	`+#endif`
`34`	`35`	`var typeDef = new AssemblyTypeDefinition(typeName);`
`35`	`36`	`if (!String.IsNullOrEmpty(typeDef.AssemblyName))`
`36`	`37`	`{`