From 9508c54155b8ac87cfb34434b470422c52394847 Mon Sep 17 00:00:00 2001
From: Mark Rendle <mark@markrendle.net>
Date: Tue, 9 Mar 2021 20:18:41 +0000
Subject: [PATCH 1/5] Fix actions

---
 .github/workflows/dotnet.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index e31d1ea..ab09c9c 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -44,26 +44,29 @@ jobs:
         --output . src\ReCode.Cocoon.Legacy\ReCode.Cocoon.Legacy.csproj
       working-directory: .\main
     - name: PackProxy
+      working-directory: .\main
       run: >
         dotnet pack --configuration Release --no-build
         -p:PackageVersion=${{ steps.nbgv.outputs.SimpleVersion }}${{ steps.nbgv.outputs.PrereleaseVersion }}
         --output . src\ReCode.Cocoon.Proxy\ReCode.Cocoon.Proxy.csproj
     - name: PackProxyBlazorServer
+      working-directory: .\main
       run: >
         dotnet pack --configuration Release --no-build
         -p:PackageVersion=${{ steps.nbgv.outputs.SimpleVersion }}${{ steps.nbgv.outputs.PrereleaseVersion }}
         --output . src\ReCode.Cocoon.Proxy.BlazorServer\ReCode.Cocoon.Proxy.BlazorServer.csproj
     - name: PackProxyBlazorWasm
+      working-directory: .\main
       run: >
         dotnet pack --configuration Release --no-build
         -p:PackageVersion=${{ steps.nbgv.outputs.SimpleVersion }}${{ steps.nbgv.outputs.PrereleaseVersion }}
         --output . src\ReCode.Cocoon.Proxy.BlazorWasm\ReCode.Cocoon.Proxy.BlazorWasm.csproj
     - name: PackProxyBlazorWasmAuth
+      working-directory: .\main
       run: >
         dotnet pack --configuration Release --no-build
         -p:PackageVersion=${{ steps.nbgv.outputs.SimpleVersion }}${{ steps.nbgv.outputs.PrereleaseVersion }}
         --output . src\ReCode.Cocoon.Proxy.BlazorWasmAuth\ReCode.Cocoon.Proxy.BlazorWasmAuth.csproj
-      working-directory: .\main
     - name: Push
       run: dotnet nuget push *.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }} --skip-duplicate
       working-directory: .\main

From 3d6751a02b2c9305f4837fb5b802e189e841c82e Mon Sep 17 00:00:00 2001
From: Mark <mark@rendlelabs.com>
Date: Mon, 23 May 2022 13:56:56 +0100
Subject: [PATCH 2/5] Set UseCookies false on all backend HTTP clients

---
 .github/workflows/dotnet-develop.yml          |  2 +-
 main/Cocoon.sln                               |  1 +
 .../ReCode.Cocoon.Legacy.csproj               |  1 +
 .../Session/SessionValueDeserializer.cs       |  2 +
 .../Session/ValueSerializer.cs                |  4 ++
 .../ReCode.Cocoon.Proxy.BlazorServer.csproj   |  2 +-
 .../ReCode.Cocoon.Proxy.BlazorWasm.csproj     |  2 +-
 .../ReCode.Cocoon.Proxy.BlazorWasmAuth.csproj | 20 +++++---
 .../CocoonAuthenticationClient.cs             | 13 +++---
 .../CocoonAuthenticationExtensions.cs         | 24 ++++++----
 .../CocoonAuthenticationHandler.cs            |  2 +
 .../Authentication/MessageClaim.cs            |  3 ++
 .../Authentication/MessageIdentity.cs         |  3 ++
 .../Authentication/MessagePrincipal.cs        |  3 ++
 .../Cookies/CocoonCookieExtensions.cs         | 18 ++++----
 .../Cookies/CocoonCookies.cs                  |  7 ++-
 .../Cookies/ICocoonCookies.cs                 |  2 +-
 .../Internal/ProxyActivitySource.cs           | 12 +++++
 .../ReCode.Cocoon.Proxy/Proxy/CocoonProxy.cs  | 19 ++++----
 .../Proxy/CocoonProxyServicesExtensions.cs    | 10 ++--
 .../Proxy/RedirectTransformer.cs              | 20 ++++----
 .../ReCode.Cocoon.Proxy.csproj                |  9 ++--
 .../Session/CocoonSession.cs                  | 46 +++++++++++--------
 .../Session/CocoonSessionClient.cs            |  7 ++-
 .../Session/CocoonSessionExtensions.cs        | 23 ++++++----
 .../Session/CocoonSessionOptions.cs           |  5 +-
 .../Session/SessionValueDeserializer.cs       |  2 +-
 .../Session/ValueSerializer.cs                |  8 ++--
 main/version.json                             |  2 +-
 .../MvcCocoon/src/MvcCocoon/MvcCocoon.csproj  |  6 +--
 30 files changed, 171 insertions(+), 107 deletions(-)
 create mode 100644 main/src/ReCode.Cocoon.Proxy/Internal/ProxyActivitySource.cs

diff --git a/.github/workflows/dotnet-develop.yml b/.github/workflows/dotnet-develop.yml
index df65007..74467bc 100644
--- a/.github/workflows/dotnet-develop.yml
+++ b/.github/workflows/dotnet-develop.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 6.0.x
     - name: Restore dependencies
       run: dotnet restore
       working-directory: .\main
diff --git a/main/Cocoon.sln b/main/Cocoon.sln
index 9483bca..67673a7 100644
--- a/main/Cocoon.sln
+++ b/main/Cocoon.sln
@@ -28,6 +28,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{19C51172-6F93-479C-BF81-EDA51D6597AE}"
 ProjectSection(SolutionItems) = preProject
 	Directory.Build.props = Directory.Build.props
+	version.json = version.json
 EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{6AD14C47-2BE5-4428-AB83-641684162C8A}"
