Upgrade to .NET 5.0

mythz · mythz · commit 14a966e9dc83 · 2020-11-18T21:17:53.000+08:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
 WORKDIR /app
 
 # copy csproj and restore as distinct layers
@@ -10,7 +10,7 @@ COPY src/. ./
 WORKDIR /app
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 AS runtime
+FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS runtime
 WORKDIR /app
 COPY --from=build /app/out ./
 ENV ASPNETCORE_URLS http://*:5000
diff --git a/src/GitHubMarkdownFilters.cs b/src/GitHubMarkdownFilters.cs
@@ -59,7 +59,7 @@ public static async Task<Stream> convertScriptToLispBlocks(Stream renderedHtmlMa
             return MemoryStreamFactory.GetStream(html.ToUtf8Bytes());
         }
 
-        const bool ReplaceUserContent = true;
+        static bool ReplaceUserContent = true;
 
         public async Task githubMarkdown(ScriptScopeContext scope, string markdownPath) 
         {
diff --git a/src/ScriptServices.cs b/src/ScriptServices.cs
@@ -70,7 +70,7 @@ public async Task<string> Any(EvaluateScript request)
                 DebugMode = false,
                 ScriptLanguages = { ScriptLisp.Language },
                 ScriptMethods = {
-                    new DbScripts(),
+                    new DbScriptsAsync(),
                     new AutoQueryScripts(),
                     new ServiceStackScripts(),
                     new CustomScriptMethods(),
diff --git a/src/SharpScript.csproj b/src/SharpScript.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5</TargetFramework>
     <AssemblyName>SharpScript</AssemblyName>
     <PackageId>SharpScript</PackageId>
   </PropertyGroup>
diff --git a/src/wwwroot/docs/installation.html b/src/wwwroot/docs/installation.html
@@ -69,7 +69,7 @@ <h2 id="starter-projects">Starter Project Templates</h2>
 <h4>.NET Core #Script Pages Project</h4>
 
 <p>
-    Create a new <a href="https://github.com/NetCoreTemplates/templates">#Script Pages Website</a> .NET Core 3.1 App with 
+    Create a new <a href="https://github.com/NetCoreTemplates/templates">#Script Pages Website</a> .NET 5.0 App with 
     <a href="https://docs.servicestack.net/web-new">x new</a>:
 </p>
 
diff --git a/src/wwwroot/docs/script-pages.html b/src/wwwroot/docs/script-pages.html
@@ -108,7 +108,7 @@ <h4 id="runs-everywhere">Runs Everywhere</h4>
 <h4>.NET Core #Script Pages Project</h4>
 
 <p>
-    Create a new <a href="https://github.com/NetCoreTemplates/templates">#Script Pages Website</a> .NET Core 3.1 App with 
+    Create a new <a href="https://github.com/NetCoreTemplates/templates">#Script Pages Website</a> .NET 5.0 App with 
     <a href="https://docs.servicestack.net/web-new">x new</a>:
 </p>
 
diff --git a/src/wwwroot/gfm/apps/02.html b/src/wwwroot/gfm/apps/02.html
@@ -514,7 +514,7 @@ <h3>
 <span class="pl-kos">]</span> |<span class="pl-c1">&gt;</span> <span class="pl-s1">map</span> <span class="pl-c1">=&gt;</span> <span class="pl-s">`&lt;script src="<span class="pl-s1"><span class="pl-kos">${</span><span class="pl-s1">it</span><span class="pl-kos">}</span></span>"&gt;&lt;/script&gt;`</span> |<span class="pl-c1">&gt;</span> <span class="pl-s1">joinln</span> |<span class="pl-c1">&gt;</span> <span class="pl-s1">raw</span> <span class="pl-kos">}</span><span class="pl-kos">}</span></pre></div>
 <p>But instead of needing to exist on disk &amp; deployed with your project it's referencing the embedded resources in <code>ServiceStack.Desktop.dll</code> and only the bundled assets need to be <a href="https://github.com/NetCoreApps/SharpData/blob/0499e7c66ca4289d17158e79bcc91815bbcd7a99/SharpData.csproj#L17">deployed with your project</a> which is using the built-in <a href="https://github.com/xoofx/NUglify">NUglify</a> support in the <a href="https://docs.servicestack.net/dotnet-tool" rel="nofollow">dotnet tools</a> to produce its highly optimized/minified bundle without needing to rely on any npm tooling when publishing the .NET Core App:</p>
 <div class="highlight highlight-text-xml"><pre>&lt;<span class="pl-ent">Target</span> <span class="pl-e">Name</span>=<span class="pl-s"><span class="pl-pds">"</span>Bundle<span class="pl-pds">"</span></span> <span class="pl-e">BeforeTargets</span>=<span class="pl-s"><span class="pl-pds">"</span>AfterPublish<span class="pl-pds">"</span></span>&gt;
