Skip to content

Commit 492a691

Browse files
bordoleybordoley
committed
Misc doc fixes. Increment dependency versions.
1 parent 88a6b34 commit 492a691

12 files changed

Lines changed: 186 additions & 65 deletions

File tree

‎SQLitePCL.pretty.Async/AsyncDatabaseConnection.cs‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ public T Value
5454
}
5555

5656
/// <summary>
57-
/// SQLiteDatabaseConnectionBuilder extension functions.
57+
/// Extensions methods for <see cref="IAsyncDatabaseConnection"/>.
5858
/// </summary>
59-
public static class SQLiteDatabaseConnectionBuilderExtensions
59+
public static class AsyncDatabaseConnection
6060
{
6161
/// <summary>
6262
/// Builds an IAsyncDatabaseConnection using the specified scheduler.
@@ -84,13 +84,7 @@ public static IAsyncDatabaseConnection BuildAsyncDatabaseConnection(
8484
/// <param name="This">A SQLiteDatabaseConnectionBuilder instance.</param>
8585
public static IAsyncDatabaseConnection BuildAsyncDatabaseConnection(this SQLiteDatabaseConnectionBuilder This) =>
8686
This.BuildAsyncDatabaseConnection(TaskPoolScheduler.Default);
87-
}
88-
89-
/// <summary>
90-
/// Extensions methods for <see cref="IAsyncDatabaseConnection"/>.
91-
/// </summary>
92-
public static class AsyncDatabaseConnection
93-
{
87+
9488
/// <summary>
9589
/// Compiles and executes multiple SQL statements.
9690
/// </summary>

‎SQLitePCL.pretty.Orm/SQLitePCL.pretty.Orm.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\portable-net45+winrt45+wp8+wpa81\System.Reactive.PlatformServices.dll</HintPath>
116116
</Reference>
117117
<Reference Include="SQLitePCL.raw">
118-
<HintPath>..\packages\SQLitePCL.raw.0.8.1\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCL.raw.dll</HintPath>
118+
<HintPath>..\packages\SQLitePCL.raw.0.8.2\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCL.raw.dll</HintPath>
119119
</Reference>
120120
</ItemGroup>
121121
<ItemGroup>

‎SQLitePCL.pretty.Orm/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
<package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win+wpa81+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
66
<package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win+wpa81+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
77
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win+wpa81+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
8-
<package id="SQLitePCL.raw" version="0.8.1" targetFramework="portable-net45+win+wpa81+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
9-
</packages>
8+
<package id="SQLitePCL.raw" version="0.8.2" targetFramework="portable-net45+win+wpa81+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
9+
</packages>

‎SQLitePCL.pretty.tests.iOS/SQLitePCL.pretty.tests.iOS.csproj‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,17 +113,20 @@
113113
<Reference Include="xunit.runner.devices">
114114
<HintPath>..\packages\xunit.runner.devices.1.0.0\lib\Xamarin.iOS\xunit.runner.devices.dll</HintPath>
115115
</Reference>
116+
<Reference Include="SQLitePCL.raw">
117+
<HintPath>..\packages\SQLitePCL.raw.0.8.1\build\Xamarin.iOS10\pinvoke_packaged_sqlite3\anycpu\SQLitePCL.raw.dll</HintPath>
118+
</Reference>
116119
<Reference Include="Xamarin.Forms.Platform.iOS">
117-
<HintPath>..\packages\Xamarin.Forms.1.4.1.6349\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
120+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
118121
</Reference>
119122
<Reference Include="Xamarin.Forms.Core">
120-
<HintPath>..\packages\Xamarin.Forms.1.4.1.6349\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
123+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
121124
</Reference>
122125
<Reference Include="Xamarin.Forms.Xaml">
123-
<HintPath>..\packages\Xamarin.Forms.1.4.1.6349\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
126+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
124127
</Reference>
125-
<Reference Include="SQLitePCL.raw">
126-
<HintPath>..\packages\SQLitePCL.raw.0.8.1\build\Xamarin.iOS10\pinvoke_packaged_sqlite3\anycpu\SQLitePCL.raw.dll</HintPath>
128+
<Reference Include="Xamarin.Forms.Platform">
129+
<HintPath>..\packages\Xamarin.Forms.1.5.0.6446\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
127130
</Reference>
128131
</ItemGroup>
129132
<ItemGroup>
@@ -138,8 +141,8 @@
138141
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
139142
<Import Project="..\packages\xunit.core.2.0.0\build\Xamarin.iOS\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.0.0\build\Xamarin.iOS\xunit.core.props')" />
140143
<Import Project="..\packages\xunit.runner.devices.1.0.0\build\Xamarin.iOS\xunit.runner.devices.targets" Condition="Exists('..\packages\xunit.runner.devices.1.0.0\build\Xamarin.iOS\xunit.runner.devices.targets')" />
141-
<Import Project="..\packages\Xamarin.Forms.1.4.1.6349\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.4.1.6349\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
142-
<Import Project="..\packages\SQLitePCL.raw.0.8.1\build\Xamarin.iOS10\SQLitePCL.raw.targets" Condition="Exists('..\packages\SQLitePCL.raw.0.8.1-pre2\build\Xamarin.iOS10\SQLitePCL.raw.targets')" />
144+
<Import Project="..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
145+
<Import Project="..\packages\SQLitePCL.raw.0.8.2\build\Xamarin.iOS10\SQLitePCL.raw.targets" Condition="Exists('..\packages\SQLitePCL.raw.0.8.2\build\Xamarin.iOS10\SQLitePCL.raw.targets')" />
143146
<ItemGroup>
144147
<ProjectReference Include="..\SQLitePCL.pretty.Async\SQLitePCL.pretty.Async.csproj">
145148
<Project>{ED71D4D4-498E-432E-B941-F704CECCF254}</Project>

‎SQLitePCL.pretty.tests.iOS/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="SQLitePCL.raw" version="0.8.1" targetFramework="xamarinios10" />
4-
<package id="Xamarin.Forms" version="1.4.1.6349" targetFramework="xamarinios10" />
3+
<package id="SQLitePCL.raw" version="0.8.2" targetFramework="xamarinios10" />
4+
<package id="Xamarin.Forms" version="1.5.0.6446" targetFramework="xamarinios10" />
55
<package id="xunit" version="2.0.0" targetFramework="xamarinios10" />
66
<package id="xunit.abstractions" version="2.0.0" targetFramework="xamarinios10" />
77
<package id="xunit.assert" version="2.0.0" targetFramework="xamarinios10" />
@@ -10,4 +10,4 @@
1010
<package id="xunit.extensibility.execution" version="2.0.0" targetFramework="xamarinios10" />
1111
<package id="xunit.runner.devices" version="1.0.0" targetFramework="xamarinios10" />
1212
<package id="xunit.runner.utility" version="2.0.0" targetFramework="xamarinios10" />
13-
</packages>
13+
</packages>

‎SQLitePCL.pretty.tests/AsyncTests/AsyncDatabaseConnectionTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ await adb.Use(db => Enumerable.Range(0, 1000))
124124

125125
Assert.Throws<ObjectDisposedException>(() => adb.Use(db => Enumerable.Range(0, 1000)));
126126
Assert.Throws<ObjectDisposedException>(() => anotherUse.Subscribe());
127-
Assert.ThrowsAsync<ObjectDisposedException>(async () => await adb.Use(db => { }));
127+
await Assert.ThrowsAsync<ObjectDisposedException>(async () => await adb.Use(db => { }));
128128
}
129129
}
130130

