From 1d3b8542cc8b07c7c58f49683857ea056bbfa605 Mon Sep 17 00:00:00 2001
From: Robert Di Pardo <dipardo.r@gmail.com>
Date: Sun, 6 Jun 2021 21:29:48 -0400
Subject: [PATCH] Update actions & other chores

---
 .github/workflows/ci.yml    |  4 ++--
 .github/workflows/nuget.yml |  6 +++---
 README.md                   | 10 +++++-----
 scripts/pack.cmd            |  4 ++--
 src/Fornax                  |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d45c1b2..51ccdb4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,11 +15,11 @@ jobs:
           submodules: 'recursive'
           fetch-depth: 0
       - name: Pre-test install
-        uses: actions/setup-dotnet@v1.7.2
+        uses: actions/setup-dotnet@v1.8.0
         with:
           dotnet-version: '5.0.202'
       - name: Cache packages
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2.1.6
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('src/Fornax.Seo/Directory.Build.props') }}
diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
index edd8643..4da534c 100644
--- a/.github/workflows/nuget.yml
+++ b/.github/workflows/nuget.yml
@@ -15,7 +15,7 @@ jobs:
           submodules: 'recursive'
           fetch-depth: 0
       - name: Pre-build Install
-        uses: actions/setup-dotnet@v1.7.2
+        uses: actions/setup-dotnet@v1.8.0
         with:
           dotnet-version: '5.0.202'
       - name: Build package
@@ -40,11 +40,11 @@ jobs:
           submodules: 'recursive'
           fetch-depth: 0
       - name: Pre-build Install
-        uses: actions/setup-dotnet@v1.7.2
+        uses: actions/setup-dotnet@v1.8.0
         with:
           dotnet-version: '5.0.202'
       - name: Cache packages
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2.1.6
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('src/Fornax.Seo/Directory.Build.props') }}
diff --git a/README.md b/README.md
index dd8e1ee..30b170a 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ A SEO meta tag generator for [Fornax](https://ionide.io/Tools/fornax.html)
 
 **IMPORTANT**
 
-- Add the root domain of your website to a global instance of `Fornax.Core.Model.SiteContents`:
+- Provide the root domain of your website:
 
 ~~~fsharp
 // loaders/globalloader.fsx
@@ -43,7 +43,7 @@ type SiteInfo = {
 }
 ~~~
 
-- add personal authorship details, e.g.:
+- Add personal authorship details, e.g.:
 
 ~~~fsharp
 // loaders/globalloader.fsx
@@ -155,10 +155,10 @@ let layout (ctx: SiteContents) (active: string) (content: HtmlElement seq) =
         | Some info -> info
         | _ ->
             { ContentObject.Default with
-                  Title = title
+                  Title = pageTitle
                   Description = tagline
                   BaseUrl = siteRoot
-                  SiteName = Some title
+                  SiteName = Some pageTitle
                   Headline = Some tagline
                   Author = siteAuthor }
 
@@ -166,7 +166,7 @@ let layout (ctx: SiteContents) (active: string) (content: HtmlElement seq) =
         head [] [
             meta [ CharSet "utf-8" ]
             meta [ Name "viewport"; Content "width=device-width, initial-scale=1" ]
-            title [] [ !!"My Blog" ]
+            title [] [ !!pageTitle ]
             // . . .
             yield! seo pageMeta
         ]
diff --git a/scripts/pack.cmd b/scripts/pack.cmd
index 52aa953..0b50a11 100644
--- a/scripts/pack.cmd
+++ b/scripts/pack.cmd
@@ -6,14 +6,14 @@ SET NL=^
 
 dotnet fsi /exec scripts/release-notes.fsx
 
-DIR /B release\notes.txt >NUL
+DIR /B release\notes.txt 2>NUL
 IF NOT %ERRORLEVEL% == 0 (GOTO END)
 
 FOR /F "tokens=* USEBACKQ" %%F IN (`type release\notes.txt`) DO (
 SET "PackageReleaseNotes=%%F"
 )
 
-git describe --tags >NUL
+git describe --tags 2>NUL
 IF NOT %ERRORLEVEL% == 0 (
   FOR /F "tokens=* USEBACKQ" %%F IN (`git rev-parse --short HEAD`) DO (
   SET "BUILD_NUMBER=--version-suffix %%F"
diff --git a/src/Fornax b/src/Fornax
index aaaf95b..e681704 160000
--- a/src/Fornax
+++ b/src/Fornax
@@ -1 +1 @@
-Subproject commit aaaf95b3d269a371c8ba45e84ff918c03079b127
+Subproject commit e6817040f3c7bffc4b78d04d0363b562f3c8bf1c