Use the static 'ValueTask.FromResult' instead of 'new ValueTask' (#16659

)
OrchardCMS · Sep 3, 2024 · 3242f90 · 3242f90
1 parent 14ee8f9
commit 3242f90
Show file tree

Hide file tree

Showing 49 changed files with 153 additions and 162 deletions.
diff --git a/...dCore.Modules/OrchardCore.AuditTrail/Services/DefaultAuditTrailAdminListFilterProvider.cs b/...dCore.Modules/OrchardCore.AuditTrail/Services/DefaultAuditTrailAdminListFilterProvider.cs
@@ -9,7 +9,6 @@
 using OrchardCore.AuditTrail.ViewModels;
 using OrchardCore.Modules;
 using Parlot;
-using YesSql;
 using YesSql.Filters.Query;
 using YesSql.Services;
 
@@ -178,7 +177,7 @@ public void Build(QueryEngineBuilder<AuditTrailEvent> builder)
                         var normalizedUserName = lookupNormalizer.NormalizeName(val);
                         query.With<AuditTrailEventIndex>(x => x.NormalizedUserName.Contains(normalizedUserName));
 
-                        return new ValueTask<IQuery<AuditTrailEvent>>(query);
+                        return ValueTask.FromResult(query);
                     },
                     (val, query, ctx) =>
                     {
@@ -187,7 +186,7 @@ public void Build(QueryEngineBuilder<AuditTrailEvent> builder)
                         var normalizedUserName = lookupNormalizer.NormalizeName(val);
                         query.With<AuditTrailEventIndex>(x => x.NormalizedUserName.NotContains(normalizedUserName));
 
-                        return new ValueTask<IQuery<AuditTrailEvent>>(query);
+                        return ValueTask.FromResult(query);
                     }
                 )
             )

diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Liquid/SwitchCultureUrlFilter.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Liquid/SwitchCultureUrlFilter.cs
@@ -35,6 +35,6 @@ public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments argu
                 contentItemUrl = request.Path.Value,
                 queryStringValue = request.QueryString.Value,
             });
-        return new ValueTask<FluidValue>(FluidValue.Create(url, context.Options));
+        return ValueTask.FromResult(FluidValue.Create(url, context.Options));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/BuildDisplayFilter.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/BuildDisplayFilter.cs
@@ -50,7 +50,7 @@ static async ValueTask<FluidValue> Awaited(Task<IShape> task, TemplateOptions op
         // a 'ContentItem' is still created but with some null properties.
         if (contentItem?.ContentItemId == null)
         {
-            return new ValueTask<FluidValue>(NilValue.Instance);
+            return ValueTask.FromResult<FluidValue>(NilValue.Instance);
         }
 
         // When {{ Model.ContentItem | shape_build_display | shape_render }} is called prevent unlimited recursions.
@@ -59,15 +59,15 @@ static async ValueTask<FluidValue> Awaited(Task<IShape> task, TemplateOptions op
         var recursionLimit = maxRecursions.Type == FluidValues.Number ? Convert.ToInt32(maxRecursions.ToNumberValue()) : DefaultMaxContentItemRecursions;
         if (_buildDisplayRecursionHelper.IsRecursive(contentItem, recursionLimit))
         {
-            return new ValueTask<FluidValue>(NilValue.Instance);
+            return ValueTask.FromResult<FluidValue>(NilValue.Instance);
         }
 
         var displayType = arguments["type"].Or(arguments.At(0)).ToStringValue();
 
         var task = _contentItemDisplayManager.BuildDisplayAsync(contentItem, _updateModelAccessor.ModelUpdater, displayType);
         if (task.IsCompletedSuccessfully)
         {
-            return new ValueTask<FluidValue>(FluidValue.Create(task.Result, ctx.Options));
+            return ValueTask.FromResult(FluidValue.Create(task.Result, ctx.Options));
         }
 
         return Awaited(task, ctx.Options);

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/DisplayTextFilter.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/DisplayTextFilter.cs
@@ -12,9 +12,9 @@ public static ValueTask<FluidValue> DisplayText(FluidValue input, FilterArgument
 
         if (contentItem == null)
         {
-            return new ValueTask<FluidValue>(NilValue.Instance);
+            return ValueTask.FromResult<FluidValue>(NilValue.Instance);
         }
 
-        return new ValueTask<FluidValue>(new StringValue(contentItem.DisplayText ?? ""));
+        return ValueTask.FromResult<FluidValue>(new StringValue(contentItem.DisplayText ?? string.Empty));
     }
 }
diff --git a/...chardCore.Modules/OrchardCore.Contents/Services/DefaultContentsAdminListFilterProvider.cs b/...chardCore.Modules/OrchardCore.Contents/Services/DefaultContentsAdminListFilterProvider.cs
@@ -51,7 +51,7 @@ public void Build(QueryEngineBuilder<ContentItem> builder)
                         query.With<ContentItemIndex>(x => x.Latest);
                     }
 
