Updates for #65, nullable ref types.

scottdorman · Jan 30, 2021 · 6e48d7f · 6e48d7f
1 parent d3bac0b
commit 6e48d7f
Show file tree

Hide file tree

Showing 46 changed files with 1,125 additions and 455 deletions.
diff --git a/common.props b/common.props
@@ -48,6 +48,10 @@ projects from the command-line or the IDE. -->
   <ItemGroup>
     <None Include="$(SolutionDir)\Cadru.licenseheader" Link="Cadru.licenseheader" />
   </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="all" />
+  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Validation" Version="2.5.5-beta" PrivateAssets="all" /> 

diff --git a/src/Cadru.AspNetCore.Mvc.TagHelpers/Cadru.AspNetCore.Mvc.TagHelpers.csproj b/src/Cadru.AspNetCore.Mvc.TagHelpers/Cadru.AspNetCore.Mvc.TagHelpers.csproj
@@ -3,6 +3,8 @@
     <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
     <Description>Provides additional ASP.NET Core TagHelpers.</Description>
     <PackageTags>$(CommonPackageTags) aspnetcore taghelper rendering</PackageTags>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />

diff --git a/src/Cadru.AspNetCore.Mvc.TagHelpers/Cadru.AspNetCore.Mvc.TagHelpers.xml b/src/Cadru.AspNetCore.Mvc.TagHelpers/Cadru.AspNetCore.Mvc.TagHelpers.xml
diff --git a/src/Cadru.AspNetCore.Mvc/Extensions/StateManagementExtensions.cs b/src/Cadru.AspNetCore.Mvc/Extensions/StateManagementExtensions.cs
@@ -37,6 +37,12 @@ namespace Cadru.AspNetCore.Mvc.Extensions
     /// </summary>
     public static class StateManagementExtensions
     {
+        private static string GetTypeName<T>()
+        {
+            var type = typeof(T);
+            return $"{type.Namespace}.{type.Name}";
+        }
+
         /// <summary>
         /// Gets the value associated with the specified key.
         /// </summary>
@@ -57,7 +63,7 @@ public static class StateManagementExtensions
         [return: MaybeNull]
         public static T Get<T>(this ITempDataDictionary storageProvider)
         {
-            storageProvider.TryGetValue<T>(typeof(T).FullName, out var value);
+            storageProvider.TryGetValue<T>(GetTypeName<T>(), out var value);
             return value;
         }
 
@@ -99,7 +105,7 @@ public static T Get<T>(this ITempDataDictionary storageProvider, string key)
         [return: MaybeNull]
         public static T Get<T>(this ISession storageProvider)
         {
-            storageProvider.TryGetValue<T>(typeof(T).FullName, out var value);
+            storageProvider.TryGetValue<T>(GetTypeName<T>(), out var value);
             return value;
         }
 
@@ -141,7 +147,7 @@ public static T Get<T>(this ISession storageProvider, string key)
         [return: MaybeNull]
         public static T Get<T>(this ViewDataDictionary storageProvider)
         {
-            storageProvider.TryGetValue<T>(typeof(T).FullName, out var value);
+            storageProvider.TryGetValue<T>(GetTypeName<T>(), out var value);
             return value;
         }
 
@@ -184,7 +190,7 @@ public static T Get<T>(this ViewDataDictionary storageProvider, string key)
         [return: MaybeNull]
         public static T Peek<T>(this ITempDataDictionary storageProvider)
         {
-            storageProvider.TryPeekValue<T>(typeof(T).FullName, out var value);
+            storageProvider.TryPeekValue<T>(GetTypeName<T>(), out var value);
             return value;
         }
 
@@ -228,7 +234,7 @@ public static T Peek<T>(this ITempDataDictionary storageProvider, string key)
         [return: MaybeNull]
         public static T Peek<T>(this ISession storageProvider)
         {
-            return storageProvider.Get<T>(typeof(T).FullName);
+            return storageProvider.Get<T>(GetTypeName<T>());
         }
 
         /// <summary>
@@ -321,7 +327,7 @@ public static T Peek<T>(this ViewDataDictionary storageProvider, string key)
         /// </remarks>
         public static void Put<T>(this ITempDataDictionary storageProvider, T value)
         {
-            storageProvider.Put(typeof(T).FullName, value);
+            storageProvider.Put(GetTypeName<T>(), value);
         }
 
         /// <summary>
@@ -355,7 +361,7 @@ public static void Put<T>(this ITempDataDictionary storageProvider, string key,
         /// </remarks>
         public static void Put<T>(this ISession storageProvider, T value)
         {
-            storageProvider.Put(typeof(T).FullName, value);
+            storageProvider.Put(GetTypeName<T>(), value);
         }
 
         /// <summary>
@@ -389,7 +395,7 @@ public static void Put<T>(this ISession storageProvider, string key, T value)
         /// </remarks>
         public static void Put<T>(this ViewDataDictionary storageProvider, T value)
         {
-            storageProvider.Put(typeof(T).FullName, value);
+            storageProvider.Put(GetTypeName<T>(), value);
         }
 
         /// <summary>
@@ -423,7 +429,6 @@ public static void Put<T>(this ViewDataDictionary storageProvider, string key, T
         /// <paramref name="storageProvider"/> contains an element with the
         /// specified key; otherwise, <see langword="false"></see>.
         /// </returns>
-        [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "<Pending>")]
         public static bool TryGetValue<T>(this ITempDataDictionary storageProvider, string key, [MaybeNull] out T value)
         {
             var valid = false;
@@ -461,7 +466,6 @@ public static bool TryGetValue<T>(this ITempDataDictionary storageProvider, stri
         /// <paramref name="storageProvider"/> contains an element with the
         /// specified key; otherwise, <see langword="false"></see>.
         /// </returns>
-        [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "<Pending>")]
         public static bool TryGetValue<T>(this ISession storageProvider, string key, [MaybeNull] out T value)
         {
             var valid = false;
@@ -500,7 +504,6 @@ public static bool TryGetValue<T>(this ISession storageProvider, string key, [Ma
         /// <paramref name="storageProvider"/> contains an element with the
         /// specified key; otherwise, <see langword="false"></see>.
         /// </returns>
-        [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "<Pending>")]
         public static bool TryGetValue<T>(this ViewDataDictionary storageProvider, string key, [MaybeNull] out T value)
         {
             var valid = false;
@@ -539,7 +542,6 @@ public static bool TryGetValue<T>(this ViewDataDictionary storageProvider, strin
         /// <paramref name="storageProvider"/> contains an element with the
         /// specified key; otherwise, <see langword="false"></see>.
         /// </returns>
-        [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "<Pending>")]
         public static bool TryPeekValue<T>(this ITempDataDictionary storageProvider, string key, [MaybeNull] out T value)
         {
             var valid = false;

diff --git a/src/Cadru.Build.Tasks/Cadru.Build.Tasks.csproj b/src/Cadru.Build.Tasks/Cadru.Build.Tasks.csproj
@@ -3,6 +3,8 @@
     <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
     <Description>Provides additional MSBuild tasks.</Description>
     <PackageTags>$(CommonPackageTags) collections logical natural string comparison date comparison comparer</PackageTags>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="RoslynWriteThisAssemblyCodeFile.cs" />

diff --git a/src/Cadru.Caching/CacheKey.cs b/src/Cadru.Caching/CacheKey.cs
@@ -87,14 +87,22 @@ public CacheKey(string prefix, IEnumerable<object>? data)
 
                             foreach (var element in e)
                             {
-                                tempBuilder.Add(element.ToString());
+                                var key = element.ToString();
+                                if (!String.IsNullOrWhiteSpace(key))
+                                {
+                                    tempBuilder.Add(key);
+                                }
                             }
 
                             keyBuilder.Add(String.Join("-", tempBuilder));
                         }
                         else
                         {
-                            keyBuilder.Add(d.ToString());
+                            var key = d.ToString();
+                            if (!String.IsNullOrWhiteSpace(key))
+                            {
+                                keyBuilder.Add(key);
+                            }
                         }
                     }
                 }
@@ -119,7 +127,7 @@ public CacheKey(string prefix, IEnumerable<object>? data)
         private int Hash { get; }
 
         /// <inheritdoc/>
-        public override bool Equals(object obj) => (obj is CacheKey key) ? this.Key == key.Key : this == obj;
+        public override bool Equals(object? obj) => (obj is CacheKey key) ? this.Key == key.Key : this == obj;
 
         /// <inheritdoc/>
         public override int GetHashCode() => this.Hash;