Merge branch 'main' into remove-redundant-ToImmutableDictionary-allocations

Author: StefanOssendorf

Source/Csla.Analyzers/Csla.Analyzers.Tests/EvaluateManagedBackingFieldsAnalayzerTests.cs Source/Csla.Analyzers/Csla.Analyzers.Tests/EvaluateManagedBackingFieldsAnalyzerTests.cs

@@ -4,12 +4,12 @@
 namespace Csla.Analyzers.Tests
 {
   [TestClass]
-  public sealed class EvaluateManagedBackingFieldsAnalayzerTests
+  public sealed class EvaluateManagedBackingFieldsAnalyzerTests
   {
     [TestMethod]
     public void VerifySupportedDiagnostics()
     {
-      var analyzer = new EvaluateManagedBackingFieldsAnalayzer();
+      var analyzer = new EvaluateManagedBackingFieldsAnalyzer();
       var diagnostics = analyzer.SupportedDiagnostics;
       Assert.AreEqual(1, diagnostics.Length);
 
@@ -22,7 +22,7 @@ public void VerifySupportedDiagnostics()
         nameof(DiagnosticDescriptor.Category));
       Assert.AreEqual(DiagnosticSeverity.Error, diagnostic.DefaultSeverity,
         nameof(DiagnosticDescriptor.DefaultSeverity));
-      Assert.AreEqual(HelpUrlBuilder.Build(Constants.AnalyzerIdentifiers.EvaluateManagedBackingFields, nameof(EvaluateManagedBackingFieldsAnalayzer)),
+      Assert.AreEqual(HelpUrlBuilder.Build(Constants.AnalyzerIdentifiers.EvaluateManagedBackingFields, nameof(EvaluateManagedBackingFieldsAnalyzer)),
         diagnostic.HelpLinkUri,
         nameof(DiagnosticDescriptor.HelpLinkUri));
     }
@@ -31,7 +31,7 @@ public void VerifySupportedDiagnostics()
     public async Task AnalyzeWhenClassIsNotStereotype()
     {
       var code = "public class ClassIsNotStereotype { }";
-      await TestHelpers.RunAnalysisAsync<EvaluateManagedBackingFieldsAnalayzer>(code, []);
+      await TestHelpers.RunAnalysisAsync<EvaluateManagedBackingFieldsAnalyzer>(code, []);
     }
 
     [TestMethod]
@@ -68,7 +68,7 @@ public string BlockData
           public string ExpressionData => string.Empty;
         }
         """;
-      await TestHelpers.RunAnalysisAsync<EvaluateManagedBackingFieldsAnalayzer>(code, []);
+      await TestHelpers.RunAnalysisAsync<EvaluateManagedBackingFieldsAnalyzer>(code, []);
     }
 
     [TestMethod]
@@ -113,7 +113,7 @@ public string Data4
           public string ExpressionData => GetProperty(ExpressionDataProperty);
         }
         """;
-      await TestHelpers.RunAnalysisAsync<EvaluateManagedBackingFieldsAnalayzer>(code, [
+      await TestHelpers.RunAnalysisAsync<EvaluateManagedBackingFieldsAnalyzer>(code, [
           Constants.AnalyzerIdentifiers.EvaluateManagedBackingFields,
           Constants.AnalyzerIdentifiers.EvaluateManagedBackingFields,
           Constants.AnalyzerIdentifiers.EvaluateManagedBackingFields
@@ -142,7 +142,7 @@ public string Data
           public string ExpressionData => GetProperty(ExpressionDataProperty);
         }
         """;
-      await TestHelpers.RunAnalysisAsync<EvaluateManagedBackingFieldsAnalayzer>(code, []);
+      await TestHelpers.RunAnalysisAsync<EvaluateManagedBackingFieldsAnalyzer>(code, []);
     }
 
     [TestMethod]
@@ -175,7 +175,7 @@ public string ArrowData
           public string ExpressionData => GetProperty(ExpressionDataProperty);
         }
         """;
-      await TestHelpers.RunAnalysisAsync<EvaluateManagedBackingFieldsAnalayzer>(
+      await TestHelpers.RunAnalysisAsync<EvaluateManagedBackingFieldsAnalyzer>(
         code,
         [
           Constants.AnalyzerIdentifiers.EvaluateManagedBackingFields,
@@ -214,7 +214,7 @@ public string ArrowData
           public string ExpressionData => GetProperty(ExpressionDataProperty);
         }
         """;
-      await TestHelpers.RunAnalysisAsync<EvaluateManagedBackingFieldsAnalayzer>(
+      await TestHelpers.RunAnalysisAsync<EvaluateManagedBackingFieldsAnalyzer>(
         code,
         [
           Constants.AnalyzerIdentifiers.EvaluateManagedBackingFields,
@@ -253,7 +253,7 @@ public string Data
           public string ExpressionData => GetProperty(ExpressionDataProperty);
         }
         """;
-      await TestHelpers.RunAnalysisAsync<EvaluateManagedBackingFieldsAnalayzer>(
+      await TestHelpers.RunAnalysisAsync<EvaluateManagedBackingFieldsAnalyzer>(
         code,
         [
           Constants.AnalyzerIdentifiers.EvaluateManagedBackingFields,
@@ -292,7 +292,7 @@ public string ArrowData
           public string ExpressionData => ReadProperty(ExpressionDataProperty);
         }
         """;
-      await TestHelpers.RunAnalysisAsync<EvaluateManagedBackingFieldsAnalayzer>(
+      await TestHelpers.RunAnalysisAsync<EvaluateManagedBackingFieldsAnalyzer>(
         code,
         [
           Constants.AnalyzerIdentifiers.EvaluateManagedBackingFields,

Source/Csla.Analyzers/Csla.Analyzers.Tests/EvaluateManagedBackingFieldsCodeFixTests.cs

@@ -42,7 +42,7 @@ public string Data
         """;
       var document = TestHelpers.Create(code);
       var tree = await document.GetSyntaxTreeAsync();
-      var diagnostics = await TestHelpers.GetDiagnosticsAsync(code, new EvaluateManagedBackingFieldsAnalayzer());
+      var diagnostics = await TestHelpers.GetDiagnosticsAsync(code, new EvaluateManagedBackingFieldsAnalyzer());
 
       var actions = new List<CodeAction>();
       var codeActionRegistration = new Action<CodeAction, ImmutableArray<Diagnostic>>(
@@ -86,7 +86,7 @@ public class A : BusinessBase<A>
         """;
       var document = TestHelpers.Create(code);
       var tree = await document.GetSyntaxTreeAsync();
-      var diagnostics = await TestHelpers.GetDiagnosticsAsync(code, new EvaluateManagedBackingFieldsAnalayzer());
+      var diagnostics = await TestHelpers.GetDiagnosticsAsync(code, new EvaluateManagedBackingFieldsAnalyzer());
 
       var actions = new List<CodeAction>();
       var codeActionRegistration = new Action<CodeAction, ImmutableArray<Diagnostic>>(

Source/Csla.Analyzers/Csla.Analyzers/AnalyzerReleases.Unshipped.md

@@ -10,7 +10,7 @@ CSLA0004 | Usage | Warning | CheckConstructorsAnalyzer
 CSLA0005 | Usage | Error | FindSaveAssignmentIssueAnalyzer
 CSLA0006 | Usage | Error | FindSaveAssignmentIssueAnalyzer
 CSLA0007 | Usage | Warning | EvaluatePropertiesForSimplicityAnalyzer
-CSLA0008 | Usage | Error | EvaluateManagedBackingFieldsAnalayzer
+CSLA0008 | Usage | Error | EvaluateManagedBackingFieldsAnalyzer
 CSLA0009 | Design | Warning | IsOperationMethodPublicAnalyzer
 CSLA0010 | Design | Warning | FindOperationsWithNonSerializableArgumentsAnalyzer
 CSLA0011 | Usage | Error | FindBusinessObjectCreationAnalyzer

Source/Csla.Analyzers/Csla.Analyzers/DoesOperationHaveAttributeAddAttributeCodeFix.cs

@@ -78,7 +78,7 @@ private static void AddCodeFix(CodeFixContext context, SyntaxNode root,
 
       if (!root.HasUsing(DoesOperationHaveAttributeAnalyzerAddAttributeCodeFixConstants.CslaNamespace))
       {
-        newRoot = (newRoot as CompilationUnitSyntax).AddUsings(
+        newRoot = ((CompilationUnitSyntax)newRoot).AddUsings(
           SyntaxFactory.UsingDirective(SyntaxFactory.ParseName(
             DoesOperationHaveAttributeAnalyzerAddAttributeCodeFixConstants.CslaNamespace)));
         description = DoesOperationHaveAttributeAnalyzerAddAttributeCodeFixConstants.AddAttributeAndUsingDescription;

Source/Csla.Analyzers/Csla.Analyzers/EvaluateManagedBackingFieldsAnalayzer.cs Source/Csla.Analyzers/Csla.Analyzers/EvaluateManagedBackingFieldsAnalyzer.cs

@@ -11,17 +11,17 @@ namespace Csla.Analyzers
   /// 
   /// </summary>
   [DiagnosticAnalyzer(LanguageNames.CSharp)]
-  public sealed class EvaluateManagedBackingFieldsAnalayzer
+  public sealed class EvaluateManagedBackingFieldsAnalyzer
     : DiagnosticAnalyzer
   {
     private static readonly DiagnosticDescriptor mustBePublicStaticAndReadonlyRule =
       new(
         Constants.AnalyzerIdentifiers.EvaluateManagedBackingFields,
-        EvaluateManagedBackingFieldsAnalayzerConstants.Title,
-        EvaluateManagedBackingFieldsAnalayzerConstants.Message,
+        EvaluateManagedBackingFieldsAnalyzerConstants.Title,
+        EvaluateManagedBackingFieldsAnalyzerConstants.Message,
         Constants.Categories.Usage, DiagnosticSeverity.Error, true,
         helpLinkUri: HelpUrlBuilder.Build(
-          Constants.AnalyzerIdentifiers.EvaluateManagedBackingFields, nameof(EvaluateManagedBackingFieldsAnalayzer)));
+          Constants.AnalyzerIdentifiers.EvaluateManagedBackingFields, nameof(EvaluateManagedBackingFieldsAnalyzer)));
 
     /// <summary>
     /// 
@@ -125,15 +125,15 @@ private static bool DetermineIfPropertyUsesField(SyntaxNodeAnalysisContext conte
         return DetermineIfPropertyUsesField(
           context, fieldSymbol, classProperty,
           propertyNode => propertyNode.ExpressionBody as SyntaxNode ??
-            propertyNode.AccessorList?.Accessors.Single(
+            propertyNode.AccessorList.Accessors.Single(
               _ => _.IsKind(SyntaxKind.GetAccessorDeclaration)));
       }
 
       if (classProperty.SetMethod != null)
       {
         return DetermineIfPropertyUsesField(
           context, fieldSymbol, classProperty,
-          propertyNode => propertyNode.AccessorList?.Accessors.Single(
+          propertyNode => propertyNode.AccessorList.Accessors.Single(
             _ => _.IsKind(SyntaxKind.SetAccessorDeclaration)));
       }
 

Source/Csla.Analyzers/Csla.Analyzers/EvaluateManagedBackingFieldsAnalayzerConstants.cs Source/Csla.Analyzers/Csla.Analyzers/EvaluateManagedBackingFieldsAnalyzerConstants.cs

@@ -6,7 +6,7 @@ namespace Csla.Analyzers
   /// <summary>
   /// 
   /// </summary>
-  public static class EvaluateManagedBackingFieldsAnalayzerConstants
+  public static class EvaluateManagedBackingFieldsAnalyzerConstants
   {
     /// <summary>
     /// 

Source/Csla.AspNetCore/Blazor/ApplicationContextManagerBlazor.cs

@@ -130,10 +130,7 @@ public IPrincipal GetUser()
       return CurrentPrincipal;
     }
 
-    /// <summary>
-    /// Not supported in Blazor.
-    /// </summary>
-    /// <param name="principal">Principal object.</param>
+    /// <inheritdoc />
     public virtual void SetUser(IPrincipal principal)
     {
       ArgumentNullException.ThrowIfNull(principal);

Source/Csla.AspNetCore/Blazor/ApplicationContextManagerInMemory.cs

@@ -129,13 +129,11 @@ public IPrincipal GetUser()
       return CurrentPrincipal;
     }
 
-    /// <summary>
-    /// Attempts to set the current principal on the registered
-    /// IHostEnvironmentAuthenticationStateProvider service.
-    /// </summary>
-    /// <param name="principal">Principal object.</param>
+    /// <inheritdoc />
     public virtual void SetUser(IPrincipal principal)
     {
+      ArgumentNullException.ThrowIfNull(principal);
+      
       if (!ReferenceEquals(CurrentPrincipal, principal))
       {
         if (ActiveCircuitState.CircuitExists)
@@ -151,7 +149,11 @@ public virtual void SetUser(IPrincipal principal)
         }
         else if (HttpContext is not null)
         {
-          HttpContext.User = (ClaimsPrincipal)principal;
+          if (principal is not ClaimsPrincipal claimsPrincipal)
+          {
+            throw new ArgumentException("typeof(principal) != ClaimsPrincipal");
+          }
+          HttpContext.User = claimsPrincipal;
         }
         else
         {

Source/Csla.AspNetCore/Blazor/State/SessionIdManager.cs

@@ -55,7 +55,7 @@ public string GetSessionId()
           httpContext.Response.Cookies.Append(sessionIdName, result);
       }
 
-      return result ?? throw new InvalidOperationException(Csla.Properties.Resources.SessionIdManagerIdMustBeNotNull);
+      return result ?? throw new InvalidOperationException(Properties.Resources.SessionIdManagerIdMustBeNotNull);
     }
   }
 }

Source/Csla.AspNetCore/Blazor/State/SessionManager.cs

@@ -26,11 +26,8 @@ public class SessionManager(ISessionIdManager sessionIdManager) : ISessionManage
     /// </summary>
     public Session GetSession()
     {
-      Session result;
       var key = _sessionIdManager.GetSessionId();
-      if (!_sessions.ContainsKey(key))
-        _sessions.TryAdd(key, []);
-      result = _sessions[key];
+      var result = _sessions.GetOrAdd(key, []);
       result.Touch();
       return result;
     }

Source/Csla.AspNetCore/Blazor/State/StateController.cs

@@ -11,6 +11,8 @@
 using Csla.Security;
 using Csla.Blazor.State.Messages;
 using Csla.Serialization;
+using System.Runtime.Serialization;
+using Csla.Properties;
 
 namespace Csla.AspNetCore.Blazor.State
 {
@@ -45,8 +47,7 @@ public virtual StateResult Get(long lastTouched)
       }
       else
       {
-        var message = (SessionMessage)applicationContext.CreateInstanceDI(typeof(SessionMessage));
-        message.Session = session;
+        var message = applicationContext.CreateInstanceDI<SessionMessage>(session);
         if (FlowUserIdentityToWebAssembly)
         {
           message.Principal = applicationContext.Principal;
@@ -73,7 +74,11 @@ public virtual void Put(byte[] updatedSessionData)
       {
         Position = 0
       };
-      var session = (Session)formatter.Deserialize(buffer);
+      if (formatter.Deserialize(buffer) is not Session session)
+      {
+        throw new SerializationException(string.Format(Resources.DeserializationFailedDueToWrongData, nameof(Session)));
+      }
+
       sessionManager.UpdateSession(session);
     }
   }

Source/Csla.AspNetCore/ConfigurationExtensions.cs

@@ -13,6 +13,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Csla.Core;
 using Csla.AspNetCore;
+using Csla.Web.Mvc;
 
 namespace Csla.Configuration
 {
@@ -45,6 +46,9 @@ public static CslaOptions AddAspNetCore(this CslaOptions config, Action<AspNetCo
 #if NET8_0_OR_GREATER
       config.Services.AddScoped<ActiveCircuitState>();
       config.Services.AddScoped(typeof(CircuitHandler), typeof(ActiveCircuitHandler));
+#endif
+#if NETSTANDARD2_0 || NET8_0_OR_GREATER 
+      config.Services.AddMvcCore(opt => opt.ModelBinderProviders.Insert(0, new CslaModelBinderProvider()));
 #endif
       config.Services.AddScoped(typeof(IContextManager), typeof(ApplicationContextManagerHttpContext));
       return config;

Source/Csla.AspNetCore/Mvc/TagHelpers/CslaErrorsTagHelper.cs

@@ -5,6 +5,7 @@
 // </copyright>
 // <summary>Razor tag helper</summary>
 //-----------------------------------------------------------------------
+using Csla.Properties;
 using Csla.Rules;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
@@ -39,7 +40,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
       var propertyName = parts[parts.Length - 1];
       object source = model;
       for (int i = 0; i < parts.Length - 1; i++)
-        source = Reflection.MethodCaller.CallPropertyGetter(source, parts[i]);
+        source = Reflection.MethodCaller.CallPropertyGetter(source, parts[i]) ?? throw new InvalidOperationException(string.Format(Resources.TagHelperPropertyInPathHasNullValue, parts[i], CslaErrorsFor.Name));
       var result = string.Empty;
       if (source is Core.BusinessBase obj)
         result = obj.BrokenRulesCollection.ToString(",", RuleSeverity.Error, propertyName);

Source/Csla.AspNetCore/Mvc/TagHelpers/CslaInformationTagHelper.cs

@@ -5,6 +5,7 @@
 // </copyright>
 // <summary>Razor tag helper</summary>
 //-----------------------------------------------------------------------
+using Csla.Properties;
 using Csla.Rules;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
@@ -39,7 +40,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
       var propertyName = parts[parts.Length - 1];
       object source = model;
       for (int i = 0; i < parts.Length - 1; i++)
-        source = Reflection.MethodCaller.CallPropertyGetter(source, parts[i]);
+        source = Reflection.MethodCaller.CallPropertyGetter(source, parts[i]) ?? throw new InvalidOperationException(string.Format(Resources.TagHelperPropertyInPathHasNullValue, parts[i], CslaInformationFor.Name));
       var result = string.Empty;
       if (source is Core.BusinessBase obj)
         result = obj.BrokenRulesCollection.ToString(",", RuleSeverity.Information, propertyName);

Source/Csla.AspNetCore/Mvc/TagHelpers/CslaWarningsTagHelper.cs

@@ -5,6 +5,7 @@
 // </copyright>
 // <summary>Razor tag helper</summary>
 //-----------------------------------------------------------------------
+using Csla.Properties;
 using Csla.Rules;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
@@ -39,7 +40,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
       var propertyName = parts[parts.Length - 1];
       object source = model;
       for (int i = 0; i < parts.Length - 1; i++)
-        source = Reflection.MethodCaller.CallPropertyGetter(source, parts[i]);
+        source = Reflection.MethodCaller.CallPropertyGetter(source, parts[i]) ?? throw new InvalidOperationException(string.Format(Resources.TagHelperPropertyInPathHasNullValue, parts[i], CslaWarningsFor.Name));
       var result = string.Empty;
       if (source is Core.BusinessBase obj)
         result = obj.BrokenRulesCollection.ToString(",", RuleSeverity.Warning, propertyName);

Source/Csla.Blazor.Test/ViewModelSaveAsyncErrorTests.cs

@@ -123,10 +123,6 @@ public async Task SavingWithCancelledCancellationToken_ErrorEventIsInvoked()
 
     private class FakeBusy : Core.ITrackStatus
     {
-      public FakeBusy()
-      {
-      }
-
       public bool IsValid { get; set; }
 
       public bool IsSelfValid { get; set; }

Source/Csla.Blazor.WebAssembly.Tests/SessionManagerTests.cs

@@ -32,10 +32,9 @@ public void Initialize()
     var provider = services.BuildServiceProvider();
     var _applicationContext = provider.GetRequiredService<ApplicationContext>();
 
-    _sessionValue = new SessionMessage
+    _sessionValue = new SessionMessage([])
     {
-      Principal = new ClaimsPrincipal() { },
-      Session = []
+      Principal = new ClaimsPrincipal()
     };
 
     _sessionManager = new SessionManager(_applicationContext, GetHttpClient(_sessionValue, _applicationContext), new BlazorWebAssemblyConfigurationOptions { SyncContextWithServer = true });