Lombiq · sarahelsaig · Aug 23, 2024 · Jul 29, 2024 · Jul 29, 2024 · Jul 30, 2024
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
@@ -5,6 +5,7 @@ Bubl
 chartjs
 Chro
 chromedriver
+cloudflare
 clike
 codeanalysis
 codestyle

diff --git a/.github/workflows/validate-pull-request.yml b/.github/workflows/validate-pull-request.yml
@@ -8,4 +8,4 @@ on:
 jobs:
   validate-pull-request:
     name: Validate Pull Request
-    uses: Lombiq/GitHub-Actions/.github/workflows/validate-pull-request.yml@issue/OSOE-888
+    uses: Lombiq/GitHub-Actions/.github/workflows/validate-pull-request.yml@dev
diff --git a/NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Lombiq.OSOCE.NuGet.Web.csproj b/NuGetTest/src/Lombiq.OSOCE.NuGet.Web/Lombiq.OSOCE.NuGet.Web.csproj
@@ -60,8 +60,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Logging.NLog" Version="2.0.0-preview-18312" />
-    <PackageReference Include="OrchardCore.Application.Cms.Targets" Version="2.0.0-preview-18312" />
+    <PackageReference Include="OrchardCore.Logging.NLog" Version="2.0.0-preview-18315" />
+    <PackageReference Include="OrchardCore.Application.Cms.Targets" Version="2.0.0-preview-18315" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/NuGetTest/src/Modules/Lombiq.OSOCE.NuGet.TestModule/Lombiq.OSOCE.NuGet.TestModule.csproj b/NuGetTest/src/Modules/Lombiq.OSOCE.NuGet.TestModule/Lombiq.OSOCE.NuGet.TestModule.csproj
@@ -17,10 +17,10 @@
 
   <ItemGroup>
     <PackageReference Include="Lombiq.HelpfulLibraries" Version="10.0.1-alpha.4.osoe-893" />
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18312" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18312" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18312" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18312" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18315" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18315" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18315" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18315" />
   </ItemGroup>
 
 </Project>
diff --git a/NuGetTest/src/Themes/Lombiq.OSOCE.NuGet.TestTheme/Lombiq.OSOCE.NuGet.TestTheme.csproj b/NuGetTest/src/Themes/Lombiq.OSOCE.NuGet.TestTheme/Lombiq.OSOCE.NuGet.TestTheme.csproj
@@ -21,10 +21,10 @@
 
   <ItemGroup>
     <PackageReference Include="Lombiq.Npm.Targets" Version="1.4.0" />
-    <PackageReference Include="OrchardCore.Theme.Targets" Version="2.0.0-preview-18312" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18312" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18312" />
-    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18312" />
+    <PackageReference Include="OrchardCore.Theme.Targets" Version="2.0.0-preview-18315" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18315" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18315" />
+    <PackageReference Include="OrchardCore.ResourceManagement" Version="2.0.0-preview-18315" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Libraries/Lombiq.HelpfulLibraries b/src/Libraries/Lombiq.HelpfulLibraries
diff --git a/src/Libraries/Lombiq.OrchardCoreApiClient b/src/Libraries/Lombiq.OrchardCoreApiClient
diff --git a/src/Lombiq.OSOCE.Web/Lombiq.OSOCE.Web.csproj b/src/Lombiq.OSOCE.Web/Lombiq.OSOCE.Web.csproj
@@ -58,9 +58,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Admin.Abstractions" Version="2.0.0-preview-18312" />
-    <PackageReference Include="OrchardCore.Application.Cms.Targets" Version="2.0.0-preview-18312" />
-    <PackageReference Include="OrchardCore.Logging.NLog" Version="2.0.0-preview-18312" />
+    <PackageReference Include="OrchardCore.Admin.Abstractions" Version="2.0.0-preview-18315" />
+    <PackageReference Include="OrchardCore.Application.Cms.Targets" Version="2.0.0-preview-18315" />
+    <PackageReference Include="OrchardCore.Logging.NLog" Version="2.0.0-preview-18315" />
     <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.3" />
   </ItemGroup>
 

