Bump OCC.Liquid to 1.4.0

Author: hishamco

Directory.Packages.props

@@ -39,6 +39,7 @@
 		<PackageVersion Include="OrchardCore.Users.Core" Version="2.2.0" />
 		<PackageVersion Include="OrchardCoreContrib.Abstractions" Version="1.4.0" />
 		<PackageVersion Include="OrchardCoreContrib.ContentLocalization.Core" Version="1.2.0" />
+		<PackageVersion Include="OrchardCoreContrib.DisplayManagement.Liquid" Version="1.0.0" />
 		<PackageVersion Include="OrchardCoreContrib.Data" Version="1.2.0" />
 		<PackageVersion Include="OrchardCoreContrib.Data.YesSql" Version="1.2.0" />
 		<PackageVersion Include="OrchardCoreContrib.Email" Version="1.6.0" />

src/OrchardCoreContrib.Liquid/Manifest.cs

@@ -5,7 +5,7 @@
     Name = "Liquid",
     Author = ManifestConstants.Author,
     Website = ManifestConstants.Website,
-    Version = "1.2.1",
+    Version = "1.4.0",
     Description = "Provides a list of useful liquid filters.",
     Category = "Content Management"
 )]

src/OrchardCoreContrib.Liquid/OrchardCoreContrib.Liquid.csproj

@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<VersionPrefix>1.3.0</VersionPrefix>
+		<VersionPrefix>1.4.0</VersionPrefix>
 		<Authors>The Orchard Core Contrib Team</Authors>
 		<Company />
+		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<Description>Provides a list of useful Liquid filters.</Description>
 		<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
 		<PackageProjectUrl>https://github.com/OrchardCoreContrib/OrchardCoreContrib.Modules/tree/main/src/OrchardCoreContrib.Liquid/README.md</PackageProjectUrl>
@@ -25,12 +26,13 @@
 
 	<ItemGroup>
 		<None Include="../../images/icon.png" Pack="true" PackagePath="icon.png" />
+		<None Include="README.md" Pack="true" PackagePath="\"/>
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="OrchardCore.Liquid.Abstractions" />
 		<PackageReference Include="OrchardCore.Module.Targets" />
 		<PackageReference Include="OrchardCoreContrib.Abstractions" />
+		<PackageReference Include="OrchardCoreContrib.DisplayManagement.Liquid" />
 	</ItemGroup>
 
 </Project>

src/OrchardCoreContrib.Liquid/README.md

@@ -4,7 +4,7 @@ This module provides a list of useful Liquid filters.
 
 ## Version
 
-1.2.1
+1.4.0
 
 ## Category
 
@@ -26,6 +26,7 @@ There's no dependencies.
 
 | Name                                                                                                | Version      |
 |-----------------------------------------------------------------------------------------------------|--------------|
+| [`OrchardCoreContrib.Liquid`](https://www.nuget.org/packages/OrchardCoreContrib.Liquid/1.3.0)       | 1.4.0        |
 | [`OrchardCoreContrib.Liquid`](https://www.nuget.org/packages/OrchardCoreContrib.Liquid/1.3.0)       | 1.3.0        |
 | [`OrchardCoreContrib.Liquid`](https://www.nuget.org/packages/OrchardCoreContrib.Liquid/1.2.1)       | 1.2.1        |
 | [`OrchardCoreContrib.Liquid`](https://www.nuget.org/packages/OrchardCoreContrib.Liquid/1.2.0)       | 1.2.0        |

src/OrchardCoreContrib.Liquid/Startup.cs

@@ -1,33 +1,18 @@
 using Fluid;
-using Fluid.Values;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 using OrchardCore.Modules;
+using OrchardCoreContrib.DisplayManagement.Liquid;
 
 namespace OrchardCoreContrib.Liquid;
+
 public class Startup : StartupBase
 {
-    private readonly IHostEnvironment _hostEnvironment;
-
-    public Startup(IHostEnvironment hostEnvironment)
-    {
-        _hostEnvironment = hostEnvironment;
-    }
-    
     public override void ConfigureServices(IServiceCollection services)
     {
-        var environment = new Environment
-        {
-            IsDevelopment = BooleanValue.Create(_hostEnvironment.IsDevelopment()),
-            IsStaging = BooleanValue.Create(_hostEnvironment.IsStaging()),
-            IsProduction = BooleanValue.Create(_hostEnvironment.IsProduction())
-        };
-
+        // Override the "Environment" value from OrchardCore.DisplayManagement.Liquid
         services.Configure<TemplateOptions>(options =>
-        {
-            options.Scope.SetValue("Environment", new ObjectValue(environment));
+            options.Scope.Delete(Constants.FluidValueNames.Environment));
 
-            options.MemberAccessStrategy.Register<Environment>();
-        });
+        services.AddLiquidDisplayManagement();
     }
 }