From d8a250f843b127661c47a2c747fbcbed2ed23f30 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Thu, 23 Sep 2021 15:06:55 +0200
Subject: [PATCH] Updated to rc004.

---
 .gitignore                                    |  1 -
 PersonalisationGroups/AppConfiguration.cs     | 30 +++++--------------
 .../UmbracoPersonalisationGroups.csproj       |  4 +--
 UmbracoPersonalisationGroupsCore.sln          |  6 ++++
 4 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 79636dc..49402d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -198,5 +198,4 @@ ExamineIndexes/
 
 # Solution
 TestWebApp/
-TestWebAppWithPackage/
 
diff --git a/PersonalisationGroups/AppConfiguration.cs b/PersonalisationGroups/AppConfiguration.cs
index ca9bb48..9188f3b 100644
--- a/PersonalisationGroups/AppConfiguration.cs
+++ b/PersonalisationGroups/AppConfiguration.cs
@@ -5,36 +5,22 @@ namespace Our.Umbraco.PersonalisationGroups
 {
     public static class AppConfiguration
     {
-        public static IUmbracoEndpointBuilder UsePersonalisationGroupsEndpoints(this IUmbracoEndpointBuilder builder)
+        public static IUmbracoEndpointBuilderContext UsePersonalisationGroupsEndpoints(this IUmbracoEndpointBuilderContext builderContext)
         {
-            const string controllersNamespace = "Our.Umbraco.PersonalisationGroups.Controllers";
-
-            builder.EndpointRouteBuilder.MapControllerRoute(
-                name: "Criteria methods",
-                pattern: "App_Plugins/PersonalisationGroups/Criteria",
-                defaults: new { controller = "Criteria", action = "Index" }
-                //namespaces: new[] { controllersNamespace }
-                );
-            builder.EndpointRouteBuilder.MapControllerRoute(
+            builderContext.EndpointRouteBuilder.MapControllerRoute(
                 name: "Criteria methods",
                 pattern: "App_Plugins/PersonalisationGroups/Criteria",
-                defaults: new { controller = "Criteria", action = "Index" }
-                //namespaces: new[] { controllersNamespace }
-                );
-            builder.EndpointRouteBuilder.MapControllerRoute(
+                defaults: new { controller = "Criteria", action = "Index" });
+            builderContext.EndpointRouteBuilder.MapControllerRoute(
                 name: "Geo location methods",
                 pattern: "App_Plugins/PersonalisationGroups/GeoLocation/{action}",
-                defaults: new { controller = "GeoLocation", action = "Index" }
-                //namespaces: new[] { controllersNamespace }
-                );
-            builder.EndpointRouteBuilder.MapControllerRoute(
+                defaults: new { controller = "GeoLocation", action = "Index" });
+            builderContext.EndpointRouteBuilder.MapControllerRoute(
                 name: "Member methods",
                 pattern: "App_Plugins/PersonalisationGroups/Member/{action}",
-                defaults: new { controller = "Member", action = "Index" }
-                //namespaces: new[] { controllersNamespace }
-                );
+                defaults: new { controller = "Member", action = "Index" });
 
-            return builder;
+            return builderContext;
         }
     }
 }
diff --git a/PersonalisationGroups/UmbracoPersonalisationGroups.csproj b/PersonalisationGroups/UmbracoPersonalisationGroups.csproj
index c2ca7cc..90e9c72 100644
--- a/PersonalisationGroups/UmbracoPersonalisationGroups.csproj
+++ b/PersonalisationGroups/UmbracoPersonalisationGroups.csproj
@@ -6,7 +6,7 @@
     <ContentTargetFolders>.</ContentTargetFolders>
     <TargetFramework>net5.0</TargetFramework>
     <PackageId>UmbracoPersonalisationGroups</PackageId>
-    <Version>3.0.0-beta-2</Version>
+    <Version>3.0.0-beta-3</Version>
     <Authors>Andy Butland</Authors>
     <Description>An Umbraco package supporting personalisation of content to different groups of site visitors.</Description>
     <Copyright>2021 Andy Butland</Copyright>
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="MaxMind.GeoIP2" Version="4.0.1" />
-    <PackageReference Include="Umbraco.Cms.Web.Common" Version="9.0.0-rc001" />
+    <PackageReference Include="Umbraco.Cms.Web.Common" Version="9.0.0-rc004" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/UmbracoPersonalisationGroupsCore.sln b/UmbracoPersonalisationGroupsCore.sln
index d25346b..3fd6808 100644
--- a/UmbracoPersonalisationGroupsCore.sln
+++ b/UmbracoPersonalisationGroupsCore.sln
@@ -7,6 +7,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UmbracoPersonalisationGroup
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UmbracoPersonalisationGroups.Tests", "PersonalisationGroups.Tests\UmbracoPersonalisationGroups.Tests.csproj", "{4CDFDC2F-332E-4FF0-868F-AFA214563288}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestWebApp", "TestWebApp\TestWebApp.csproj", "{B75A6370-1971-45C9-8C34-5CE4CC8D1C3D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,6 +23,10 @@ Global
 		{4CDFDC2F-332E-4FF0-868F-AFA214563288}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4CDFDC2F-332E-4FF0-868F-AFA214563288}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4CDFDC2F-332E-4FF0-868F-AFA214563288}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B75A6370-1971-45C9-8C34-5CE4CC8D1C3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B75A6370-1971-45C9-8C34-5CE4CC8D1C3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B75A6370-1971-45C9-8C34-5CE4CC8D1C3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B75A6370-1971-45C9-8C34-5CE4CC8D1C3D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE