Merge branch 'master' into dev

Author: Jcparkyn

.github/workflows/main.yml

@@ -1,6 +1,6 @@
 name: DeployToGitHubPages
 env:
-  PUBLISH_DIR: Nodexr/bin/Release/netstandard2.1/publish/wwwroot
+  PUBLISH_DIR: Nodexr/bin/Release/net5.0/publish/wwwroot
 
 # Controls when the action will run
 on:
@@ -13,6 +13,11 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '5.0.x'
+
     - name: Publish app
       run: dotnet publish -c Release