-    &lt;<span class="pl-ent">Exec</span> <span class="pl-e">Command</span>=<span class="pl-s"><span class="pl-pds">"</span>x run _bundle.ss -to /bin/Release/netcoreapp3.1/publish/wwwroot<span class="pl-pds">"</span></span> /&gt;
+    &lt;<span class="pl-ent">Exec</span> <span class="pl-e">Command</span>=<span class="pl-s"><span class="pl-pds">"</span>x run _bundle.ss -to /bin/Release/net5/publish/wwwroot<span class="pl-pds">"</span></span> /&gt;
 &lt;/<span class="pl-ent">Target</span>&gt;</pre></div>
 <p>The included <a href="https://github.com/NetCoreApps/SharpData/tree/master/typings">/typings</a> are just the TypeScript definitions for each library which
 TypeScript uses for its static analysis &amp; its great dev UX in IDEs &amp; VSCode, but are only needed during development and not deployed with the project.</p>
diff --git a/src/wwwroot/gfm/apps/02.md b/src/wwwroot/gfm/apps/02.md
@@ -576,7 +576,7 @@ But instead of needing to exist on disk & deployed with your project it's refere
 
 ```xml
 <Target Name="Bundle" BeforeTargets="AfterPublish">
-    <Exec Command="x run _bundle.ss -to /bin/Release/netcoreapp3.1/publish/wwwroot" />
+    <Exec Command="x run _bundle.ss -to /bin/Release/net5/publish/wwwroot" />
 </Target>
 ```
 
diff --git a/src/wwwroot/gfm/sharp-apps/13.html b/src/wwwroot/gfm/sharp-apps/13.html
@@ -91,6 +91,6 @@ <h3>
 <pre><code>$ npm run build
 </code></pre>
 <p>Which will bundle and minify all <code>.css</code>, <code>.js</code> and <code>.html</code> assets and publish to <code>/app/wwwroot</code>.</p>
-<p>Then to deploy Sharp Apps you just need to copy the <code>/app</code> and <code>/web</code> folders to any server with .NET Core 3.1 runtime installed.
+<p>Then to deploy Sharp Apps you just need to copy the <code>/app</code> and <code>/web</code> folders to any server with .NET 5.0 runtime installed.
 The <a href="http://sharpscript.net/docs/deploying-sharp-apps" rel="nofollow">Deploying Sharp Apps</a> docs.</p>
 </div>
diff --git a/src/wwwroot/gfm/sharp-apps/13.md b/src/wwwroot/gfm/sharp-apps/13.md
@@ -116,5 +116,5 @@ During development Parcel maintains a debug and source-code friendly version of
 
 Which will bundle and minify all `.css`, `.js` and `.html` assets and publish to `/app/wwwroot`.
 
