bit-badger/PrayerTracker
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 16 Activity

Convert to .NET Core 3.0 (#20)

Browse Source 
Also extracted common project items to Directory.Build.props, and fixed code and execution issues related to EF Core 3.0 changes
This commit is contained in:
Daniel J. Summers
2019-10-19 11:21:48 -05:00
parent bf48c360de
commit e29a21ed6e
9 changed files with 41 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/PrayerTracker.Data/DataAccess.fs
View File

@@ -163,9 +163,8 @@ type AppDbContext with
""" SELECT * FROM pt."PrayerRequest" WHERE "SmallGroupId" = {0} AND "Text" ILIKE {1}
UNION
SELECT * FROM pt."PrayerRequest" WHERE "SmallGroupId" = {0} AND COALESCE("Requestor", '') ILIKE {1}"""
|> RawSqlString
let like = sprintf "%%%s%%"
this.PrayerRequests.FromSql(sql, grp.smallGroupId, like searchTerm).AsNoTracking ()
this.PrayerRequests.FromSqlRaw(sql, grp.smallGroupId, like searchTerm).AsNoTracking ()
|> reqSort grp.preferences.requestSort
|> function
| q ->

13
src/PrayerTracker.Data/PrayerTracker.Data.fsproj
View File

@@ -1,10 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyVersion>7.3.2.0</AssemblyVersion>
<FileVersion>7.3.2.0</FileVersion>
<Version>7.3.2</Version>
<TargetFramework>netstandard2.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
@@ -17,14 +14,14 @@
<ItemGroup>
<PackageReference Include="FSharp.EFCore.OptionConverter" Version="1.0.0" />
<PackageReference Include="Microsoft.FSharpLu" Version="0.10.31" />
<PackageReference Include="NodaTime" Version="2.4.5" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.2.4" />
<PackageReference Include="Microsoft.FSharpLu" Version="0.11.5" />
<PackageReference Include="NodaTime" Version="2.4.7" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.0.1" />
<PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="FSharp.Core" Version="4.6.2" />
<PackageReference Update="FSharp.Core" Version="4.7.0" />
</ItemGroup>
</Project>