From d332322200ff513c82bcd5e37130e0a070c32b5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 May 2022 22:14:29 +0000 Subject: [PATCH 1/2] Bump nokogiri from 1.11.4 to 1.13.6 in /docs Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.4 to 1.13.6. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.4...v1.13.6) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] --- docs/Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 358a186..5a61121 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -202,17 +202,17 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - mini_portile2 (2.5.1) + mini_portile2 (2.8.0) minima (2.5.1) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) multi_json (1.15.0) multipart-post (2.1.1) - nokogiri (1.11.4) - mini_portile2 (~> 2.5.0) + nokogiri (1.13.6) + mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.11.4-x64-mingw32) + nokogiri (1.13.6-x64-mingw32) racc (~> 1.4) octokit (4.19.0) faraday (>= 0.9) @@ -220,7 +220,7 @@ GEM pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (3.1.1) - racc (1.5.2) + racc (1.6.0) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) From 58519f9a4de94b90c960a010cf77911e7b7382ad Mon Sep 17 00:00:00 2001 From: "Daniel J. Summers" Date: Sat, 6 Aug 2022 09:06:11 -0400 Subject: [PATCH 2/2] Fix announcement send problem (#40) --- src/Directory.Build.props | 6 +++--- src/PrayerTracker.Data/DataAccess.fs | 11 ++--------- src/PrayerTracker.sln | 6 +++--- src/Publish-App.ps1 | 2 +- 4 files changed, 9 insertions(+), 16 deletions(-) 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