-Then to deploy Sharp Apps you just need to copy the `/app` and `/web` folders to any server with .NET Core 3.1 runtime installed. 
+Then to deploy Sharp Apps you just need to copy the `/app` and `/web` folders to any server with .NET 5.0 runtime installed. 
 The [Deploying Sharp Apps](http://sharpscript.net/docs/deploying-sharp-apps) docs.
diff --git a/src/wwwroot/sharp-apps/chat.html b/src/wwwroot/sharp-apps/chat.html
@@ -36,7 +36,7 @@
 <h4>Develop back-end using .NET IDE's</h4>
 
 <p>
-    For <a href="http://chat.web-app.io">chat.web-app.io</a> we've taken a copy of the existing .NET Core 3.1 
+    For <a href="http://chat.web-app.io">chat.web-app.io</a> we've taken a copy of the existing .NET 5.0 
     <a href="https://github.com/NetCoreApps/Chat">Chat App</a> and moved its C# code to
     <a href="https://github.com/sharp-apps/chat/tree/master/src">/chat/src</a>
     and its files to <a href="https://github.com/sharp-apps/chat">/chat</a> 
diff --git a/src/wwwroot/sharp-apps/gist-desktop-apps.html b/src/wwwroot/sharp-apps/gist-desktop-apps.html
@@ -468,7 +468,7 @@
 [Script Methods](http://sharpscript.net/docs/methods), [Sharp Code Pages](http://sharpscript.net/docs/code-pages) and 
 [Validators](https://docs.servicestack.net/validation) contained within **.dll's** or **.exe's** dropped in a Sharp Apps 
 [/plugins](https://github.com/sharp-apps/plugins/tree/master/plugins) folder which are auto-registered 
-on startup. The source code for all plugins used in this App were built from the .NET Core 3.1 projects in the
+on startup. The source code for all plugins used in this App were built from the .NET 5.0 projects in the
 [/plugins/src](https://github.com/sharp-apps/plugins/tree/master/src) folder. 
 
 {{/markdown}}
diff --git a/src/wwwroot/sharp-apps/index.html b/src/wwwroot/sharp-apps/index.html
@@ -174,6 +174,16 @@ <h3 id="project-templates">SharpApp Project Templates</h3>
 
 <pre class="sh"><code>$ dotnet tool install --global x</code></pre>
 
+<h4 id="vue-desktop">Vue Desktop</h4>
+
+<p>
+    The most versatile project template is the <a href="https://github.com/NetCoreTemplates/vue-desktop">Vue Desktop Template</a> which is capable
+    of building a standard <a href="https://github.com/NetCoreTemplates/vue-lite">vue-lite</a> .NET Core Web App that can also be bundled into 
+    a single GitHub Gist and run as a <a href="/gist-desktop-apps">Gist Desktop App</a>:
+</p>
+
+<iframe width="896" height="525" src="https://www.youtube.com/embed/kRnQSWdqH6U" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+
 <h4 id="bare-app">Bare SharpApp</h4>
 
 <p>
diff --git a/src/wwwroot/sharp-apps/plugins.html b/src/wwwroot/sharp-apps/plugins.html
@@ -26,7 +26,7 @@
     <a href="https://docs.servicestack.net/validation">Validators</a>, etc.
     contained within <b>.dll's</b> or <b>.exe's</b> dropped in a Sharp App's 
     <a href="https://github.com/sharp-apps/plugins/tree/master/plugins">/plugins</a> folder which are auto-registered 
-    on startup. This source code for plugins used in this App were built from the .NET Core 3.1 projects in the
+    on startup. This source code for plugins used in this App were built from the .NET 5.0 projects in the
     <a href="https://github.com/sharp-apps/plugins/tree/master/src">/plugins/src</a> folder.
 </p>
 
diff --git a/src/wwwroot/sharp-apps/redis.html b/src/wwwroot/sharp-apps/redis.html
@@ -34,7 +34,7 @@ <h3>Redis HTML</h3>
 <p>
     For the Redis Browser Web App, we wanted to implement an App that was an ideal candidate for a Single Page App but constrain ourselves
     to do all HTML rendering on the server and have each interaction request a full-page reload to see how a traditional server-generated
-    Web App feels like with the performance of .NET Core 3.1 and <em>#Script</em>. We're pleasantly surprised with the result as when 
+    Web App feels like with the performance of .NET 5.0 and <em>#Script</em>. We're pleasantly surprised with the result as when 
     the App is run locally the responsiveness is effectively indistinguishable from an Ajax App. When hosted on the Internet 
     there is a sub-second delay which causes a noticeable flicker but it still retains a pleasant UX that's faster than most websites.
 </p>
diff --git a/src/wwwroot/sharp-apps/rockwind.html b/src/wwwroot/sharp-apps/rockwind.html
@@ -131,7 +131,7 @@ <h4>Northwind</h4>
 <h4>Multi platform configurations</h4>
 
 <p>
-    In addition to being a .NET Core 3.1 App that runs flawlessly cross-platform on Windows, Linux and OSX, Sharp Apps can also support 
+    In addition to being a .NET 5.0 App that runs flawlessly cross-platform on Windows, Linux and OSX, Sharp Apps can also support 
     multiple RDBMS's and <a href="https://docs.servicestack.net/virtual-file-system">Virtual File Systems</a> using just configuration.
 </p>
 
@@ -324,7 +324,7 @@ <h5><a href="https://github.com/sharp-apps/rockwind-aws/blob/master/app/app.sett
 
 <p>
     With all files being sourced from S3 and the App configured to use AWS RDS PostgreSQL, the AWS settings is an example of 
-    a <b>Pure Cloud App</b> where the entire App is hosted on managed cloud services that's decoupled from the .NET Core 3.1 binary 
+    a <b>Pure Cloud App</b> where the entire App is hosted on managed cloud services that's decoupled from the .NET 5.0 binary 
     that runs it that for the most part won't require redeploying the Web App binary unless making configuration changes or 
     upgrading the <a href="https://docs.servicestack.net/dotnet-tool">x</a> dotnet tool
     as any App changes can just be uploaded straight to S3 which changes reflected within the

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public static async Task<Stream> convertScriptToLispBlocks(Stream renderedHtmlMa`
`59`	`59`	`return MemoryStreamFactory.GetStream(html.ToUtf8Bytes());`
`60`	`60`	`}`
`61`	`61`
`62`		`- const bool ReplaceUserContent = true;`
	`62`	`+ static bool ReplaceUserContent = true;`
`63`	`63`
`64`	`64`	`public async Task githubMarkdown(ScriptScopeContext scope, string markdownPath)`
`65`	`65`	`{`