diff --git a/src/Lombiq.OSOCE.Web/Views/Settings-Cache.Edit.cshtml b/src/Lombiq.OSOCE.Web/Views/Settings-Cache.Edit.cshtml
@@ -0,0 +1,18 @@
+@* Copied from OC on 2024-08-22. All difference is that the <em> elements were removed to pacify Chrome. *@
+
+@model OrchardCore.Settings.ViewModels.SiteSettingsViewModel
+
+<h5>@T["Settings for dynamic caches"]</h5>
+
+<div class="mb-3">
+    <div class="col-xl-6" asp-validation-class-for="CacheMode">
+        <label asp-for="CacheMode" class="form-label">@T["Cache Mode"]</label>
+        <select asp-for="CacheMode" class="form-select">
+            <option value="@CacheMode.FromConfiguration.ToString()">@T["From environment — enabled in Production, disabled otherwise"]</option>
+            <option value="@CacheMode.Enabled.ToString()">@T["Enabled"]</option>
+            <option value="@CacheMode.DebugEnabled.ToString()">@T["Enabled with cache debug mode"]</option>
+            <option value="@CacheMode.Disabled.ToString()">@T["Disabled"]</option>
+        </select>
+        <span class="hint">@T["Determines whether caches are enabled or disabled."]</span>
+    </div>
+</div>
diff --git a/src/Lombiq.OSOCE.Web/Views/Settings-Resources.Edit.cshtml b/src/Lombiq.OSOCE.Web/Views/Settings-Resources.Edit.cshtml
@@ -0,0 +1,40 @@
+@* Copied from OC on 2024-08-22. All difference is that the <em> elements were removed to pacify Chrome. *@
+
+@model SiteSettingsViewModel
+
+<h5>@T["Settings for scripts and stylesheets"]</h5>
+
+<div class="mb-3" asp-validation-class-for="AppendVersion">
+    <div class="form-check">
+        <input type="checkbox" class="form-check-input" asp-for="@Model.AppendVersion" />
+        <label class="form-check-label" asp-for="@Model.AppendVersion">@T["Use resources cache busting"]</label>
+        <span class="hint dashed">@T["Whether cache busting (append a version) is used for scripts and stylesheets"]</span>
+    </div>
+</div>
+
+<div class="mb-3" asp-validation-class-for="UseCdn">
+    <div class="form-check">
+        <input type="checkbox" class="form-check-input" asp-for="@Model.UseCdn" />
+        <label class="form-check-label" asp-for="@Model.UseCdn">@T["Use framework CDN (Content Delivery Network)"]</label>
+        <span class="hint dashed">@T["Whether a framework CDN is used for registered scripts and stylesheets, such as jQuery, or their local version"]</span>
+    </div>
+</div>
+
+<div class="mb-3" asp-validation-class-for="CdnBaseUrl">
+    <label asp-for="CdnBaseUrl" class="form-label">@T["Site CDN (Content Delivery Network) base url"]</label>
+    <input asp-for="CdnBaseUrl" class="form-control" />
+    <span asp-validation-for="CdnBaseUrl"></span>
+    <span class="hint">@T["A base CDN URL prefixed to the local scripts and stylesheets. It is disabled if the value is empty or if the Resource Debug Mode is enabled, e.g. https://cdn.mysite.com"]</span>
+</div>
+
+<div class="mb-3">
+    <div class="col-xl-6" asp-validation-class-for="ResourceDebugMode">
+        <label asp-for="ResourceDebugMode" class="form-label">@T["Resource Debug Mode"]</label>
+        <select asp-for="ResourceDebugMode" class="form-select">
+            <option value="@ResourceDebugMode.FromConfiguration.ToString()">@T["From environment — disabled in Production, enabled otherwise"]</option>
+            <option value="@ResourceDebugMode.Enabled.ToString()">@T["Enabled — use debuggable version of resources"]</option> @* #spell-check-ignore-line *@
+            <option value="@ResourceDebugMode.Disabled.ToString()">@T["Disabled — use minified version of resources"]</option>
+        </select>
+        <span class="hint">@T["Determines whether scripts and stylesheets load in their debuggable or minified form."]</span> @* #spell-check-ignore-line *@
+    </div>
+</div>
diff --git a/src/Lombiq.OSOCE.Web/Views/_ViewImports.cshtml b/src/Lombiq.OSOCE.Web/Views/_ViewImports.cshtml
@@ -0,0 +1,11 @@
+@inherits OrchardCore.DisplayManagement.Razor.RazorPage<TModel>
+
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, OrchardCore.Contents.TagHelpers
+@addTagHelper *, OrchardCore.DisplayManagement
+@addTagHelper *, OrchardCore.ResourceManagement
+@addTagHelper *, Lombiq.UIKit
+
+@using Microsoft.AspNetCore.Mvc.TagHelpers
+@using OrchardCore.Settings
+@using OrchardCore.Settings.ViewModels
diff --git a/src/Modules/Lombiq.AuditTrailExtensions b/src/Modules/Lombiq.AuditTrailExtensions
diff --git a/src/Modules/Lombiq.ChartJs b/src/Modules/Lombiq.ChartJs
diff --git a/src/Modules/Lombiq.ContentEditors b/src/Modules/Lombiq.ContentEditors
diff --git a/src/Modules/Lombiq.DataTables b/src/Modules/Lombiq.DataTables
diff --git a/src/Modules/Lombiq.HelpfulExtensions b/src/Modules/Lombiq.HelpfulExtensions
diff --git a/src/Modules/Lombiq.Hosting.Azure.ApplicationInsights b/src/Modules/Lombiq.Hosting.Azure.ApplicationInsights
diff --git a/src/Modules/Lombiq.Hosting.BuildVersionDisplay b/src/Modules/Lombiq.Hosting.BuildVersionDisplay
diff --git a/src/Modules/Lombiq.Hosting.Tenants b/src/Modules/Lombiq.Hosting.Tenants
diff --git a/src/Modules/Lombiq.JsonEditor b/src/Modules/Lombiq.JsonEditor
diff --git a/src/Modules/Lombiq.LoginAsAnybody b/src/Modules/Lombiq.LoginAsAnybody
diff --git a/src/Modules/Lombiq.OSOCE.Samples/Lombiq.OSOCE.Samples.csproj b/src/Modules/Lombiq.OSOCE.Samples/Lombiq.OSOCE.Samples.csproj
@@ -11,10 +11,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18312" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18312" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18312" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18312" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0-preview-18315" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0-preview-18315" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0-preview-18315" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0-preview-18315" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Modules/Lombiq.Privacy b/src/Modules/Lombiq.Privacy
diff --git a/src/Modules/Lombiq.TrainingDemo b/src/Modules/Lombiq.TrainingDemo
diff --git a/src/Modules/Lombiq.UIKit b/src/Modules/Lombiq.UIKit
diff --git a/src/Modules/Lombiq.VueJs b/src/Modules/Lombiq.VueJs
diff --git a/src/Modules/Lombiq.Walkthroughs b/src/Modules/Lombiq.Walkthroughs
diff --git a/src/Themes/Lombiq.BaseTheme b/src/Themes/Lombiq.BaseTheme
diff --git a/src/Themes/Lombiq.Hosting.MediaTheme b/src/Themes/Lombiq.Hosting.MediaTheme
diff --git a/src/Utilities/Lombiq.SetupExtensions b/src/Utilities/Lombiq.SetupExtensions
diff --git a/test/Lombiq.OSOCE.Tests.UI/Tests/VisualVerificationTests/VisualVerificationTests.cs b/test/Lombiq.OSOCE.Tests.UI/Tests/VisualVerificationTests/VisualVerificationTests.cs
@@ -29,5 +29,7 @@ public Task VerifyHomePageAndLayout() =>
             context => context.AssertVisualVerificationApprovedOnAllResolutionsWithPlatformSuffix(
                 _visualVerificationSizes,
                 _ => By.TagName("body"),
-                pixelErrorPercentageThreshold: 0.005));
+                // Chrome can have rendering differences among GitHub Actions runner types, so to not break CI builds,
+                // allowing a larger threshold.
+                pixelErrorPercentageThreshold: 0.016));
 }
diff --git a/...alVerificationTests_VerifyHomePageAndLayout_By_TagName_-body-1920x1080_Unix.png b/...alVerificationTests_VerifyHomePageAndLayout_By_TagName_-body-1920x1080_Unix.png
diff --git a/test/Lombiq.UITestingToolbox b/test/Lombiq.UITestingToolbox