diff --git a/src/Directory.Build.props b/src/Directory.Build.props
new file mode 100644
index 0000000..9c9a4e9
--- /dev/null
+++ b/src/Directory.Build.props
@@ -0,0 +1,9 @@
+
+
+ 7.4.0.0
+ 7.4.0.0
+ danieljsummers
+ Bit Badger Solutions
+ 7.4.0
+
+
diff --git a/src/PrayerTracker.Data/DataAccess.fs b/src/PrayerTracker.Data/DataAccess.fs
index de5615b..d36f0cb 100644
--- a/src/PrayerTracker.Data/DataAccess.fs
+++ b/src/PrayerTracker.Data/DataAccess.fs
@@ -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 ->
diff --git a/src/PrayerTracker.Data/PrayerTracker.Data.fsproj b/src/PrayerTracker.Data/PrayerTracker.Data.fsproj
index 6dd443d..238ed67 100644
--- a/src/PrayerTracker.Data/PrayerTracker.Data.fsproj
+++ b/src/PrayerTracker.Data/PrayerTracker.Data.fsproj
@@ -1,10 +1,7 @@
- netstandard2.0
- 7.3.2.0
- 7.3.2.0
- 7.3.2
+ netstandard2.1
@@ -17,14 +14,14 @@
-
-
-
+
+
+
-
+
diff --git a/src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj b/src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj
index 6fcfc9e..58109c3 100644
--- a/src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj
+++ b/src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj
@@ -2,10 +2,7 @@
Exe
- netcoreapp2.2
- 7.3.2.0
- 7.3.2.0
- 7.3.2
+ netcoreapp3.0
@@ -18,9 +15,9 @@
-
+
-
+
@@ -30,7 +27,7 @@
-
+
diff --git a/src/PrayerTracker.UI/PrayerTracker.UI.fsproj b/src/PrayerTracker.UI/PrayerTracker.UI.fsproj
index 981eaf1..5481751 100644
--- a/src/PrayerTracker.UI/PrayerTracker.UI.fsproj
+++ b/src/PrayerTracker.UI/PrayerTracker.UI.fsproj
@@ -1,10 +1,7 @@
- netstandard2.0
- 7.3.2.0
- 7.3.2.0
- 7.3.2
+ netstandard2.1
@@ -21,8 +18,8 @@
-
-
+
+
@@ -65,7 +62,7 @@
-
+
diff --git a/src/PrayerTracker.sln b/src/PrayerTracker.sln
index a5a2c69..f7736bb 100644
--- a/src/PrayerTracker.sln
+++ b/src/PrayerTracker.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29411.108
MinimumVisualStudioVersion = 10.0.40219.1
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "PrayerTracker", "PrayerTracker\PrayerTracker.fsproj", "{63780D3F-D811-4BFB-9FB0-C28A83CCE28F}"
EndProject
@@ -11,6 +11,11 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "PrayerTracker.Tests", "Pray
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "PrayerTracker.Data", "PrayerTracker.Data\PrayerTracker.Data.fsproj", "{2B5BA107-9BDA-4A1D-A9AF-AFEE6BF12270}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B290BA27-C8B8-44F3-BF01-D103302D815F}"
+ ProjectSection(SolutionItems) = preProject
+ Directory.Build.props = Directory.Build.props
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
diff --git a/src/PrayerTracker/App.fs b/src/PrayerTracker/App.fs
index d0546a7..ab186e3 100644
--- a/src/PrayerTracker/App.fs
+++ b/src/PrayerTracker/App.fs
@@ -15,6 +15,7 @@ module Configure =
open Microsoft.EntityFrameworkCore
open Microsoft.Extensions.Configuration
open Microsoft.Extensions.DependencyInjection
+ open Microsoft.Extensions.Hosting
open Microsoft.Extensions.Localization
open Microsoft.Extensions.Logging
open Microsoft.Extensions.Options
@@ -150,7 +151,7 @@ module Configure =
/// Configure logging
let logging (log : ILoggingBuilder) =
- let env = log.Services.BuildServiceProvider().GetService ()
+ let env = log.Services.BuildServiceProvider().GetService ()
match env.IsDevelopment () with
| true -> log
| false -> log.AddFilter (fun l -> l > LogLevel.Information)
@@ -158,8 +159,7 @@ module Configure =
|> ignore
let app (app : IApplicationBuilder) =
- let env = app.ApplicationServices.GetRequiredService()
- let log = app.ApplicationServices.GetRequiredService()
+ let env = app.ApplicationServices.GetRequiredService()
(match env.IsDevelopment () with
| true ->
app.UseDeveloperExceptionPage ()
diff --git a/src/PrayerTracker/Church.fs b/src/PrayerTracker/Church.fs
index c18fc32..f1694f4 100644
--- a/src/PrayerTracker/Church.fs
+++ b/src/PrayerTracker/Church.fs
@@ -71,17 +71,14 @@ let maintain : HttpHandler =
requireAccess [ Admin ]
>=> fun next ctx ->
let startTicks = DateTime.Now.Ticks
+ let await = Async.AwaitTask >> Async.RunSynchronously
let db = ctx.dbContext ()
task {
let! churches = db.AllChurches ()
- let! stats =
- churches
- |> Seq.ofList
- |> Seq.map (fun c -> findStats db c.churchId)
- |> Task.WhenAll
+ let stats = churches |> List.map (fun c -> await (findStats db c.churchId))
return!
viewInfo ctx startTicks
- |> Views.Church.maintain churches (stats |> Map.ofArray) ctx
+ |> Views.Church.maintain churches (stats |> Map.ofList) ctx
|> renderHtml next ctx
}
diff --git a/src/PrayerTracker/PrayerTracker.fsproj b/src/PrayerTracker/PrayerTracker.fsproj
index 085722f..bddb697 100644
--- a/src/PrayerTracker/PrayerTracker.fsproj
+++ b/src/PrayerTracker/PrayerTracker.fsproj
@@ -1,12 +1,7 @@
- netcoreapp2.2
- 7.3.2.0
- 7.3.2.0
-
- Bit Badger Solutions
- 7.3.2
+ netcoreapp3.0
@@ -28,11 +23,10 @@
-
+
-
-
-
+
+
@@ -41,7 +35,7 @@
-
+