Merge pull request #96 from Lombiq/issue/OSOE-903

OSOE-903: Update to Orchard Core 2.1.0

Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj

@@ -22,9 +22,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Forms" Version="2.0.0" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0" />
-    <PackageReference Include="OrchardCore.Workflows" Version="2.0.0" />
+    <PackageReference Include="OrchardCore.Forms" Version="2.1.0" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.1.0" />
+    <PackageReference Include="OrchardCore.Workflows" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">

Lombiq.Privacy.Tests.UI/CompatibilitySuppressions.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
+<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Suppression>
+    <DiagnosticId>CP0001</DiagnosticId>
+    <Target>T:Lombiq.Privacy.Tests.UI.Constants.TestUser</Target>
+    <Left>lib/net8.0/Lombiq.Privacy.Tests.UI.dll</Left>
+    <Right>lib/net8.0/Lombiq.Privacy.Tests.UI.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
+</Suppressions>

Lombiq.Privacy.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs

@@ -1,8 +1,8 @@
 using Lombiq.Privacy.Tests.UI.Constants;
+using Lombiq.Tests.UI.Constants;
 using Lombiq.Tests.UI.Extensions;
 using Lombiq.Tests.UI.Services;
 using OpenQA.Selenium;
-using OrchardCore.Users.Models;
 using Shouldly;
 using System.Threading.Tasks;
 
@@ -101,22 +101,21 @@ public static async Task TestRegistrationConsentCheckboxAsync(this UITestContext
     {
         await context.EnablePrivacyConsentBannerFeatureAsync();
         await context.EnablePrivacyRegistrationConsentFeatureAsync();
-        await context.SetUserRegistrationTypeAsync(UserRegistrationType.AllowRegistration);
 
         await context.TestRegistrationConsentCheckboxContentAsync();
 
         // Go to registration and create a new user.
         await context.GoToRegistrationPageAsync();
-        await context.FillInWithRetriesAsync(By.Id("RegisterUserForm_UserName"), TestUser.Name);
+        await context.FillInWithRetriesAsync(By.Id("RegisterUserForm_UserName"), TestUser.UserName);
         await context.FillInWithRetriesAsync(By.Id("RegisterUserForm_Email"), TestUser.Email);
         await context.FillInWithRetriesAsync(By.Id("RegisterUserForm_Password"), TestUser.Password);
         await context.FillInWithRetriesAsync(By.Id("RegisterUserForm_ConfirmPassword"), TestUser.Password);
         await context.SetCheckboxValueAsync(By.Id("RegisterUserForm_RegistrationCheckbox"));
         await context.ClickReliablyOnSubmitAsync();
 
         // Login with the created user.
-        await context.SignInDirectlyAsync(TestUser.Name);
-        (await context.GetCurrentUserNameAsync()).ShouldBe(TestUser.Name);
+        await context.SignInDirectlyAsync(TestUser.UserName);
+        (await context.GetCurrentUserNameAsync()).ShouldBe(TestUser.UserName);
 
         // Check that, the consent banner doesn't come up after login.
         await context.GoToHomePageAsync();

Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj

@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Tests.UI" Version="11.0.0" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="11.1.1-alpha.1.osoe-903" />
   </ItemGroup>
 
   <ItemGroup>

Lombiq.Privacy/Lombiq.Privacy.csproj

@@ -32,15 +32,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.CustomSettings" Version="2.0.0" />
-    <PackageReference Include="OrchardCore.Forms" Version="2.0.0" />
-    <PackageReference Include="OrchardCore.Liquid" Version="2.0.0" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0" />
-    <PackageReference Include="OrchardCore.Navigation" Version="2.0.0" />
-    <PackageReference Include="OrchardCore.Users" Version="2.0.0" />
+    <PackageReference Include="OrchardCore.CustomSettings" Version="2.1.0" />
+    <PackageReference Include="OrchardCore.Forms" Version="2.1.0" />
+    <PackageReference Include="OrchardCore.Liquid" Version="2.1.0" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.1.0" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="2.1.0" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.1.0" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.1.0" />
+    <PackageReference Include="OrchardCore.Navigation" Version="2.1.0" />
+    <PackageReference Include="OrchardCore.Users" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' != 'true'">

Lombiq.Privacy/Startup.cs

@@ -107,7 +107,7 @@ public sealed class RegistrationConsentStartup : StartupBase
 
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<IDisplayDriver<RegisterUserForm>, RegistrationCheckboxDriver>();
+        services.AddDisplayDriver<RegisterUserForm, RegistrationCheckboxDriver>();
         services.AddScoped<IRegistrationFormEvents, RegistrationFormEventHandler>();
         services.AddDataMigration<PrivacyRegistrationConsentSettingsMigrations>();
         services.AddNavigationProvider<PrivacyRegistrationConsentSettingsMenu>();