‎SQLitePCL.pretty.tests/AsyncTests/AsyncStatementTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ await aStmt.Use(stmt => Enumerable.Range(0, 1000))
7777

7878
Assert.Throws<ObjectDisposedException>(() => aStmt.Use(stmt => Enumerable.Range(0, 1000)));
7979
Assert.Throws<ObjectDisposedException>(() => anotherUse.Subscribe());
80-
Assert.ThrowsAsync<ObjectDisposedException>(async () => await aStmt.Use(stmt => { }));
80+
await Assert.ThrowsAsync<ObjectDisposedException>(async () => await aStmt.Use(stmt => { }));
8181

8282
var bStmt = await db.PrepareStatementAsync("SELECT 2");
8383
int mutable = 0;

‎SQLitePCL.pretty.tests/SQLitePCL.pretty.tests.x86.csproj‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1212
<NuGetPackageImportStamp>4e4e7804</NuGetPackageImportStamp>
1313
<AssemblyName>SQLitePCL.pretty.tests</AssemblyName>
14+
<UseSQLiteFrom>packaged\_sqlite3</UseSQLiteFrom>
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<DebugSymbols>true</DebugSymbols>
@@ -83,9 +84,6 @@
8384
<Reference Include="System.Reactive.PlatformServices">
8485
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
8586
</Reference>
86-
<Reference Include="SQLitePCL.raw">
87-
<HintPath>..\packages\SQLitePCL.raw.0.8.1\lib\net45\SQLitePCL.raw.dll</HintPath>
88-
</Reference>
8987
<Reference Include="xunit.abstractions">
9088
<HintPath>..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath>
9189
</Reference>
@@ -95,6 +93,9 @@
9593
<Reference Include="xunit.core">
9694
<HintPath>..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
9795
</Reference>
96+
<Reference Include="SQLitePCL.raw">
97+
<HintPath>..\packages\SQLitePCL.raw.0.8.2\lib\net45\SQLitePCL.raw.dll</HintPath>
98+
</Reference>
9899
</ItemGroup>
99100
<ItemGroup>
100101
<ProjectReference Include="..\SQLitePCL.pretty.Async\SQLitePCL.pretty.Async.csproj">
@@ -115,14 +116,8 @@
115116
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
116117
</ItemGroup>
117118
<Import Project="..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
118-
<Import Project="..\packages\SQLitePCL.raw.0.8.1\build\net45\SQLitePCL.raw.targets" Condition="Exists('..\packages\SQLitePCL.raw.0.8.1-pre2\build\net45\SQLitePCL.raw.targets')" />
119+
<Import Project="..\packages\SQLitePCL.raw.0.8.2\build\net45\SQLitePCL.raw.targets" Condition="Exists('..\packages\SQLitePCL.raw.0.8.2\build\net45\SQLitePCL.raw.targets')" />
119120
<ItemGroup>
120121
<None Include="packages.config" />
121122
</ItemGroup>
122-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
123-
<PropertyGroup>
124-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
125-
</PropertyGroup>
126-
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
127-
</Target>
128123
</Project>

‎SQLitePCL.pretty.tests/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
66
<package id="Rx-Main" version="2.2.5" targetFramework="net45" />
77
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
8-
<package id="SQLitePCL.raw" version="0.8.1" targetFramework="portable-net45+win+wpa81+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
8+
<package id="SQLitePCL.raw" version="0.8.2" targetFramework="net45" />
99
<package id="xunit" version="2.0.0" targetFramework="net45" />
1010
<package id="xunit.abstractions" version="2.0.0" targetFramework="portable-net45+win+wpa81+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
1111
<package id="xunit.assert" version="2.0.0" targetFramework="net45" />
@@ -14,5 +14,5 @@
1414
<package id="xunit.extensibility.execution" version="2.0.0" targetFramework="MonoAndroid50" />
1515
<package id="xunit.runner.devices" version="1.0.0" targetFramework="MonoAndroid50" />
1616
<package id="xunit.runner.utility" version="2.0.0" targetFramework="MonoAndroid50" />
17-
<package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" />
18-
</packages>
17+
<package id="xunit.runner.visualstudio" version="2.0.1" targetFramework="net45" />
18+
</packages>

0 commit comments

Comments
 (0)