Skip to content

Commit

Permalink
Fix build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
agriffard committed Nov 9, 2024
1 parent 546b408 commit d0e0dd9
Show file tree
Hide file tree
Showing 12 changed files with 9 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using OrchardCore.AdminDashboard.Indexes;
using OrchardCore.ContentManagement.Metadata;
using OrchardCore.ContentManagement.Metadata.Settings;
using OrchardCore.Data.Migration;
using OrchardCore.Recipes;
using OrchardCore.Recipes.Services;
Expand Down
1 change: 0 additions & 1 deletion src/OrchardCore.Modules/OrchardCore.Alias/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
using OrchardCore.Data;
using OrchardCore.Data.Migration;
using OrchardCore.DisplayManagement;
using OrchardCore.DisplayManagement.Descriptors;
using OrchardCore.Indexing;
using OrchardCore.Liquid;
using OrchardCore.Modules;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Text.Json.Nodes;
using OrchardCore.Deployment;
using OrchardCore.Microsoft.Authentication.Services;
using OrchardCore.Microsoft.Authentication.Settings;

namespace OrchardCore.Microsoft.Authentication.Deployment;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Text.Json.Nodes;
using OrchardCore.Deployment;
using OrchardCore.Microsoft.Authentication.Services;
using OrchardCore.Microsoft.Authentication.Settings;

namespace OrchardCore.Microsoft.Authentication.Deployment;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using OrchardCore.Deployment;
using OrchardCore.OpenId.Recipes;
using OrchardCore.OpenId.Services;
using OrchardCore.OpenId.Settings;

namespace OrchardCore.OpenId.Deployment;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ protected override async Task ProcessAsync(OpenIdValidationDeploymentStep step,

result.Steps.Add(new JsonObject
{
["name"] = "OpenIdValidationSettings",
["name"] = nameof(OpenIdValidationSettings),
["OpenIdValidationSettings"] = JObject.FromObject(validationSettings),
});
}
Expand Down
1 change: 0 additions & 1 deletion src/OrchardCore.Modules/OrchardCore.OpenId/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
using OrchardCore.OpenId.Settings;
using OrchardCore.OpenId.Tasks;
using OrchardCore.Recipes;
using OrchardCore.Recipes.Services;
using OrchardCore.Security;
using OrchardCore.Security.Permissions;
using OrchardCore.Settings;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public override void WriteTo(TextWriter writer, TextEncoder encoder, CultureInfo
#pragma warning restore CS0672 // Member overrides obsolete member
=> writer.Write(Culture.Name);

public async override ValueTask WriteToAsync(TextWriter writer, TextEncoder encoder, CultureInfo cultureInfo)
public override async ValueTask WriteToAsync(TextWriter writer, TextEncoder encoder, CultureInfo cultureInfo)
=> await writer.WriteAsync(Culture.Name);

public override ValueTask<FluidValue> GetValueAsync(string name, TemplateContext context)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public override void WriteTo(TextWriter writer, TextEncoder encoder, CultureInfo
#pragma warning restore CS0672 // Member overrides obsolete member
=> writer.Write(ToStringValue());

public async override ValueTask WriteToAsync(TextWriter writer, TextEncoder encoder, CultureInfo cultureInfo)
public override async ValueTask WriteToAsync(TextWriter writer, TextEncoder encoder, CultureInfo cultureInfo)
=> await writer.WriteAsync(ToStringValue());

public override ValueTask<FluidValue> GetValueAsync(string name, TemplateContext context)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public sealed class ElasticIndexManager
{ ElasticsearchConstants.StopAnalyzer, () => new StopAnalyzer() },
};

private List<string> _tokenFilterNames = new List<string>()
private readonly List<string> _tokenFilterNames = new List<string>()
{
"asciifolding",
"common_grams",
Expand Down Expand Up @@ -457,7 +457,7 @@ public async Task<bool> CreateIndexAsync(ElasticIndexSettings elasticIndexSettin
{
var analyzer = CreateAnalyzer(analyzerProperties);
analysisDescriptor.Analyzers(a => a.UserDefined(analyzerName, analyzer));
}
}

indexSettingsDescriptor = new IndexSettingsDescriptor();
indexSettingsDescriptor.Analysis(an => analysisDescriptor);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ private static Task PopulateAsync(RewriteRule rule, JsonNode data)
{
metadata.RedirectType = redirectType.Value;
}
else if (!Enum.IsDefined(typeof(RedirectType), metadata.RedirectType))
else if (!Enum.IsDefined<RedirectType>(metadata.RedirectType))
{
metadata.RedirectType = RedirectType.Found;
}
Expand Down
2 changes: 1 addition & 1 deletion src/docs/reference/modules/Workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ public abstract class ActivityDisplayDriver<TActivity, TEditViewModel> : Activit
return Initialize<TEditViewModel>(_editShapeType, viewModel => EditActivityAsync(activity, viewModel)).Location("Content");
}

public async override Task<IDisplayResult> UpdateAsync(TActivity activity, UpdateEditorContext context)
public override async Task<IDisplayResult> UpdateAsync(TActivity activity, UpdateEditorContext context)
{
var viewModel = new TEditViewModel();
if (await context.Updater.TryUpdateModelAsync(viewModel, Prefix))
Expand Down

0 comments on commit d0e0dd9

Please sign in to comment.