Update to .NET Core 3.1 (and deps) (#25)

Bump nokogiri from 1.10.4 to 1.10.8 in /docs

docs/Gemfile.lock

@@ -208,9 +208,9 @@ GEM
       jekyll-seo-tag (~> 2.1)
     minitest (5.12.2)
     multipart-post (2.1.1)
-    nokogiri (1.10.4)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.4-x64-mingw32)
+    nokogiri (1.10.8-x64-mingw32)
       mini_portile2 (~> 2.4.0)
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
@@ -244,7 +244,6 @@ GEM
     tzinfo-data (1.2019.3)
       tzinfo (>= 1.0.0)
     unicode-display_width (1.6.0)
-    wdm (0.1.1)
 
 PLATFORMS
   ruby
@@ -253,7 +252,6 @@ PLATFORMS
 DEPENDENCIES
   github-pages
   tzinfo-data
-  wdm (~> 0.1.0)
 
 BUNDLED WITH
    2.0.2

src/Directory.Build.props

@@ -1,9 +1,9 @@
 <Project>
   <PropertyGroup>
-    <AssemblyVersion>7.4.0.0</AssemblyVersion>
-    <FileVersion>7.4.0.0</FileVersion>
+    <AssemblyVersion>7.4.2.0</AssemblyVersion>
+    <FileVersion>7.4.2.0</FileVersion>
     <Authors>danieljsummers</Authors>
     <Company>Bit Badger Solutions</Company>
-    <Version>7.4.0</Version>
+    <Version>7.4.2</Version>
   </PropertyGroup>
 </Project>

src/PrayerTracker.Data/PrayerTracker.Data.fsproj

@@ -14,9 +14,9 @@
 
   <ItemGroup>
     <PackageReference Include="FSharp.EFCore.OptionConverter" Version="1.0.0" />
-    <PackageReference Include="Microsoft.FSharpLu" Version="0.11.5" />
+    <PackageReference Include="Microsoft.FSharpLu" Version="0.11.6" />
     <PackageReference Include="NodaTime" Version="2.4.7" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.0.1" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.2" />
     <PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
   </ItemGroup>
 

src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Expecto" Version="8.12.0" />
+    <PackageReference Include="Expecto" Version="8.13.1" />
     <PackageReference Include="Expecto.VisualStudio.TestAdapter" Version="10.0.2" />
     <PackageReference Include="NodaTime.Testing" Version="2.4.7" />
   </ItemGroup>

src/PrayerTracker.UI/PrayerTracker.UI.fsproj

@@ -19,12 +19,12 @@
 
   <ItemGroup>
     <PackageReference Include="Giraffe" Version="4.0.1" />
-    <PackageReference Include="MailKit" Version="2.3.2" />
+    <PackageReference Include="MailKit" Version="2.5.1" />
     <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 
   <ItemGroup>

src/PrayerTracker.sln

@@ -14,6 +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
 	EndProjectSection
 EndProject
 Global

src/PrayerTracker/.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "3.1.2",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}

src/PrayerTracker/Email.fs

@@ -8,10 +8,9 @@ open Microsoft.Extensions.Localization
 open MimeKit
 open MimeKit.Text
 open PrayerTracker.Entities
-open System
 
-/// The e-mail address from which e-mail is sent (must match Google account)
-let private fromAddress = "prayer@djs-consulting.com"
+/// The e-mail address from which e-mail is sent
+let private fromAddress = "prayer@bitbadger.solutions"
 
 /// Get an SMTP client connection
 // FIXME: make host configurable

src/PrayerTracker/PrayerTracker.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -25,8 +25,8 @@
   <ItemGroup>
     <PackageReference Include="Giraffe" Version="4.0.1" />
     <PackageReference Include="Giraffe.TokenRouter" Version="1.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.0.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.1" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.2" />
   </ItemGroup>
 
   <ItemGroup>

src/global.json

@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "3.1.101"
+  }
+}