diff --git a/main/src/ReCode.Cocoon.Legacy/ReCode.Cocoon.Legacy.csproj b/main/src/ReCode.Cocoon.Legacy/ReCode.Cocoon.Legacy.csproj
index ba89198..5be2bc1 100644
--- a/main/src/ReCode.Cocoon.Legacy/ReCode.Cocoon.Legacy.csproj
+++ b/main/src/ReCode.Cocoon.Legacy/ReCode.Cocoon.Legacy.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net45</TargetFramework>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/main/src/ReCode.Cocoon.Legacy/Session/SessionValueDeserializer.cs b/main/src/ReCode.Cocoon.Legacy/Session/SessionValueDeserializer.cs
index 4b6c085..5c9ada2 100644
--- a/main/src/ReCode.Cocoon.Legacy/Session/SessionValueDeserializer.cs
+++ b/main/src/ReCode.Cocoon.Legacy/Session/SessionValueDeserializer.cs
@@ -36,6 +36,8 @@ internal static class SessionValueDeserializer
 
         public static object Deserialize(Type type, byte[] bytes)
         {
+            if (bytes is not { Length: > 0 }) return null;
+            
             if (Deserializers.TryGetValue(type, out var deserializer))
             {
                 return deserializer(bytes);
diff --git a/main/src/ReCode.Cocoon.Legacy/Session/ValueSerializer.cs b/main/src/ReCode.Cocoon.Legacy/Session/ValueSerializer.cs
index 53e4f14..55f8b5a 100644
--- a/main/src/ReCode.Cocoon.Legacy/Session/ValueSerializer.cs
+++ b/main/src/ReCode.Cocoon.Legacy/Session/ValueSerializer.cs
@@ -8,10 +8,14 @@ namespace ReCode.Cocoon.Legacy.Session
 {
     public static class ValueSerializer
     {
+        private static readonly byte[] Empty = new byte[0];
+        
         public static byte[] Serialize(object value)
         {
             switch (value)
             {
+                case null:
+                    return Empty;
                 case string str:
                     return Encoding.UTF8.GetBytes(str);
                 case short i16:
diff --git a/main/src/ReCode.Cocoon.Proxy.BlazorServer/ReCode.Cocoon.Proxy.BlazorServer.csproj b/main/src/ReCode.Cocoon.Proxy.BlazorServer/ReCode.Cocoon.Proxy.BlazorServer.csproj
index 9731acd..5329d4e 100644
--- a/main/src/ReCode.Cocoon.Proxy.BlazorServer/ReCode.Cocoon.Proxy.BlazorServer.csproj
+++ b/main/src/ReCode.Cocoon.Proxy.BlazorServer/ReCode.Cocoon.Proxy.BlazorServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/main/src/ReCode.Cocoon.Proxy.BlazorWasm/ReCode.Cocoon.Proxy.BlazorWasm.csproj b/main/src/ReCode.Cocoon.Proxy.BlazorWasm/ReCode.Cocoon.Proxy.BlazorWasm.csproj
index 5409774..eb04044 100644
--- a/main/src/ReCode.Cocoon.Proxy.BlazorWasm/ReCode.Cocoon.Proxy.BlazorWasm.csproj
+++ b/main/src/ReCode.Cocoon.Proxy.BlazorWasm/ReCode.Cocoon.Proxy.BlazorWasm.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/main/src/ReCode.Cocoon.Proxy.BlazorWasmAuth/ReCode.Cocoon.Proxy.BlazorWasmAuth.csproj b/main/src/ReCode.Cocoon.Proxy.BlazorWasmAuth/ReCode.Cocoon.Proxy.BlazorWasmAuth.csproj
index 7a69bcf..e24b833 100644
--- a/main/src/ReCode.Cocoon.Proxy.BlazorWasmAuth/ReCode.Cocoon.Proxy.BlazorWasmAuth.csproj
+++ b/main/src/ReCode.Cocoon.Proxy.BlazorWasmAuth/ReCode.Cocoon.Proxy.BlazorWasmAuth.csproj
@@ -1,16 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="5.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="5.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.3" PrivateAssets="all" />
+  <ItemGroup Condition="('$(TargetFramework)'=='net5.0')">
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="5.0.17" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.17" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="5.0.17" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.17" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
     <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="('$(TargetFramework)'=='net6.0')">
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.5" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/main/src/ReCode.Cocoon.Proxy/Authentication/CocoonAuthenticationClient.cs b/main/src/ReCode.Cocoon.Proxy/Authentication/CocoonAuthenticationClient.cs
index 10cc764..a4627c8 100644
--- a/main/src/ReCode.Cocoon.Proxy/Authentication/CocoonAuthenticationClient.cs
+++ b/main/src/ReCode.Cocoon.Proxy/Authentication/CocoonAuthenticationClient.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
@@ -15,8 +14,6 @@ namespace ReCode.Cocoon.Proxy.Authentication
 {
     public class CocoonAuthenticationClient
     {
-        private static readonly ActivitySource Source = new ("ReCode.Cocoon.Proxy");
-        
         private readonly HttpClient _httpClient;
         private readonly IOptionsMonitor<CocoonAuthenticationOptions> _options;
         private readonly ILogger<CocoonAuthenticationClient> _logger;
@@ -30,7 +27,7 @@ public CocoonAuthenticationClient(HttpClient httpClient, IOptionsMonitor<CocoonA
 
         public async Task<AuthenticateResult> AuthenticateAsync(HttpRequest request)
         {
-            using var activity = Source.StartActivity("Authenticate");
+            using var activity = ProxyActivitySource.StartActivity("Authenticate");
             
             var requestMessage = new HttpRequestMessage(HttpMethod.Get, "");
 
@@ -94,7 +91,9 @@ private static void CopyDefaultHeaders(HttpRequest request, HttpRequestMessage r
 
         private void CopyOptionsHeaders(HttpRequest request, HttpRequestMessage requestMessage)
         {
-            foreach (var headerName in _options.CurrentValue.Headers)
+            if (_options.CurrentValue?.Headers is not { Length: > 0 } headers) return;
+            
+            foreach (var headerName in headers)
             {
                 if (request.Headers.TryGetValue(headerName, out var values))
                 {
@@ -115,7 +114,9 @@ private void CopyOptionsHeaders(HttpRequest request, HttpRequestMessage requestM
 
         private void CopyOptionsCookies(HttpRequest request, HttpRequestMessage requestMessage)
         {
-            foreach (var cookieName in _options.CurrentValue.Cookies)
+            if (_options.CurrentValue?.Cookies is not { Length: > 0 } cookies) return;
+            
+            foreach (var cookieName in cookies)
             {
                 if (request.Cookies.TryGetValue(cookieName, out var value))
                 {
diff --git a/main/src/ReCode.Cocoon.Proxy/Authentication/CocoonAuthenticationExtensions.cs b/main/src/ReCode.Cocoon.Proxy/Authentication/CocoonAuthenticationExtensions.cs
index 9317375..eb3782c 100644
--- a/main/src/ReCode.Cocoon.Proxy/Authentication/CocoonAuthenticationExtensions.cs
+++ b/main/src/ReCode.Cocoon.Proxy/Authentication/CocoonAuthenticationExtensions.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Net.Http;
+using JetBrains.Annotations;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -6,24 +8,26 @@
 
 namespace ReCode.Cocoon.Proxy.Authentication
 {
+    [PublicAPI]
     public static class CocoonAuthenticationExtensions
     {
         public static AuthenticationBuilder AddCocoon(this AuthenticationBuilder builder)
         {
             builder.Services.AddOptions<CocoonAuthenticationOptions>()
-                .Configure<IConfiguration>((options, configuration) =>
-                {
-                    configuration.GetSection("Cocoon:Authentication").Bind(options);
-                })
+                .Configure<IConfiguration>((options, configuration) => { configuration.GetSection("Cocoon:Authentication").Bind(options); })
                 .Validate(o => Uri.TryCreate(o.BackendApiUrl, UriKind.Absolute, out _),
                     "Invalid BackendApiUrl");
-            
+
             builder.Services.AddHttpClient<CocoonAuthenticationClient>((provider, client) =>
-            {
-                var options = provider.GetRequiredService<IOptionsMonitor<CocoonAuthenticationOptions>>();
-                client.BaseAddress = new Uri(options.CurrentValue.BackendApiUrl);
-            });
-            
+                {
+                    var options = provider.GetRequiredService<IOptionsMonitor<CocoonAuthenticationOptions>>();
+                    client.BaseAddress = new Uri(options.CurrentValue.BackendApiUrl);
+                })
+                .ConfigurePrimaryHttpMessageHandler(() => new SocketsHttpHandler
+                {
+                    UseCookies = false
+                });
+
             builder.AddScheme<CocoonAuthenticationOptions, CocoonAuthenticationHandler>(CocoonAuthenticationDefaults.Scheme, null);
 
             return builder;
diff --git a/main/src/ReCode.Cocoon.Proxy/Authentication/CocoonAuthenticationHandler.cs b/main/src/ReCode.Cocoon.Proxy/Authentication/CocoonAuthenticationHandler.cs
index 8821d2d..6a96af8 100644
--- a/main/src/ReCode.Cocoon.Proxy/Authentication/CocoonAuthenticationHandler.cs
+++ b/main/src/ReCode.Cocoon.Proxy/Authentication/CocoonAuthenticationHandler.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.Extensions.Logging;
@@ -8,6 +9,7 @@
 
 namespace ReCode.Cocoon.Proxy.Authentication
 {
+    [PublicAPI]
     public class CocoonAuthenticationHandler : AuthenticationHandler<CocoonAuthenticationOptions>
     {
         private readonly CocoonAuthenticationClient _client;
diff --git a/main/src/ReCode.Cocoon.Proxy/Authentication/MessageClaim.cs b/main/src/ReCode.Cocoon.Proxy/Authentication/MessageClaim.cs
index 721da7f..bf0f7ca 100644
--- a/main/src/ReCode.Cocoon.Proxy/Authentication/MessageClaim.cs
+++ b/main/src/ReCode.Cocoon.Proxy/Authentication/MessageClaim.cs
@@ -1,10 +1,13 @@
 using System.Collections.Generic;
 using System.Security.Claims;
+using JetBrains.Annotations;
 using MessagePack;
+#pragma warning disable CS8618
 
 namespace ReCode.Cocoon.Proxy.Authentication
 {
     [MessagePackObject]
+    [PublicAPI]
     public class MessageClaim
     {
         [Key(0)]
diff --git a/main/src/ReCode.Cocoon.Proxy/Authentication/MessageIdentity.cs b/main/src/ReCode.Cocoon.Proxy/Authentication/MessageIdentity.cs
index 83543c9..79a77f3 100644
--- a/main/src/ReCode.Cocoon.Proxy/Authentication/MessageIdentity.cs
+++ b/main/src/ReCode.Cocoon.Proxy/Authentication/MessageIdentity.cs
@@ -1,11 +1,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
+using JetBrains.Annotations;
 using MessagePack;
+#pragma warning disable CS8618
 
 namespace ReCode.Cocoon.Proxy.Authentication
 {
     [MessagePackObject]
+    [PublicAPI]
     public class MessageIdentity
     {
         [Key(0)]
diff --git a/main/src/ReCode.Cocoon.Proxy/Authentication/MessagePrincipal.cs b/main/src/ReCode.Cocoon.Proxy/Authentication/MessagePrincipal.cs
index 6ffda10..cebe575 100644
--- a/main/src/ReCode.Cocoon.Proxy/Authentication/MessagePrincipal.cs
+++ b/main/src/ReCode.Cocoon.Proxy/Authentication/MessagePrincipal.cs
@@ -1,11 +1,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
+using JetBrains.Annotations;
 using MessagePack;
+#pragma warning disable CS8618
 
 namespace ReCode.Cocoon.Proxy.Authentication
 {
     [MessagePackObject]
+    [PublicAPI]
     public class MessagePrincipal
     {
         [Key(0)]
diff --git a/main/src/ReCode.Cocoon.Proxy/Cookies/CocoonCookieExtensions.cs b/main/src/ReCode.Cocoon.Proxy/Cookies/CocoonCookieExtensions.cs
index 6877fec..d3c90cf 100644
--- a/main/src/ReCode.Cocoon.Proxy/Cookies/CocoonCookieExtensions.cs
+++ b/main/src/ReCode.Cocoon.Proxy/Cookies/CocoonCookieExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Net.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
@@ -12,17 +13,18 @@ public static IServiceCollection AddCocoonCookies(this IServiceCollection servic
         {
             services.AddHttpContextAccessor();
             services.AddOptions<CocoonCookieOptions>()
-                .Configure<IConfiguration>((options, configuration) =>
-                {
-                    configuration.GetSection("Cocoon:Cookies").Bind(options);
-                })
+                .Configure<IConfiguration>((options, configuration) => { configuration.GetSection("Cocoon:Cookies").Bind(options); })
                 .Validate(o => Uri.TryCreate(o.BackendApiUrl, UriKind.Absolute, out _),
                     "Invalid BackendApiUrl");
             services.AddHttpClient<CocoonCookieClient>((provider, client) =>
-            {
-                var options = provider.GetRequiredService<IOptionsMonitor<CocoonCookieOptions>>();
-                client.BaseAddress = new Uri(options.CurrentValue.BackendApiUrl);
-            });
+                {
+                    var options = provider.GetRequiredService<IOptionsMonitor<CocoonCookieOptions>>();
+                    client.BaseAddress = new Uri(options.CurrentValue.BackendApiUrl!);
+                })
+                .ConfigurePrimaryHttpMessageHandler(() => new SocketsHttpHandler
+                {
+                    UseCookies = false
+                });
             services.AddScoped<ICocoonCookies, CocoonCookies>();
             return services;
         }
diff --git a/main/src/ReCode.Cocoon.Proxy/Cookies/CocoonCookies.cs b/main/src/ReCode.Cocoon.Proxy/Cookies/CocoonCookies.cs
index 9e3d1a8..86eef65 100644
--- a/main/src/ReCode.Cocoon.Proxy/Cookies/CocoonCookies.cs
+++ b/main/src/ReCode.Cocoon.Proxy/Cookies/CocoonCookies.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 
@@ -7,7 +6,7 @@ namespace ReCode.Cocoon.Proxy.Cookies
 {
     public class CocoonCookies : ICocoonCookies
     {
-        private CocoonCookieClient _client;
+        private readonly CocoonCookieClient _client;
         private readonly IHttpContextAccessor _contextAccessor;
 
         public CocoonCookies(CocoonCookieClient client, IHttpContextAccessor contextAccessor)
@@ -16,11 +15,11 @@ public CocoonCookies(CocoonCookieClient client, IHttpContextAccessor contextAcce
             _contextAccessor = contextAccessor;
         }
 
-        public ValueTask<string> GetAsync(string key)
+        public ValueTask<string?> GetAsync(string key)
         {
             var context = _contextAccessor.HttpContext;
             if (context is null) throw new InvalidOperationException("No context");
-            return new ValueTask<string>(_client.GetAsync(key, context.Request));
+            return new ValueTask<string?>(_client.GetAsync(key, context.Request));
         }
 
         public async Task SetAsync(string key, string value)
diff --git a/main/src/ReCode.Cocoon.Proxy/Cookies/ICocoonCookies.cs b/main/src/ReCode.Cocoon.Proxy/Cookies/ICocoonCookies.cs
index 683151c..fa571be 100644
--- a/main/src/ReCode.Cocoon.Proxy/Cookies/ICocoonCookies.cs
+++ b/main/src/ReCode.Cocoon.Proxy/Cookies/ICocoonCookies.cs
@@ -4,7 +4,7 @@ namespace ReCode.Cocoon.Proxy.Cookies
 {
     public interface ICocoonCookies
     {
-        ValueTask<string> GetAsync(string key);
+        ValueTask<string?> GetAsync(string key);
         Task SetAsync(string key, string value);
     }
 }
\ No newline at end of file
diff --git a/main/src/ReCode.Cocoon.Proxy/Internal/ProxyActivitySource.cs b/main/src/ReCode.Cocoon.Proxy/Internal/ProxyActivitySource.cs
new file mode 100644
index 0000000..c82fe4d
--- /dev/null
+++ b/main/src/ReCode.Cocoon.Proxy/Internal/ProxyActivitySource.cs
@@ -0,0 +1,12 @@
+// ReSharper disable once CheckNamespace
+
+using System.Diagnostics;
+
+namespace ReCode.Cocoon.Proxy;
+
+internal static class ProxyActivitySource
+{
+    private static readonly ActivitySource Source = new("ReCode.Cocoon.Proxy");
+
+    public static Activity? StartActivity(string name) => Source.StartActivity(name, ActivityKind.Client);
+}
\ No newline at end of file
diff --git a/main/src/ReCode.Cocoon.Proxy/Proxy/CocoonProxy.cs b/main/src/ReCode.Cocoon.Proxy/Proxy/CocoonProxy.cs
index 42a160e..cbcfe3f 100644
--- a/main/src/ReCode.Cocoon.Proxy/Proxy/CocoonProxy.cs
+++ b/main/src/ReCode.Cocoon.Proxy/Proxy/CocoonProxy.cs
@@ -7,23 +7,22 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-using Yarp.ReverseProxy.Service.Proxy;
+using Yarp.ReverseProxy.Forwarder;
 
 namespace ReCode.Cocoon.Proxy.Proxy
 {
     public class CocoonProxy
     {
-        private static readonly ActivitySource Source = new("ReCode.Cocoon.Proxy");
-        private readonly IHttpProxy _httpProxy;
+        private readonly IHttpForwarder _httpForwarder;
         private readonly HashSet<string> _backendUrls;
         private readonly HttpMessageInvoker _httpClient;
         private readonly RedirectTransformer _transformer;
-        private readonly RequestProxyOptions _requestOptions;
+        private readonly ForwarderRequestConfig _requestConfig;
         private readonly string _destinationPrefix;
 
-        public CocoonProxy(IConfiguration configuration, ILogger<CocoonProxy> logger, IHttpProxy httpProxy, CocoonProxyOptions? proxyOptions)
+        public CocoonProxy(IConfiguration configuration, ILogger<CocoonProxy> logger, IHttpForwarder httpForwarder, CocoonProxyOptions? proxyOptions)
         {
-            _httpProxy = httpProxy;
+            _httpForwarder = httpForwarder;
             _destinationPrefix = configuration
                 .GetValue<string>("Cocoon:Proxy:DestinationPrefix");
 
@@ -62,9 +61,9 @@ public CocoonProxy(IConfiguration configuration, ILogger<CocoonProxy> logger, IH
             {
                 timeout = TimeSpan.FromSeconds(30);
             }
-            _requestOptions = new RequestProxyOptions
+            _requestConfig = new ForwarderRequestConfig()
             {
-                Timeout = timeout
+                ActivityTimeout = timeout
             };
         }
 
@@ -76,10 +75,10 @@ public async Task ProxyAsync(HttpContext httpContext)
                 return;
             }
 
-            using var activity = Source.StartActivity("Proxy");
+            using var activity = ProxyActivitySource.StartActivity("Proxy");
             activity?.SetTag("path", httpContext.Request.Path.ToString());
 
-            await _httpProxy.ProxyAsync(httpContext, _destinationPrefix, _httpClient, _requestOptions, _transformer);
+            await _httpForwarder.SendAsync(httpContext, _destinationPrefix, _httpClient, _requestConfig, _transformer);
         }
     }
 }
\ No newline at end of file
diff --git a/main/src/ReCode.Cocoon.Proxy/Proxy/CocoonProxyServicesExtensions.cs b/main/src/ReCode.Cocoon.Proxy/Proxy/CocoonProxyServicesExtensions.cs
index ca94bea..16e36f1 100644
--- a/main/src/ReCode.Cocoon.Proxy/Proxy/CocoonProxyServicesExtensions.cs
+++ b/main/src/ReCode.Cocoon.Proxy/Proxy/CocoonProxyServicesExtensions.cs
@@ -1,11 +1,13 @@
+using JetBrains.Annotations;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using ReCode.Cocoon.Proxy.Proxy;
-using Yarp.ReverseProxy.Service.Proxy;
+using Yarp.ReverseProxy.Forwarder;
 
 // ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection
 {
+    [PublicAPI]
     public static class CocoonProxyServicesExtensions
     {
         public static IReverseProxyBuilder AddCocoonProxy(this IServiceCollection services, IConfiguration configuration)
@@ -15,10 +17,10 @@ public static IReverseProxyBuilder AddCocoonProxy(this IServiceCollection servic
 
         public static IReverseProxyBuilder AddCocoonProxy(this IServiceCollection services, IConfiguration configuration, CocoonProxyOptions? cocoonProxyOptions)
         {
-            services.AddSingleton<CocoonProxy>(provider => new CocoonProxy(
+            services.AddSingleton(provider => new CocoonProxy(
                 configuration, 
-                provider.GetService<ILogger<CocoonProxy>>(), 
-                provider.GetService<IHttpProxy>(), cocoonProxyOptions));
+                provider.GetRequiredService<ILogger<CocoonProxy>>(), 
+                provider.GetRequiredService<IHttpForwarder>(), cocoonProxyOptions));
 
             return ReverseProxyBuilder(services, configuration);
         }
diff --git a/main/src/ReCode.Cocoon.Proxy/Proxy/RedirectTransformer.cs b/main/src/ReCode.Cocoon.Proxy/Proxy/RedirectTransformer.cs
index d4db481..7b73a57 100644
--- a/main/src/ReCode.Cocoon.Proxy/Proxy/RedirectTransformer.cs
+++ b/main/src/ReCode.Cocoon.Proxy/Proxy/RedirectTransformer.cs
@@ -2,7 +2,7 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using Yarp.ReverseProxy.Service.Proxy;
+using Yarp.ReverseProxy.Forwarder;
 
 namespace ReCode.Cocoon.Proxy.Proxy
 {
@@ -15,16 +15,20 @@ public RedirectTransformer(Uri destinationPrefix)
             _destinationPrefix = destinationPrefix;
         }
 
-        public override async Task TransformResponseAsync(HttpContext context, HttpResponseMessage response)
+        public override async ValueTask<bool> TransformResponseAsync(HttpContext context, HttpResponseMessage? response)
         {
-            var location = response.Headers.Location;
-            
-            if (location?.IsAbsoluteUri == true && _destinationPrefix.IsBaseOf(location))
+            if (response is not null)
             {
-                var relative = location.PathAndQuery;
-                response.Headers.Location = new Uri(relative, UriKind.Relative);
+                var location = response.Headers.Location;
+
+                if (location?.IsAbsoluteUri == true && _destinationPrefix.IsBaseOf(location))
+                {
+                    var relative = location.PathAndQuery;
+                    response.Headers.Location = new Uri(relative, UriKind.Relative);
+                }
             }
-            await base.TransformResponseAsync(context, response);
+
+            return await base.TransformResponseAsync(context, response);
         }
     }
 }
\ No newline at end of file
diff --git a/main/src/ReCode.Cocoon.Proxy/ReCode.Cocoon.Proxy.csproj b/main/src/ReCode.Cocoon.Proxy/ReCode.Cocoon.Proxy.csproj
index 1a38af6..1946ef1 100644
--- a/main/src/ReCode.Cocoon.Proxy/ReCode.Cocoon.Proxy.csproj
+++ b/main/src/ReCode.Cocoon.Proxy/ReCode.Cocoon.Proxy.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -11,9 +11,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MessagePack" Version="2.2.85" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.1" />
-    <PackageReference Include="Yarp.ReverseProxy" Version="1.0.0-preview.10.21168.2" />
+    <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
+    <PackageReference Include="MessagePack" Version="2.3.85" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
+    <PackageReference Include="Yarp.ReverseProxy" Version="1.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/main/src/ReCode.Cocoon.Proxy/Session/CocoonSession.cs b/main/src/ReCode.Cocoon.Proxy/Session/CocoonSession.cs
index a044f97..d1c2f43 100644
--- a/main/src/ReCode.Cocoon.Proxy/Session/CocoonSession.cs
+++ b/main/src/ReCode.Cocoon.Proxy/Session/CocoonSession.cs
@@ -1,20 +1,20 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
 using Microsoft.AspNetCore.Http;
 
 namespace ReCode.Cocoon.Proxy.Session
 {
+    [PublicAPI]
     public class CocoonSession : IAsyncDisposable
     {
-        private static readonly ActivitySource Source = new("ReCode.Cocoon.Proxy");
         private readonly CocoonSessionClient _client;
-        private readonly HttpContext _context;
+        private readonly HttpContext? _context;
         private readonly object _mutex = new();
-        private Dictionary<string, byte[]>? _original;
-        private Dictionary<string, object>? _cache;
+        private Dictionary<string, byte[]?>? _original;
+        private Dictionary<string, object?>? _cache;
         private int _disposed;
 
         public CocoonSession(CocoonSessionClient client, IHttpContextAccessor contextAccessor)
@@ -23,29 +23,31 @@ public CocoonSession(CocoonSessionClient client, IHttpContextAccessor contextAcc
             _context = contextAccessor.HttpContext;
         }
 
-        public ValueTask<T> GetAsync<T>(string key)
+        public ValueTask<T?> GetAsync<T>(string key)
         {
             EnsureCache();
             lock (_mutex)
             {
-                if (_cache.TryGetValue(key, out var value))
+                if (_cache!.TryGetValue(key, out var value))
                 {
-                    return new ValueTask<T>((T) value);
+                    return new ValueTask<T?>(value is null ? default : (T)value);
                 }
             }
             
-            return new ValueTask<T>(Get<T>(key));
+            return new ValueTask<T?>(Get<T>(key));
         }
 
-        public void Set<T>(string key, T value)
+        public void Set<T>(string key, T? value)
         {
             EnsureCache();
             CacheValue(key, value);
         }
 
-        private async Task<T> Get<T>(string key)
+        private async Task<T?> Get<T>(string key)
         {
-            using var activity = Source.StartActivity("GetSession");
+            if (_context is null) return default;
+            
+            using var activity = ProxyActivitySource.StartActivity("GetSession");
             activity?.AddTag("key", key);
             
             var bytes = await _client.GetAsync(key, _context.Request);
@@ -53,10 +55,10 @@ private async Task<T> Get<T>(string key)
             
             CacheValue(key, bytes, value);
 
-            return (T)value;
+            return value is null ? default : (T)value;
         }
 
-        private void CacheValue(string key, byte[] bytes, object value)
+        private void CacheValue(string key, byte[]? bytes, object? value)
         {
             lock (_mutex)
             {
@@ -65,7 +67,7 @@ private void CacheValue(string key, byte[] bytes, object value)
             }
         }
 
-        private void CacheValue(string key, object value)
+        private void CacheValue(string key, object? value)
         {
             lock (_mutex)
             {
@@ -77,8 +79,8 @@ private void EnsureCache()
         {
             lock (_mutex)
             {
-                _cache ??= new ();
-                _original ??= new ();
+                _cache ??= new Dictionary<string, object?>();
+                _original ??= new Dictionary<string, byte[]?>();
             }
         }
 
@@ -88,24 +90,26 @@ public ValueTask DisposeAsync()
             
             if (Interlocked.Increment(ref _disposed) > 1) return default;
             
-            using var activity = Source.StartActivity("SaveSession");
+            using var activity = ProxyActivitySource.StartActivity("SaveSession");
 
             List<Task>? tasks = null;
             
             foreach (var (key, value) in _cache)
             {
+                var type = value?.GetType() ?? typeof(object);
+                
                 var bytes = ValueSerializer.Serialize(value);
                 
                 if (_original!.TryGetValue(key, out var original))
                 {
                     if (!bytes.AsSpan().SequenceEqual(original))
                     {
-                        SendValue(key, bytes, value.GetType(), ref tasks);
+                        SendValue(key, bytes, type, ref tasks);
                     }
                 }
                 else
                 {
-                    SendValue(key, bytes, value.GetType(), ref tasks);
+                    SendValue(key, bytes, type, ref tasks);
                 }
             }
 
@@ -125,6 +129,8 @@ public ValueTask DisposeAsync()
 
         private void SendValue(string key, byte[] bytes, Type type, ref List<Task>? tasks)
         {
+            if (_context is null) return;
+            
             var task = _client.SetAsync(key, bytes, type, _context.Request);
             tasks ??= new();
             tasks.Add(task);
diff --git a/main/src/ReCode.Cocoon.Proxy/Session/CocoonSessionClient.cs b/main/src/ReCode.Cocoon.Proxy/Session/CocoonSessionClient.cs
index 5f624cb..6ed7d02 100644
--- a/main/src/ReCode.Cocoon.Proxy/Session/CocoonSessionClient.cs
+++ b/main/src/ReCode.Cocoon.Proxy/Session/CocoonSessionClient.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
@@ -20,7 +19,7 @@ public CocoonSessionClient(HttpClient client, IOptionsMonitor<CocoonSessionOptio
 
         public async Task<byte[]?> GetAsync(string key, HttpRequest request)
         {
-            var message = CreateMessage(key, request, HttpMethod.Get, $"?key={key}");
+            var message = CreateMessage(request, HttpMethod.Get, $"?key={key}");
 
             using var response = await _client.SendAsync(message);
             if (!response.IsSuccessStatusCode)
@@ -35,14 +34,14 @@ public async Task SetAsync(string key, byte[] bytes, Type type, HttpRequest requ
         {
             var uri = $"?key={key}&type={type.AssemblyQualifiedName}";
             
-            var message = CreateMessage(key, request, HttpMethod.Put, uri);
+            var message = CreateMessage(request, HttpMethod.Put, uri);
 
             message.Content = new ByteArrayContent(bytes);
 
             await _client.SendAsync(message);
         }
 
-        private HttpRequestMessage CreateMessage(string key, HttpRequest request, HttpMethod httpMethod, string? requestUri)
+        private HttpRequestMessage CreateMessage(HttpRequest request, HttpMethod httpMethod, string? requestUri)
         {
             var message = new HttpRequestMessage(httpMethod, requestUri);
 
diff --git a/main/src/ReCode.Cocoon.Proxy/Session/CocoonSessionExtensions.cs b/main/src/ReCode.Cocoon.Proxy/Session/CocoonSessionExtensions.cs
index cb08ef2..11d9b45 100644
--- a/main/src/ReCode.Cocoon.Proxy/Session/CocoonSessionExtensions.cs
+++ b/main/src/ReCode.Cocoon.Proxy/Session/CocoonSessionExtensions.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Net.Http;
+using JetBrains.Annotations;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 using ReCode.Cocoon.Proxy.Session;
@@ -6,24 +8,29 @@
 // ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection
 {
+    [PublicAPI]
     public static class CocoonSessionExtensions
     {
         public static IServiceCollection AddCocoonSession(this IServiceCollection services)
         {
             services.AddHttpContextAccessor();
+
             services.AddOptions<CocoonSessionOptions>()
-                .Configure<IConfiguration>((options, configuration) =>
-                {
-                    configuration.GetSection("Cocoon:Session").Bind(options);
-                })
+                .Configure<IConfiguration>((options, configuration) => { configuration.GetSection("Cocoon:Session").Bind(options); })
                 .Validate(o => o.Cookies is { Length: > 0 }
                                && Uri.TryCreate(o.BackendApiUrl, UriKind.Absolute, out _),
                     "Invalid BackendApiUrl");
+
             services.AddHttpClient<CocoonSessionClient>((provider, client) =>
-            {
-                var options = provider.GetRequiredService<IOptionsMonitor<CocoonSessionOptions>>();
-                client.BaseAddress = new Uri(options.CurrentValue.BackendApiUrl);
-            });
+                {
+                    var options = provider.GetRequiredService<IOptionsMonitor<CocoonSessionOptions>>();
+                    client.BaseAddress = new Uri(options.CurrentValue.BackendApiUrl);
+                })
+                .ConfigurePrimaryHttpMessageHandler(() => new SocketsHttpHandler
+                {
+                    UseCookies = false
+                });
+
             services.AddScoped<CocoonSession>();
             return services;
         }
diff --git a/main/src/ReCode.Cocoon.Proxy/Session/CocoonSessionOptions.cs b/main/src/ReCode.Cocoon.Proxy/Session/CocoonSessionOptions.cs
index d719b8b..05819bc 100644
--- a/main/src/ReCode.Cocoon.Proxy/Session/CocoonSessionOptions.cs
+++ b/main/src/ReCode.Cocoon.Proxy/Session/CocoonSessionOptions.cs
@@ -1,5 +1,8 @@
-namespace ReCode.Cocoon.Proxy.Session
+using JetBrains.Annotations;
+
+namespace ReCode.Cocoon.Proxy.Session
 {
+    [PublicAPI]
     public class CocoonSessionOptions
     {
         public string BackendApiUrl { get; set; } = null!;
diff --git a/main/src/ReCode.Cocoon.Proxy/Session/SessionValueDeserializer.cs b/main/src/ReCode.Cocoon.Proxy/Session/SessionValueDeserializer.cs
index 1c7aa9f..867bbb4 100644
--- a/main/src/ReCode.Cocoon.Proxy/Session/SessionValueDeserializer.cs
+++ b/main/src/ReCode.Cocoon.Proxy/Session/SessionValueDeserializer.cs
@@ -12,7 +12,7 @@ internal static class SessionValueDeserializer
     {
         public static object? Deserialize<T>(byte[]? bytes)
         {
-            if (bytes is null) return default;
+            if (bytes is not {Length: > 0}) return default;
             
             if (Deserializers.TryGetValue(typeof(T), out var deserializer))
             {
diff --git a/main/src/ReCode.Cocoon.Proxy/Session/ValueSerializer.cs b/main/src/ReCode.Cocoon.Proxy/Session/ValueSerializer.cs
index 1c36163..98fd4fb 100644
--- a/main/src/ReCode.Cocoon.Proxy/Session/ValueSerializer.cs
+++ b/main/src/ReCode.Cocoon.Proxy/Session/ValueSerializer.cs
@@ -4,17 +4,17 @@
 using MessagePack;
 using MessagePack.Resolvers;
 
-// using System.Buffers;
-// using System.Buffers.Text;
-
 namespace ReCode.Cocoon.Proxy.Session
 {
     public static class ValueSerializer
     {
-        public static byte[] Serialize(object value)
+        private static readonly byte[] Empty = Array.Empty<byte>();
+        public static byte[] Serialize(object? value)
         {
             switch (value)
             {
+                case null:
+                    return Empty;
                 case string str:
                     return Encoding.UTF8.GetBytes(str);
                 case short i16:
diff --git a/main/version.json b/main/version.json
index 1f7d04e..999b31e 100644
--- a/main/version.json
+++ b/main/version.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "1.0-beta1",
+    "version": "1.0-rc1",
     "assemblyVersion": {
       "precision": "revision"
     }
diff --git a/samples/MvcCocoon/src/MvcCocoon/MvcCocoon.csproj b/samples/MvcCocoon/src/MvcCocoon/MvcCocoon.csproj
index c5a65e3..29368a3 100644
--- a/samples/MvcCocoon/src/MvcCocoon/MvcCocoon.csproj
+++ b/samples/MvcCocoon/src/MvcCocoon/MvcCocoon.csproj
@@ -1,14 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MessagePack" Version="2.2.85" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.1" />
-    <PackageReference Include="Microsoft.ReverseProxy" Version="1.0.0-preview.8.21065.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.5" />
   </ItemGroup>
 
   <ItemGroup>

From a4c3f7a028c4123d657df760a8cb7fe860407365 Mon Sep 17 00:00:00 2001
From: Mark <mark@rendlelabs.com>
Date: Mon, 23 May 2022 14:15:48 +0100
Subject: [PATCH 3/5] Update to net6.0

---
 .../IndentedStringBuilder.cs                  |  72 ++
 .../ReCode.Cocoon.Proxy.BlazorCodeGen.csproj  |  17 +
 .../Route.cs                                  |  79 ++
 .../RouteTesterGenerator.cs                   | 210 ++++
 .../RouteTesterSourceGenerator.cs             |  47 +
 .../TemplateFinder.cs                         |  69 ++
 samples/BlazorCocoon/BlazorCocoon.sln         |  14 +
 .../Client/BlazorCocoon.Client.csproj         |  12 +-
 samples/BlazorCocoon/Client/Pages/Admin.razor |  58 ++
 .../Client/Pages/AdminEditProduct.razor       |  67 ++
 .../Client/Pages/AdminNewProduct.razor        |  67 ++
 .../BlazorCocoon/Client/Pages/Counter.razor   |  16 +
 .../BlazorCocoon/Client/Pages/FetchData.razor |  46 +
 samples/BlazorCocoon/Client/Program.cs        |   9 +
 samples/BlazorCocoon/Client/RouteTester.cs    | 923 ++++++++++++++++++
 .../BlazorCocoon/Client/Shared/CartLink.razor |  15 +
 .../Client/Shared/LoginPartial.razor          |   4 +-
 .../BlazorCocoon/Client/Shared/NavMenu.razor  |   2 +-
 .../BlazorCocoon/Client/Shared/TopMenu.razor  |   3 +-
 samples/BlazorCocoon/Dockerfile               |  24 -
 .../Server/BlazorCocoon.Server.csproj         |   6 +-
 .../Server/Controllers/AdminController.cs     | 109 +++
 .../Server/Controllers/CartController.cs      |  28 +
 .../BlazorCocoon/Server/Controllers/Cocoon.cs |  26 +-
 .../Controllers/WeatherForecastController.cs  |  40 +
 samples/BlazorCocoon/Server/Data/CartItem.cs  |  21 +
 samples/BlazorCocoon/Server/Data/Category.cs  |  18 +
 samples/BlazorCocoon/Server/Data/Product.cs   |  25 +
 .../Server/Data/WingtipToysContext.cs         |  17 +
 .../Server/Services/ShoppingCart.cs           |  32 +
 samples/BlazorCocoon/Server/Startup.cs        |  20 +-
 .../Server/appsettings.Development.json       |  11 +-
 samples/BlazorCocoon/Server/appsettings.json  |  22 +-
 .../Data/WingtipToysContext.cs                |  17 +
 .../src/BlazorServerCocoon/Dockerfile         |  24 -
 .../src/BlazorServerCocoon/Pages/Admin.razor  |  61 ++
 .../Pages/AdminEditProduct.razor              |  71 ++
 .../Pages/AdminNewProduct.razor               |  72 ++
 .../Properties/launchSettings.json            |  17 +-
 .../Services/ShoppingCart.cs                  |  32 +
 .../BlazorServerCocoon/Shared/CartLink.razor  |  14 +
 .../Shared/LoginPartial.razor                 |   2 +-
 .../BlazorServerCocoon/Shared/NavMenu.razor   |   2 +-
 .../BlazorServerCocoon/Shared/TopMenu.razor   |   2 +-
 .../src/BlazorServerCocoon/Startup.cs         |  17 +-
 .../appsettings.Development.json              |   3 +
 .../src/BlazorServerCocoon/appsettings.json   |  23 +-
 .../MvcCocoon/Controllers/AdminController.cs  |  60 ++
 samples/MvcCocoon/src/MvcCocoon/Dockerfile    |  20 -
 .../MvcCocoon/Properties/launchSettings.json  |  19 +-
 .../src/MvcCocoon/Services/ShoppingCart.cs    |  32 +
 samples/MvcCocoon/src/MvcCocoon/Startup.cs    |  14 +-
 .../MvcCocoon/TagHelpers/CartLinkTagHelper.cs |  31 +
 .../src/MvcCocoon/Views/Admin/Index.cshtml    |  38 +
 .../MvcCocoon/Views/Admin/NewProduct.cshtml   |  41 +
 .../src/MvcCocoon/Views/Shared/_Layout.cshtml |  47 +-
 .../Views/Shared/_LoginPartial.cshtml         |   2 +-
 .../src/MvcCocoon/Views/_ViewImports.cshtml   |   1 +
 .../MvcCocoon/appsettings.Development.json    |   3 +
 .../MvcCocoon/src/MvcCocoon/appsettings.json  |  23 +-
 60 files changed, 2590 insertions(+), 227 deletions(-)
 create mode 100644 main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/IndentedStringBuilder.cs
 create mode 100644 main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/ReCode.Cocoon.Proxy.BlazorCodeGen.csproj
 create mode 100644 main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/Route.cs
 create mode 100644 main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/RouteTesterGenerator.cs
 create mode 100644 main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/RouteTesterSourceGenerator.cs
 create mode 100644 main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/TemplateFinder.cs
 create mode 100644 samples/BlazorCocoon/Client/Pages/Admin.razor
 create mode 100644 samples/BlazorCocoon/Client/Pages/AdminEditProduct.razor
 create mode 100644 samples/BlazorCocoon/Client/Pages/AdminNewProduct.razor
 create mode 100644 samples/BlazorCocoon/Client/Pages/Counter.razor
 create mode 100644 samples/BlazorCocoon/Client/Pages/FetchData.razor
 create mode 100644 samples/BlazorCocoon/Client/RouteTester.cs
 create mode 100644 samples/BlazorCocoon/Client/Shared/CartLink.razor
 delete mode 100644 samples/BlazorCocoon/Dockerfile
 create mode 100644 samples/BlazorCocoon/Server/Controllers/AdminController.cs
 create mode 100644 samples/BlazorCocoon/Server/Controllers/CartController.cs
 create mode 100644 samples/BlazorCocoon/Server/Controllers/WeatherForecastController.cs
 create mode 100644 samples/BlazorCocoon/Server/Data/CartItem.cs
 create mode 100644 samples/BlazorCocoon/Server/Data/Category.cs
 create mode 100644 samples/BlazorCocoon/Server/Data/Product.cs
 create mode 100644 samples/BlazorCocoon/Server/Data/WingtipToysContext.cs
 create mode 100644 samples/BlazorCocoon/Server/Services/ShoppingCart.cs
 create mode 100644 samples/BlazorServerCocoon/src/BlazorServerCocoon/Data/WingtipToysContext.cs
 delete mode 100644 samples/BlazorServerCocoon/src/BlazorServerCocoon/Dockerfile
 create mode 100644 samples/BlazorServerCocoon/src/BlazorServerCocoon/Pages/Admin.razor
 create mode 100644 samples/BlazorServerCocoon/src/BlazorServerCocoon/Pages/AdminEditProduct.razor
 create mode 100644 samples/BlazorServerCocoon/src/BlazorServerCocoon/Pages/AdminNewProduct.razor
 create mode 100644 samples/BlazorServerCocoon/src/BlazorServerCocoon/Services/ShoppingCart.cs
 create mode 100644 samples/BlazorServerCocoon/src/BlazorServerCocoon/Shared/CartLink.razor
 create mode 100644 samples/MvcCocoon/src/MvcCocoon/Controllers/AdminController.cs
 delete mode 100644 samples/MvcCocoon/src/MvcCocoon/Dockerfile
 create mode 100644 samples/MvcCocoon/src/MvcCocoon/Services/ShoppingCart.cs
 create mode 100644 samples/MvcCocoon/src/MvcCocoon/TagHelpers/CartLinkTagHelper.cs
 create mode 100644 samples/MvcCocoon/src/MvcCocoon/Views/Admin/Index.cshtml
 create mode 100644 samples/MvcCocoon/src/MvcCocoon/Views/Admin/NewProduct.cshtml

diff --git a/main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/IndentedStringBuilder.cs b/main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/IndentedStringBuilder.cs
new file mode 100644
index 0000000..db75298
--- /dev/null
+++ b/main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/IndentedStringBuilder.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Text;
+
+namespace ReCode.Cocoon.Proxy.BlazorCodeGen
+{
+    public class IndentedStringBuilder
+    {
+        private readonly int _indentSpaces;
+        private readonly StringBuilder _builder = new();
+        private bool _newLine = true;
+
+        public IndentedStringBuilder(int indentSpaces = 4)
+        {
+            _indentSpaces = indentSpaces;
+        }
+
+        public int Indent { get; set; }
+
+        public IndentedStringBuilder Append(string value)
+        {
+            if (_newLine)
+            {
+                if (Indent > 0)
+                {
+                    _builder.Append(new string(' ', _indentSpaces * Indent));
+                    _newLine = false;
+                }
+            }
+
+            _builder.Append(value);
+
+            return this;
+        }
+
+        public IndentedStringBuilder AppendLine(string value)
+        {
+            Append(value);
+            _builder.AppendLine();
+            _newLine = true;
+            return this;
+        }
+        
+        public IndentedStringBuilder AppendLine()
+        {
+            _builder.AppendLine();
+            _newLine = true;
+            return this;
+        }
+
+        public IDisposable OpenBrace() => new Block(this);
+
+        private class Block : IDisposable
+        {
+            private readonly IndentedStringBuilder _builder;
+
+            public Block(IndentedStringBuilder builder)
+            {
+                _builder = builder;
+                _builder.AppendLine("{");
+                _builder.Indent++;
+            }
+
+            public void Dispose()
+            {
+                _builder.Indent--;
+                _builder.AppendLine("}");
+            }
+        }
+
+        public override string ToString() => _builder.ToString();
+    }
+}
\ No newline at end of file
diff --git a/main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/ReCode.Cocoon.Proxy.BlazorCodeGen.csproj b/main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/ReCode.Cocoon.Proxy.BlazorCodeGen.csproj
new file mode 100644
index 0000000..5f9b4f4
--- /dev/null
+++ b/main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/ReCode.Cocoon.Proxy.BlazorCodeGen.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.2.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/Route.cs b/main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/Route.cs
new file mode 100644
index 0000000..00bee03
--- /dev/null
+++ b/main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/Route.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+
+namespace ReCode.Cocoon.Proxy.BlazorCodeGen
+{
+    internal class Route
+    {
+        private readonly Dictionary<char, Route> _routes = new();
+
+        public Route(bool isStart)
+        {
+            IsStart = isStart;
+        }
+
+        public bool IsStart { get; }
+        
+        public bool IsEnd { get; private set; }
+        public bool IsWildcard { get; private set; }
+
+        public IEnumerable<char> GetValues() => _routes.Keys;
+        public Route GetRoute(char key) => _routes[key];
+
+        public void Add(Span<string> parts)
+        {
+            if (parts.Length == 0)
+            {
+                IsEnd = true;
+                return;
+            }
+            var part = parts[0];
+            
+            if (parts[0].Length == 0)
+            {
+                if (parts.Length == 0)
+                {
+                    IsEnd = true;
+                }
+                return;
+            }
+
+            if (part[0] == '{')
+            {
+                if (part.Length > 1 && part[1] == '*')
+                {
+                    IsWildcard = true;
+                    return;
+                }
+
+                char ch = '*';
+                if (!_routes.TryGetValue(ch, out var route))
+                {
+                    route = new Route(part.Length == 1);
+                    _routes.Add(ch, route);
+                }
+                route.Add(parts.Slice(1));
+            }
+            else
+            {
+                char ch = part[0];
+                if (!_routes.TryGetValue(ch, out var route))
+                {
+                    route = new Route(part.Length == 1);
+                    _routes.Add(ch, route);
+                }
+
+                if (part.Length == 1)
+                {
+                    route.Add(parts.Slice(1));
+                }
+                else
+                {
+                    parts[0] = part.Substring(1);
+                    route.Add(parts);
+                }
+            }
+            
+        }
+    }
+}
\ No newline at end of file
diff --git a/main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/RouteTesterGenerator.cs b/main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/RouteTesterGenerator.cs
new file mode 100644
index 0000000..596d87a
--- /dev/null
+++ b/main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/RouteTesterGenerator.cs
@@ -0,0 +1,210 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ReCode.Cocoon.Proxy.BlazorCodeGen
+{
+    public class RouteTesterGenerator
+    {
+        private readonly Route _root;
+
+        public RouteTesterGenerator(IEnumerable<string> routes)
+        {
+            _root = new Route(true);
+
+            foreach (var route in routes)
+            {
+                var parts = route.ToLowerInvariant()
+                    .Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries);
+
+                _root.Add(parts);
+            }
+        }
+
+        public string Generate()
+        {
+            var code = new IndentedStringBuilder();
+            code.AppendLine("using System;");
+            code.AppendLine("using System.Collections.Generic;");
+            code.AppendLine();
+            code.AppendLine("namespace ReCode.Cocoon.Proxy.Blazor");
+            using (code.OpenBrace())
+            {
+                code.AppendLine("public class CocoonBlazorRouteTester");
+                using (code.OpenBrace())
+                {
+                    WriteIsMatch(code);
+                    code.AppendLine();
+                    WriteToNextSlash(code);
+                }
+            }
+
+            return code.ToString();
+        }
+
+        private void WriteIsMatch(IndentedStringBuilder code)
+        {
+            code.AppendLine("public bool IsMatch(string path)");
+            using (code.OpenBrace())
+            {
+                code.AppendLine("if (path == string.Empty) return false;");
+
+                code.AppendLine("Span<char> span = stackalloc char[path.Length];");
+                code.AppendLine("MemoryExtensions.ToLowerInvariant(path, span);");
+                code.AppendLine("if (span[0] == '/' && span.Length > 1)");
+                using (code.OpenBrace())
+                {
+                    code.AppendLine("span = span.Slice(1);");
+                }
+
+                code.AppendLine("var rest = ToNextSlash(ref span);");
+                code.AppendLine("if (rest.Length == 0) return false;");
+                code.AppendLine("var ch = rest[0];");
+                code.AppendLine("rest = rest.Slice(1);");
+                WriteSwitch(_root, code);
+                code.AppendLine("return false;");
+            }
+        }
+
+        private void WriteSwitch(Route route, IndentedStringBuilder code)
+        {
+            var values = route.GetValues()
+                .Distinct()
+                .ToArray();
+
+            bool wildcard = values.Contains('*');
+            values = values.Where(v => v != '*').ToArray();
+
+            if (values.Length > 1)
+            {
+                code.AppendLine($"switch (ch)");
+                using (code.OpenBrace())
+                {
+                    foreach (var c in values)
+                    {
+                        if (c == '*')
+                        {
+                            continue;
+                        }
+
+                        var subRoute = route.GetRoute(c);
+                        code.AppendLine($"case '{c}':");
+                        using (code.OpenBrace())
+                        {
+                            code.AppendLine("if (rest.Length == 0)");
+                            using (code.OpenBrace())
+                            {
+                                if (subRoute.IsEnd)
+                                {
+                                    code.AppendLine("if (span.Length == 0) return true;");
+                                }
+
+                                if (subRoute.IsStart)
+                                {
+                                    if (subRoute.IsWildcard)
+                                    {
+                                        code.AppendLine("return true;");
+                                    }
+                                    else
+                                    {
+                                        code.AppendLine("rest = ToNextSlash(ref span);");
+                                        code.AppendLine("ch = rest[0];");
+                                        code.AppendLine("rest = rest.Slice(1);");
+                                        WriteSwitch(subRoute, code);
+                                    }
+                                }
+
+                                code.AppendLine("return false;");
+                            }
+                            code.AppendLine("else");
+                            using (code.OpenBrace())
+                            {
+                                code.AppendLine("ch = rest[0];");
+                                code.AppendLine("rest = rest.Slice(1);");
+                                WriteSwitch(subRoute, code);
+                            }
+                            code.AppendLine("return false;");
+                        }
+                    }
+                }
+            }
+            else if (values.Length == 1)
+            {
+                var c = values[0];
+                var subRoute = route.GetRoute(c);
+                code.AppendLine($"if (ch == '{c}')");
+                using (code.OpenBrace())
+                {
+                    code.AppendLine("if (rest.Length == 0)");
+                    using (code.OpenBrace())
+                    {
+                        if (subRoute.IsEnd)
+                        {
+                            code.AppendLine("if (span.Length == 0) return true;");
+                        }
+
+                        if (subRoute.IsStart)
+                        {
+                            if (subRoute.IsWildcard)
+                            {
+                                code.AppendLine("return true;");
+                            }
+                            else
+                            {
+                                code.AppendLine("rest = ToNextSlash(ref span);");
+                                code.AppendLine("ch = rest[0];");
+                                code.AppendLine("rest = rest.Slice(1);");
+                                WriteSwitch(subRoute, code);
+                            }
+                        }
+
+                        code.AppendLine("return false;");
+                    }
+
+                    code.AppendLine("ch = rest[0];");
+                    code.AppendLine("rest = rest.Slice(1);");
+                    WriteSwitch(subRoute, code);
+                    code.AppendLine("return false;");
+                }
+            }
+
+            if (wildcard)
+            {
+                var subRoute = route.GetRoute('*');
+                code.AppendLine("rest = ToNextSlash(ref span);");
+                if (subRoute.IsEnd)
+                {
+                    code.AppendLine("if (span.Length == 0) return true;");
+                }
+                code.AppendLine("ch = rest[0];");
+            }
+        }
+
+        private static void WriteToNextSlash(IndentedStringBuilder code)
+        {
+            foreach (var line in ToNextSlash.Trim().Split('\n').Select(l => l.TrimEnd()))
+            {
+                code.AppendLine(line);
+            }
+        }
+
+        private const string ToNextSlash = @"
+private static Span<char> ToNextSlash(ref Span<char> span)
+{
+    var index = span.IndexOf('/');
+    if (index > 0)
+    {
+        var ret = span.Slice(0, index);
+        span = span.Slice(index + 1);
+        return ret;
+    }
+    else
+    {
+        var ret = span;
+        span = Array.Empty<char>().AsSpan();
+        return ret;
+    }
+}
+";
+    }
+}
\ No newline at end of file
diff --git a/main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/RouteTesterSourceGenerator.cs b/main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/RouteTesterSourceGenerator.cs
new file mode 100644
index 0000000..69d2e3f
--- /dev/null
+++ b/main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/RouteTesterSourceGenerator.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+
+namespace ReCode.Cocoon.Proxy.BlazorCodeGen
+{
+    [Generator]
+    public class RouteTesterSourceGenerator : ISourceGenerator
+    {
+        public void Initialize(GeneratorInitializationContext context)
+        {
+        }
+
+        public void Execute(GeneratorExecutionContext context)
+        {
+            try
+            {
+                var allRoutePaths = TemplateFinder.GetRouteTemplates(context.Compilation);
+                if (allRoutePaths.Length == 0)
+                {
+                    var descriptor = new DiagnosticDescriptor("Cocoon42", "No Routes",
+                        "No routes were found",
+                        "Cocoon", DiagnosticSeverity.Warning, true);
+
+                    var diagnostic = Diagnostic.Create(descriptor, null);
+                    context.ReportDiagnostic(diagnostic);
+                    return;
+                }
+
+                var generator = new RouteTesterGenerator(allRoutePaths);
+                var dictSource = SourceText.From(generator.Generate(), Encoding.UTF8);
+                context.AddSource("CocoonBlazorRouteTester", dictSource);
+            }
+            catch (Exception)
+            {
+                #if(DEBUG)
+                Debugger.Launch();
+                #endif
+            }
+        }
+        
+    }
+}
diff --git a/main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/TemplateFinder.cs b/main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/TemplateFinder.cs
new file mode 100644
index 0000000..c32fad7
--- /dev/null
+++ b/main/src/ReCode.Cocoon.Proxy.BlazorCodeGen/TemplateFinder.cs
@@ -0,0 +1,69 @@
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace ReCode.Cocoon.Proxy.BlazorCodeGen
+{
+    internal static class TemplateFinder
+    {
+        private const string RouteAttributeName = "Microsoft.AspNetCore.Components.RouteAttribute";
+
+        private static readonly HashSet<string> RouteAttributeNames = new()
+        {
+            RouteAttributeName,
+            "Route",
+            "RouteAttribute"
+        };
+        
+        public static ImmutableArray<string> GetRouteTemplates(Compilation compilation)
+        {
+            // Get all classes
+            IEnumerable<SyntaxNode> allNodes = compilation.SyntaxTrees.SelectMany(s => s.GetRoot().DescendantNodes());
+            IEnumerable<ClassDeclarationSyntax> allClasses = allNodes
+                .Where(d => d.IsKind(SyntaxKind.ClassDeclaration))
+                .OfType<ClassDeclarationSyntax>();
+            
+            return allClasses
+                .Select(component => GetRoutePath(compilation, component))
+                .Where(route => route is not null)
+                .Cast<string>()// stops the nullable lies
+                .ToImmutableArray();
+        }
+        
+        private static string? GetRoutePath(Compilation compilation, ClassDeclarationSyntax component)
+        {
+            var routeAttribute = component.AttributeLists
+                .SelectMany(x => x.Attributes)
+                .FirstOrDefault(attr => RouteAttributeNames.Contains(attr.Name.ToString()));
+                
+            if (routeAttribute?.ArgumentList?.Arguments.Count != 1)
+            {
+                // no route path
+                return null;
+            }
+                
+            var semanticModel = compilation.GetSemanticModel(component.SyntaxTree);
+
+            var symbol = semanticModel.GetSymbolInfo(routeAttribute).Symbol;
+
+            if (symbol is IMethodSymbol methodSymbol)
+            {
+                if (methodSymbol.ContainingType is INamedTypeSymbol namedTypeSymbol)
+                {
+                    var fullName = $"{namedTypeSymbol.ContainingNamespace}.{namedTypeSymbol.Name}";
+                    if (fullName == RouteAttributeName)
+                    {
+                        var routeArg = routeAttribute.ArgumentList.Arguments[0];
+                        var routeExpr = routeArg.Expression;
+                        return semanticModel.GetConstantValue(routeExpr).ToString();
+                    }
+                }
+            }
+
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/BlazorCocoon/BlazorCocoon.sln b/samples/BlazorCocoon/BlazorCocoon.sln
index b86cc8a..b3792dd 100644
--- a/samples/BlazorCocoon/BlazorCocoon.sln
+++ b/samples/BlazorCocoon/BlazorCocoon.sln
@@ -14,6 +14,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReCode.Cocoon.Proxy.BlazorW
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReCode.Cocoon.Proxy.BlazorWasmAuth", "..\..\main\src\ReCode.Cocoon.Proxy.BlazorWasmAuth\ReCode.Cocoon.Proxy.BlazorWasmAuth.csproj", "{D84E0BFC-85F2-43E0-8F70-C3A129CCF032}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReCode.Cocoon.Proxy.BlazorCodeGen", "..\..\main\src\ReCode.Cocoon.Proxy.BlazorCodeGen\ReCode.Cocoon.Proxy.BlazorCodeGen.csproj", "{AE2242A3-AEF6-4145-8A59-8C0AABF5D014}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -96,6 +98,18 @@ Global
 		{D84E0BFC-85F2-43E0-8F70-C3A129CCF032}.Release|x64.Build.0 = Release|Any CPU
 		{D84E0BFC-85F2-43E0-8F70-C3A129CCF032}.Release|x86.ActiveCfg = Release|Any CPU
 		{D84E0BFC-85F2-43E0-8F70-C3A129CCF032}.Release|x86.Build.0 = Release|Any CPU
+		{AE2242A3-AEF6-4145-8A59-8C0AABF5D014}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE2242A3-AEF6-4145-8A59-8C0AABF5D014}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE2242A3-AEF6-4145-8A59-8C0AABF5D014}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AE2242A3-AEF6-4145-8A59-8C0AABF5D014}.Debug|x64.Build.0 = Debug|Any CPU
+		{AE2242A3-AEF6-4145-8A59-8C0AABF5D014}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AE2242A3-AEF6-4145-8A59-8C0AABF5D014}.Debug|x86.Build.0 = Debug|Any CPU
+		{AE2242A3-AEF6-4145-8A59-8C0AABF5D014}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE2242A3-AEF6-4145-8A59-8C0AABF5D014}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE2242A3-AEF6-4145-8A59-8C0AABF5D014}.Release|x64.ActiveCfg = Release|Any CPU
+		{AE2242A3-AEF6-4145-8A59-8C0AABF5D014}.Release|x64.Build.0 = Release|Any CPU
+		{AE2242A3-AEF6-4145-8A59-8C0AABF5D014}.Release|x86.ActiveCfg = Release|Any CPU
+		{AE2242A3-AEF6-4145-8A59-8C0AABF5D014}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/samples/BlazorCocoon/Client/BlazorCocoon.Client.csproj b/samples/BlazorCocoon/Client/BlazorCocoon.Client.csproj
index 564ee22..ad6eb7c 100644
--- a/samples/BlazorCocoon/Client/BlazorCocoon.Client.csproj
+++ b/samples/BlazorCocoon/Client/BlazorCocoon.Client.csproj
@@ -1,19 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="5.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="5.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.3" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
-    <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
+    <ProjectReference Include="..\..\..\main\src\ReCode.Cocoon.Proxy.BlazorCodeGen\ReCode.Cocoon.Proxy.BlazorCodeGen.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
     <ProjectReference Include="..\..\..\main\src\ReCode.Cocoon.Proxy.BlazorWasmAuth\ReCode.Cocoon.Proxy.BlazorWasmAuth.csproj" />
     <ProjectReference Include="..\Shared\BlazorCocoon.Shared.csproj" />
   </ItemGroup>
diff --git a/samples/BlazorCocoon/Client/Pages/Admin.razor b/samples/BlazorCocoon/Client/Pages/Admin.razor
new file mode 100644
index 0000000..c6c52f1
--- /dev/null
+++ b/samples/BlazorCocoon/Client/Pages/Admin.razor
@@ -0,0 +1,58 @@
+@page "/Admin/AdminPage"
+@using BlazorCocoon.Shared
+@inject HttpClient Http
+
+<h1>Admin</h1>
+
+<h2>Products</h2>
+
+<div class="row">
+  <div class="col-1">
+    <a class="btn btn-primary" href="/Admin/NewProduct">
+      Add a New Product
+    </a>
+  </div>
+</div>
+
+@if (_products is null)
+{
+  <p>Loading...</p>
+}
+else
+{
+<table class="table">
+  <thead>
+  <th>Category</th>
+  <th>Name</th>
+  <th>Description</th>
+  <th>Price</th>
+  <th></th>
+  </thead>
+  <tbody>
+  @foreach (var product in _products)
+  {
+    <tr>
+      <td>@product.Category.CategoryName</td>
+      <td>@product.ProductName</td>
+      <td>@product.Description</td>
+      <td>@product.UnitPrice.GetValueOrDefault().ToString("C")</td>
+      <td><a href="/Admin/EditProduct/@product.ProductID">Edit</a></td>
+    </tr>
+  }
+  </tbody>
+</table>
+}
+
+@code {
+  private Product[] _products;
+
+  protected override async Task OnInitializedAsync()
+  {
+    _products = await Http.GetFromJsonAsync<Product[]>("/api/admin/products");
+
+    _products = _products.OrderBy(p => p.Category.CategoryName)
+      .ThenBy(p => p.ProductName)
+      .ToArray();
+  }
+
+}
\ No newline at end of file
diff --git a/samples/BlazorCocoon/Client/Pages/AdminEditProduct.razor b/samples/BlazorCocoon/Client/Pages/AdminEditProduct.razor
new file mode 100644
index 0000000..8784232
--- /dev/null
+++ b/samples/BlazorCocoon/Client/Pages/AdminEditProduct.razor
@@ -0,0 +1,67 @@
+@page "/Admin/EditProduct/{productId:int}"
+@using BlazorCocoon.Shared
+@inject HttpClient Http
+@inject NavigationManager Nav;
+
+@if (_categories is null)
+{
+  <p>Loading...</p>
+}
+else
+{
+  <div class="row">
+    <div class="col-12">
+      <h1>Add a New Product</h1>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-md-12">
+      <EditForm Model="@_product" OnValidSubmit="OnSubmit">
+        <div class="form-group">
+          <label asp-for="Name">Name</label>
+          <InputText id="Name" @bind-Value="_product.ProductName" class="form-control" />
+        </div>
+        <div class="form-group">
+          <label asp-for="Description">Description</label>
+          <InputText id="Description" @bind-Value="_product.Description" class="form-control" />
+        </div>
+        <div class="form-group">
+          <label asp-for="Price">Price</label>
+          <InputNumber id="Price" @bind-Value="_product.UnitPrice" class="form-control" />
+        </div>
+        <div class="form-group">
+          <label asp-for="Price">Category</label>
+          <InputSelect id="CategoryId" @bind-Value="_product.CategoryID">
+            @foreach (var category in _categories)
+            {
+              <option value="@category.CategoryID">@category.CategoryName</option>
+            }
+          </InputSelect>
+        </div>
+        <button type="submit">Submit</button>
+      </EditForm>
+    </div>
+  </div>
+}
+
+@code {
+  private Category[] _categories;
+  private Product _product = new();
+  
+  [Parameter]
+  public int ProductId { get; set; }
+  
+  protected override async Task OnParametersSetAsync()
+  {
+    _categories = await Http.GetFromJsonAsync<Category[]>("/api/admin/categories");
+    _product = await Http.GetFromJsonAsync<Product>($"/api/admin/products/{ProductId}");
+  }
+
+  private async void OnSubmit()
+  {
+    await Http.PostAsJsonAsync("/api/admin/products", _product);
+    Nav.NavigateTo("/Admin/AdminPage");
+  }
+
+}
diff --git a/samples/BlazorCocoon/Client/Pages/AdminNewProduct.razor b/samples/BlazorCocoon/Client/Pages/AdminNewProduct.razor
new file mode 100644
index 0000000..ec12143
--- /dev/null
+++ b/samples/BlazorCocoon/Client/Pages/AdminNewProduct.razor
@@ -0,0 +1,67 @@
+@page "/Admin/NewProduct"
+@using BlazorCocoon.Shared
+@inject HttpClient Http
+@inject NavigationManager Nav;
+
+@if (_categories is null)
+{
+  <p>Loading...</p>
+}
+else
+{
+  <div class="row">
+    <div class="col-12">
+      <h1>Add a New Product</h1>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-md-12">
+      <EditForm Model="@_product" OnValidSubmit="OnSubmit">
+        <div class="form-group">
+          <label asp-for="Name">Name</label>
+          <InputText id="Name" @bind-Value="_product.ProductName" class="form-control" />
+        </div>
+        <div class="form-group">
+          <label asp-for="Description">Description</label>
+          <InputText id="Description" @bind-Value="_product.Description" class="form-control" />
+        </div>
+        <div class="form-group">
+          <label asp-for="Price">Price</label>
+          <InputNumber id="Price" @bind-Value="_product.UnitPrice" class="form-control" />
+        </div>
+        <div class="form-group">
+          <label asp-for="Price">Category</label>
+          <InputSelect id="CategoryId" @bind-Value="_product.CategoryID">
+            @foreach (var category in _categories)
+            {
+              <option value="@category.CategoryID">@category.CategoryName</option>
+            }
+          </InputSelect>
+        </div>
+        <button type="submit">Submit</button>
+      </EditForm>
+    </div>
+  </div>
+}
+
+@code {
+  private Category[] _categories;
+  private Product _product = new();
+  
+  protected override async Task OnInitializedAsync()
+  {
+    _categories = await Http.GetFromJsonAsync<Category[]>("/api/admin/categories");
+    _product = new Product
+    {
+      CategoryID = _categories[0].CategoryID
+    };
+  }
+
+  private async Task OnSubmit()
+  {
+    await Http.PostAsJsonAsync("/api/admin/products", _product);
+    Nav.NavigateTo("/Admin/AdminPage");
+  }
+
+}
\ No newline at end of file
diff --git a/samples/BlazorCocoon/Client/Pages/Counter.razor b/samples/BlazorCocoon/Client/Pages/Counter.razor
new file mode 100644
index 0000000..ea07ff3
--- /dev/null
+++ b/samples/BlazorCocoon/Client/Pages/Counter.razor
@@ -0,0 +1,16 @@
+@page "/counter"
+
+<h1>Counter</h1>
+
+<p>Current count: @currentCount</p>
+
+<button class="btn btn-primary" @onclick="IncrementCount">Click me</button>
+
+@code {
+    private int currentCount = 0;
+
+    private void IncrementCount()
+    {
+        currentCount++;
+    }
+}
diff --git a/samples/BlazorCocoon/Client/Pages/FetchData.razor b/samples/BlazorCocoon/Client/Pages/FetchData.razor
new file mode 100644
index 0000000..37ce81c
--- /dev/null
+++ b/samples/BlazorCocoon/Client/Pages/FetchData.razor
@@ -0,0 +1,46 @@
+@page "/fetchdata"
+@using BlazorCocoon.Shared
+@inject HttpClient Http
+
+<h1>Weather forecast</h1>
+
+<p>This component demonstrates fetching data from the server.</p>
+
+@if (forecasts == null)
+{
+    <p><em>Loading...</em></p>
+}
+else
+{
+    <table class="table">
+        <thead>
+            <tr>
+                <th>Date</th>
+                <th>Temp. (C)</th>
+                <th>Temp. (F)</th>
+                <th>Summary</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var forecast in forecasts)
+            {
+                <tr>
+                    <td>@forecast.Date.ToShortDateString()</td>
+                    <td>@forecast.TemperatureC</td>
+                    <td>@forecast.TemperatureF</td>
+                    <td>@forecast.Summary</td>
+                </tr>
+            }
+        </tbody>
+    </table>
+}
+
+@code {
+    private WeatherForecast[] forecasts;
+
+    protected override async Task OnInitializedAsync()
+    {
+        forecasts = await Http.GetFromJsonAsync<WeatherForecast[]>("WeatherForecast");
+    }
+
+}
diff --git a/samples/BlazorCocoon/Client/Program.cs b/samples/BlazorCocoon/Client/Program.cs
index 8be5b87..7e2b4c7 100644
--- a/samples/BlazorCocoon/Client/Program.cs
+++ b/samples/BlazorCocoon/Client/Program.cs
@@ -1,8 +1,16 @@
 using System;
 using System.Net.Http;
+using System.Collections.Generic;
+using System.Net.Http.Json;
+using System.Security.Claims;
 using System.Threading.Tasks;
+using System.Text;
+using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 
 namespace BlazorCocoon.Client
 {
@@ -14,6 +22,7 @@ public static async Task Main(string[] args)
             builder.RootComponents.Add<App>("#app");
 
             builder.Services.AddCocoonAuthentication();
+            
             builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
             await builder.Build().RunAsync();
diff --git a/samples/BlazorCocoon/Client/RouteTester.cs b/samples/BlazorCocoon/Client/RouteTester.cs
new file mode 100644
index 0000000..af00687
--- /dev/null
+++ b/samples/BlazorCocoon/Client/RouteTester.cs
@@ -0,0 +1,923 @@
+using System;
+using System.Collections.Generic;
+
+namespace ReCode.Cocoon.Proxy.Blazor
+{
+    public class CocoonBlazorRouteTesterManual
+    {
+        public bool IsMatch(string path)
+        {
+            if (path == string.Empty) return false;
+            Span<char> span = stackalloc char[path.Length];
+            MemoryExtensions.ToLowerInvariant(path, span);
+            if (span[0] == '/' && span.Length > 1)
+            {
+                span = span.Slice(1);
+            }
+            var rest = ToNextSlash(ref span);
+            if (rest.Length == 0) return false;
+            var ch = rest[0];
+            rest = rest.Slice(1);
+            switch (ch)
+            {
+                case 'a':
+                {
+                    if (rest.Length == 0)
+                    {
+                        return false;
+                    }
+                    else
+                    {
+                        ch = rest[0];
+                        rest = rest.Slice(1);
+                        if (ch == 'd')
+                        {
+                            if (rest.Length == 0)
+                            {
+                                return false;
+                            }
+                            ch = rest[0];
+                            rest = rest.Slice(1);
+                            if (ch == 'm')
+                            {
+                                if (rest.Length == 0)
+                                {
+                                    return false;
+                                }
+                                ch = rest[0];
+                                rest = rest.Slice(1);
+                                if (ch == 'i')
+                                {
+                                    if (rest.Length == 0)
+                                    {
+                                        return false;
+                                    }
+                                    ch = rest[0];
+                                    rest = rest.Slice(1);
+                                    if (ch == 'n')
+                                    {
+                                        if (rest.Length == 0)
+                                        {
+                                            rest = ToNextSlash(ref span);
+                                            ch = rest[0];
+                                            switch (ch)
+                                            {
+                                                case 'a':
+                                                {
+                                                    if (rest.Length == 0)
+                                                    {
+                                                        return false;
+                                                    }
+                                                    else
+                                                    {
+                                                        ch = rest[0];
+                                                        rest = rest.Slice(1);
+                                                        if (ch == 'd')
+                                                        {
+                                                            if (rest.Length == 0)
+                                                            {
+                                                                return false;
+                                                            }
+                                                            ch = rest[0];
+                                                            rest = rest.Slice(1);
+                                                            if (ch == 'm')
+                                                            {
+                                                                if (rest.Length == 0)
+                                                                {
+                                                                    return false;
+                                                                }
+                                                                ch = rest[0];
+                                                                rest = rest.Slice(1);
+                                                                if (ch == 'i')
+                                                                {
+                                                                    if (rest.Length == 0)
+                                                                    {
+                                                                        return false;
+                                                                    }
+                                                                    ch = rest[0];
+                                                                    rest = rest.Slice(1);
+                                                                    if (ch == 'n')
+                                                                    {
+                                                                        if (rest.Length == 0)
+                                                                        {
+                                                                            return false;
+                                                                        }
+                                                                        ch = rest[0];
+                                                                        rest = rest.Slice(1);
+                                                                        if (ch == 'p')
+                                                                        {
+                                                                            if (rest.Length == 0)
+                                                                            {
+                                                                                return false;
+                                                                            }
+                                                                            ch = rest[0];
+                                                                            rest = rest.Slice(1);
+                                                                            if (ch == 'a')
+                                                                            {
+                                                                                if (rest.Length == 0)
+                                                                                {
+                                                                                    return false;
+                                                                                }
+                                                                                ch = rest[0];
+                                                                                rest = rest.Slice(1);
+                                                                                if (ch == 'g')
+                                                                                {
+                                                                                    if (rest.Length == 0)
+                                                                                    {
+                                                                                        return false;
+                                                                                    }
+                                                                                    ch = rest[0];
+                                                                                    rest = rest.Slice(1);
+                                                                                    if (ch == 'e')
+                                                                                    {
+                                                                                        if (rest.Length == 0)
+                                                                                        {
+                                                                                            if (span.Length == 0) return true;
+                                                                                            rest = ToNextSlash(ref span);
+                                                                                            ch = rest[0];
+                                                                                            return false;
+                                                                                        }
+                                                                                        ch = rest[0];
+                                                                                        rest = rest.Slice(1);
+                                                                                        return false;
+                                                                                    }
+                                                                                    return false;
+                                                                                }
+                                                                                return false;
+                                                                            }
+                                                                            return false;
+                                                                        }
+                                                                        return false;
+                                                                    }
+                                                                    return false;
+                                                                }
+                                                                return false;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    }
+                                                    return false;
+                                                }
+                                                case 'e':
+                                                {
+                                                    if (rest.Length == 0)
+                                                    {
+                                                        return false;
+                                                    }
+                                                    else
+                                                    {
+                                                        ch = rest[0];
+                                                        rest = rest.Slice(1);
+                                                        if (ch == 'd')
+                                                        {
+                                                            if (rest.Length == 0)
+                                                            {
+                                                                return false;
+                                                            }
+                                                            ch = rest[0];
+                                                            rest = rest.Slice(1);
+                                                            if (ch == 'i')
+                                                            {
+                                                                if (rest.Length == 0)
+                                                                {
+                                                                    return false;
+                                                                }
+                                                                ch = rest[0];
+                                                                rest = rest.Slice(1);
+                                                                if (ch == 't')
+                                                                {
+                                                                    if (rest.Length == 0)
+                                                                    {
+                                                                        return false;
+                                                                    }
+                                                                    ch = rest[0];
+                                                                    rest = rest.Slice(1);
+                                                                    if (ch == 'p')
+                                                                    {
+                                                                        if (rest.Length == 0)
+                                                                        {
+                                                                            return false;
+                                                                        }
+                                                                        ch = rest[0];
+                                                                        rest = rest.Slice(1);
+                                                                        if (ch == 'r')
+                                                                        {
+                                                                            if (rest.Length == 0)
+                                                                            {
+                                                                                return false;
+                                                                            }
+                                                                            ch = rest[0];
+                                                                            rest = rest.Slice(1);
+                                                                            if (ch == 'o')
+                                                                            {
+                                                                                if (rest.Length == 0)
+                                                                                {
+                                                                                    return false;
+                                                                                }
+                                                                                ch = rest[0];
+                                                                                rest = rest.Slice(1);
+                                                                                if (ch == 'd')
+                                                                                {
+                                                                                    if (rest.Length == 0)
+                                                                                    {
+                                                                                        return false;
+                                                                                    }
+                                                                                    ch = rest[0];
+                                                                                    rest = rest.Slice(1);
+                                                                                    if (ch == 'u')
+                                                                                    {
+                                                                                        if (rest.Length == 0)
+                                                                                        {
+                                                                                            return false;
+                                                                                        }
+                                                                                        ch = rest[0];
+                                                                                        rest = rest.Slice(1);
+                                                                                        if (ch == 'c')
+                                                                                        {
+                                                                                            if (rest.Length == 0)
+                                                                                            {
+                                                                                                return false;
+                                                                                            }
+                                                                                            ch = rest[0];
+                                                                                            rest = rest.Slice(1);
+                                                                                            if (ch == 't')
+                                                                                            {
+                                                                                                if (rest.Length == 0)
+                                                                                                {
+                                                                                                    rest = ToNextSlash(ref span);
+                                                                                                    ch = rest[0];
+                                                                                                    rest = ToNextSlash(ref span);
+                                                                                                    if (span.Length == 0) return true;
+                                                                                                    ch = rest[0];
+                                                                                                    return false;
+                                                                                                }
+                                                                                                ch = rest[0];
+                                                                                                rest = rest.Slice(1);
+                                                                                                rest = ToNextSlash(ref span);
+                                                                                                if (span.Length == 0) return true;
+                                                                                                ch = rest[0];
+                                                                                                return false;
+                                                                                            }
+                                                                                            return false;
+                                                                                        }
+                                                                                        return false;
+                                                                                    }
+                                                                                    return false;
+                                                                                }
+                                                                                return false;
+                                                                            }
+                                                                            return false;
+                                                                        }
+                                                                        return false;
+                                                                    }
+                                                                    return false;
+                                                                }
+                                                                return false;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    }
+                                                    return false;
+                                                }
+                                                case 'n':
+                                                {
+                                                    if (rest.Length == 0)
+                                                    {
+                                                        return false;
+                                                    }
+                                                    else
+                                                    {
+                                                        ch = rest[0];
+                                                        rest = rest.Slice(1);
+                                                        if (ch == 'e')
+                                                        {
+                                                            if (rest.Length == 0)
+                                                            {
+                                                                return false;
+                                                            }
+                                                            ch = rest[0];
+                                                            rest = rest.Slice(1);
+                                                            if (ch == 'w')
+                                                            {
+                                                                if (rest.Length == 0)
+                                                                {
+                                                                    return false;
+                                                                }
+                                                                ch = rest[0];
+                                                                rest = rest.Slice(1);
+                                                                if (ch == 'p')
+                                                                {
+                                                                    if (rest.Length == 0)
+                                                                    {
+                                                                        return false;
+                                                                    }
+                                                                    ch = rest[0];
+                                                                    rest = rest.Slice(1);
+                                                                    if (ch == 'r')
+                                                                    {
+                                                                        if (rest.Length == 0)
+                                                                        {
+                                                                            return false;
+                                                                        }
+                                                                        ch = rest[0];
+                                                                        rest = rest.Slice(1);
+                                                                        if (ch == 'o')
+                                                                        {
+                                                                            if (rest.Length == 0)
+                                                                            {
+                                                                                return false;
+                                                                            }
+                                                                            ch = rest[0];
+                                                                            rest = rest.Slice(1);
+                                                                            if (ch == 'd')
+                                                                            {
+                                                                                if (rest.Length == 0)
+                                                                                {
+                                                                                    return false;
+                                                                                }
+                                                                                ch = rest[0];
+                                                                                rest = rest.Slice(1);
+                                                                                if (ch == 'u')
+                                                                                {
+                                                                                    if (rest.Length == 0)
+                                                                                    {
+                                                                                        return false;
+                                                                                    }
+                                                                                    ch = rest[0];
+                                                                                    rest = rest.Slice(1);
+                                                                                    if (ch == 'c')
+                                                                                    {
+                                                                                        if (rest.Length == 0)
+                                                                                        {
+                                                                                            return false;
+                                                                                        }
+                                                                                        ch = rest[0];
+                                                                                        rest = rest.Slice(1);
+                                                                                        if (ch == 't')
+                                                                                        {
+                                                                                            if (rest.Length == 0)
+                                                                                            {
+                                                                                                if (span.Length == 0) return true;
+                                                                                                rest = ToNextSlash(ref span);
+                                                                                                ch = rest[0];
+                                                                                                return false;
+                                                                                            }
+                                                                                            ch = rest[0];
+                                                                                            rest = rest.Slice(1);
+                                                                                            return false;
+                                                                                        }
+                                                                                        return false;
+                                                                                    }
+                                                                                    return false;
+                                                                                }
+                                                                                return false;
+                                                                            }
+                                                                            return false;
+                                                                        }
+                                                                        return false;
+                                                                    }
+                                                                    return false;
+                                                                }
+                                                                return false;
+                                                            }
+                                                            return false;
+                                                        }
+                                                    }
+                                                    return false;
+                                                }
+                                            }
+                                            return false;
+                                        }
+                                        ch = rest[0];
+                                        rest = rest.Slice(1);
+                                        switch (ch)
+                                        {
+                                            case 'a':
+                                            {
+                                                if (rest.Length == 0)
+                                                {
+                                                    return false;
+                                                }
+                                                else
+                                                {
+                                                    ch = rest[0];
+                                                    rest = rest.Slice(1);
+                                                    if (ch == 'd')
+                                                    {
+                                                        if (rest.Length == 0)
+                                                        {
+                                                            return false;
+                                                        }
+                                                        ch = rest[0];
+                                                        rest = rest.Slice(1);
+                                                        if (ch == 'm')
+                                                        {
+                                                            if (rest.Length == 0)
+                                                            {
+                                                                return false;
+                                                            }
+                                                            ch = rest[0];
+                                                            rest = rest.Slice(1);
+                                                            if (ch == 'i')
+                                                            {
+                                                                if (rest.Length == 0)
+                                                                {
+                                                                    return false;
+                                                                }
+                                                                ch = rest[0];
+                                                                rest = rest.Slice(1);
+                                                                if (ch == 'n')
+                                                                {
+                                                                    if (rest.Length == 0)
+                                                                    {
+                                                                        return false;
+                                                                    }
+                                                                    ch = rest[0];
+                                                                    rest = rest.Slice(1);
+                                                                    if (ch == 'p')
+                                                                    {
+                                                                        if (rest.Length == 0)
+                                                                        {
+                                                                            return false;
+                                                                        }
+                                                                        ch = rest[0];
+                                                                        rest = rest.Slice(1);
+                                                                        if (ch == 'a')
+                                                                        {
+                                                                            if (rest.Length == 0)
+                                                                            {
+                                                                                return false;
+                                                                            }
+                                                                            ch = rest[0];
+                                                                            rest = rest.Slice(1);
+                                                                            if (ch == 'g')
+                                                                            {
+                                                                                if (rest.Length == 0)
+                                                                                {
+                                                                                    return false;
+                                                                                }
+                                                                                ch = rest[0];
+                                                                                rest = rest.Slice(1);
+                                                                                if (ch == 'e')
+                                                                                {
+                                                                                    if (rest.Length == 0)
+                                                                                    {
+                                                                                        if (span.Length == 0) return true;
+                                                                                        rest = ToNextSlash(ref span);
+                                                                                        ch = rest[0];
+                                                                                        return false;
+                                                                                    }
+                                                                                    ch = rest[0];
+                                                                                    rest = rest.Slice(1);
+                                                                                    return false;
+                                                                                }
+                                                                                return false;
+                                                                            }
+                                                                            return false;
+                                                                        }
+                                                                        return false;
+                                                                    }
+                                                                    return false;
+                                                                }
+                                                                return false;
+                                                            }
+                                                            return false;
+                                                        }
+                                                        return false;
+                                                    }
+                                                }
+                                                return false;
+                                            }
+                                            case 'e':
+                                            {
+                                                if (rest.Length == 0)
+                                                {
+                                                    return false;
+                                                }
+                                                else
+                                                {
+                                                    ch = rest[0];
+                                                    rest = rest.Slice(1);
+                                                    if (ch == 'd')
+                                                    {
+                                                        if (rest.Length == 0)
+                                                        {
+                                                            return false;
+                                                        }
+                                                        ch = rest[0];
+                                                        rest = rest.Slice(1);
+                                                        if (ch == 'i')
+                                                        {
+                                                            if (rest.Length == 0)
+                                                            {
+                                                                return false;
+                                                            }
+                                                            ch = rest[0];
+                                                            rest = rest.Slice(1);
+                                                            if (ch == 't')
+                                                            {
+                                                                if (rest.Length == 0)
+                                                                {
+                                                                    return false;
+                                                                }
+                                                                ch = rest[0];
+                                                                rest = rest.Slice(1);
+                                                                if (ch == 'p')
+                                                                {
+                                                                    if (rest.Length == 0)
+                                                                    {
+                                                                        return false;
+                                                                    }
+                                                                    ch = rest[0];
+                                                                    rest = rest.Slice(1);
+                                                                    if (ch == 'r')
+                                                                    {
+                                                                        if (rest.Length == 0)
+                                                                        {
+                                                                            return false;
+                                                                        }
+                                                                        ch = rest[0];
+                                                                        rest = rest.Slice(1);
+                                                                        if (ch == 'o')
+                                                                        {
+                                                                            if (rest.Length == 0)
+                                                                            {
+                                                                                return false;
+                                                                            }
+                                                                            ch = rest[0];
+                                                                            rest = rest.Slice(1);
+                                                                            if (ch == 'd')
+                                                                            {
+                                                                                if (rest.Length == 0)
+                                                                                {
+                                                                                    return false;
+                                                                                }
+                                                                                ch = rest[0];
+                                                                                rest = rest.Slice(1);
+                                                                                if (ch == 'u')
+                                                                                {
+                                                                                    if (rest.Length == 0)
+                                                                                    {
+                                                                                        return false;
+                                                                                    }
+                                                                                    ch = rest[0];
+                                                                                    rest = rest.Slice(1);
+                                                                                    if (ch == 'c')
+                                                                                    {
+                                                                                        if (rest.Length == 0)
+                                                                                        {
+                                                                                            return false;
+                                                                                        }
+                                                                                        ch = rest[0];
+                                                                                        rest = rest.Slice(1);
+                                                                                        if (ch == 't')
+                                                                                        {
+                                                                                            if (rest.Length == 0)
+                                                                                            {
+                                                                                                rest = ToNextSlash(ref span);
+                                                                                                ch = rest[0];
+                                                                                                rest = ToNextSlash(ref span);
+                                                                                                if (span.Length == 0) return true;
+                                                                                                ch = rest[0];
+                                                                                                return false;
+                                                                                            }
+                                                                                            ch = rest[0];
+                                                                                            rest = rest.Slice(1);
+                                                                                            rest = ToNextSlash(ref span);
+                                                                                            if (span.Length == 0) return true;
+                                                                                            ch = rest[0];
+                                                                                            return false;
+                                                                                        }
+                                                                                        return false;
+                                                                                    }
+                                                                                    return false;
+                                                                                }
+                                                                                return false;
+                                                                            }
+                                                                            return false;
+                                                                        }
+                                                                        return false;
+                                                                    }
+                                                                    return false;
+                                                                }
+                                                                return false;
+                                                            }
+                                                            return false;
+                                                        }
+                                                        return false;
+                                                    }
+                                                }
+                                                return false;
+                                            }
+                                            case 'n':
+                                            {
+                                                if (rest.Length == 0)
+                                                {
+                                                    return false;
+                                                }
+                                                else
+                                                {
+                                                    ch = rest[0];
+                                                    rest = rest.Slice(1);
+                                                    if (ch == 'e')
+                                                    {
+                                                        if (rest.Length == 0)
+                                                        {
+                                                            return false;
+                                                        }
+                                                        ch = rest[0];
+                                                        rest = rest.Slice(1);
+                                                        if (ch == 'w')
+                                                        {
+                                                            if (rest.Length == 0)
+                                                            {
+                                                                return false;
+                                                            }
+                                                            ch = rest[0];
+                                                            rest = rest.Slice(1);
+                                                            if (ch == 'p')
+                                                            {
+                                                                if (rest.Length == 0)
+                                                                {
+                                                                    return false;
+                                                                }
+                                                                ch = rest[0];
+                                                                rest = rest.Slice(1);
+                                                                if (ch == 'r')
+                                                                {
+                                                                    if (rest.Length == 0)
+                                                                    {
+                                                                        return false;
+                                                                    }
+                                                                    ch = rest[0];
+                                                                    rest = rest.Slice(1);
+                                                                    if (ch == 'o')
+                                                                    {
+                                                                        if (rest.Length == 0)
+                                                                        {
+                                                                            return false;
+                                                                        }
+                                                                        ch = rest[0];
+                                                                        rest = rest.Slice(1);
+                                                                        if (ch == 'd')
+                                                                        {
+                                                                            if (rest.Length == 0)
+                                                                            {
+                                                                                return false;
+                                                                            }
+                                                                            ch = rest[0];
+                                                                            rest = rest.Slice(1);
+                                                                            if (ch == 'u')
+                                                                            {
+                                                                                if (rest.Length == 0)
+                                                                                {
+                                                                                    return false;
+                                                                                }
+                                                                                ch = rest[0];
+                                                                                rest = rest.Slice(1);
+                                                                                if (ch == 'c')
+                                                                                {
+                                                                                    if (rest.Length == 0)
+                                                                                    {
+                                                                                        return false;
+                                                                                    }
+                                                                                    ch = rest[0];
+                                                                                    rest = rest.Slice(1);
+                                                                                    if (ch == 't')
+                                                                                    {
+                                                                                        if (rest.Length == 0)
+                                                                                        {
+                                                                                            if (span.Length == 0) return true;
+                                                                                            rest = ToNextSlash(ref span);
+                                                                                            ch = rest[0];
+                                                                                            return false;
+                                                                                        }
+                                                                                        ch = rest[0];
+                                                                                        rest = rest.Slice(1);
+                                                                                        return false;
+                                                                                    }
+                                                                                    return false;
+                                                                                }
+                                                                                return false;
+                                                                            }
+                                                                            return false;
+                                                                        }
+                                                                        return false;
+                                                                    }
+                                                                    return false;
+                                                                }
+                                                                return false;
+                                                            }
+                                                            return false;
+                                                        }
+                                                        return false;
+                                                    }
+                                                }
+                                                return false;
+                                            }
+                                        }
+                                        return false;
+                                    }
+                                    return false;
+                                }
+                                return false;
+                            }
+                            return false;
+                        }
+                    }
+                    return false;
+                }
+                case 'c':
+                {
+                    if (rest.Length == 0)
+                    {
+                        return false;
+                    }
+                    else
+                    {
+                        ch = rest[0];
+                        rest = rest.Slice(1);
+                        if (ch == 'o')
+                        {
+                            if (rest.Length == 0)
+                            {
+                                return false;
+                            }
+                            ch = rest[0];
+                            rest = rest.Slice(1);
+                            if (ch == 'u')
+                            {
+                                if (rest.Length == 0)
+                                {
+                                    return false;
+                                }
+                                ch = rest[0];
+                                rest = rest.Slice(1);
+                                if (ch == 'n')
+                                {
+                                    if (rest.Length == 0)
+                                    {
+                                        return false;
+                                    }
+                                    ch = rest[0];
+                                    rest = rest.Slice(1);
+                                    if (ch == 't')
+                                    {
+                                        if (rest.Length == 0)
+                                        {
+                                            return false;
+                                        }
+                                        ch = rest[0];
+                                        rest = rest.Slice(1);
+                                        if (ch == 'e')
+                                        {
+                                            if (rest.Length == 0)
+                                            {
+                                                return false;
+                                            }
+                                            ch = rest[0];
+                                            rest = rest.Slice(1);
+                                            if (ch == 'r')
+                                            {
+                                                if (rest.Length == 0)
+                                                {
+                                                    if (span.Length == 0) return true;
+                                                    rest = ToNextSlash(ref span);
+                                                    ch = rest[0];
+                                                    return false;
+                                                }
+                                                ch = rest[0];
+                                                rest = rest.Slice(1);
+                                                return false;
+                                            }
+                                            return false;
+                                        }
+                                        return false;
+                                    }
+                                    return false;
+                                }
+                                return false;
+                            }
+                            return false;
+                        }
+                    }
+                    return false;
+                }
+                case 'f':
+                {
+                    if (rest.Length == 0)
+                    {
+                        return false;
+                    }
+                    else
+                    {
+                        ch = rest[0];
+                        rest = rest.Slice(1);
+                        if (ch == 'e')
+                        {
+                            if (rest.Length == 0)
+                            {
+                                return false;
+                            }
+                            ch = rest[0];
+                            rest = rest.Slice(1);
+                            if (ch == 't')
+                            {
+                                if (rest.Length == 0)
+                                {
+                                    return false;
+                                }
+                                ch = rest[0];
+                                rest = rest.Slice(1);
+                                if (ch == 'c')
+                                {
+                                    if (rest.Length == 0)
+                                    {
+                                        return false;
+                                    }
+                                    ch = rest[0];
+                                    rest = rest.Slice(1);
+                                    if (ch == 'h')
+                                    {
+                                        if (rest.Length == 0)
+                                        {
+                                            return false;
+                                        }
+                                        ch = rest[0];
+                                        rest = rest.Slice(1);
+                                        if (ch == 'd')
+                                        {
+                                            if (rest.Length == 0)
+                                            {
+                                                return false;
+                                            }
+                                            ch = rest[0];
+                                            rest = rest.Slice(1);
+                                            if (ch == 'a')
+                                            {
+                                                if (rest.Length == 0)
+                                                {
+                                                    return false;
+                                                }
+                                                ch = rest[0];
+                                                rest = rest.Slice(1);
+                                                if (ch == 't')
+                                                {
+                                                    if (rest.Length == 0)
+                                                    {
+                                                        return false;
+                                                    }
+                                                    ch = rest[0];
+                                                    rest = rest.Slice(1);
+                                                    if (ch == 'a')
+                                                    {
+                                                        if (rest.Length == 0)
+                                                        {
+                                                            if (span.Length == 0) return true;
+                                                            rest = ToNextSlash(ref span);
+                                                            ch = rest[0];
+                                                            return false;
+                                                        }
+                                                        ch = rest[0];
+                                                        rest = rest.Slice(1);
+                                                        return false;
+                                                    }
+                                                    return false;
+                                                }
+                                                return false;
+                                            }
+                                            return false;
+                                        }
+                                        return false;
+                                    }
+                                    return false;
+                                }
+                                return false;
+                            }
+                            return false;
+                        }
+                    }
+                    return false;
+                }
+            }
+            return false;
+        }
+
+        private static Span<char> ToNextSlash(ref Span<char> span)
+        {
+            var index = span.IndexOf('/');
+            if (index > 0)
+            {
+                var ret = span.Slice(0, index);
+                span = span.Slice(index + 1);
+                return ret;
+            }
+            else
+            {
+                var ret = span;
+                span = Array.Empty<char>().AsSpan();
+                return ret;
+            }
+        }
+    }
+}
diff --git a/samples/BlazorCocoon/Client/Shared/CartLink.razor b/samples/BlazorCocoon/Client/Shared/CartLink.razor
new file mode 100644
index 0000000..94cecc2
--- /dev/null
+++ b/samples/BlazorCocoon/Client/Shared/CartLink.razor
@@ -0,0 +1,15 @@
+@using BlazorCocoon.Shared
+@inject HttpClient Http
+
+<li><a href="/ShoppingCart" ID="cartCount">Cart (@_cartCount)</a></li>
+
+@code {
+                  
+    private int _cartCount;
+
+    protected override async Task OnInitializedAsync()
+    {
+        var cartCount = await Http.GetFromJsonAsync<CartCount>("/api/cart/count");
+        _cartCount = cartCount!.Count;
+    }
+}
\ No newline at end of file
diff --git a/samples/BlazorCocoon/Client/Shared/LoginPartial.razor b/samples/BlazorCocoon/Client/Shared/LoginPartial.razor
index e59c124..10d5a23 100644
--- a/samples/BlazorCocoon/Client/Shared/LoginPartial.razor
+++ b/samples/BlazorCocoon/Client/Shared/LoginPartial.razor
@@ -2,11 +2,11 @@
   <AuthorizeView>
     <Authorized>
       <li>
-        <a href="/Account/Manage" title="Manage your account" id="account-link">Hello,
+        <a href="/Account/Manage" title="Manage your account">Hello,
           @context.User.Identity?.Name !</a>
       </li>
       <li>
-        <a href="/Account/Logout" id="account-logout-link">Log out</a>
+        <a href="/Account/Logout">Log out</a>
       </li>
     </Authorized>
     <NotAuthorized>
diff --git a/samples/BlazorCocoon/Client/Shared/NavMenu.razor b/samples/BlazorCocoon/Client/Shared/NavMenu.razor
index b2ef8b7..aa81b27 100644
--- a/samples/BlazorCocoon/Client/Shared/NavMenu.razor
+++ b/samples/BlazorCocoon/Client/Shared/NavMenu.razor
@@ -1,5 +1,5 @@
 <div class="top-row pl-4 navbar navbar-dark">
-    <a class="navbar-brand" href="" id="appName">BlazorCocoon - Wasm</a>
+    <a class="navbar-brand" href="">BlazorCocoon</a>
     <button class="navbar-toggler" @onclick="ToggleNavMenu">
         <span class="navbar-toggler-icon"></span>
     </button>
diff --git a/samples/BlazorCocoon/Client/Shared/TopMenu.razor b/samples/BlazorCocoon/Client/Shared/TopMenu.razor
index 017810e..3001322 100644
--- a/samples/BlazorCocoon/Client/Shared/TopMenu.razor
+++ b/samples/BlazorCocoon/Client/Shared/TopMenu.razor
@@ -8,7 +8,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="/">Wingtip Toys - WASM</a>
+            <a class="navbar-brand" href="/">Wingtip Toys</a>
         </div>
         <div class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
@@ -21,6 +21,7 @@
                 <li><a href="/About">About</a></li>
                 <li><a href="/Contact">Contact</a></li>
                 <li><a href="/ProductList">Products</a></li>
+                <CartLink />
             </ul>
             <LoginPartial />
         </div>
diff --git a/samples/BlazorCocoon/Dockerfile b/samples/BlazorCocoon/Dockerfile
deleted file mode 100644
index 5c0244f..0000000
--- a/samples/BlazorCocoon/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 as build
-
-# Copy files
-RUN md c:\build
-WORKDIR c:/build
-COPY . c:/build
-
-# Build the application
-RUN dotnet publish -c release samples/blazorcocoon/server/BlazorCocoon.Server.csproj -o c:/build/app -r win10-x64
-
-## Switch to a runtime image
-FROM mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 as runtime
-WORKDIR C:/inetpub/wwwroot
-
-COPY --from=build c:/build/app/ . 
-RUN Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
-
-#RUN choco install dotnet-5.0-sdk -y
-RUN choco install dotnet-5.0-windowshosting -y
-RUN choco install urlrewrite -y
-
-## Change the acls to allow localdb creation.
-RUN ["icacls","C:\\inetpub\\wwwroot", "/grant", "everyone:(OI)(CI)F","/T"]
-
diff --git a/samples/BlazorCocoon/Server/BlazorCocoon.Server.csproj b/samples/BlazorCocoon/Server/BlazorCocoon.Server.csproj
index 1656807..be7f7ed 100644
--- a/samples/BlazorCocoon/Server/BlazorCocoon.Server.csproj
+++ b/samples/BlazorCocoon/Server/BlazorCocoon.Server.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/BlazorCocoon/Server/Controllers/AdminController.cs b/samples/BlazorCocoon/Server/Controllers/AdminController.cs
new file mode 100644
index 0000000..23ed519
--- /dev/null
+++ b/samples/BlazorCocoon/Server/Controllers/AdminController.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using BlazorCocoon.Server.Data;
+using BlazorCocoon.Shared;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Product = BlazorCocoon.Shared.Product;
+using Category = BlazorCocoon.Shared.Category;
+using ProductEntity = BlazorCocoon.Server.Data.Product;
+using CategoryEntity = BlazorCocoon.Server.Data.Category;
+
+namespace BlazorCocoon.Server.Controllers
+{
+    [Authorize]
+    [Route("api/admin")]
+    public class AdminController : ControllerBase
+    {
+        private readonly WingtipToysContext _context;
+
+        public AdminController(WingtipToysContext context)
+        {
+            _context = context;
+        }
+
+        [HttpGet("products")]
+        public async Task<ActionResult<Product[]>> GetProducts()
+        {
+            var products = (await _context.Products
+                .Include(p => p.Category)
+                .AsNoTracking()
+                .ToArrayAsync())
+                .Select(ToDto)
+                .ToArray();
+
+            return products;
+        }
+
+        [HttpGet("products/{productId}")]
+        public async Task<ActionResult<Product>> GetProduct(int productId)
+        {
+            var product = await _context.Products
+                .Include(p => p.Category)
+                .AsNoTracking()
+                .FirstOrDefaultAsync(p => p.ProductID == productId);
+
+            if (product is null) return NotFound();
+
+            return ToDto(product);
+        }
+
+        [HttpPost("products")]
+        public async Task<ActionResult<Product>> PostProduct([FromBody] Product product)
+        {
+            var entity = new ProductEntity
+            {
+                CategoryID = product.CategoryID,
+                Description = product.Description,
+                ImagePath = product.ImagePath,
+                ProductName = product.ProductName,
+                UnitPrice = product.UnitPrice,
+            };
+
+            await _context.Products.AddAsync(entity);
+            await _context.SaveChangesAsync();
+
+            return ToDto(entity);
+        }
+
+        [HttpGet("categories")]
+        public async Task<ActionResult<Category[]>> GetCategories()
+        {
+            var categories = (await _context.Categories
+                .ToArrayAsync())
+                .Select(ToDto)
+                .ToArray();
+
+            return categories;
+        }
+
+        private static Product ToDto(ProductEntity source)
+        {
+            return new()
+            {
+                ProductID = source.ProductID,
+                ProductName = source.ProductName,
+                Description = source.Description,
+                ImagePath = source.ImagePath,
+                UnitPrice = source.UnitPrice,
+                CategoryID = source.CategoryID,
+                Category = new Category
+                {
+                    CategoryID = source.Category.CategoryID,
+                    Description = source.Category.Description,
+                    CategoryName = source.Category.CategoryName
+                }
+            };
+        }
+
+        private static Category ToDto(CategoryEntity source) =>
+            new()
+            {
+                CategoryID = source.CategoryID,
+                Description = source.Description,
+                CategoryName = source.CategoryName
+            };
+    }
+}
\ No newline at end of file
diff --git a/samples/BlazorCocoon/Server/Controllers/CartController.cs b/samples/BlazorCocoon/Server/Controllers/CartController.cs
new file mode 100644
index 0000000..e45debc
--- /dev/null
+++ b/samples/BlazorCocoon/Server/Controllers/CartController.cs
@@ -0,0 +1,28 @@
+using System.Threading.Tasks;
+using BlazorCocoon.Server.Services;
+using BlazorCocoon.Shared;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BlazorCocoon.Server.Controllers
+{
+    [Route("api/cart")]
+    public class CartController : ControllerBase
+    {
+        private readonly ShoppingCart _shoppingCart;
+
+        public CartController(ShoppingCart shoppingCart)
+        {
+            _shoppingCart = shoppingCart;
+        }
+
+        [HttpGet("count")]
+        public async Task<ActionResult<CartCount>> Count()
+        {
+            var count = await _shoppingCart.GetCountAsync();
+            return new CartCount
+            {
+                Count = count,
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/BlazorCocoon/Server/Controllers/Cocoon.cs b/samples/BlazorCocoon/Server/Controllers/Cocoon.cs
index 79498e0..0fd736b 100644
--- a/samples/BlazorCocoon/Server/Controllers/Cocoon.cs
+++ b/samples/BlazorCocoon/Server/Controllers/Cocoon.cs
@@ -1,10 +1,7 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using ReCode.Cocoon.Proxy.Session;
+using Microsoft.AspNetCore.Mvc;
 
 namespace BlazorCocoon.Server.Controllers
 {
-    [Route("_cocoon")]
     public class CocoonController : Controller
     {
         private static readonly CocoonPrincipal Unauthenticated = new CocoonPrincipal
@@ -12,16 +9,9 @@ public class CocoonController : Controller
             Name = string.Empty,
             IsAuthenticated = false
         };
-
-        private readonly CocoonSession _session;
-        
-        public CocoonController(CocoonSession session)
-        {
-            _session = session;
-        }
         
         // GET
-        [HttpGet("auth")]
+        [HttpGet("_cocoon/auth")]
         public ActionResult<CocoonPrincipal> Index()
         {
             if (User.Identity?.IsAuthenticated == true)
@@ -35,17 +25,5 @@ public ActionResult<CocoonPrincipal> Index()
 
             return Unauthenticated;
         }
-        
-        [HttpGet("session")]
-        public async Task<string> Get(string id)
-        {
-            return await _session.GetAsync<string>(id);
-        }
-
-        [HttpPost("session")]
-        public void Save(string id, string value)
-        {
-            _session.Set(id, value);
-        }
     }
 }
\ No newline at end of file
diff --git a/samples/BlazorCocoon/Server/Controllers/WeatherForecastController.cs b/samples/BlazorCocoon/Server/Controllers/WeatherForecastController.cs
new file mode 100644
index 0000000..a9c4399
--- /dev/null
+++ b/samples/BlazorCocoon/Server/Controllers/WeatherForecastController.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using BlazorCocoon.Shared;
+
+namespace BlazorCocoon.Server.Controllers
+{
+    [ApiController]
+    [Route("[controller]")]
+    public class WeatherForecastController : ControllerBase
+    {
+        private static readonly string[] Summaries = new[]
+        {
+            "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
+        };
+
+        private readonly ILogger<WeatherForecastController> _logger;
+
+        public WeatherForecastController(ILogger<WeatherForecastController> logger)
+        {
+            _logger = logger;
+        }
+
+        [HttpGet]
+        public IEnumerable<WeatherForecast> Get()
+        {
+            var rng = new Random();
+            return Enumerable.Range(1, 5).Select(index => new WeatherForecast
+            {
+                Date = DateTime.Now.AddDays(index),
+                TemperatureC = rng.Next(-20, 55),
+                Summary = Summaries[rng.Next(Summaries.Length)]
+            })
+            .ToArray();
+        }
+    }
+}
diff --git a/samples/BlazorCocoon/Server/Data/CartItem.cs b/samples/BlazorCocoon/Server/Data/CartItem.cs
new file mode 100644
index 0000000..5d3d40b
--- /dev/null
+++ b/samples/BlazorCocoon/Server/Data/CartItem.cs
@@ -0,0 +1,21 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace BlazorCocoon.Server.Data
+{
+    public class CartItem
+    {
+        [Key]
+        public string ItemId { get; set; }
+
+        public string CartId { get; set; }
+
+        public int Quantity { get; set; }
+
+        public System.DateTime DateCreated { get; set; }
+
+        public int ProductId { get; set; }
+
+        public virtual Product Product { get; set; }
+
+    }
+}
\ No newline at end of file
diff --git a/samples/BlazorCocoon/Server/Data/Category.cs b/samples/BlazorCocoon/Server/Data/Category.cs
new file mode 100644
index 0000000..8a6bd1b
--- /dev/null
+++ b/samples/BlazorCocoon/Server/Data/Category.cs
@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace BlazorCocoon.Server.Data
+{
+    public class Category
+    {
+        public int CategoryID { get; set; }
+
+        [Required, StringLength(100), Display(Name = "Name")]
+        public string CategoryName { get; set; } = null!;
+
+        [Display(Name = "Product Description")]
+        public string? Description { get; set; }
+
+        public virtual ICollection<Product> Products { get; set; } = null!;
+    }
+}
\ No newline at end of file
diff --git a/samples/BlazorCocoon/Server/Data/Product.cs b/samples/BlazorCocoon/Server/Data/Product.cs
new file mode 100644
index 0000000..20a6eb7
--- /dev/null
+++ b/samples/BlazorCocoon/Server/Data/Product.cs
@@ -0,0 +1,25 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace BlazorCocoon.Server.Data
+{
+    public class Product
+    {
+        [ScaffoldColumn(false)]
+        public int ProductID { get; set; }
+
+        [Required, StringLength(100), Display(Name = "Name")]
+        public string ProductName { get; set; } = null!;
+
+        [Required, StringLength(10000), Display(Name = "Product Description"), DataType(DataType.MultilineText)]
+        public string Description { get; set; } = null!;
+
+        public string? ImagePath { get; set; }
+
+        [Display(Name = "Price")]
+        public double? UnitPrice { get; set; }
+
+        public int? CategoryID { get; set; }
+
+        public virtual Category Category { get; set; } = null!;
+    }
+}
\ No newline at end of file
diff --git a/samples/BlazorCocoon/Server/Data/WingtipToysContext.cs b/samples/BlazorCocoon/Server/Data/WingtipToysContext.cs
new file mode 100644
index 0000000..18f55fa
--- /dev/null
+++ b/samples/BlazorCocoon/Server/Data/WingtipToysContext.cs
@@ -0,0 +1,17 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace BlazorCocoon.Server.Data
+{
+    public class WingtipToysContext : DbContext
+    {
+        public WingtipToysContext(DbContextOptions options) : base(options)
+        {
+            
+        }
+        public DbSet<Category> Categories { get; set; }
+        
+        public DbSet<CartItem> CartItems { get; set; }
+        
+        public DbSet<Product> Products { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/samples/BlazorCocoon/Server/Services/ShoppingCart.cs b/samples/BlazorCocoon/Server/Services/ShoppingCart.cs
new file mode 100644
index 0000000..119fa21
--- /dev/null
+++ b/samples/BlazorCocoon/Server/Services/ShoppingCart.cs
@@ -0,0 +1,32 @@
+using System.Linq;
+using System.Threading.Tasks;
+using BlazorCocoon.Server.Data;
+using Microsoft.EntityFrameworkCore;
+using ReCode.Cocoon.Proxy.Session;
+
+namespace BlazorCocoon.Server.Services
+{
+    public class ShoppingCart
+    {
+        private CocoonSession _session;
+        private WingtipToysContext _db;
+        
+        public ShoppingCart(CocoonSession session, WingtipToysContext db)
+        {
+            _session = session;
+            _db = db;
+        }
+
+        public async Task<int> GetCountAsync()
+        {
+            var cartId = await _session.GetAsync<string>("CartId");
+            var cart = await _db.CartItems
+                .Where(item => item.CartId == cartId)
+                .ToListAsync();
+            var count = cart    
+                .Select(item => item.Quantity)
+                .Sum();
+            return count;
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/BlazorCocoon/Server/Startup.cs b/samples/BlazorCocoon/Server/Startup.cs
index 9a5f7dd..6cdb0e8 100644
--- a/samples/BlazorCocoon/Server/Startup.cs
+++ b/samples/BlazorCocoon/Server/Startup.cs
@@ -3,8 +3,12 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using BlazorCocoon.Server.Data;
+using BlazorCocoon.Server.Services;
 using Microsoft.AspNetCore.Routing;
+using Microsoft.EntityFrameworkCore;
 using ReCode.Cocoon.Proxy.Authentication;
+using ReCode.Cocoon.Proxy.Blazor;
 
 namespace BlazorCocoon.Server
 {
@@ -22,10 +26,19 @@ public Startup(IConfiguration configuration)
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddCocoonSession();
+            services.AddScoped<ShoppingCart>();
             services.AddControllersWithViews();
             services.AddRazorPages();
             services.AddCocoonProxy(Configuration);
-            services.AddAuthentication(CocoonAuthenticationDefaults.Scheme).AddCocoon();
+            
+            var connectionString = Configuration.GetConnectionString("WingtipToys");
+            services.AddDbContextPool<WingtipToysContext>(builder =>
+            {
+                builder.UseSqlServer(connectionString);
+            });
+            
+            services.AddAuthentication(CocoonAuthenticationDefaults.Scheme)
+                .AddCocoon();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -39,8 +52,11 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             else
             {
                 app.UseExceptionHandler("/Error");
+                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+                app.UseHsts();
             }
 
+            app.UseHttpsRedirection();
             app.UseBlazorFrameworkFiles();
             app.UseStaticFiles();
 
@@ -53,7 +69,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             {
                 endpoints.MapRazorPages();
                 endpoints.MapControllers();
-                endpoints.MapCocoonProxyWithBlazor(typeof(Client.Program));
+                endpoints.MapCocoonProxyWithBlazor(typeof(CocoonBlazorRouteTesterManual));
             });
         }
     }
diff --git a/samples/BlazorCocoon/Server/appsettings.Development.json b/samples/BlazorCocoon/Server/appsettings.Development.json
index 37db147..5ed9460 100644
--- a/samples/BlazorCocoon/Server/appsettings.Development.json
+++ b/samples/BlazorCocoon/Server/appsettings.Development.json
@@ -6,25 +6,28 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
+  "ConnectionStrings": {
+    "WingtipToys": "Data Source=(LocalDB)\\MSSQLLocalDB;AttachDbFilename=D:\\Cocoon\\Cocoon\\samples\\Wingtip-Toys\\WingtipToys\\App_Data\\wingtiptoys.mdf;Integrated Security=True"
+  },
   "Cocoon": {
     "Proxy": {
-      "DestinationPrefix": "http://localhost:8080/"
+      "DestinationPrefix": "http://localhost:24019/"
     },
     "Authentication": {
-      "BackendApiUrl": "http://localhost:8080/facadeauth",
+      "BackendApiUrl": "http://localhost:24019/facadeauth",
       "LoginUrl": "/Account/Login?ReturnUrl={{ReturnUrl}}",
       "Cookies": [
         ".AspNet.ApplicationCookie"
       ]
     },
     "Session": {
-      "BackendApiUrl": "http://localhost:8080/facadesession",
+      "BackendApiUrl": "http://localhost:24019/facadesession",
       "Cookies": [
         "ASP.NET_SessionId"
       ]
     },
     "Cookies": {
-      "BackendApiUrl": "http://localhost:8080/facadecookies"
+      "BackendApiUrl": "http://localhost:24019/facadecookies"
     }
   }
 }
diff --git a/samples/BlazorCocoon/Server/appsettings.json b/samples/BlazorCocoon/Server/appsettings.json
index 45a1701..904e499 100644
--- a/samples/BlazorCocoon/Server/appsettings.json
+++ b/samples/BlazorCocoon/Server/appsettings.json
@@ -6,25 +6,5 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "Cocoon": {
-    "Proxy": {
-      "DestinationPrefix": "http://legacyapp"
-    },
-    "Authentication": {
-      "BackendApiUrl": "http://legacyapp/facadeauth",
-      "LoginUrl": "/Account/Login?ReturnUrl={{ReturnUrl}}",
-      "Cookies": [
-        ".AspNet.ApplicationCookie"
-      ]
-    },
-    "Session": {
-      "BackendApiUrl": "http://legacyapp/facadesession",
-      "Cookies": [
-        "ASP.NET_SessionId"
-      ]
-    },
-    "Cookies": {
-      "BackendApiUrl": "http://legacyapp/facadecookies"
-    }
-  }
+"AllowedHosts": "*"
 }
diff --git a/samples/BlazorServerCocoon/src/BlazorServerCocoon/Data/WingtipToysContext.cs b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Data/WingtipToysContext.cs
new file mode 100644
index 0000000..99ac57a
--- /dev/null
+++ b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Data/WingtipToysContext.cs
@@ -0,0 +1,17 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace BlazorServerCocoon.Data
+{
+    public class WingtipToysContext : DbContext
+    {
+        public WingtipToysContext(DbContextOptions options) : base(options)
+        {
+            
+        }
+        public DbSet<Category> Categories { get; set; }
+        
+        public DbSet<CartItem> CartItems { get; set; }
+        
+        public DbSet<Product> Products { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/samples/BlazorServerCocoon/src/BlazorServerCocoon/Dockerfile b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Dockerfile
deleted file mode 100644
index 7d021dd..0000000
--- a/samples/BlazorServerCocoon/src/BlazorServerCocoon/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 as build
-
-# Copy files
-RUN md c:\build
-WORKDIR c:/build
-COPY . c:/build
-
-# Build the application
-RUN dotnet publish -c release samples/BlazorServerCocoon/src/BlazorServerCocoon/BlazorServerCocoon.csproj -o c:/build/app -r win10-x64
-
-## Switch to a runtime image
-FROM mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 as runtime
-WORKDIR C:/inetpub/wwwroot
-
-COPY --from=build c:/build/app/ . 
-RUN Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
-
-#RUN choco install dotnet-5.0-sdk -y
-RUN choco install dotnet-5.0-windowshosting -y
-RUN choco install urlrewrite -y
-
-## Change the acls to allow localdb creation.
-RUN ["icacls","C:\\inetpub\\wwwroot", "/grant", "everyone:(OI)(CI)F","/T"]
-
diff --git a/samples/BlazorServerCocoon/src/BlazorServerCocoon/Pages/Admin.razor b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Pages/Admin.razor
new file mode 100644
index 0000000..5bb84a6
--- /dev/null
+++ b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Pages/Admin.razor
@@ -0,0 +1,61 @@
+@page "/Admin/AdminPage"
+@using BlazorServerCocoon.Data
+@using Microsoft.EntityFrameworkCore
+@using System.Linq
+@inject WingtipToysContext Db
+
+<h1>Admin</h1>
+
+<h2>Products</h2>
+
+<div class="row">
+  <div class="col-1">
+    <a class="btn btn-primary" href="/Admin/NewProduct">
+      Add a New Product
+    </a>
+  </div>
+</div>
+
+@if (_products is null)
+{
+  <p>Loading...</p>
+}
+else
+{
+<table class="table">
+  <thead>
+  <th>Category</th>
+  <th>Name</th>
+  <th>Description</th>
+  <th>Price</th>
+  <th></th>
+  </thead>
+  <tbody>
+  @foreach (var product in _products)
+  {
+    <tr>
+      <td>@product.Category.CategoryName</td>
+      <td>@product.ProductName</td>
+      <td>@product.Description</td>
+      <td>@product.UnitPrice.GetValueOrDefault().ToString("C")</td>
+      <td><a href="/Admin/EditProduct/@product.ProductID">Edit</a></td>
+    </tr>
+  }
+  </tbody>
+</table>
+}
+
+@code {
+  private Product[] _products;
+
+  protected override async Task OnInitializedAsync()
+  {
+    _products = await Db.Products
+      .Include(p => p.Category)
+      .OrderBy(p => p.Category.CategoryName)
+      .ThenBy(p => p.ProductName)
+      .AsNoTracking()
+      .ToArrayAsync();
+  }
+
+}
\ No newline at end of file
diff --git a/samples/BlazorServerCocoon/src/BlazorServerCocoon/Pages/AdminEditProduct.razor b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Pages/AdminEditProduct.razor
new file mode 100644
index 0000000..c806631
--- /dev/null
+++ b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Pages/AdminEditProduct.razor
@@ -0,0 +1,71 @@
+@page "/Admin/EditProduct/{productId:int}"
+@using BlazorServerCocoon.Data
+@using Microsoft.EntityFrameworkCore
+@inject NavigationManager Nav;
+@inject WingtipToysContext Db
+
+@if (_categories is null)
+{
+  <p>Loading...</p>
+}
+else
+{
+  <div class="row">
+    <div class="col-12">
+      <h1>Add a New Product</h1>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-md-12">
+      <EditForm Model="@_product" OnValidSubmit="OnSubmit">
+        <div class="form-group">
+          <label asp-for="Name">Name</label>
+          <InputText id="Name" @bind-Value="_product.ProductName" class="form-control" />
+        </div>
+        <div class="form-group">
+          <label asp-for="Description">Description</label>
+          <InputText id="Description" @bind-Value="_product.Description" class="form-control" />
+        </div>
+        <div class="form-group">
+          <label asp-for="Price">Price</label>
+          <InputNumber id="Price" @bind-Value="_product.UnitPrice" class="form-control" />
+        </div>
+        <div class="form-group">
+          <label asp-for="Price">Category</label>
+          <InputSelect id="CategoryId" @bind-Value="_product.CategoryID">
+            @foreach (var category in _categories)
+            {
+              <option value="@category.CategoryID">@category.CategoryName</option>
+            }
+          </InputSelect>
+        </div>
+        <button type="submit">Submit</button>
+      </EditForm>
+    </div>
+  </div>
+}
+
+@code {
+  private Category[] _categories;
+  private Product _product = new();
+  
+  [Parameter]
+  public int ProductId { get; set; }
+  
+  protected override async Task OnParametersSetAsync()
+  {
+    _product = await Db.Products
+        .Include(p => p.Category)
+        .FirstOrDefaultAsync(p => p.ProductID == ProductId);
+    _categories = await Db.Categories
+      .ToArrayAsync();
+  }
+
+  private async void OnSubmit()
+  {
+    await Db.SaveChangesAsync();
+    Nav.NavigateTo("/Admin/AdminPage");
+  }
+
+}
diff --git a/samples/BlazorServerCocoon/src/BlazorServerCocoon/Pages/AdminNewProduct.razor b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Pages/AdminNewProduct.razor
new file mode 100644
index 0000000..668b310
--- /dev/null
+++ b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Pages/AdminNewProduct.razor
@@ -0,0 +1,72 @@
+@page "/Admin/NewProduct"
+@using BlazorServerCocoon.Data
+@using System.Net
+@using Microsoft.EntityFrameworkCore
+@inject NavigationManager Nav;
+@inject WingtipToysContext Db
+
+@if (_categories is null)
+{
+  <p>Loading...</p>
+}
+else
+{
+  <div class="row">
+    <div class="col-12">
+      <h1>Add a New Product</h1>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-md-12">
+      <EditForm Model="@_product" OnValidSubmit="OnSubmit">
+        <div class="form-group">
+          <label asp-for="Name">Name</label>
+          <InputText id="Name" @bind-Value="_product.ProductName" class="form-control" />
+        </div>
+        <div class="form-group">
+          <label asp-for="Description">Description</label>
+          <InputText id="Description" @bind-Value="_product.Description" class="form-control" />
+        </div>
+        <div class="form-group">
+          <label asp-for="Price">Price</label>
+          <InputNumber id="Price" @bind-Value="_product.UnitPrice" class="form-control" />
+        </div>
+        <div class="form-group">
+          <label asp-for="Price">Category</label>
+          <InputSelect id="CategoryId" @bind-Value="_product.CategoryID">
+            @foreach (var category in _categories)
+            {
+              <option value="@category.CategoryID">@category.CategoryName</option>
+            }
+          </InputSelect>
+        </div>
+        <button type="submit">Submit</button>
+      </EditForm>
+    </div>
+  </div>
+}
+
+@code {
+  private Category[] _categories;
+  private Product _product = new();
+  
+  protected override async Task OnInitializedAsync()
+  {
+    _categories = await Db.Categories
+      .ToArrayAsync();
+    
+    _product = new Product
+    {
+      CategoryID = _categories[0].CategoryID
+    };
+  }
+
+  private async Task OnSubmit()
+  {
+    await Db.Products.AddAsync(_product);
+    await Db.SaveChangesAsync();
+    Nav.NavigateTo("/Admin/AdminPage");
+  }
+
+}
\ No newline at end of file
diff --git a/samples/BlazorServerCocoon/src/BlazorServerCocoon/Properties/launchSettings.json b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Properties/launchSettings.json
index 6970fdd..9a6101d 100644
--- a/samples/BlazorServerCocoon/src/BlazorServerCocoon/Properties/launchSettings.json
+++ b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Properties/launchSettings.json
@@ -1,25 +1,10 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:59750",
-      "sslPort": 44312
-    }
-  },
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
     "BlazorServerCocoon": {
       "commandName": "Project",
       "dotnetRunMessages": "true",
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5005",
+      "applicationUrl": "https://localhost:5001;http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/samples/BlazorServerCocoon/src/BlazorServerCocoon/Services/ShoppingCart.cs b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Services/ShoppingCart.cs
new file mode 100644
index 0000000..2b091af
--- /dev/null
+++ b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Services/ShoppingCart.cs
@@ -0,0 +1,32 @@
+using System.Linq;
+using System.Threading.Tasks;
+using BlazorServerCocoon.Data;
+using Microsoft.EntityFrameworkCore;
+using ReCode.Cocoon.Proxy.Session;
+
+namespace BlazorServerCocoon.Services
+{
+    public class ShoppingCart
+    {
+        private CocoonSession _session;
+        private WingtipToysContext _db;
+        
+        public ShoppingCart(CocoonSession session, WingtipToysContext db)
+        {
+            _session = session;
+            _db = db;
+        }
+
+        public async Task<int> GetCountAsync()
+        {
+            var cartId = await _session.GetAsync<string>("CartId");
+            var cart = await _db.CartItems
+                .Where(item => item.CartId == cartId)
+                .ToListAsync();
+            var count = cart    
+                .Select(item => item.Quantity)
+                .Sum();
+            return count;
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/BlazorServerCocoon/src/BlazorServerCocoon/Shared/CartLink.razor b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Shared/CartLink.razor
new file mode 100644
index 0000000..6ba4389
--- /dev/null
+++ b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Shared/CartLink.razor
@@ -0,0 +1,14 @@
+@using BlazorServerCocoon.Services
+@inject ShoppingCart Cart
+
+<li><a href="/ShoppingCart" ID="cartCount">Cart (@_cartCount)</a></li>
+
+@code {
+                  
+    private int _cartCount;
+
+    protected override async Task OnInitializedAsync()
+    {
+        _cartCount = await Cart.GetCountAsync();
+    }
+}
\ No newline at end of file
diff --git a/samples/BlazorServerCocoon/src/BlazorServerCocoon/Shared/LoginPartial.razor b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Shared/LoginPartial.razor
index feda420..10d5a23 100644
--- a/samples/BlazorServerCocoon/src/BlazorServerCocoon/Shared/LoginPartial.razor
+++ b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Shared/LoginPartial.razor
@@ -2,7 +2,7 @@
   <AuthorizeView>
     <Authorized>
       <li>
-        <a href="/Account/Manage" title="Manage your account" id="account-link">Hello,
+        <a href="/Account/Manage" title="Manage your account">Hello,
           @context.User.Identity?.Name !</a>
       </li>
       <li>
diff --git a/samples/BlazorServerCocoon/src/BlazorServerCocoon/Shared/NavMenu.razor b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Shared/NavMenu.razor
index a97c5b1..7dcd83d 100644
--- a/samples/BlazorServerCocoon/src/BlazorServerCocoon/Shared/NavMenu.razor
+++ b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Shared/NavMenu.razor
@@ -1,5 +1,5 @@
 <div class="top-row pl-4 navbar navbar-dark">
-    <a class="navbar-brand" href="" id="appName">BlazorServerCocoon</a>
+    <a class="navbar-brand" href="">BlazorServerCocoon</a>
     <button class="navbar-toggler" @onclick="ToggleNavMenu">
         <span class="navbar-toggler-icon"></span>
     </button>
diff --git a/samples/BlazorServerCocoon/src/BlazorServerCocoon/Shared/TopMenu.razor b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Shared/TopMenu.razor
index 6323e59..effb07c 100644
--- a/samples/BlazorServerCocoon/src/BlazorServerCocoon/Shared/TopMenu.razor
+++ b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Shared/TopMenu.razor
@@ -6,7 +6,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="/">Wingtip Toys - BlazorServer</a>
+            <a class="navbar-brand" href="/">Wingtip Toys</a>
         </div>
         <div class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
diff --git a/samples/BlazorServerCocoon/src/BlazorServerCocoon/Startup.cs b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Startup.cs
index 5777a5e..1b52018 100644
--- a/samples/BlazorServerCocoon/src/BlazorServerCocoon/Startup.cs
+++ b/samples/BlazorServerCocoon/src/BlazorServerCocoon/Startup.cs
@@ -3,7 +3,11 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using BlazorServerCocoon.Data;
+using BlazorServerCocoon.Services;
 using Microsoft.AspNetCore.Components.Authorization;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.EntityFrameworkCore;
 using ReCode.Cocoon.Proxy.Authentication;
 using ReCode.Cocoon.Proxy.Cookies;
 using ReCode.Cocoon.Proxy.Proxy;
@@ -25,10 +29,19 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddCocoonSession();
             services.AddCocoonCookies();
+            services.AddScoped<ShoppingCart>();
 
-            services.AddAuthentication(CocoonAuthenticationDefaults.Scheme).AddCocoon();
+            services.AddAuthentication(CocoonAuthenticationDefaults.Scheme)
+                .AddCocoon();
 
             services.AddScoped<AuthenticationStateProvider, CustomAuthenticationStateProvider>();
+            
+            var connectionString = Configuration.GetConnectionString("WingtipToys");
+            services.AddDbContextPool<WingtipToysContext>(builder =>
+            {
+                builder.UseSqlServer(connectionString);
+            });
+            
             services.AddCocoonProxy(Configuration);
 
             services.AddRazorPages();
@@ -46,8 +59,10 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             {
                 app.UseExceptionHandler("/Error");
                 // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+                app.UseHsts();
             }
 
+            app.UseHttpsRedirection();
             app.UseStaticFiles();
 
             // This has to go before app.UseRouting();
diff --git a/samples/BlazorServerCocoon/src/BlazorServerCocoon/appsettings.Development.json b/samples/BlazorServerCocoon/src/BlazorServerCocoon/appsettings.Development.json
index 250b194..fa883fb 100644
--- a/samples/BlazorServerCocoon/src/BlazorServerCocoon/appsettings.Development.json
+++ b/samples/BlazorServerCocoon/src/BlazorServerCocoon/appsettings.Development.json
@@ -7,6 +7,9 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
+  "ConnectionStrings": {
+    "WingtipToys": "Data Source=(LocalDB)\\MSSQLLocalDB;AttachDbFilename=D:\\Cocoon\\Cocoon\\samples\\Wingtip-Toys\\WingtipToys\\App_Data\\wingtiptoys.mdf;Integrated Security=True"
+  },
   "Cocoon": {
     "Proxy": {
       "DestinationPrefix": "http://localhost:8080/"
diff --git a/samples/BlazorServerCocoon/src/BlazorServerCocoon/appsettings.json b/samples/BlazorServerCocoon/src/BlazorServerCocoon/appsettings.json
index ba26674..81ff877 100644
--- a/samples/BlazorServerCocoon/src/BlazorServerCocoon/appsettings.json
+++ b/samples/BlazorServerCocoon/src/BlazorServerCocoon/appsettings.json
@@ -6,26 +6,5 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "AllowedHosts": "*",
-  "Cocoon": {
-    "Proxy": {
-      "DestinationPrefix": "http://legacyapp"
-    },
-    "Authentication": {
-      "BackendApiUrl": "http://legacyapp/facadeauth",
-      "LoginUrl": "/Account/Login?ReturnUrl={{ReturnUrl}}",
-      "Cookies": [
-        ".AspNet.ApplicationCookie"
-      ]
-    },
-    "Session": {
-      "BackendApiUrl": "http://legacyapp/facadesession",
-      "Cookies": [
-        "ASP.NET_SessionId"
-      ]
-    },
-    "Cookies": {
-      "BackendApiUrl": "http://legacyapp/facadecookies"
-    }
-  }
+  "AllowedHosts": "*"
 }
diff --git a/samples/MvcCocoon/src/MvcCocoon/Controllers/AdminController.cs b/samples/MvcCocoon/src/MvcCocoon/Controllers/AdminController.cs
new file mode 100644
index 0000000..4fea507
--- /dev/null
+++ b/samples/MvcCocoon/src/MvcCocoon/Controllers/AdminController.cs
@@ -0,0 +1,60 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using MvcCocoon.Data;
+using MvcCocoon.Models.Admin;
+
+namespace MvcCocoon.Controllers
+{
+    [Authorize]
+    [Route("Admin")]
+    public class AdminController : Controller
+    {
+        private readonly WingtipToysContext _dbContext;
+
+        public AdminController(WingtipToysContext dbContext)
+        {
+            _dbContext = dbContext;
+        }
+
+        [HttpGet("AdminPage")]
+        public async Task<IActionResult> Index()
+        {
+            var products = await _dbContext.Products
+                .Include(p => p.Category)
+                .OrderBy(p => p.Category.CategoryName)
+                .ThenBy(p => p.ProductName)
+                .ToListAsync();
+            var model = new AdminPageViewModel(products);
+            return View(model);
+        }
+
+        [HttpGet("NewProduct")]
+        public async Task<IActionResult> NewProduct()
+        {
+            var categories = await _dbContext.Categories.ToListAsync();
+            var model = new AddProductViewModel
+            {
+                Categories = categories
+            };
+            return View(model);
+        }
+
+        [HttpPost("AddProduct")]
+        public async Task<IActionResult> AddProduct(AddProductViewModel model)
+        {
+            var product = new Product
+            {
+                CategoryID = model.CategoryId,
+                ProductName = model.Name,
+                Description = model.Description,
+                UnitPrice = model.Price,
+            };
+            await _dbContext.Products.AddAsync(product);
+            await _dbContext.SaveChangesAsync();
+            return RedirectToAction("Index");
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/MvcCocoon/src/MvcCocoon/Dockerfile b/samples/MvcCocoon/src/MvcCocoon/Dockerfile
deleted file mode 100644
index eb0a453..0000000
--- a/samples/MvcCocoon/src/MvcCocoon/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 as build
-
-# Copy files
-RUN md c:\build
-WORKDIR c:/build
-COPY . c:/build
-
-# Build the application
-RUN dotnet publish -c release samples/MvcCocoon/src/MvcCocoon/MvcCocoon.csproj -o c:/build/app -r win10-x64
-
-## Switch to a runtime image
-FROM mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 as runtime
-WORKDIR C:/inetpub/wwwroot
-
-COPY --from=build c:/build/app/ . 
-RUN Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
-
-RUN choco install dotnet-5.0-windowshosting -y
-
-
diff --git a/samples/MvcCocoon/src/MvcCocoon/Properties/launchSettings.json b/samples/MvcCocoon/src/MvcCocoon/Properties/launchSettings.json
index b629207..37b323b 100644
--- a/samples/MvcCocoon/src/MvcCocoon/Properties/launchSettings.json
+++ b/samples/MvcCocoon/src/MvcCocoon/Properties/launchSettings.json
@@ -1,25 +1,10 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:9268",
-      "sslPort": 44371
-    }
-  },
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Facade": {
+    "MvcCocoon": {
       "commandName": "Project",
       "dotnetRunMessages": "true",
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:5004;http://localhost:5003",
+      "applicationUrl": "https://localhost:5001;http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/samples/MvcCocoon/src/MvcCocoon/Services/ShoppingCart.cs b/samples/MvcCocoon/src/MvcCocoon/Services/ShoppingCart.cs
new file mode 100644
index 0000000..3c63107
--- /dev/null
+++ b/samples/MvcCocoon/src/MvcCocoon/Services/ShoppingCart.cs
@@ -0,0 +1,32 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using MvcCocoon.Data;
+using ReCode.Cocoon.Proxy.Session;
+
+namespace MvcCocoon.Services
+{
+    public class ShoppingCart
+    {
+        private CocoonSession _session;
+        private WingtipToysContext _db;
+        
+        public ShoppingCart(CocoonSession session, WingtipToysContext db)
+        {
+            _session = session;
+            _db = db;
+        }
+
+        public async Task<int> GetCountAsync()
+        {
+            var cartId = await _session.GetAsync<string>("CartId");
+            var cart = await _db.CartItems
+                .Where(item => item.CartId == cartId)
+                .ToListAsync();
+            var count = cart    
+                .Select(item => item.Quantity)
+                .Sum();
+            return count;
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/MvcCocoon/src/MvcCocoon/Startup.cs b/samples/MvcCocoon/src/MvcCocoon/Startup.cs
index 5aef6e5..2699906 100644
--- a/samples/MvcCocoon/src/MvcCocoon/Startup.cs
+++ b/samples/MvcCocoon/src/MvcCocoon/Startup.cs
@@ -25,11 +25,20 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddCocoonSession();
             services.AddCocoonCookies();
+            services.AddScoped<ShoppingCart>();
 
-            services.AddAuthentication(CocoonAuthenticationDefaults.Scheme).AddCocoon();
+            services.AddAuthentication(CocoonAuthenticationDefaults.Scheme)
+                .AddCocoon();
+
+            var connectionString = Configuration.GetConnectionString("WingtipToys");
+            services.AddDbContextPool<WingtipToysContext>(builder =>
+            {
+                builder.UseSqlServer(connectionString);
+            });
 
             services.AddControllersWithViews();
             services.AddCocoonProxy(Configuration);
+
             services.AddHostedService<ActivityDebug>();
         }
 
@@ -41,9 +50,10 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             }
             else
             {
+                app.UseExceptionHandler("/Home/Error");
                 app.UseHsts();
             }
-
+            app.UseHttpsRedirection();
             app.UseStaticFiles();
 
             app.UseRouting();
diff --git a/samples/MvcCocoon/src/MvcCocoon/TagHelpers/CartLinkTagHelper.cs b/samples/MvcCocoon/src/MvcCocoon/TagHelpers/CartLinkTagHelper.cs
new file mode 100644
index 0000000..db16c80
--- /dev/null
+++ b/samples/MvcCocoon/src/MvcCocoon/TagHelpers/CartLinkTagHelper.cs
@@ -0,0 +1,31 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using MvcCocoon.Services;
+
+namespace MvcCocoon.TagHelpers
+{
+    public class CartLinkTagHelper : TagHelper
+    {
+        private readonly ShoppingCart _shoppingCart;
+
+        public CartLinkTagHelper(ShoppingCart shoppingCart)
+        {
+            _shoppingCart = shoppingCart;
+        }
+
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
+        {
+            output.TagName = "a";
+            int count;
+            try
+            {
+                count = await _shoppingCart.GetCountAsync();
+            }
+            catch
+            {
+                count = 0;
+            }
+            output.Content.SetContent($"Cart ({count})");
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/MvcCocoon/src/MvcCocoon/Views/Admin/Index.cshtml b/samples/MvcCocoon/src/MvcCocoon/Views/Admin/Index.cshtml
new file mode 100644
index 0000000..efd41e4
--- /dev/null
+++ b/samples/MvcCocoon/src/MvcCocoon/Views/Admin/Index.cshtml
@@ -0,0 +1,38 @@
+@model MvcCocoon.Models.Admin.AdminPageViewModel
+
+@{
+  ViewBag.Title = "Admin";
+  Layout = "_Layout";
+}
+
+<h1>Administration</h1>
+
+<h2>Products</h2>
+
+<div class="row">
+  <div class="col-1">
+    <a class="btn btn-primary" asp-action="NewProduct">
+      Add a New Product
+    </a>
+  </div>
+</div>
+
+<table class="table">
+  <thead>
+  <th>Category</th>
+  <th>Name</th>
+  <th>Description</th>
+  <th>Price</th>
+  </thead>
+  <tbody>
+  @foreach (var product in Model.Products)
+  {
+    <tr>
+      <td>@product.Category.CategoryName</td>
+      <td>@product.ProductName</td>
+      <td>@product.Description</td>
+      <td>@product.UnitPrice.GetValueOrDefault().ToString("C")</td>
+    </tr>
+  }
+  </tbody>
+</table>
diff --git a/samples/MvcCocoon/src/MvcCocoon/Views/Admin/NewProduct.cshtml b/samples/MvcCocoon/src/MvcCocoon/Views/Admin/NewProduct.cshtml
new file mode 100644
index 0000000..167a5b9
--- /dev/null
+++ b/samples/MvcCocoon/src/MvcCocoon/Views/Admin/NewProduct.cshtml
@@ -0,0 +1,41 @@
+@model MvcCocoon.Models.Admin.AddProductViewModel
+
+@{
+  ViewBag.Title = "title";
+  Layout = "_Layout";
+}
+
+<div class="row">
+  <div class="col-12">
+    <h1>Add a New Product</h1>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-md-12">
+    <form asp-action="AddProduct">
+      <div class="form-group">
+        <label asp-for="Name">Name</label>
+        <input asp-for="Name" class="form-control" />
+      </div>
+      <div class="form-group">
+        <label asp-for="Description">Description</label>
+        <input asp-for="Description" class="form-control" />
+      </div>
+      <div class="form-group">
+        <label asp-for="Price">Price</label>
+        <input asp-for="Price" type="number" class="form-control" />
+      </div>
+      <div class="form-group">
+        <label asp-for="Price">Category</label>
+        <select asp-for="CategoryId" class="form-control">
+          @foreach (var category in Model.Categories)
+          {
+            <option value="@category.CategoryID">@category.CategoryName</option>
+          }
+        </select>
+      </div>
+      <button type="submit">Submit</button>
+    </form>
+  </div>
+</div>
diff --git a/samples/MvcCocoon/src/MvcCocoon/Views/Shared/_Layout.cshtml b/samples/MvcCocoon/src/MvcCocoon/Views/Shared/_Layout.cshtml
index 339dd19..209746b 100644
--- a/samples/MvcCocoon/src/MvcCocoon/Views/Shared/_Layout.cshtml
+++ b/samples/MvcCocoon/src/MvcCocoon/Views/Shared/_Layout.cshtml
@@ -1,5 +1,6 @@
 @using System.Security.Claims
 @using MvcCocoon.Data
+@inject WingtipToysContext DbContext
 
 <!DOCTYPE html>
 <html lang="en">
@@ -20,7 +21,7 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </button>
-                    <a class="navbar-brand" runat="server" href="~/" id="appName">Wingtip Toys 2 - MVCCore</a>
+                    <a class="navbar-brand" runat="server" href="~/">Wingtip Toys 2</a>
                 </div>
                 <div class="navbar-collapse collapse">
                     <ul class="nav navbar-nav">
@@ -28,16 +29,32 @@
                             c.Type == ClaimTypes.Role
                             && c.Value == "Administrator"))
                         {
-                        <li><a href="~/Admin/AdminPage">Admin</a></li>
+                        <li><a href="/Admin/AdminPage">Admin</a></li>
                         }
-                        <li><a href="~/">Home</a></li>
-                        <li><a href="~/About">About</a></li>
-                        <li><a href="~/Contact">Contact</a></li>
-                        <li><a href="~/ProductList">Products</a></li>
-                        <li><cart-link href="~/ShoppingCart"></cart-link></li>
+                        <li><a href="/">Home</a></li>
+                        <li><a href="/About">About</a></li>
+                        <li><a href="/Contact">Contact</a></li>
+                        <li><a href="/ProductList">Products</a></li>
+                        <li><cart-link href="/ShoppingCart"></cart-link></li>
                         @* <li><a href="~/ShoppingCart" ID="cartCount">&nbsp;</a></li> *@
                     </ul>
                     <partial name="_LoginPartial" />
+                    @* <asp:LoginView runat="server" ViewStateMode="Disabled"> *@
+                    @*     <AnonymousTemplate> *@
+                    @*         <ul class="nav navbar-nav navbar-right"> *@
+                    @*             <li><a runat="server" href="~/Account/Register">Register</a></li> *@
+                    @*             <li><a runat="server" href="~/Account/Login">Log in</a></li> *@
+                    @*         </ul> *@
+                    @*     </AnonymousTemplate> *@
+                    @*     <LoggedInTemplate> *@
+                    @*         <ul class="nav navbar-nav navbar-right"> *@
+                    @*             <li><a runat="server" href="~/Account/Manage" title="Manage your account">Hello, <%: Context.User.Identity.GetUserName()  %> !</a></li> *@
+                    @*             <li> *@
+                    @*                 <asp:LoginStatus runat="server" LogoutAction="Redirect" LogoutText="Log off" LogoutPageUrl="~/" OnLoggingOut="Unnamed_LoggingOut" /> *@
+                    @*             </li> *@
+                    @*         </ul> *@
+                    @*     </LoggedInTemplate> *@
+                    @* </asp:LoginView> *@
                 </div>
             </div>
         </div>
@@ -49,6 +66,22 @@
         </a>  
         <br />  
     </div>
+    
+    <div id="CategoryMenu" style="text-align: center">
+        @{ bool first = true; }
+        @foreach (var category in DbContext.Categories)
+        {
+            @if (!first)
+            {
+                <span>&nbsp;&nbsp;|&nbsp;&nbsp;</span>
+            }
+            else
+            {
+                first = false;
+            }
+            <a href="~/Category/@category.CategoryName">@category.CategoryName</a>
+        }
+    </div>
 
     <main role="main" class="pb-3">
         @RenderBody()
diff --git a/samples/MvcCocoon/src/MvcCocoon/Views/Shared/_LoginPartial.cshtml b/samples/MvcCocoon/src/MvcCocoon/Views/Shared/_LoginPartial.cshtml
index d5dd39c..2582209 100644
--- a/samples/MvcCocoon/src/MvcCocoon/Views/Shared/_LoginPartial.cshtml
+++ b/samples/MvcCocoon/src/MvcCocoon/Views/Shared/_LoginPartial.cshtml
@@ -2,7 +2,7 @@
 @if (User.Identity.IsAuthenticated)
 {
   <li>
-    <a href="/Account/Manage" title="Manage your account" id="account-link">Hello, @User.Identity.Name !</a>
+    <a href="/Account/Manage" title="Manage your account">Hello, @User.Identity.Name !</a>
   </li>
   <li>
     <a href="/Account/Logout">Log out</a>
diff --git a/samples/MvcCocoon/src/MvcCocoon/Views/_ViewImports.cshtml b/samples/MvcCocoon/src/MvcCocoon/Views/_ViewImports.cshtml
index 90b8f27..c72a6d4 100644
--- a/samples/MvcCocoon/src/MvcCocoon/Views/_ViewImports.cshtml
+++ b/samples/MvcCocoon/src/MvcCocoon/Views/_ViewImports.cshtml
@@ -1,2 +1,3 @@
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @addTagHelper *, Facade
+@addTagHelper *, MvcCocoon
diff --git a/samples/MvcCocoon/src/MvcCocoon/appsettings.Development.json b/samples/MvcCocoon/src/MvcCocoon/appsettings.Development.json
index 54acedd..ab5aeae 100644
--- a/samples/MvcCocoon/src/MvcCocoon/appsettings.Development.json
+++ b/samples/MvcCocoon/src/MvcCocoon/appsettings.Development.json
@@ -6,6 +6,9 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
+  "ConnectionStrings": {
+    "WingtipToys": "Data Source=(LocalDB)\\MSSQLLocalDB;AttachDbFilename=D:\\Cocoon\\Cocoon\\samples\\Wingtip-Toys\\WingtipToys\\App_Data\\wingtiptoys.mdf;Integrated Security=True"
+  },
   "Cocoon": {
     "Proxy": {
       "DestinationPrefix": "http://localhost:8080/"
diff --git a/samples/MvcCocoon/src/MvcCocoon/appsettings.json b/samples/MvcCocoon/src/MvcCocoon/appsettings.json
index ba26674..81ff877 100644
--- a/samples/MvcCocoon/src/MvcCocoon/appsettings.json
+++ b/samples/MvcCocoon/src/MvcCocoon/appsettings.json
@@ -6,26 +6,5 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
-  "AllowedHosts": "*",
-  "Cocoon": {
-    "Proxy": {
-      "DestinationPrefix": "http://legacyapp"
-    },
-    "Authentication": {
-      "BackendApiUrl": "http://legacyapp/facadeauth",
-      "LoginUrl": "/Account/Login?ReturnUrl={{ReturnUrl}}",
-      "Cookies": [
-        ".AspNet.ApplicationCookie"
-      ]
-    },
-    "Session": {
-      "BackendApiUrl": "http://legacyapp/facadesession",
-      "Cookies": [
-        "ASP.NET_SessionId"
-      ]
-    },
-    "Cookies": {
-      "BackendApiUrl": "http://legacyapp/facadecookies"
-    }
-  }
+  "AllowedHosts": "*"
 }

From d88a0b6d06d359bfa0a54f3868d672e7c0144d40 Mon Sep 17 00:00:00 2001
From: Mark <mark@rendlelabs.com>
Date: Mon, 23 May 2022 14:37:26 +0100
Subject: [PATCH 4/5] Update test project to net6.0

---
 .../ReCode.Cocoon.Proxy.Tests/ReCode.Cocoon.Proxy.Tests.csproj  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/test/ReCode.Cocoon.Proxy.Tests/ReCode.Cocoon.Proxy.Tests.csproj b/main/test/ReCode.Cocoon.Proxy.Tests/ReCode.Cocoon.Proxy.Tests.csproj
index a5b6024..f0e6137 100644
--- a/main/test/ReCode.Cocoon.Proxy.Tests/ReCode.Cocoon.Proxy.Tests.csproj
+++ b/main/test/ReCode.Cocoon.Proxy.Tests/ReCode.Cocoon.Proxy.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>

From c7ec5b7382cf963959f28f73b6a5b80d1da02e07 Mon Sep 17 00:00:00 2001
From: Mark <mark@rendlelabs.com>
Date: Mon, 23 May 2022 14:51:00 +0100
Subject: [PATCH 5/5] Remove custom net45 build step

---
 .github/workflows/dotnet-develop.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/dotnet-develop.yml b/.github/workflows/dotnet-develop.yml
index 74467bc..b7e23a9 100644
--- a/.github/workflows/dotnet-develop.yml
+++ b/.github/workflows/dotnet-develop.yml
@@ -39,10 +39,6 @@ jobs:
     - name: Test
       run: dotnet test -c Release --no-build --verbosity normal .\test\ReCode.Cocoon.Proxy.Tests
       working-directory: .\main
-    - name: BuildNet45
-      run: |
-        cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\"
-        .\MSBuild.exe $Env:GITHUB_WORKSPACE\main\Cocoon.sln -m /p:Configuration=Release
     - name: ConsoleRunXUnitLegacyTests
       run: |
         ~/.nuget/packages/xunit.runner.console/2.4.1/tools/net472/xunit.console.exe $Env:GITHUB_WORKSPACE\main\test\ReCode.Cocoon.Legacy.Tests\bin\Release\net45\ReCode.Cocoon.Legacy.Tests.dll
\ No newline at end of file