Updated to .NET Core 2.2 (#23)

Also updated API and app deps
This commit is contained in:
Daniel J. Summers 2019-02-23 10:59:23 -06:00
parent 4310fb91fa
commit 8995097d68
5 changed files with 571 additions and 736 deletions

View File

@ -1,6 +1,6 @@
namespace MyPrayerJournal namespace MyPrayerJournal
open FSharp.Control.Tasks.ContextInsensitive open FSharp.Control.Tasks.V2.ContextInsensitive
open Microsoft.EntityFrameworkCore open Microsoft.EntityFrameworkCore
/// Helpers for this file /// Helpers for this file
@ -183,7 +183,6 @@ module Entities =
open System.Linq open System.Linq
open System.Threading.Tasks
/// Data context /// Data context
type AppDbContext (opts : DbContextOptions<AppDbContext>) = type AppDbContext (opts : DbContextOptions<AppDbContext>) =

View File

@ -2,6 +2,7 @@
[<RequireQualifiedAccess>] [<RequireQualifiedAccess>]
module MyPrayerJournal.Api.Handlers module MyPrayerJournal.Api.Handlers
open FSharp.Control.Tasks.V2.ContextInsensitive
open Giraffe open Giraffe
open MyPrayerJournal open MyPrayerJournal
open System open System

View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework> <TargetFramework>netcoreapp2.2</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -12,11 +12,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="FSharp.EFCore.OptionConverter" Version="1.0.0" /> <PackageReference Include="FSharp.EFCore.OptionConverter" Version="1.0.0" />
<PackageReference Include="Giraffe" Version="1.1.0" /> <PackageReference Include="Giraffe" Version="3.6.0" />
<PackageReference Include="Giraffe.TokenRouter" Version="0.1.0-beta-110" /> <PackageReference Include="Giraffe.TokenRouter" Version="1.0.0" />
<PackageReference Include="Microsoft.AspNetCore.App" /> <PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="NCuid.NetCore" Version="1.0.1" /> <PackageReference Include="NCuid.NetCore" Version="1.0.1" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.1.1" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.2.0" />
<PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -1,12 +1,12 @@
{ {
"name": "my-prayer-journal", "name": "my-prayer-journal",
"version": "1.0.1", "version": "1.0.2",
"description": "myPrayerJournal - Front End", "description": "myPrayerJournal - Front End",
"author": "Daniel J. Summers <daniel@bitbadger.solutions>", "author": "Daniel J. Summers <daniel@bitbadger.solutions>",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
"build": "vue-cli-service build", "build": "vue-cli-service build --modern",
"lint": "vue-cli-service lint", "lint": "vue-cli-service lint",
"apistart": "cd ../api/MyPrayerJournal.Api && dotnet run", "apistart": "cd ../api/MyPrayerJournal.Api && dotnet run",
"vue": "vue-cli-service build --modern && cd ../api/MyPrayerJournal.Api && dotnet run" "vue": "vue-cli-service build --modern && cd ../api/MyPrayerJournal.Api && dotnet run"

File diff suppressed because it is too large Load Diff