diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000..eee9e3bf
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,35 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      // Use IntelliSense to find out which attributes exist for C# debugging
+      // Use hover for the description of the existing attributes
+      // For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md.
+      "name": ".NET Core Launch (web)",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "build",
+      // If you have changed target frameworks, make sure to update the program path.
+      "program": "${workspaceFolder}/Examples/BookingSystem.AspNetCore/bin/Debug/net6.0/BookingSystem.AspNetCore.dll",
+      "args": [],
+      "cwd": "${workspaceFolder}/Examples/BookingSystem.AspNetCore",
+      "stopAtEntry": false,
+      // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
+      "serverReadyAction": {
+        "action": "openExternally",
+        "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+      },
+      "env": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "sourceFileMap": {
+        "/Views": "${workspaceFolder}/Views"
+      }
+    },
+    {
+      "name": ".NET Core Attach",
+      "type": "coreclr",
+      "request": "attach"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 00000000..16fdfdac
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,55 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "build",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+          "build",
+          "${workspaceFolder}/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj",
+          "--configuration",
+          "Debug"
+      ],
+      "problemMatcher": "$msCompile",
+      "group": {
+          "kind": "build",
+          "isDefault": true
+      }
+    },
+    {
+      "label": "publish",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+          "publish",
+          "${workspaceFolder}/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj",
+          "--configuration",
+          "Release"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "watch",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+          "watch",
+          "run",
+          "--project",
+          "${workspaceFolder}/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "clean",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+          "clean",
+          "${workspaceFolder}/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj"
+      ],
+      "problemMatcher": "$msCompile"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Examples/BookingSystem.AspNetCore.IdentityServer/BookingSystem.AspNetCore.IdentityServer.csproj b/Examples/BookingSystem.AspNetCore.IdentityServer/BookingSystem.AspNetCore.IdentityServer.csproj
index fb12cf38..936c8e33 100644
--- a/Examples/BookingSystem.AspNetCore.IdentityServer/BookingSystem.AspNetCore.IdentityServer.csproj
+++ b/Examples/BookingSystem.AspNetCore.IdentityServer/BookingSystem.AspNetCore.IdentityServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   
   <ItemGroup>
diff --git a/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj b/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj
index 62f36fd2..ab56d8f6 100644
--- a/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj
+++ b/Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <UserSecretsId>aspnet-BookingSystem.AspNetCore-443B4F82-A20C-41CE-9924-329A0BCF0D14</UserSecretsId>
     <Configurations>Release;Debug</Configurations>
   </PropertyGroup>
diff --git a/Examples/BookingSystem.AspNetCore/Properties/launchSettings.json b/Examples/BookingSystem.AspNetCore/Properties/launchSettings.json
index b6b622f3..f1a81025 100644
--- a/Examples/BookingSystem.AspNetCore/Properties/launchSettings.json
+++ b/Examples/BookingSystem.AspNetCore/Properties/launchSettings.json
@@ -6,11 +6,12 @@
   "profiles": {
     "BookingSystem.AspNetCore": {
       "commandName": "Project",
-      "launchUrl": "https://localhost:5001/openactive",
-      "applicationUrl": "https://localhost:5001",
+      "launchUrl": "https://localhost:5004/openactive",
+      "applicationUrl": "https://localhost:5004",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
-        "ApplicationHostBaseUrl": "https://localhost:5001"
+        "ApplicationHostBaseUrl": "https://localhost:5004",
+        "IS_LOREM_FITSUM_MODE": "false"
       }
     }
   }
diff --git a/Examples/BookingSystem.AspNetCore/Stores/SessionStore.cs b/Examples/BookingSystem.AspNetCore/Stores/SessionStore.cs
index 912579f7..7a0d4b07 100644
--- a/Examples/BookingSystem.AspNetCore/Stores/SessionStore.cs
+++ b/Examples/BookingSystem.AspNetCore/Stores/SessionStore.cs
@@ -381,17 +381,17 @@ protected override async Task GetOrderItems(List<OrderItemContext<SessionOpportu
                         },
                         Attendee = orderItemContext.RequestOrderItem.Attendee,
                         AttendeeDetailsRequired = @class.RequiresAttendeeValidation
-                                         ? new List<PropertyEnumeration>
-                                         {
-                                             PropertyEnumeration.GivenName,
-                                             PropertyEnumeration.FamilyName,
-                                             PropertyEnumeration.Email,
-                                             PropertyEnumeration.Telephone,
-                                         }
-                                         : null,
+                                        ? new List<PropertyEnumeration>
+                                        {
+                                            PropertyEnumeration.GivenName,
+                                            PropertyEnumeration.FamilyName,
+                                            PropertyEnumeration.Email,
+                                            PropertyEnumeration.Telephone,
+                                        }
+                                        : null,
                         OrderItemIntakeForm = @class.RequiresAdditionalDetails
-                                     ? PropertyValueSpecificationHelper.HydrateAdditionalDetailsIntoPropertyValueSpecifications(@class.RequiredAdditionalDetails)
-                                     : null,
+                                    ? PropertyValueSpecificationHelper.HydrateAdditionalDetailsIntoPropertyValueSpecifications(@class.RequiredAdditionalDetails)
+                                    : null,
                         OrderItemIntakeFormResponse = orderItemContext.RequestOrderItem.OrderItemIntakeFormResponse,
                     },
                     SellerId = _appSettings.FeatureFlags.SingleSeller ? new SimpleIdComponents() : new SimpleIdComponents { IdLong = @class.SellerId },
diff --git a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj
index c89ec8a1..0e245161 100644
--- a/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj
+++ b/Examples/BookingSystem.AspNetFramework/BookingSystem.AspNetFramework.csproj
@@ -498,7 +498,7 @@
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="Exists('$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets')" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
   <Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
     <AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" />
diff --git a/Fakes/OpenActive.FakeDatabase.NET.Tests/OpenActive.FakeDatabase.NET.Tests.csproj b/Fakes/OpenActive.FakeDatabase.NET.Tests/OpenActive.FakeDatabase.NET.Tests.csproj
index e6ac0462..0bfd92d5 100644
--- a/Fakes/OpenActive.FakeDatabase.NET.Tests/OpenActive.FakeDatabase.NET.Tests.csproj
+++ b/Fakes/OpenActive.FakeDatabase.NET.Tests/OpenActive.FakeDatabase.NET.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/OpenActive.Server.NET.Tests/OpenActive.Server.NET.Tests.csproj b/OpenActive.Server.NET.Tests/OpenActive.Server.NET.Tests.csproj
index 7226907e..bb85d21a 100644
--- a/OpenActive.Server.NET.Tests/OpenActive.Server.NET.Tests.csproj
+++ b/OpenActive.Server.NET.Tests/OpenActive.Server.NET.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>