Pascal entity fields still WIP

src/myWebLog.Data/Entities.fs

@@ -58,6 +58,7 @@ with
 /// A page with static content
 type Page =
   { /// The Id
+    [<JsonProperty("id")>]
     Id : string
     /// The Id of the web log to which this page belongs
     WebLogId : string
@@ -100,6 +101,7 @@ type PageListEntry =
 /// A web log
 type WebLog =
   { /// The Id
+    [<JsonProperty("id")>]
     Id : string
     /// The name
     Name : string
@@ -139,6 +141,7 @@ type Authorization =
 /// A user of myWebLog
 type User =
   { /// The Id
+    [<JsonProperty("id")>]
     Id : string
     /// The user name (e-mail address)
     UserName : string
@@ -175,6 +178,7 @@ with
 /// A category to which posts may be assigned
 type Category =
   { /// The Id
+    [<JsonProperty("id")>]
     Id : string
     /// The Id of the web log to which this category belongs
     WebLogId : string
@@ -203,6 +207,7 @@ with
 /// A comment (applies to a post)
 type Comment =
   { /// The Id
+    [<JsonProperty("id")>]
     Id : string
     /// The Id of the post to which this comment applies
     PostId : string
@@ -236,6 +241,7 @@ with
 /// A post
 type Post =
   { /// The Id
+    [<JsonProperty("id")>]
     Id : string
     /// The Id of the web log to which this post belongs
     WebLogId : string

src/myWebLog.Data/WebLog.fs

@@ -18,7 +18,7 @@ type DashboardCounts =
 /// Detemine the web log by the URL base
 let tryFindWebLogByUrlBase conn (urlBase : string) =
   r.Table(Table.WebLog)
-    .GetAll(urlBase).OptArg("index", "urlBase")
+    .GetAll(urlBase).OptArg("index", "UrlBase")
     .Merge(fun w -> r.HashMap("PageList", r.Table(Table.Page)
                                             .GetAll(w.["Id"]).OptArg("index", "WebLogId")
                                             .Filter(ReqlFunction1(fun pg -> upcast pg.["ShowInPageList"].Eq(true)))

src/myWebLog.Web/App.fs

@@ -117,9 +117,7 @@ type MyWebLogBootstrapper() =
 let version = 
   let v = Reflection.Assembly.GetExecutingAssembly().GetName().Version
   match v.Build with
-  | 0 -> match v.Minor with
+  | 0 -> match v.Minor with 0 -> string v.Major | _ -> sprintf "%d.%d" v.Major v.Minor
-         | 0 -> string v.Major
-         | _ -> sprintf "%d.%d" v.Major v.Minor
   | _ -> sprintf "%d.%d.%d" v.Major v.Minor v.Build
   |> sprintf "v%s"
 

src/myWebLog.Web/ViewModels.fs

@@ -197,7 +197,7 @@ type CategoryListModel(ctx, webLog, categories) =
 
 /// Form for editing a category
 type CategoryForm(category : Category) =
-  new() = CategoryForm(Category.empty)
+  new() = CategoryForm(Category.Empty)
   /// The name of the category
   member val Name = category.Name with get, set
   /// The slug of the category (used in category URLs)

src/myWebLog.Web/myWebLog.Web.fsproj

@@ -22,7 +22,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <WarningLevel>3</WarningLevel>
-    <DocumentationFile>bin\Debug\myWebLog.Web.xml</DocumentationFile>
+    <DocumentationFile>bin\Debug\MyWebLog.Web.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -126,11 +126,11 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Nancy.Session.Persistable">
-      <HintPath>..\packages\Nancy.Session.Persistable.0.8.6\lib\net452\Nancy.Session.Persistable.dll</HintPath>
+      <HintPath>..\packages\Nancy.Session.Persistable.0.9.0\lib\net452\Nancy.Session.Persistable.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Nancy.Session.RethinkDb">
-      <HintPath>..\packages\Nancy.Session.RethinkDB.0.8.6\lib\net452\Nancy.Session.RethinkDb.dll</HintPath>
+      <HintPath>..\packages\Nancy.Session.RethinkDB.0.9.0\lib\net452\Nancy.Session.RethinkDb.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json">

src/myWebLog.Web/packages.config

@@ -10,8 +10,8 @@
   <package id="FSharpVSPowerTools.Core" version="2.3.0" targetFramework="net452" />
   <package id="Nancy" version="1.4.3" targetFramework="net452" />
   <package id="Nancy.Authentication.Forms" version="1.4.1" targetFramework="net452" />
-  <package id="Nancy.Session.Persistable" version="0.8.6" targetFramework="net452" />
+  <package id="Nancy.Session.Persistable" version="0.9.0" targetFramework="net452" />
-  <package id="Nancy.Session.RethinkDB" version="0.8.6" targetFramework="net452" />
+  <package id="Nancy.Session.RethinkDB" version="0.9.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
   <package id="NodaTime" version="1.3.2" targetFramework="net452" />
   <package id="RethinkDb.Driver" version="2.3.9" targetFramework="net452" />

src/myWebLog/App.config

@@ -3,4 +3,26 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
-</configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.3.0.0" newVersion="3.3.1.0"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+
+</configuration>
+<!-- publicKeyToken="32ab4ba45e0a69a1"
+                              culture="neutral"
+                              
+                                 <runtime>
+      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      </assemblyBinding>
+   </runtime>
+{"Could not load file or assembly 'Common.Logging.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e' or one of its dependencies. The system cannot find the file specified.":"Common.Logging.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e"}
+-->

src/myWebLog/myWebLog.csproj

@@ -11,7 +11,7 @@
     <AssemblyName>MyWebLog</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>