Other Nullable fixes

Author: Warren Buckley

Our.Umbraco.TagHelpers/Composing/PackageManifestComposer.cs

@@ -17,7 +17,7 @@ public class TagHelperManifestFilter : IManifestFilter
     {
         public void Filter(List<PackageManifest> manifests)
         {
-            var version = typeof(TagHelperManifestFilter).Assembly.GetName().Version.ToString();
+            var version = typeof(TagHelperManifestFilter).Assembly.GetName()?.Version?.ToString() ?? "Unknown";
 
             manifests.Add(new PackageManifest
             {

Our.Umbraco.TagHelpers/DictionaryTagHelper.cs

@@ -23,14 +23,14 @@ public DictionaryTagHelper(ILocalizationService localizationService)
         /// The dictionary key to translate
         /// </summary>
         [HtmlAttributeName("key")]
-        public string Key { get; set; }
+        public string? Key { get; set; }
 
         /// <summary>
         /// An optional attribute to set a fallback language to use
         /// If the current language does not contain a translation for the key
         /// </summary>
         [HtmlAttributeName("fallback-lang")]
-        public string FallbackLang { get; set; }
+        public string? FallbackLang { get; set; }
 
         public override void Process(TagHelperContext context, TagHelperOutput output)
         {

Our.Umbraco.TagHelpers/MacroTagHelper.cs

@@ -21,21 +21,21 @@ public class MacroTagHelper : TagHelper
         /// The alias of the Macro to execute
         /// </summary>
         [HtmlAttributeName("alias")]
-        public string MacroAlias { get; set; }
+        public string? MacroAlias { get; set; }
 
         /// <summary>
         /// An optional attribute to set the context of the Content that the Macro will use
         /// Without it set it will use the current page
         /// </summary>
         [HtmlAttributeName("content")]
-        public IPublishedContent ContentNode { get; set; }
+        public IPublishedContent? ContentNode { get; set; }
 
         /// <summary>
         /// An optional list of attributes that will map to Macro Parameters
         /// bind:myMacroParam="" bind:startNodeId="" etc...
         /// </summary>
         [HtmlAttributeName(DictionaryAttributePrefix = "bind:")]
-        public IDictionary<string, string> MacroParameters { get; set; } = new Dictionary<string, string>();
+        public IDictionary<string, string>? MacroParameters { get; set; } = new Dictionary<string, string>();
 
         public MacroTagHelper(IUmbracoComponentRenderer umbracoComponentRenderer, IUmbracoContextAccessor umbracoContextAccessor)
         {
@@ -59,7 +59,7 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
             // TagHelpers dont seem to like HTMLAttributes as <string, object> dictionary
             // Hence us trying to convert it here
             IDictionary<string, object> macroParams = new Dictionary<string, object>();
-            if (MacroParameters.Any())
+            if (MacroParameters != null && MacroParameters.Any())
             {
                 macroParams = MacroParameters.ToDictionary(p => p.Key, p => (object)p.Value);
             }

Our.Umbraco.TagHelpers/MemberTagHelper.cs

@@ -23,15 +23,15 @@ public class MemberTagHelper : TagHelper
         /// * = All authenticated users
         /// </summary>
         [HtmlAttributeName("our-member-exclude")]
-        public string ExcludeRoles { get; set; }
+        public string? ExcludeRoles { get; set; }
 
         /// <summary>
         /// A comma separated list of Member Groups to include
         /// ? = All anonymous users
         /// * = All authenticated users
         /// </summary>
         [HtmlAttributeName("our-member-include")]
-        public string IncludeRoles { get; set; }
+        public string? IncludeRoles { get; set; }
 
         public MemberTagHelper(IMemberManager memberManager)
         {
@@ -62,29 +62,30 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
             }
         }
 
-        private bool IsUserInRole(string roleString, List<string> currentMemberRoles)
+        private bool IsUserInRole(string? roleString, List<string> currentMemberRoles)
         {
             // roles is a CSV of member groups they need to have access to
-            var roles = roleString.Split(',').Select(x => x.Trim());
-            foreach (var role in roles)
-            {
-                // Role ? == all anonymous users (User not logged in)
-                if (role == "?" && _memberManager.IsLoggedIn() == false)
+            var roles = roleString?.Split(',').Select(x => x.Trim());
+            if (roles != null)
+                foreach (var role in roles)
                 {
-                    return true;
-                }
+                    // Role ? == all anonymous users (User not logged in)
+                    if (role == "?" && _memberManager.IsLoggedIn() == false)
+                    {
+                        return true;
+                    }
 
-                // Role * == all authenticated users
-                if (role == "*" && _memberManager.IsLoggedIn())
-                {
-                    return true;
-                }
+                    // Role * == all authenticated users
+                    if (role == "*" && _memberManager.IsLoggedIn())
+                    {
+                        return true;
+                    }
 
-                if (currentMemberRoles.InvariantContains(role))
-                {
-                    return true;
+                    if (currentMemberRoles.InvariantContains(role))
+                    {
+                        return true;
+                    }
                 }
-            }
 
             return false;
         }

Our.Umbraco.TagHelpers/OurFallbackTagHelper.cs

@@ -17,7 +17,7 @@ public class OurFallbackTagHelper : TagHelper
         /// Would just be Header
         /// </summary>
         [HtmlAttributeName("property")]
-        public ModelExpression ModelProperty { get; set; }
+        public ModelExpression? ModelProperty { get; set; }
 
         [HtmlAttributeName("mode")]
         public Fallback Mode { get; set; }
@@ -26,17 +26,17 @@ public class OurFallbackTagHelper : TagHelper
         /// If using the fallback mode as Language then you can specify the culture to fallback to
         /// </summary>
         [HtmlAttributeName("culture")]
-        public string CultureCode { get; set; } = null;
+        public string? CultureCode { get; set; } = null;
 
         [HtmlAttributeNotBound]
         [ViewContext]
-        public ViewContext ViewContext { get; set; }
+        public ViewContext? ViewContext { get; set; }
 
         public override void Process(TagHelperContext context, TagHelperOutput output)
         {
             // Check to see that the Model Property is NOT a complex type or a collection of things
-            var isComplexType = ModelProperty.ModelExplorer.Metadata.IsComplexType;
-            var isEnumerableType = ModelProperty.ModelExplorer.Metadata.IsEnumerableType;
+            var isComplexType = ModelProperty != null && ModelProperty.ModelExplorer.Metadata.IsComplexType;
+            var isEnumerableType = ModelProperty != null && ModelProperty.ModelExplorer.Metadata.IsEnumerableType;
 
             // Only can support simpler things such as strings (as if collection)
             // We have no way of knowing how they want to iterate and display that HTML etc
@@ -47,7 +47,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
             }
 
             // Attempt to fetch/cast the Model as IPublishedContent
-            var contentNode = ViewContext.ViewData.Model as IPublishedContent;
+            var contentNode = ViewContext?.ViewData.Model as IPublishedContent;
             if(contentNode == null)
             {
                 output.SuppressOutput();
@@ -57,7 +57,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
             output.TagName = ""; // Remove the outer <our-fallback>
 
             // Get the Model property with fallback mode
-            var result = contentNode.Value(ModelProperty.Name, fallback: Mode, culture: CultureCode);
+            var result = contentNode.Value(ModelProperty?.Name, fallback: Mode, culture: CultureCode);
 
             // If we have a value that can be
             if (string.IsNullOrWhiteSpace($"{result}") == false)

Our.Umbraco.TagHelpers/Services/BackofficeUserAccessor.cs

@@ -36,12 +36,12 @@ public ClaimsIdentity BackofficeUser
                     return new ClaimsIdentity();
 
                 CookieAuthenticationOptions cookieOptions = _cookieOptionsSnapshot.Get(global::Umbraco.Cms.Core.Constants.Security.BackOfficeAuthenticationType);
-                string backOfficeCookie = httpContext.Request.Cookies[cookieOptions.Cookie.Name!];
+                string? backOfficeCookie = httpContext.Request.Cookies[cookieOptions.Cookie.Name!];
 
                 if (string.IsNullOrEmpty(backOfficeCookie))
                     return new ClaimsIdentity();
 
-                AuthenticationTicket unprotected = cookieOptions.TicketDataFormat.Unprotect(backOfficeCookie!);
+                AuthenticationTicket? unprotected = cookieOptions.TicketDataFormat.Unprotect(backOfficeCookie!);
                 ClaimsIdentity backOfficeIdentity = unprotected!.Principal.GetUmbracoIdentity();
 
                 return backOfficeIdentity;

Our.Umbraco.TagHelpers/SurfaceControllerFormTagHelper.cs

@@ -16,19 +16,19 @@ namespace Our.Umbraco.TagHelpers
     public class SurfaceControllerFormTagHelper : TagHelper
     {
         private readonly IDataProtectionProvider _dataProtectionProvider;
-        private IDictionary<string, string> _routeValues;
+        private IDictionary<string, string>? _routeValues;
 
         /// <summary>
         /// The name of the action method.
         /// </summary>
         [HtmlAttributeName("our-action")]
-        public string ControllerAction { get; set; }
+        public string? ControllerAction { get; set; }
 
         /// <summary>
         /// The name of the Umbraco controller minus the 'Controller' suffix.
         /// </summary>
         [HtmlAttributeName("our-controller")]
-        public string ControllerName { get; set; }
+        public string? ControllerName { get; set; }
 
         /// <summary>
         /// The name of the area.
@@ -40,7 +40,7 @@ public class SurfaceControllerFormTagHelper : TagHelper
         /// Additional parameters for the route.
         /// </summary>
         [HtmlAttributeName("our-route-vals", DictionaryAttributePrefix = "our-route-val")]
-        public IDictionary<string, string> RouteValues
+        public IDictionary<string, string>? RouteValues
         {
             get
             {
@@ -62,7 +62,7 @@ public IDictionary<string, string> RouteValues
         /// </summary>
         [HtmlAttributeNotBound]
         [ViewContext]
-        public ViewContext ViewContext { get; set; }
+        public ViewContext? ViewContext { get; set; }
 
         public SurfaceControllerFormTagHelper(IDataProtectionProvider dataProtectionProvider)
         {