From 651b0fe76c6f791471a36025d031fe6228886c79 Mon Sep 17 00:00:00 2001 From: "Daniel J. Summers" Date: Thu, 2 Feb 2023 18:44:20 -0500 Subject: [PATCH] Fix project files for release --- src/JobsJobsJobs/Citizens/Handlers.fs | 1 + .../Citizens/JobsJobsJobs.Citizens.fsproj | 1 - src/JobsJobsJobs/Common/Cache.fs | 3 ++ .../Common/JobsJobsJobs.Common.fsproj | 1 - src/JobsJobsJobs/Directory.Build.props | 1 + .../Home/JobsJobsJobs.Home.fsproj | 1 - .../JobsJobsJobs.V3Migration.fsproj | 30 ++++++++++--------- .../JobsJobsJobs.V3Migration/Program.fs | 2 +- .../JobsJobsJobs.V3Migration/appsettings.json | 13 -------- .../Listings/JobsJobsJobs.Listings.fsproj | 1 - .../Profiles/JobsJobsJobs.Profiles.fsproj | 1 - .../JobsJobsJobs.SuccessStories.fsproj | 9 +++--- 12 files changed, 26 insertions(+), 38 deletions(-) delete mode 100644 src/JobsJobsJobs/JobsJobsJobs.V3Migration/appsettings.json diff --git a/src/JobsJobsJobs/Citizens/Handlers.fs b/src/JobsJobsJobs/Citizens/Handlers.fs index f4f2a48..de23fc6 100644 --- a/src/JobsJobsJobs/Citizens/Handlers.fs +++ b/src/JobsJobsJobs/Citizens/Handlers.fs @@ -189,6 +189,7 @@ let register next ctx = |> render "Register" next ctx // POST: /citizen/register +#nowarn "3511" let doRegistration : HttpHandler = validateCsrf >=> fun next ctx -> task { let! form = ctx.BindFormAsync () let qAndA = Auth.questions ctx diff --git a/src/JobsJobsJobs/Citizens/JobsJobsJobs.Citizens.fsproj b/src/JobsJobsJobs/Citizens/JobsJobsJobs.Citizens.fsproj index af3e080..a482b86 100644 --- a/src/JobsJobsJobs/Citizens/JobsJobsJobs.Citizens.fsproj +++ b/src/JobsJobsJobs/Citizens/JobsJobsJobs.Citizens.fsproj @@ -2,7 +2,6 @@ net7.0 - true diff --git a/src/JobsJobsJobs/Common/Cache.fs b/src/JobsJobsJobs/Common/Cache.fs index fabeca6..45b9e06 100644 --- a/src/JobsJobsJobs/Common/Cache.fs +++ b/src/JobsJobsJobs/Common/Cache.fs @@ -59,6 +59,9 @@ open System.Threading open JobsJobsJobs.Common.Data open Microsoft.Extensions.Caching.Distributed +// getEntry isn't resumable +#nowarn "3511" + /// A distributed cache implementation in PostgreSQL used to handle sessions for Jobs, Jobs, Jobs type DistributedCache () = diff --git a/src/JobsJobsJobs/Common/JobsJobsJobs.Common.fsproj b/src/JobsJobsJobs/Common/JobsJobsJobs.Common.fsproj index 6d67a57..777bb87 100644 --- a/src/JobsJobsJobs/Common/JobsJobsJobs.Common.fsproj +++ b/src/JobsJobsJobs/Common/JobsJobsJobs.Common.fsproj @@ -2,7 +2,6 @@ net7.0 - true diff --git a/src/JobsJobsJobs/Directory.Build.props b/src/JobsJobsJobs/Directory.Build.props index 5f8aeb0..7fd3942 100644 --- a/src/JobsJobsJobs/Directory.Build.props +++ b/src/JobsJobsJobs/Directory.Build.props @@ -3,6 +3,7 @@ net7.0 enable embedded + false 3.0.0.0 3.0.0.0 diff --git a/src/JobsJobsJobs/Home/JobsJobsJobs.Home.fsproj b/src/JobsJobsJobs/Home/JobsJobsJobs.Home.fsproj index 18cdef7..8ea4765 100644 --- a/src/JobsJobsJobs/Home/JobsJobsJobs.Home.fsproj +++ b/src/JobsJobsJobs/Home/JobsJobsJobs.Home.fsproj @@ -2,7 +2,6 @@ net7.0 - true diff --git a/src/JobsJobsJobs/JobsJobsJobs.V3Migration/JobsJobsJobs.V3Migration.fsproj b/src/JobsJobsJobs/JobsJobsJobs.V3Migration/JobsJobsJobs.V3Migration.fsproj index f9e84bf..c380f67 100644 --- a/src/JobsJobsJobs/JobsJobsJobs.V3Migration/JobsJobsJobs.V3Migration.fsproj +++ b/src/JobsJobsJobs/JobsJobsJobs.V3Migration/JobsJobsJobs.V3Migration.fsproj @@ -1,21 +1,23 @@  - - Exe - + + Exe + true + false + - - - - + + + + - - - - + + + + - - - + + + diff --git a/src/JobsJobsJobs/JobsJobsJobs.V3Migration/Program.fs b/src/JobsJobsJobs/JobsJobsJobs.V3Migration/Program.fs index e051979..23dde0d 100644 --- a/src/JobsJobsJobs/JobsJobsJobs.V3Migration/Program.fs +++ b/src/JobsJobsJobs/JobsJobsJobs.V3Migration/Program.fs @@ -62,7 +62,7 @@ let getInstant (doc : JObject) name = task { // Establish database connections - let cfg = ConfigurationBuilder().AddJsonFile("appsettings.json").Build () + let cfg = ConfigurationBuilder().AddJsonFile("appsettings.Migration.json").Build () use rethinkConn = Rethink.Startup.createConnection (cfg.GetConnectionString "RethinkDB") do! setUp cfg let pgConn = dataSource () diff --git a/src/JobsJobsJobs/JobsJobsJobs.V3Migration/appsettings.json b/src/JobsJobsJobs/JobsJobsJobs.V3Migration/appsettings.json deleted file mode 100644 index 00c90ab..0000000 --- a/src/JobsJobsJobs/JobsJobsJobs.V3Migration/appsettings.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ConnectionStrings": { - "RethinkDB": "rethinkdb://data02.bitbadger.solutions/jobsjobsjobs_dev", - "PostgreSQL": "Host=hopper;Username=jobsjobsjobs;Password=devpassword;Database=jobsjobsjobs" - }, - "Logging": { - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - } -} \ No newline at end of file diff --git a/src/JobsJobsJobs/Listings/JobsJobsJobs.Listings.fsproj b/src/JobsJobsJobs/Listings/JobsJobsJobs.Listings.fsproj index 55cfbd4..d1a4eb8 100644 --- a/src/JobsJobsJobs/Listings/JobsJobsJobs.Listings.fsproj +++ b/src/JobsJobsJobs/Listings/JobsJobsJobs.Listings.fsproj @@ -2,7 +2,6 @@ net7.0 - true diff --git a/src/JobsJobsJobs/Profiles/JobsJobsJobs.Profiles.fsproj b/src/JobsJobsJobs/Profiles/JobsJobsJobs.Profiles.fsproj index 517dc85..fbbd92f 100644 --- a/src/JobsJobsJobs/Profiles/JobsJobsJobs.Profiles.fsproj +++ b/src/JobsJobsJobs/Profiles/JobsJobsJobs.Profiles.fsproj @@ -2,7 +2,6 @@ net7.0 - true diff --git a/src/JobsJobsJobs/SuccessStories/JobsJobsJobs.SuccessStories.fsproj b/src/JobsJobsJobs/SuccessStories/JobsJobsJobs.SuccessStories.fsproj index b7b12ab..7346b15 100644 --- a/src/JobsJobsJobs/SuccessStories/JobsJobsJobs.SuccessStories.fsproj +++ b/src/JobsJobsJobs/SuccessStories/JobsJobsJobs.SuccessStories.fsproj @@ -2,7 +2,6 @@ net7.0 - true @@ -12,10 +11,10 @@ - - - - + + + +