From 2b3fb935486f2df778b5d347ed1106a2be2ffcd2 Mon Sep 17 00:00:00 2001 From: Cameron Aavik Date: Wed, 19 Feb 2025 13:01:35 +1000 Subject: [PATCH] Remove System.Linq.Async and GetKeyedService overload --- Directory.Packages.props | 1 - .../Controllers/AdminController.cs | 4 ++-- .../Deployment/MediaDeploymentStepDriver.cs | 2 +- .../OrchardCore.Media/OrchardCore.Media.csproj | 1 - .../Extensions/ServiceProviderExtensions.cs | 14 -------------- .../OrchardCore.FileStorage.FileSystem.csproj | 4 ---- .../OrchardCore.Abstractions.Tests.csproj | 1 - test/OrchardCore.Tests/OrchardCore.Tests.csproj | 1 - 8 files changed, 3 insertions(+), 25 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 300b4ed9cb2..b0db46d93c9 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -63,7 +63,6 @@ - diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Media/Controllers/AdminController.cs index f57171fa73a..c37e717584d 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/Controllers/AdminController.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media/Controllers/AdminController.cs @@ -98,7 +98,7 @@ public async Task>> GetFolders(st } var allowed = _mediaFileStore.GetDirectoryContentAsync(path) - .WhereAwait(async e => e.IsDirectory && await _authorizationService.AuthorizeAsync(User, MediaPermissions.ManageMediaFolder, (object)e.Path)); + .Where(async (e, t) => e.IsDirectory && await _authorizationService.AuthorizeAsync(User, MediaPermissions.ManageMediaFolder, (object)e.Path)); return Ok(await allowed.Select(folder => { @@ -138,7 +138,7 @@ public async Task>> GetMediaItems(string path, var allowedExtensions = GetRequestedExtensions(extensions, false); var allowed = _mediaFileStore.GetDirectoryContentAsync(path) - .WhereAwait(async e => + .Where(async (e, ct) => !e.IsDirectory && (allowedExtensions.Count == 0 || allowedExtensions.Contains(Path.GetExtension(e.Path))) && await _authorizationService.AuthorizeAsync(User, MediaPermissions.ManageMediaFolder, (object)e.Path)) diff --git a/src/OrchardCore.Modules/OrchardCore.Media/Deployment/MediaDeploymentStepDriver.cs b/src/OrchardCore.Modules/OrchardCore.Media/Deployment/MediaDeploymentStepDriver.cs index 7296c6fbf07..2982342625c 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/Deployment/MediaDeploymentStepDriver.cs +++ b/src/OrchardCore.Modules/OrchardCore.Media/Deployment/MediaDeploymentStepDriver.cs @@ -58,7 +58,7 @@ await context.Updater.TryUpdateModelAsync(step, private async Task> GetMediaStoreEntries(string path = null, MediaStoreEntryViewModel parent = null) { var mediaStoreEntries = await _mediaFileStore.GetDirectoryContentAsync(path) - .SelectAwait(async e => + .Select(async (FileStorage.IFileStoreEntry e, CancellationToken token) => { var mediaStoreEntry = new MediaStoreEntryViewModel { diff --git a/src/OrchardCore.Modules/OrchardCore.Media/OrchardCore.Media.csproj b/src/OrchardCore.Modules/OrchardCore.Media/OrchardCore.Media.csproj index 50f707aa709..577f05e10ed 100644 --- a/src/OrchardCore.Modules/OrchardCore.Media/OrchardCore.Media.csproj +++ b/src/OrchardCore.Modules/OrchardCore.Media/OrchardCore.Media.csproj @@ -43,7 +43,6 @@ - diff --git a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Extensions/ServiceProviderExtensions.cs b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Extensions/ServiceProviderExtensions.cs index 097815a905d..77312293aed 100644 --- a/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Extensions/ServiceProviderExtensions.cs +++ b/src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Extensions/ServiceProviderExtensions.cs @@ -21,18 +21,4 @@ public static TResult CreateInstance(this IServiceProvider provider, Ty { return (TResult)ActivatorUtilities.CreateInstance(provider, type); } - - /// - /// Gets the service object of the specified type with the specified key. - /// - public static object? GetKeyedService(this IServiceProvider provider, Type serviceType, object? serviceKey) - { - ArgumentNullException.ThrowIfNull(provider); - if (provider is IKeyedServiceProvider keyedServiceProvider) - { - return keyedServiceProvider.GetKeyedService(serviceType, serviceKey); - } - - throw new InvalidOperationException("This service provider doesn't support keyed services."); - } } diff --git a/src/OrchardCore/OrchardCore.FileStorage.FileSystem/OrchardCore.FileStorage.FileSystem.csproj b/src/OrchardCore/OrchardCore.FileStorage.FileSystem/OrchardCore.FileStorage.FileSystem.csproj index 850fe21d7c8..d37fc9afb5b 100644 --- a/src/OrchardCore/OrchardCore.FileStorage.FileSystem/OrchardCore.FileStorage.FileSystem.csproj +++ b/src/OrchardCore/OrchardCore.FileStorage.FileSystem/OrchardCore.FileStorage.FileSystem.csproj @@ -19,8 +19,4 @@ - - - - diff --git a/test/OrchardCore.Abstractions.Tests/OrchardCore.Abstractions.Tests.csproj b/test/OrchardCore.Abstractions.Tests/OrchardCore.Abstractions.Tests.csproj index 6177c3de912..628ff96c9a5 100644 --- a/test/OrchardCore.Abstractions.Tests/OrchardCore.Abstractions.Tests.csproj +++ b/test/OrchardCore.Abstractions.Tests/OrchardCore.Abstractions.Tests.csproj @@ -17,7 +17,6 @@ - diff --git a/test/OrchardCore.Tests/OrchardCore.Tests.csproj b/test/OrchardCore.Tests/OrchardCore.Tests.csproj index 4b96f28565a..f345e0a4af4 100644 --- a/test/OrchardCore.Tests/OrchardCore.Tests.csproj +++ b/test/OrchardCore.Tests/OrchardCore.Tests.csproj @@ -68,7 +68,6 @@ -