bit-badger/myPrayerJournal
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 36 Activity

Updated dependencies

Browse Source 
New Vue files and upgraded API project to .NET Core 2
This commit is contained in:
Daniel J. Summers
2017-09-10 22:33:43 -05:00
parent 262920744a
commit 2ed01b8d5d
5 changed files with 610 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/App.fs
View File

@@ -164,7 +164,7 @@ module WebParts =
/// WebPart to return an JSON error response
let errorJSON code error =
jsonMimeType
>=> Response.response code ((toJson >> UTF8.bytes) { error = error })
>=> Response.response code ((toJson >> Text.Encoding.UTF8.GetBytes) { error = error })
/// Journal page
let viewJournal =

54
src/api/MyPrayerJournal.fsproj
View File

@@ -1,14 +1,11 @@
<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<VersionPrefix>0.8.1</VersionPrefix>
<TargetFramework>netcoreapp1.1</TargetFramework>
<AssemblyName>myPrayerJournal</AssemblyName>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<AssemblyName>myPrayerJournal</AssemblyName>
<PackageId>MyPrayerJournal</PackageId>
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
<VersionPrefix>0.8.1</VersionPrefix>
</PropertyGroup>
<ItemGroup>
<Compile Include="Extensions.fs" />
<Compile Include="Entities.fs" />
@@ -17,38 +14,21 @@
<Compile Include="Migrations/20170104023341_InitialDb.fs" />
<Compile Include="Migrations/DataContextModelSnapshot.fs" />
<Compile Include="App.fs" />
<None Update="appsettings.json">
<Content Update="appsettings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="wwwroot/**">
</Content>
<Content Update="wwwroot/**">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<!-- Import Project="..\..\.paket\Paket.Restore.targets" / -->
<ItemGroup>
<PackageReference Include="FSharp.Core">
<Version>4.1.17</Version>
</PackageReference>
<PackageReference Include="FSharp.NET.Sdk">
<Version>1.0.5</Version>
</PackageReference>
<PackageReference Include="jose-jwt">
<Version>2.*</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>10.*</Version>
</PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL">
<Version>1.*</Version>
</PackageReference>
<PackageReference Include="Suave">
<Version>2.*</Version>
</PackageReference>
</Content>
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" />
<PackageReference Include="FSharp.Core" Version="4.2.3" />
<PackageReference Include="jose-jwt" Version="2.*" />
<PackageReference Include="Newtonsoft.Json" Version="10.*" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="1.*" />
<PackageReference Include="Suave" Version="2.*" />
</ItemGroup>
</Project>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.*" />
</ItemGroup>
</Project>