Merge branch 'main' into bugfix/fix-mstest0040-warnings-and-broken-cslaWindowsTest-project

Author: StefanOssendorf

Source/Csla.Web.Mvc.Shared/CslaModelBinder.cs

@@ -250,9 +250,8 @@ protected override void OnModelUpdated(ControllerContext controllerContext, Mode
                      select r;
         foreach (var item in errors)
         {
-          ModelState state;
           string mskey = CreateSubPropertyName(bindingContext.ModelName, item.Property ?? string.Empty);
-          if (bindingContext.ModelState.TryGetValue(mskey, out state))
+          if (bindingContext.ModelState.TryGetValue(mskey, out var state))
           {
             if (state.Errors.Any(e => e.ErrorMessage == item.Description))
               continue;

Source/Csla.Windows/BindingSourceRefresh.cs

@@ -100,8 +100,7 @@ public bool CanExtend(object extendee)
     [Category("Csla")]
     public bool GetReadValuesOnChange(BindingSource source)
     {
-      bool result;
-      if (_sources.TryGetValue(source, out result))
+      if (_sources.TryGetValue(source, out var result))
         return result;
       else
         return false;

Source/Csla.Windows/ReadWriteAuthorization.cs

@@ -65,8 +65,7 @@ public bool CanExtend(object extendee)
     [Category("Csla")]
     public bool GetApplyAuthorization(Control source)
     {
-      ControlStatus result;
-      if (_sources.TryGetValue(source, out result))
+      if (_sources.TryGetValue(source, out var result))
         return result.ApplyAuthorization;
       else
         return false;
@@ -81,8 +80,7 @@ public bool GetApplyAuthorization(Control source)
     [Category("Csla")]
     public void SetApplyAuthorization(Control source, bool value)
     {
-      ControlStatus status;
-      if (_sources.TryGetValue(source, out status))
+      if (_sources.TryGetValue(source, out var status))
         status.ApplyAuthorization = value;
       else
         _sources.Add(

Source/Csla/Core/BusinessBase.cs

@@ -499,11 +499,9 @@ public virtual bool CanReadProperty(IPropertyInfo property)
       if (property is null)
         throw new ArgumentNullException(nameof(property));
 
-      var result = true;
-
       VerifyAuthorizationCache();
 
-      if (!_readResultCache!.TryGetValue(property.Name, out result))
+      if (!_readResultCache!.TryGetValue(property.Name, out var result))
       {
         result = BusinessRules.HasPermission(ApplicationContext, AuthorizationActions.ReadProperty, property);
         if (BusinessRules.CachePermissionResult(AuthorizationActions.ReadProperty, property))
@@ -579,11 +577,9 @@ public virtual bool CanWriteProperty(IPropertyInfo property)
       if (property is null)
         throw new ArgumentNullException(nameof(property));
 
-      bool result = true;
-
       VerifyAuthorizationCache();
 
-      if (!_writeResultCache!.TryGetValue(property.Name, out result))
+      if (!_writeResultCache!.TryGetValue(property.Name, out var result))
       {
         result = BusinessRules.HasPermission(ApplicationContext, AuthorizationActions.WriteProperty, property);
         if (BusinessRules.CachePermissionResult(AuthorizationActions.WriteProperty, property))
@@ -683,11 +679,9 @@ public virtual bool CanExecuteMethod(IMemberInfo method)
       if (method is null)
         throw new ArgumentNullException(nameof(method));
 
-      bool result = true;
-
       VerifyAuthorizationCache();
 
-      if (!_executeResultCache!.TryGetValue(method.Name, out result))
+      if (!_executeResultCache!.TryGetValue(method.Name, out var result))
       {
         result = BusinessRules.HasPermission(ApplicationContext, AuthorizationActions.ExecuteMethod, method);
         if (BusinessRules.CachePermissionResult(AuthorizationActions.ExecuteMethod, method))

Source/Csla/Core/FieldManager/FieldDataList.cs

@@ -34,8 +34,7 @@ public bool TryGetValue(string key, [NotNullWhen(true)] out IFieldData? result)
       if (key is null)
         throw new ArgumentNullException(nameof(key));
 
-      int index;
-      if (_fieldIndex.TryGetValue(key, out index))
+      if (_fieldIndex.TryGetValue(key, out var index))
       {
         result = _fields[index];
         return true;

Source/Csla/Core/UndoableHandler.cs

@@ -27,8 +27,6 @@ internal static class UndoableHandler
 
     public static List<DynamicMemberHandle> GetCachedFieldHandlers(Type type)
     {
-      List<DynamicMemberHandle>? handlers;
-
 #if NET8_0_OR_GREATER
 
       if (!_undoableFieldCache.TryGetValue(type, out var handlersInfo))
@@ -46,9 +44,9 @@ public static List<DynamicMemberHandle> GetCachedFieldHandlers(Type type)
         }
       }
 
-      handlers = handlersInfo.Item2;
+      return handlersInfo.Item2;
 #else
-      if (!_undoableFieldCache.TryGetValue(type, out handlers))
+      if (!_undoableFieldCache.TryGetValue(type, out var handlers))
       {
         var newHandlers = BuildHandlers(type);
 
@@ -62,9 +60,9 @@ public static List<DynamicMemberHandle> GetCachedFieldHandlers(Type type)
           }
         }
       }
-#endif
 
       return handlers;
+#endif
     }
 
     private static List<DynamicMemberHandle> BuildHandlers(Type type)

Source/Csla/ReadOnlyBase.cs

@@ -226,11 +226,9 @@ public virtual bool CanReadProperty(IPropertyInfo property)
       if (property is null)
         throw new ArgumentNullException(nameof(property));
 
-      bool result = true;
-
       VerifyAuthorizationCache();
 
-      if (!_readResultCache!.TryGetValue(property.Name, out result))
+      if (!_readResultCache!.TryGetValue(property.Name, out var result))
       {
         result = BusinessRules.HasPermission(ApplicationContext, AuthorizationActions.ReadProperty, property);
         // store value in cache
@@ -337,11 +335,9 @@ public virtual bool CanExecuteMethod(IMemberInfo method)
       if (method is null)
         throw new ArgumentNullException(nameof(method));
 
-      bool result = true;
-
       VerifyAuthorizationCache();
 
-      if (!_executeResultCache!.TryGetValue(method.Name, out result))
+      if (!_executeResultCache!.TryGetValue(method.Name, out var result))
       {
         result = BusinessRules.HasPermission(ApplicationContext, AuthorizationActions.ExecuteMethod, method);
         _executeResultCache.AddOrUpdate(method.Name, result, (_, _) => { return result; });

Source/Csla/Serialization/Mobile/CslaLegacyBinaryWriter.cs

@@ -75,8 +75,7 @@ private void WriteSystemString(string systemString, BinaryWriter writer)
     private DictionaryCheckResult GetKey(string value)
     {
       DictionaryCheckResult returnValue;
-      int key;
-      if (keywordsDictionary.TryGetValue(value, out key))
+      if (keywordsDictionary.TryGetValue(value, out var key))
       {
         returnValue = new DictionaryCheckResult(false, key);
       }

Source/Csla/Serialization/Mobile/MobileFormatter.cs

@@ -164,8 +164,7 @@ public SerializationInfo SerializeObject(object? obj)
 
     private Type GetTypeFromCache(string typeName)
     {
-      Type? result;
-      if (!_typeCache.TryGetValue(typeName, out result))
+      if (!_typeCache.TryGetValue(typeName, out var result))
       {
         result = MethodCaller.GetType(typeName);
 

Source/Csla/Server/DataPortalMethodCache.cs

@@ -28,8 +28,6 @@ public static DataPortalMethodInfo GetMethodInfo([DynamicallyAccessedMembers(Dyn
     {
       var key = new MethodCacheKey(objectType.FullName!, methodName, MethodCaller.GetParameterTypes(parameters));
 
-      DataPortalMethodInfo result;
-
 #if NET8_0_OR_GREATER
       if (_cache.TryGetValue(key, out var methodInfo))
       {
@@ -44,14 +42,14 @@ public static DataPortalMethodInfo GetMethodInfo([DynamicallyAccessedMembers(Dyn
         }
 
         var method = GetMethodOfCaller(objectType, methodName, parameters);
-        
-        result = new DataPortalMethodInfo(method);
+
+        var result = new DataPortalMethodInfo(method);
         var cacheInstance = AssemblyLoadContextManager.CreateCacheInstance(objectType, result, OnAssemblyLoadContextUnload);
         _cache.Add(key, cacheInstance);
+        return result;
       }
-      
 #else
-      if (_cache.TryGetValue(key, out result)) 
+      if (_cache.TryGetValue(key, out var result))
         return result;
 
       lock (_cache)
@@ -63,10 +61,10 @@ public static DataPortalMethodInfo GetMethodInfo([DynamicallyAccessedMembers(Dyn
 
           _cache.Add(key, result);
         }
-      }      
-#endif
+      }
 
       return result;
+#endif
     }
 
     private static System.Reflection.MethodInfo GetMethodOfCaller([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)] Type objectType, string methodName, object[] parameters)

Source/Csla/SmartDate.cs

@@ -712,9 +712,6 @@ public static DateTime StringToDate(string? value, EmptyValue emptyValue)
 
     private static bool TryStringToDate(string? value, EmptyValue emptyValue, ref DateTime result)
     {
-      
-      DateTime tmp;
-
       // call custom parser if set...
       var tmpValue = _customParser?.Invoke(value);
       // i f custom parser returned a value then parsing succeeded
@@ -729,7 +726,7 @@ private static bool TryStringToDate(string? value, EmptyValue emptyValue, ref Da
         result = emptyValue == EmptyValue.MinDate ? DateTime.MinValue : DateTime.MaxValue;
         return true;
       }
-      if (DateTime.TryParse(value, out tmp))
+      if (DateTime.TryParse(value, out var tmp))
       {
         result = tmp;
         return true;