diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 9e16426..27de438 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,9 +1,9 @@ - 7.6.0.0 - 7.6.0.0 + 7.6.1.0 + 7.6.1.0 danieljsummers Bit Badger Solutions - 7.6.0 + 7.6.1 diff --git a/src/PrayerTracker.Data/DataAccess.fs b/src/PrayerTracker.Data/DataAccess.fs index 6dfebcd..c8bf97f 100644 --- a/src/PrayerTracker.Data/DataAccess.fs +++ b/src/PrayerTracker.Data/DataAccess.fs @@ -336,15 +336,8 @@ type AppDbContext with /// Get all PrayerTracker users as members (used to send e-mails) member this.AllUsersAsMembers () = task { - let q = - query { - for usr in this.Users.AsNoTracking () do - sortBy usr.lastName - thenBy usr.firstName - select { Member.empty with email = usr.emailAddress; memberName = usr.fullName } - } - let! usrs = q.ToListAsync () - return List.ofSeq usrs + let! users = this.AllUsers () + return users |> List.map (fun u -> { Member.empty with email = u.emailAddress; memberName = u.fullName }) } /// Find a user based on their credentials diff --git a/src/PrayerTracker.sln b/src/PrayerTracker.sln index 706ef59..2239e46 100644 --- a/src/PrayerTracker.sln +++ b/src/PrayerTracker.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29411.108 +# Visual Studio Version 17 +VisualStudioVersion = 17.2.32630.192 MinimumVisualStudioVersion = 10.0.40219.1 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "PrayerTracker", "PrayerTracker\PrayerTracker.fsproj", "{63780D3F-D811-4BFB-9FB0-C28A83CCE28F}" EndProject @@ -14,7 +14,7 @@ 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 - global.json = global.json + Publish-App.ps1 = Publish-App.ps1 EndProjectSection EndProject Global diff --git a/src/Publish-App.ps1 b/src/Publish-App.ps1 index 5222d90..fd7b8bd 100644 --- a/src/Publish-App.ps1 +++ b/src/Publish-App.ps1 @@ -1,3 +1,3 @@ Set-Location PrayerTracker dotnet publish -c Release -r linux-x64 -p:PublishSingleFile=true --self-contained false -Set-Location bin\Release\net5.0\linux-x64\publish \ No newline at end of file +Set-Location bin\Release\net6.0\linux-x64\publish \ No newline at end of file