Merge branch 'master' into flac-hls-fixes

# Conflicts:
#	Jellyfin.Api/Controllers/DynamicHlsController.cs

1 files changed, 3 insertions, 5 deletions

diff --git a/MediaBrowser.Controller/Authentication/IAuthenticationProvider.cs b/MediaBrowser.Controller/Authentication/IAuthenticationProvider.cs
index a56d3c8223..81b532fda8 100644
--- a/MediaBrowser.Controller/Authentication/IAuthenticationProvider.cs
+++ b/MediaBrowser.Controller/Authentication/IAuthenticationProvider.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 #pragma warning disable CS1591
 
 using System.Threading.Tasks;
@@ -23,7 +21,7 @@ namespace MediaBrowser.Controller.Authentication
 
     public interface IRequiresResolvedUser
     {
-        Task<ProviderAuthenticationResult> Authenticate(string username, string password, User resolvedUser);
+        Task<ProviderAuthenticationResult> Authenticate(string username, string password, User? resolvedUser);
     }
 
     public interface IHasNewUserPolicy
@@ -33,8 +31,8 @@ namespace MediaBrowser.Controller.Authentication
 
     public class ProviderAuthenticationResult
     {
-        public string Username { get; set; }
+        public required string Username { get; set; }
 
-        public string DisplayName { get; set; }
+        public string? DisplayName { get; set; }
     }
 }