From 8a78d49960d515e69d15085db5e5bc29f1c8275c Mon Sep 17 00:00:00 2001
From: mh <hoess@8oceans.com>
Date: Wed, 11 Nov 2020 11:50:20 +0100
Subject: [PATCH] Update to .NET 5.0.

Note: in Blog3000.Client.csproj the change to ItemGroup/ServiceWorker
was not documented in MS-docs, but reverse engineered from a fresh
created project, since MS-build was complaining.
---
 Blog3000/Client/Blog3000.Client.csproj | 19 ++++++++-----------
 Blog3000/Server/Blog3000.Server.csproj | 10 +++++-----
 Blog3000/Server/app_data/stats.json    |  2 +-
 Blog3000/Shared/Blog3000.Shared.csproj |  6 +++---
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/Blog3000/Client/Blog3000.Client.csproj b/Blog3000/Client/Blog3000.Client.csproj
index 9754c16..1f42900 100644
--- a/Blog3000/Client/Blog3000.Client.csproj
+++ b/Blog3000/Client/Blog3000.Client.csproj
@@ -1,8 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
+	<TargetFramework>net5.0</TargetFramework>
     <ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
     <PackageId>Blog3000.Client</PackageId>
@@ -27,20 +26,18 @@
   <ItemGroup>
     <PackageReference Include="Blazored.LocalStorage" Version="3.0.0" />
     <PackageReference Include="Markdig" Version="0.22.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.2.0-preview3.20168.3" />
-    <PackageReference Include="System.Linq.Async" Version="4.1.1" />
+    <PackageReference Include="System.Linq.Async" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Shared\Blog3000.Shared.csproj" />
   </ItemGroup>
 
-  <!-- When publishing, swap service-worker.published.js in place of service-worker.js -->
-  <ItemGroup Condition="'$(DesignTimeBuild)' != 'true'">
-    <Content Remove="wwwroot\service-worker.js" />
-    <Content Update="wwwroot\service-worker.published.js" Link="wwwroot\service-worker.js" />
+
+   <ItemGroup>
+    <ServiceWorker Include="wwwroot\service-worker.js" PublishedContent="wwwroot\service-worker.published.js" />
   </ItemGroup>
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     <Exec Command="cmd.exe /c echo namespace Blog3000.Client  { &gt; &quot;$(ProjectDir)\BuildVersion.cs&quot;&#xD;&#xA;cmd.exe /c echo public static class BuildVersion { &gt;&gt; &quot;$(ProjectDir)\BuildVersion.cs&quot;&#xD;&#xA;cmd.exe /c echo public static string BUILD_DATE=&quot;%25date%25 %25time%25&quot;; &gt;&gt; &quot;$(ProjectDir)\BuildVersion.cs&quot;&#xD;&#xA;cmd.exe /c echo }  }&gt;&gt; &quot;$(ProjectDir)\BuildVersion.cs&quot;" />
diff --git a/Blog3000/Server/Blog3000.Server.csproj b/Blog3000/Server/Blog3000.Server.csproj
index 684c59c..409bd74 100644
--- a/Blog3000/Server/Blog3000.Server.csproj
+++ b/Blog3000/Server/Blog3000.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <DisableImplicitComponentsAnalyzers>true</DisableImplicitComponentsAnalyzers>
     <PackageId>Blog3000.Server</PackageId>
     <Authors>Blog3000.Server</Authors>
@@ -15,12 +15,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AspNetCoreRateLimit" Version="3.0.5" />
+    <PackageReference Include="AspNetCoreRateLimit" Version="3.2.1" />
     <PackageReference Include="Markdig" Version="0.22.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.0" />
     <PackageReference Include="Syslog.Framework.Logging" Version="2.2.0" />
-    <PackageReference Include="TweetinviAPI" Version="5.0.1" />
+    <PackageReference Include="TweetinviAPI" Version="5.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Blog3000/Server/app_data/stats.json b/Blog3000/Server/app_data/stats.json
index b960b24..cfffa92 100644
--- a/Blog3000/Server/app_data/stats.json
+++ b/Blog3000/Server/app_data/stats.json
@@ -1 +1 @@
-{"1i1n1BMmust":40,"1i1n1BMmusp":27,"1i1n1BMmusn":7,"1i1n1BMmuse":47,"1i1n1BDwtO6":131,"1i1n1BKuvCw":10,"1i1n1BMmusW":1}
\ No newline at end of file
+{"1i1n1BMmust":41,"1i1n1BMmusp":27,"1i1n1BMmusn":7,"1i1n1BMmuse":48,"1i1n1BDwtO6":142,"1i1n1BKuvCw":11,"1i1n1BMmusW":1,"1i1n1BMmusa":1}
\ No newline at end of file
diff --git a/Blog3000/Shared/Blog3000.Shared.csproj b/Blog3000/Shared/Blog3000.Shared.csproj
index 4bf86dc..c4b35f5 100644
--- a/Blog3000/Shared/Blog3000.Shared.csproj
+++ b/Blog3000/Shared/Blog3000.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <PackageId>Blog3000.Shared</PackageId>
     <Authors>Blog3000.Shared</Authors>
     <Product>Blog3000.Shared</Product>
@@ -9,8 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="HtmlSanitizer" Version="5.0.355" />
-    <PackageReference Include="System.Linq.Async" Version="4.1.1" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="4.7.1" />
+    <PackageReference Include="System.Linq.Async" Version="5.0.0" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.0" />
   </ItemGroup>
 
 </Project>