-                    return new ValueTask<IQuery<ContentItem>>(query);
+                    return ValueTask.FromResult<IQuery<ContentItem>>(query);
                 })
                 .MapTo<ContentOptionsViewModel>((val, model) =>
                 {

diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/AbsoluteUrlFilter.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/AbsoluteUrlFilter.cs
@@ -19,12 +19,13 @@ public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments argu
 
         if (string.IsNullOrWhiteSpace(relativePath))
         {
-            return new ValueTask<FluidValue>(input);
+            return ValueTask.FromResult(input);
         }
 
         var urlHelper = _urlHelperFactory.GetUrlHelper(context.ViewContext);
 
-        var result = new StringValue(urlHelper.ToAbsoluteUrl(relativePath));
-        return new ValueTask<FluidValue>(result);
+        var result = StringValue.Create(urlHelper.ToAbsoluteUrl(relativePath));
+
+        return ValueTask.FromResult<FluidValue>(result);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/ContentUrlFilter.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/ContentUrlFilter.cs
@@ -17,6 +17,6 @@ public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments argu
     {
         var urlHelper = _urlHelperFactory.GetUrlHelper(context.ViewContext);
 
-        return new ValueTask<FluidValue>(new StringValue((urlHelper).Content(input.ToStringValue())));
+        return ValueTask.FromResult<FluidValue>(new StringValue((urlHelper).Content(input.ToStringValue())));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/JsonFilter.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/JsonFilter.cs
@@ -17,31 +17,31 @@ public static ValueTask<FluidValue> Json(FluidValue input, FilterArguments argum
         switch (input.Type)
         {
             case FluidValues.Array:
-                return new ValueTask<FluidValue>(new StringValue(JConvert.SerializeObject(input.Enumerate(context).Select(o => o.ToObjectValue()), formatting)));
+                return ValueTask.FromResult<FluidValue>(new StringValue(JConvert.SerializeObject(input.Enumerate(context).Select(o => o.ToObjectValue()), formatting)));
 
             case FluidValues.Boolean:
-                return new ValueTask<FluidValue>(new StringValue(JConvert.SerializeObject(input.ToBooleanValue(), formatting)));
+                return ValueTask.FromResult<FluidValue>(new StringValue(JConvert.SerializeObject(input.ToBooleanValue(), formatting)));
 
             case FluidValues.Nil:
-                return new ValueTask<FluidValue>(StringValue.Create("null"));
+                return ValueTask.FromResult<FluidValue>(StringValue.Create("null"));
 
             case FluidValues.Number:
-                return new ValueTask<FluidValue>(new StringValue(JConvert.SerializeObject(input.ToNumberValue(), formatting)));
+                return ValueTask.FromResult<FluidValue>(new StringValue(JConvert.SerializeObject(input.ToNumberValue(), formatting)));
 
             case FluidValues.DateTime:
             case FluidValues.Dictionary:
             case FluidValues.Object:
-                return new ValueTask<FluidValue>(new StringValue(JConvert.SerializeObject(input.ToObjectValue(), formatting)));
+                return ValueTask.FromResult<FluidValue>(new StringValue(JConvert.SerializeObject(input.ToObjectValue(), formatting)));
 
             case FluidValues.String:
                 var stringValue = input.ToStringValue();
 
                 if (string.IsNullOrWhiteSpace(stringValue))
                 {
-                    return new ValueTask<FluidValue>(input);
+                    return ValueTask.FromResult(input);
                 }
 
-                return new ValueTask<FluidValue>(new StringValue(JConvert.SerializeObject(stringValue, formatting)));
+                return ValueTask.FromResult<FluidValue>(new StringValue(JConvert.SerializeObject(stringValue, formatting)));
         }
 
         throw new NotSupportedException("Unrecognized FluidValue");

diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/JsonParseFilter.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/Filters/JsonParseFilter.cs
@@ -12,9 +12,9 @@ public static ValueTask<FluidValue> JsonParse(FluidValue input, FilterArguments
         var parsedValue = JNode.Parse(input.ToStringValue());
         if (parsedValue.GetValueKind() == JsonValueKind.Array)
         {
-            return new ValueTask<FluidValue>(FluidValue.Create(parsedValue, context.Options));
+            return ValueTask.FromResult(FluidValue.Create(parsedValue, context.Options));
         }
 
-        return new ValueTask<FluidValue>(new ObjectValue(parsedValue));
+        return ValueTask.FromResult<FluidValue>(new ObjectValue(parsedValue));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Markdown/Filters/Markdownify.cs b/src/OrchardCore.Modules/OrchardCore.Markdown/Filters/Markdownify.cs
@@ -16,6 +16,6 @@ public Markdownify(IMarkdownService markdownService)
 
     public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments arguments, LiquidTemplateContext ctx)
     {
-        return new ValueTask<FluidValue>(new StringValue(_markdownService.ToHtml(input.ToStringValue())));
+        return ValueTask.FromResult<FluidValue>(new StringValue(_markdownService.ToHtml(input.ToStringValue())));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Filters/AssetUrlFilter.cs b/src/OrchardCore.Modules/OrchardCore.Media/Filters/AssetUrlFilter.cs
@@ -17,6 +17,7 @@ public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments argu
     {
         var url = input.ToStringValue();
         var imageUrl = _mediaFileStore.MapPathToPublicUrl(url);
-        return new ValueTask<FluidValue>(new StringValue(imageUrl ?? url));
+
+        return ValueTask.FromResult<FluidValue>(StringValue.Create(imageUrl ?? url));
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Filters/MediaFilters.cs b/src/OrchardCore.Modules/OrchardCore.Media/Filters/MediaFilters.cs
@@ -18,6 +18,6 @@ public static ValueTask<FluidValue> ImgTag(FluidValue input, FilterArguments arg
 
         imgTag += " />";
 
-        return new ValueTask<FluidValue>(new StringValue(imgTag) { Encode = false });
+        return ValueTask.FromResult<FluidValue>(new StringValue(imgTag) { Encode = false });
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Shortcodes/AssetUrlShortcodeProvider.cs b/src/OrchardCore.Modules/OrchardCore.Media/Shortcodes/AssetUrlShortcodeProvider.cs
@@ -26,7 +26,7 @@ public ValueTask<string> EvaluateAsync(string identifier, Arguments arguments, s
     {
         if (!string.Equals(identifier, "asset_url", StringComparison.OrdinalIgnoreCase))
         {
-            return new ValueTask<string>((string)null);
+            return ValueTask.FromResult<string>(null);
         }
 
         // Handle self closing shortcodes.
@@ -35,7 +35,7 @@ public ValueTask<string> EvaluateAsync(string identifier, Arguments arguments, s
             content = arguments.NamedOrDefault("src");
             if (string.IsNullOrEmpty(content))
             {
-                return new ValueTask<string>("[asset_url]");
+                return ValueTask.FromResult("[asset_url]");
             }
         }
 
@@ -97,6 +97,6 @@ public ValueTask<string> EvaluateAsync(string identifier, Arguments arguments, s
 
         // This does not produce a tag, so sanitization is performed by the consumer (html body or markdown).
 
-        return new ValueTask<string>(content);
+        return ValueTask.FromResult(content);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Shortcodes/ImageShortcodeProvider.cs b/src/OrchardCore.Modules/OrchardCore.Media/Shortcodes/ImageShortcodeProvider.cs
@@ -134,6 +134,6 @@ public ValueTask<string> EvaluateAsync(string identifier, Arguments arguments, s
         content = "<img " + altText + className + "src=\"" + content + "\">";
         content = _htmlSanitizerService.Sanitize(content);
 
-        return new ValueTask<string>(content);
+        return ValueTask.FromResult(content);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Shortcodes/Providers/LocaleShortcodeProvider.cs b/src/OrchardCore.Modules/OrchardCore.Shortcodes/Providers/LocaleShortcodeProvider.cs
@@ -31,7 +31,7 @@ public ValueTask<string> EvaluateAsync(string identifier, Arguments arguments, s
             {
                 if (currentCulture.Name.Equals(language, StringComparison.OrdinalIgnoreCase))
                 {
-                    return new ValueTask<string>(content);
+                    return ValueTask.FromResult(content);
                 }
 
                 currentCulture = currentCulture.Parent;
@@ -42,7 +42,7 @@ public ValueTask<string> EvaluateAsync(string identifier, Arguments arguments, s
         {
             if (currentCulture.Name.Equals(language, StringComparison.OrdinalIgnoreCase))
             {
-                return new ValueTask<string>(content);
+                return ValueTask.FromResult(content);
             }
         }
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Liquid/IsInRoleFilter.cs b/src/OrchardCore.Modules/OrchardCore.Users/Liquid/IsInRoleFilter.cs
@@ -30,11 +30,11 @@ public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments argu
 
                 if (user.Claims.Any(claim => claim.Type == roleClaimType && claim.Value.Equals(claimName, StringComparison.OrdinalIgnoreCase)))
                 {
-                    return new ValueTask<FluidValue>(BooleanValue.True);
+                    return ValueTask.FromResult<FluidValue>(BooleanValue.True);
                 }
             }
         }
 
-        return new ValueTask<FluidValue>(BooleanValue.False);
+        return ValueTask.FromResult<FluidValue>(BooleanValue.False);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Liquid/UserFilters.cs b/src/OrchardCore.Modules/OrchardCore.Users/Liquid/UserFilters.cs
@@ -23,12 +23,12 @@ public static ValueTask<FluidValue> HasClaim(FluidValue input, FilterArguments a
 
                 if (user.HasClaim(claimType, claimName))
                 {
-                    return new ValueTask<FluidValue>(BooleanValue.True);
+                    return ValueTask.FromResult<FluidValue>(BooleanValue.True);
                 }
             }
         }
 
-        return new ValueTask<FluidValue>(BooleanValue.False);
+        return ValueTask.FromResult<FluidValue>(BooleanValue.False);
     }
 
     public static ValueTask<FluidValue> UserId(FluidValue input, FilterArguments _, TemplateContext ctx)
@@ -43,11 +43,11 @@ public static ValueTask<FluidValue> UserId(FluidValue input, FilterArguments _,
                 var userId = user.FindFirstValue(ClaimTypes.NameIdentifier);
                 if (userId != null)
                 {
-                    return new ValueTask<FluidValue>(FluidValue.Create(userId, ctx.Options));
+                    return ValueTask.FromResult(FluidValue.Create(userId, ctx.Options));
                 }
             }
         }
 
-        return new ValueTask<FluidValue>(NilValue.Instance);
+        return ValueTask.FromResult<FluidValue>(NilValue.Instance);
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Services/DefaultUsersAdminListFilterProvider.cs b/src/OrchardCore.Modules/OrchardCore.Users/Services/DefaultUsersAdminListFilterProvider.cs
@@ -3,7 +3,6 @@
 using OrchardCore.Users.Indexes;
 using OrchardCore.Users.Models;
 using OrchardCore.Users.ViewModels;
-using YesSql;
 using YesSql.Filters.Query;
 using YesSql.Services;
 
@@ -97,7 +96,7 @@ public void Build(QueryEngineBuilder<User> builder)
                     var normalizedRoleName = userManager.NormalizeName(val);
                     query.With<UserByRoleNameIndex>(x => x.RoleName == normalizedRoleName);
 
-                    return new ValueTask<IQuery<User>>(query);
+                    return ValueTask.FromResult(query);
                 })
                 .MapTo<UserIndexOptions>((val, model) => model.SelectedRole = val)
                 .MapFrom<UserIndexOptions>((model) => (!string.IsNullOrEmpty(model.SelectedRole), model.SelectedRole))
@@ -111,7 +110,7 @@ public void Build(QueryEngineBuilder<User> builder)
                         var normalizedUserName = userManager.NormalizeName(val);
                         query.With<UserIndex>(x => x.NormalizedUserName.Contains(normalizedUserName));
 
-                        return new ValueTask<IQuery<User>>(query);
+                        return ValueTask.FromResult(query);
                     },
                     (val, query, ctx) =>
                     {
@@ -120,7 +119,7 @@ public void Build(QueryEngineBuilder<User> builder)
                         var normalizedUserName = userManager.NormalizeName(val);
                         query.With<UserIndex>(x => x.NormalizedUserName.NotContains(normalizedUserName));
 
-                        return new ValueTask<IQuery<User>>(query);
+                        return ValueTask.FromResult(query);
                     }
                 )
             )
@@ -133,7 +132,7 @@ public void Build(QueryEngineBuilder<User> builder)
                         var normalizedEmail = userManager.NormalizeEmail(val);
                         query.With<UserIndex>(x => x.NormalizedEmail.Contains(normalizedEmail));
 
-                        return new ValueTask<IQuery<User>>(query);
+                        return ValueTask.FromResult(query);
                     },
                     (val, query, ctx) =>
                     {
@@ -142,7 +141,7 @@ public void Build(QueryEngineBuilder<User> builder)
                         var normalizedEmail = userManager.NormalizeEmail(val);
                         query.With<UserIndex>(x => x.NormalizedEmail.NotContains(normalizedEmail));
 
-                        return new ValueTask<IQuery<User>>(query);
+                        return ValueTask.FromResult(query);
                     }
                 )
             );

diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Liquid/SignalUrlFilter.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Http/Liquid/SignalUrlFilter.cs
@@ -38,8 +38,8 @@ public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments argu
             : SignalPayload.ForCorrelation(signalName, workflowContext.CorrelationId);
 
         var token = _securityTokenService.CreateToken(payload, TimeSpan.FromDays(7));
-        var urlValue = new StringValue(urlHelper.Action("Trigger", "HttpWorkflow", new { area = "OrchardCore.Workflows", token }));
+        var urlValue = StringValue.Create(urlHelper.Action("Trigger", "HttpWorkflow", new { area = "OrchardCore.Workflows", token }));
 
-        return new ValueTask<FluidValue>(urlValue);
+        return ValueTask.FromResult<FluidValue>(urlValue);
     }
 }
