Merge remote-tracking branch 'sdk/issue/SITE-62-uitt-config' into tas…

…k/ui-testing
Lombiq · Jan 26, 2024 · f6132d6 · f6132d6
2 parents 882a92d + 9064709
commit f6132d6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/src/DotNest.Core.SDK.Web/DotNest.Core.SDK.Web.csproj b/src/DotNest.Core.SDK.Web/DotNest.Core.SDK.Web.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -35,7 +35,8 @@
     <PackageReference Include="Lombiq.SetupExtensions" Version="5.0.0" />
     <PackageReference Include="Lombiq.Hosting.MediaTheme" Version="5.0.1-alpha.1.osoe-775" />
     <PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="5.0.1-alpha.1.osoe-775" />
-    <PackageReference Include="Lombiq.Tests.UI.Shortcuts" Version="8.2.1-alpha.6.osoe-351" />
+    <PackageReference Include="Lombiq.Tests.UI.AppExtensions" Version="8.2.1-alpha.13.tdeal-16" />
+    <PackageReference Include="Lombiq.Tests.UI.Shortcuts" Version="8.2.1-alpha.13.tdeal-16" />
     <PackageReference Include="Lombiq.Walkthroughs" Version="1.0.0-alpha.1.lmbq-113" />
   </ItemGroup>
 

diff --git a/src/DotNest.Core.SDK.Web/Program.cs b/src/DotNest.Core.SDK.Web/Program.cs
@@ -12,18 +12,11 @@
 builder.Services
     .AddSingleton(configuration)
     .AddOrchardCms(orchardCoreBuilder =>
-    {
         orchardCoreBuilder
             .AddDatabaseShellsConfigurationIfAvailable(configuration)
-            .ConfigureSmtpSettings(overrideAdminSettings: false);
-
-        if (builder.Environment.IsDevelopment())
-        {
-            orchardCoreBuilder
-                .AddSetupFeatures("OrchardCore.AutoSetup")
-                .HideRecipesByTagsFromSetup("test", "HideFromSetupScreen");
-        }
-    });
+            .ConfigureSmtpSettings(overrideAdminSettings: false)
+            .EnableAutoSetupIfNotUITesting(configuration)
+            .HideRecipesByTagsFromSetup("test", "HideFromSetupScreen"));
 
 var app = builder.Build();
 

diff --git a/test/DotNest.Core.SDK.Tests.UI/DotNest.Core.SDK.Tests.UI.csproj b/test/DotNest.Core.SDK.Tests.UI/DotNest.Core.SDK.Tests.UI.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
-    <PackageReference Include="Lombiq.Tests.UI" Version="8.2.1-alpha.6.osoe-351" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="8.2.1-alpha.13.tdeal-16" />
     <PackageReference Include="Lombiq.Analyzers" Version="3.3.0" />
   </ItemGroup>