diff --git a/src/ServiceStack.Text/PclExport.Net40.cs b/src/ServiceStack.Text/PclExport.Net40.cs index 44bdd442b..52158e37e 100644 --- a/src/ServiceStack.Text/PclExport.Net40.cs +++ b/src/ServiceStack.Text/PclExport.Net40.cs @@ -47,9 +47,10 @@ public Net40PclExport() this.PlatformName = Environment.OSVersion.Platform.ToString(); } - public static void Configure() + public static PclExport Configure() { Configure(Provider); + return Provider; } public override string ReadAllText(string filePath) diff --git a/src/ServiceStack.Text/PclExport.Sl5.cs b/src/ServiceStack.Text/PclExport.Sl5.cs index 601e9ab2a..0b507273a 100644 --- a/src/ServiceStack.Text/PclExport.Sl5.cs +++ b/src/ServiceStack.Text/PclExport.Sl5.cs @@ -21,6 +21,12 @@ public Sl5PclExport() this.PlatformName = "Silverlight5"; } + public static PclExport Configure() + { + Configure(Provider); + return Provider; + } + public override string ReadAllText(string filePath) { return File.ReadAllText(filePath); @@ -64,11 +70,6 @@ public override HttpWebRequest CreateWebRequest(string requestUri, bool? emulate return (HttpWebRequest)creator.Create(new Uri(requestUri)); } - - public static void Configure() - { - Configure(Provider); - } } } diff --git a/src/ServiceStack.Text/PclExport.WP.cs b/src/ServiceStack.Text/PclExport.WP.cs index 520070ae8..5eef2fd02 100644 --- a/src/ServiceStack.Text/PclExport.WP.cs +++ b/src/ServiceStack.Text/PclExport.WP.cs @@ -13,13 +13,19 @@ namespace ServiceStack { public class WpPclExport : PclExport { - public new static WpPclExport Instance = new WpPclExport(); + public static WpPclExport Provider = new WpPclExport(); public WpPclExport() { this.PlatformName = "WindowsPhone"; } + public static PclExport Configure() + { + Configure(Provider); + return Provider; + } + public override string ReadAllText(string filePath) { using (var isoStore = IsolatedStorageFile.GetUserStoreForApplication()) diff --git a/src/ServiceStack.Text/PclExport.WinStore.cs b/src/ServiceStack.Text/PclExport.WinStore.cs index d0d7fb793..f2dfb8f88 100644 --- a/src/ServiceStack.Text/PclExport.WinStore.cs +++ b/src/ServiceStack.Text/PclExport.WinStore.cs @@ -19,9 +19,10 @@ public WinStorePclExport() this.PlatformName = "WindowsStore"; } - public static void Configure() + public static PclExport Configure() { Configure(Provider); + return Provider; } public override string ReadAllText(string filePath) diff --git a/src/ServiceStack.Text/PclExport.Xbox.cs b/src/ServiceStack.Text/PclExport.Xbox.cs index e5658d8de..9fcd23ae6 100644 --- a/src/ServiceStack.Text/PclExport.Xbox.cs +++ b/src/ServiceStack.Text/PclExport.Xbox.cs @@ -8,13 +8,19 @@ namespace ServiceStack { public class XboxPclExport : PclExport { - public new static XboxPclExport Instance = new XboxPclExport(); + public static XboxPclExport Provider = new XboxPclExport(); public XboxPclExport() { this.PlatformName = "XBOX"; } + public static PclExport Configure() + { + Configure(Provider); + return Provider; + } + public override string ReadAllText(string filePath) { using (var fileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read))