aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Collections
diff options
context:
space:
mode:
authorNyanmisaka <nst799610810@gmail.com>2021-08-13 15:01:06 +0800
committerGitHub <noreply@github.com>2021-08-13 15:01:06 +0800
commita84dc794c6960a8a6e1dc0660e15a030e0f51305 (patch)
tree9e1c33cab6cca6681811d0a2f6a51902c108bf77 /MediaBrowser.Controller/Collections
parentd4f09c6c9b142081064c4008bc1e84fb17c81ad8 (diff)
parente33901b9f5f65eb8e48c018a30a37094ad874897 (diff)
Merge branch 'master' into tonemap-overlay
Diffstat (limited to 'MediaBrowser.Controller/Collections')
-rw-r--r--MediaBrowser.Controller/Collections/CollectionCreationOptions.cs2
-rw-r--r--MediaBrowser.Controller/Collections/ICollectionManager.cs1
2 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Collections/CollectionCreationOptions.cs b/MediaBrowser.Controller/Collections/CollectionCreationOptions.cs
index 30f5f4efa2..76ad335c59 100644
--- a/MediaBrowser.Controller/Collections/CollectionCreationOptions.cs
+++ b/MediaBrowser.Controller/Collections/CollectionCreationOptions.cs
@@ -1,6 +1,6 @@
#nullable disable
-#pragma warning disable CS1591
+#pragma warning disable CA2227, CS1591
using System;
using System.Collections.Generic;
diff --git a/MediaBrowser.Controller/Collections/ICollectionManager.cs b/MediaBrowser.Controller/Collections/ICollectionManager.cs
index 46bc37e7f6..49cc39f047 100644
--- a/MediaBrowser.Controller/Collections/ICollectionManager.cs
+++ b/MediaBrowser.Controller/Collections/ICollectionManager.cs
@@ -32,6 +32,7 @@ namespace MediaBrowser.Controller.Collections
/// Creates the collection.
/// </summary>
/// <param name="options">The options.</param>
+ /// <returns>BoxSet wrapped in an awaitable task.</returns>
Task<BoxSet> CreateCollectionAsync(CollectionCreationOptions options);
/// <summary>