Skip to content

Commit e40e22f

Browse files
mythzmythz
committed
Fix PCL Build errors
1 parent c62c56f commit e40e22f

18 files changed

Lines changed: 133 additions & 68 deletions

‎lib/ServiceStack.Text.dll‎

0 Bytes
Binary file not shown.

‎lib/pcl/ServiceStack.Client.dll‎

18 KB
Binary file not shown.

‎lib/pcl/ServiceStack.Client.dll.mdb‎

3.61 KB
Binary file not shown.

‎lib/pcl/ServiceStack.Text.dll‎

512 Bytes
Binary file not shown.

‎lib/pcl/ServiceStack.Text.dll.mdb‎

6.19 KB
Binary file not shown.

‎src/ServiceStack.Client/PclExportClient.Android.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public override INameValueCollection ParseQueryString(string query)
2727
public Handler UiHandler;
2828
public static PclExportClient Configure()
2929
{
30-
Configure(Provider);
30+
Configure(Provider ?? (Provider = new AndroidPclExportClient()));
3131
AndroidPclExport.Configure();
3232

3333
Provider.UiHandler = new Handler(Looper.MainLooper);

‎src/ServiceStack.Client/PclExportClient.Ios.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public override INameValueCollection ParseQueryString(string query)
2525

2626
public static PclExportClient Configure()
2727
{
28-
Configure(Provider);
28+
Configure(Provider ?? (Provider = new IosPclExportClient()));
2929
IosPclExport.Configure();
3030
return Provider;
3131
}

‎src/ServiceStack.Client/PclExportClient.Net40.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class Net40PclExportClient : PclExportClient
1717

1818
public static PclExportClient Configure()
1919
{
20-
Configure(Provider);
20+
Configure(Provider ?? (Provider = new Net40PclExportClient()));
2121
Net40PclExport.Configure();
2222
return Provider;
2323
}
@@ -53,10 +53,9 @@ public override string HtmlDecode(string html)
5353
}
5454

5555
public override ITimer CreateTimer(TimerCallback cb, TimeSpan timeOut, object state)
56-
5756
{
5857
return new AsyncTimer(new
59-
System.Threading.Timer(cb, state, (int)timeOut.TotalMilliseconds, Timeout.Infinite));
58+
System.Threading.Timer(s => cb(s), state, (int)timeOut.TotalMilliseconds, Timeout.Infinite));
6059
}
6160
}
6261

‎src/ServiceStack.Client/PclExportClient.WinStore.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class WinStorePclExportClient : PclExportClient
1616

1717
public static PclExportClient Configure()
1818
{
19-
Configure(Provider);
19+
Configure(Provider ?? (Provider = new WinStorePclExportClient()));
2020
WinStorePclExport.Configure();
2121
return Provider;
2222
}
@@ -33,7 +33,7 @@ public override INameValueCollection ParseQueryString(string query)
3333

3434
public override ITimer CreateTimer(TimerCallback cb, TimeSpan timeOut, object state)
3535
{
36-
return new WinStoreAsyncTimer(ThreadPoolTimer.CreateTimer(cb, timeOut));
36+
return new WinStoreAsyncTimer(ThreadPoolTimer.CreateTimer(s => cb(s), timeOut));
3737
}
3838

3939
public override void RunOnUiThread(Action fn)

‎src/ServiceStack.Client/ServiceStack.Client.PCL.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
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
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
77
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8-
<ProjectGuid>{42E1C8C0-A163-44CC-92B1-8F416F2C0B01}</ProjectGuid>
8+
<ProjectGuid>{135808A7-CE69-4C32-BE30-25A8FFBF4A58}</ProjectGuid>
99
<OutputType>Library</OutputType>
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>ServiceStack</RootNamespace>
@@ -99,16 +99,16 @@
9999
<!--ItemGroup,Content-->
100100
<!--ItemGroup,None-->
101101
<ItemGroup>
102-
<ProjectReference Include="..\ServiceStack.Interfaces\ServiceStack.Interfaces.csproj">
103-
<Project>{55942102-033A-4DA8-A6AF-1DB7B2F34A2D}</Project>
104-
<Name>ServiceStack.Interfaces</Name>
105-
</ProjectReference>
106-
</ItemGroup>
107-
<ItemGroup>
108-
<Reference Include="ServiceStack.Text">
109-
<HintPath>..\..\lib\pcl\ServiceStack.Text.dll</HintPath>
110-
</Reference>
111-
</ItemGroup>
102+
<ProjectReference Include="..\ServiceStack.Interfaces\ServiceStack.Interfaces.csproj">
103+
<Project>{55942102-033A-4DA8-A6AF-1DB7B2F34A2D}</Project>
104+
<Name>ServiceStack.Interfaces</Name>
105+
</ProjectReference>
106+
</ItemGroup>
107+
<ItemGroup>
108+
<Reference Include="ServiceStack.Text">
109+
<HintPath>..\..\lib\pcl\ServiceStack.Text.dll</HintPath>
110+
</Reference>
111+
</ItemGroup>
112112
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
113113
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
114114
Other similar extension points exist, see Microsoft.Common.targets.

0 commit comments

Comments
 (0)