Merge branch 'master' into isc30-patch-1

Author: isc30

GitVersion.yml

@@ -6,7 +6,7 @@ tag-prefix: '[vV]'
 branches:
   master: 
     mode: ContinuousDeployment
-    tag: beta
+    label: beta
     regex: master$
     increment: minor
     source-branches:
@@ -17,7 +17,7 @@ branches:
   feature:
     mode: ContinuousDeployment
     regex: features?[/-]
-    tag: useBranchName
+    label: useBranchName
     increment: Inherit
     source-branches:
     - master
@@ -27,7 +27,7 @@ branches:
   task:
     mode: ContinuousDeployment
     regex: tasks?[/-]
-    tag: useBranchName
+    label: useBranchName
     increment: Inherit
     source-branches:
     - master
@@ -37,9 +37,10 @@ branches:
   hotfix:
     mode: ContinuousDeployment
     regex: hotfix[/-]
-    tag: 'patch'
+    label: 'patch'
     increment: Patch
-    prevent-increment-of-merged-branch-version: true
+    prevent-increment:
+      of-merged-branch: true
     source-branches:
     - master
     - feature
@@ -49,7 +50,7 @@ branches:
   bugfix:
     mode: ContinuousDeployment
     regex: bugfixs?[/-]
-    tag: useBranchName
+    label: useBranchName
     increment: Inherit
     source-branches:
     - master

demo/DemoApp/DemoApp.Client/DemoApp.Client.csproj

@@ -1,15 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview9.19465.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview9.19465.2" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.0.0-preview9.19465.2" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview9.19465.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

demo/DemoApp/DemoApp.Client/Program.cs

@@ -1,16 +1,20 @@
-using Microsoft.AspNetCore.Blazor.Hosting;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Blazor.Analytics;
+using System.Threading.Tasks;
 
 namespace DemoApp.Client
 {
     public class Program
     {
-        public static void Main(string[] args)
+        public static async Task Main(string[] args)
         {
-            CreateHostBuilder(args).Build().Run();
-        }
+            var builder = WebAssemblyHostBuilder.CreateDefault(args);
+            builder.RootComponents.Add<App>("#app");
+
+            builder.Services.AddGoogleAnalytics("UA-111742878-2");
 
-        public static IWebAssemblyHostBuilder CreateHostBuilder(string[] args) =>
-            BlazorWebAssemblyHost.CreateDefaultBuilder()
-                .UseBlazorStartup<Startup>();
+            await builder.Build().RunAsync();
+        }
     }
 }

demo/DemoApp/DemoApp.Client/Startup.cs

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp8.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>