diff --git a/...e/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailAdminListOptionBuilder.cs b/...e/OrchardCore.AuditTrail.Abstractions/Services/Models/AuditTrailAdminListOptionBuilder.cs
@@ -24,7 +24,7 @@ public AuditTrailAdminListOptionBuilder(string value)
     /// </summary>
     public AuditTrailAdminListOptionBuilder WithQuery(Func<string, IQuery<AuditTrailEvent>, IQuery<AuditTrailEvent>> query)
     {
-        _query = (q, val, ctx) => new ValueTask<IQuery<AuditTrailEvent>>(query(q, val));
+        _query = (q, val, ctx) => ValueTask.FromResult(query(q, val));
 
         return this;
     }

diff --git a/...ore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentItemDisplayCoordinator.cs b/...ore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentItemDisplayCoordinator.cs
@@ -104,7 +104,7 @@ public async Task BuildDisplayAsync(ContentItem contentItem, BuildDisplayContext
             {
                 var shapeType = context.DisplayType != "Detail" ? "ContentPart_" + context.DisplayType : "ContentPart";
 
-                var shapeResult = new ShapeResult(shapeType, ctx => ctx.ShapeFactory.CreateAsync(shapeType, () => new ValueTask<IShape>(new ZoneHolding(() => ctx.ShapeFactory.CreateAsync("Zone")))));
+                var shapeResult = new ShapeResult(shapeType, ctx => ctx.ShapeFactory.CreateAsync(shapeType, () => ValueTask.FromResult<IShape>(new ZoneHolding(() => ctx.ShapeFactory.CreateAsync("Zone")))));
                 shapeResult.Differentiator(partName);
                 shapeResult.Name(partName);
                 shapeResult.Location("Content");

diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/AppendVersionFilter.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/AppendVersionFilter.cs
@@ -23,6 +23,6 @@ public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments argu
 
         var imageUrl = _fileVersionProvider.AddFileVersionToPath(_httpContextAccessor.HttpContext.Request.PathBase, url);
 
-        return new ValueTask<FluidValue>(new StringValue(imageUrl ?? url));
+        return ValueTask.FromResult<FluidValue>(new StringValue(imageUrl ?? url));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/LiquidViewFilters.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/LiquidViewFilters.cs
@@ -23,12 +23,12 @@ public static ValueTask<FluidValue> Localize(FluidValue input, FilterArguments a
             parameters[i] = arguments.At(i).ToStringValue();
         }
 
-        return new ValueTask<FluidValue>(new StringValue(localizer.GetString(input.ToStringValue(), parameters)));
+        return ValueTask.FromResult<FluidValue>(new StringValue(localizer.GetString(input.ToStringValue(), parameters)));
     }
 
     public static ValueTask<FluidValue> HtmlClass(FluidValue input, FilterArguments _1, TemplateContext _2)
     {
-        return new ValueTask<FluidValue>(new StringValue(input.ToStringValue().HtmlClassify()));
+        return ValueTask.FromResult<FluidValue>(new StringValue(input.ToStringValue().HtmlClassify()));
     }
 
     public static ValueTask<FluidValue> ShapeProperties(FluidValue input, FilterArguments arguments, TemplateContext ctx)

diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/NewShapeFilter.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/NewShapeFilter.cs
@@ -35,6 +35,6 @@ static async ValueTask<FluidValue> Awaited(ValueTask<IShape> task, TemplateOptio
             return Awaited(task, ctx.Options);
         }
 
-        return new ValueTask<FluidValue>(FluidValue.Create(task.Result, ctx.Options));
+        return ValueTask.FromResult<FluidValue>(FluidValue.Create(task.Result, ctx.Options));
     }
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/ResourceUrlFilter.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Filters/ResourceUrlFilter.cs
@@ -41,6 +41,6 @@ public ValueTask<FluidValue> ProcessAsync(FluidValue input, FilterArguments argu
             resourcePath = _options.CdnBaseUrl + resourcePath;
         }
 
-        return new ValueTask<FluidValue>(new StringValue(resourcePath));
+        return ValueTask.FromResult<FluidValue>(new StringValue(resourcePath));
     }
 }