Skip to content

Commit d03d763

Browse files
committed
Refactor nuget setup to be buildable on mac. Use volatile for DefaultScheduler.
1 parent d267739 commit d03d763

7 files changed

Lines changed: 15 additions & 15 deletions

File tree

SQLitePCL.pretty.Async/AsyncDatabaseConnection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static partial class DatabaseConnection
4040
// actually blocking use of the database for a measurable period of time.
4141
private static readonly int defaultInterruptInstructionCount = 100;
4242

43-
private static IScheduler defaultScheduler = TaskPoolScheduler.Default;
43+
private static volatile IScheduler defaultScheduler = TaskPoolScheduler.Default;
4444

4545
/// <summary>
4646
/// Allows an application to set a default scheduler for <see cref="IAsyncDatabaseConnection"/>

SQLitePCL.pretty.Async/SQLitePCL.pretty.Async.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
</ItemGroup>
5656
<ItemGroup>
5757
<None Include="packages.config" />
58+
<None Include="SQLitePCL.pretty.Async.nuspec" />
5859
</ItemGroup>
5960
<ItemGroup>
6061
<ProjectReference Include="..\SQLitePCL.pretty\SQLitePCL.pretty.csproj">

SQLitePCL.pretty.Async.nuspec renamed to SQLitePCL.pretty.Async/SQLitePCL.pretty.Async.nuspec

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>SQLitePCL.pretty.Async</id>
5-
<version>1.0.0</version>
5+
<version>1.0.0-rc1</version>
66
<title>SQLitePCL.pretty.Async</title>
77
<authors>David Bordoley</authors>
88
<licenseUrl>https://github.com/bordoley/SQLitePCL.pretty/blob/master/LICENSE</licenseUrl>
@@ -15,13 +15,12 @@
1515
<reference file="SQLitePCL.pretty.Async.dll" />
1616
</references>
1717
<dependencies>
18-
<dependency id="SQLitePCL.pretty" version="1.0.0" />
18+
<dependency id="SQLitePCL.pretty" version="1.0.0-rc1" />
1919
<dependency id="Rx-Main" version="2.2.5" />
2020
</dependencies>
2121
</metadata>
2222
<files>
23-
<file src="SQLitePCL.pretty.Async\bin\Release\SQLitePCL.pretty.Async.dll" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
24-
<file src="SQLitePCL.pretty.Async\bin\Release\SQLitePCL.pretty.Async.xml" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
25-
<file src="SQLitePCL.pretty.Async\bin\Release\CodeContracts\SQLitePCL.pretty.Async.Contracts.dll" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
23+
<file src="bin/Release/SQLitePCL.pretty.Async.dll" target="lib/portable-net45+netcore45+wpa81+wp8" />
24+
<file src="bin/Release/SQLitePCL.pretty.Async.xml" target="lib/portable-net45+netcore45+wpa81+wp8" />
2625
</files>
2726
</package>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,5 +120,6 @@
120120
</ItemGroup>
121121
<ItemGroup>
122122
<None Include="packages.config" />
123+
<None Include="SQLitePCL.pretty.Orm.nuspec" />
123124
</ItemGroup>
124125
</Project>

SQLitePCL.pretty.Orm.nuspec renamed to SQLitePCL.pretty.Orm/SQLitePCL.pretty.Orm.nuspec

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>SQLitePCL.pretty.Orm</id>
5-
<version>1.0.0</version>
5+
<version>1.0.0-rc1</version>
66
<title>SQLitePCL.pretty.Orm</title>
77
<authors>David Bordoley</authors>
88
<licenseUrl>https://github.com/bordoley/SQLitePCL.pretty/blob/master/LICENSE</licenseUrl>
@@ -15,13 +15,12 @@
1515
<reference file="SQLitePCL.pretty.Orm.dll" />
1616
</references>
1717
<dependencies>
18-
<dependency id="SQLitePCL.pretty" version="1.0.0" />
19-
<dependency id="SQLitePCL.pretty.Async" version="1.0.0" />
18+
<dependency id="SQLitePCL.pretty" version="1.0.0-rc1" />
19+
<dependency id="SQLitePCL.pretty.Async" version="1.0.0-rc1" />
2020
</dependencies>
2121
</metadata>
2222
<files>
23-
<file src="SQLitePCL.pretty.Orm\bin\Release\SQLitePCL.pretty.Orm.dll" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
24-
<file src="SQLitePCL.pretty.Orm\bin\Release\SQLitePCL.pretty.Orm.xml" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
25-
<file src="SQLitePCL.pretty.Orm\bin\Release\CodeContracts\SQLitePCL.pretty.Orm.Contracts.dll" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
23+
<file src="bin/Release/SQLitePCL.pretty.Orm.dll" target="lib/portable-net45+netcore45+wpa81+wp8" />
24+
<file src="bin/Release/SQLitePCL.pretty.Orm.xml" target="lib/portable-net45+netcore45+wpa81+wp8" />
2625
</files>
2726
</package>

SQLitePCL.pretty/SQLitePCL.pretty.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,6 @@
5858
</ItemGroup>
5959
<ItemGroup>
6060
<None Include="packages.config" />
61+
<None Include="SQLitePCL.pretty.nuspec" />
6162
</ItemGroup>
6263
</Project>
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ A simple table mapped ORM is also available. See https://www.nuget.org/packages/
2323
</dependencies>
2424
</metadata>
2525
<files>
26-
<file src="SQLitePCL.pretty\bin\Release\SQLitePCL.pretty.dll" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
27-
<file src="SQLitePCL.pretty\bin\Release\SQLitePCL.pretty.xml" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
28-
<file src="SQLitePCL.pretty\bin\Release\CodeContracts\SQLitePCL.pretty.Contracts.dll" target="lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
26+
<file src="bin/Release/SQLitePCL.pretty.dll" target="lib/portable-net45+netcore45+wpa81+wp8" />
27+
<file src="bin/Release/SQLitePCL.pretty.xml" target="lib/portable-net45+netcore45+wpa81+wp8" />
2928
</files>
3029
</package>

0 commit comments

Comments
 (0)