Adding NRT to WPF & MAUI (#4692)

* Add NRT to Wpf & MAUI

* NRT WIP ticked

* Changes to allow public interface changes to the main CSLA project that will not break the maui CI build is used in the shares xaml files.

* Slight change to yaml for build.

* Fix MacCatalysts minimum version for .net 8.

* Fix project file

* Changing the MacCatalyst version, and this time I mean it.

---------

Co-authored-by: Kevin E. Ford <4380198+Bowman74@users.noreply.github.com>

Author: StefanOssendorf

.github/workflows/ci.yaml

@@ -73,11 +73,5 @@ jobs:
     - name: "Select a specific version of Xcode"
       run: sudo xcode-select -s /Applications/Xcode_16.4.app
 
-    - name: Build iOS
-      run: dotnet build Source/csla.maui.test.sln -f net9.0-ios
-
-    - name: Build Android
-      run: dotnet build Source/csla.maui.test.sln -f net9.0-Android
-    
-    - name: Build MacOS
-      run: dotnet build Source/csla.maui.test.sln -f net9.0-maccatalyst
+    - name: Build Solution
+      run: dotnet build Source/csla.maui.test.sln --configuration Debug

Source/Csla.Xaml.Maui/Csla.Xaml.Maui.csproj

@@ -15,7 +15,7 @@
 		<RootNamespace>Csla.Xaml</RootNamespace>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' And $(TargetFramework) == 'net8.0-ios'">11.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' And $(TargetFramework) != 'net8.0-ios'">12.2</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst' And $(TargetFramework) == 'net8.0-maccatalyst'">12.2</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst' And $(TargetFramework) == 'net8.0-maccatalyst'">13.1</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst' And $(TargetFramework) != 'net8.0-maccatalyst'">15.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
     <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
@@ -33,15 +33,20 @@
     <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.12" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(Configuration)'=='Release'">
     <PackageReference Include="Csla" Version="9.1.*" />
   </ItemGroup>
-
+  <ItemGroup Condition="'$(Configuration)'!='Release'">
+    <ProjectReference Include="..\Csla\Csla.csproj" />
+  </ItemGroup>
+  
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);MAUI</DefineConstants>
     <Title>CSLA .NET for MAUI</Title>
     <PackageTags>CSLA;Business;MAUI</PackageTags>
     <PackageId>Csla.Maui</PackageId>
+    <Nullable>enable</Nullable>
+    <WarningsAsErrors>nullable</WarningsAsErrors>
   </PropertyGroup>
 
 	<Import Project="..\Csla.Xaml.Shared\Csla.Xaml.Shared.projitems" Label="Shared" />

Source/Csla.Xaml.Shared/ApplicationContextManager.cs

@@ -6,6 +6,7 @@
 // <summary>Provides consistent context information between the client</summary>
 //-----------------------------------------------------------------------
 
+using System.Diagnostics.CodeAnalysis;
 using System.Security.Principal;
 using Csla.Configuration;
 
@@ -17,9 +18,9 @@ namespace Csla.Xaml
   /// <param name="securityOptions"></param>
   public class ApplicationContextManager(SecurityOptions securityOptions) : Csla.Core.ApplicationContextManager
   {
-    private static IPrincipal _principal = null;
-    private static ApplicationContext applicationContext;
-    private SecurityOptions _securityOptions = securityOptions;
+    private static IPrincipal? _principal = null;
+    private static ApplicationContext? applicationContext;
+    private readonly SecurityOptions _securityOptions = securityOptions;
 
     /// <summary>
     /// Method called when the ApplicationContext
@@ -64,6 +65,7 @@ public override IPrincipal GetUser()
     }
 
     /// <inheritdoc />
+    [MemberNotNull(nameof(_principal))]
     public override void SetUser(IPrincipal principal)
     {
       _principal = principal ?? throw new ArgumentNullException(nameof(principal));

Source/Csla.Xaml.Shared/BrokenRulesSeverityConverter.cs

@@ -6,11 +6,11 @@
 // </copyright>
 // <summary>Converts validation severity values into corresponding</summary>
 //-----------------------------------------------------------------------
-using Csla.Rules;
-using System.Windows.Resources;
-using System.Windows.Media.Imaging;
 using System.Windows;
 using System.Windows.Data;
+using System.Windows.Media.Imaging;
+using System.Windows.Resources;
+using Csla.Rules;
 
 namespace Csla.Xaml
 {
@@ -28,16 +28,21 @@ public class BrokenRuleSeverityConverter : IValueConverter
     /// <param name="targetType">Desired output type (ignored).</param>
     /// <param name="parameter">Extra parameter (ignored).</param>
     /// <param name="culture">Desired culture (ignored).</param>
-    public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+    /// <exception cref="ArgumentException"><paramref name="value"/> is <see langword="null"/> or not of type <see cref="RuleSeverity"/>.</exception>
+    public object? Convert(object? value, Type? targetType, object? parameter, System.Globalization.CultureInfo? culture)
     {
-      RuleSeverity severity = (RuleSeverity)value;
+      if (value is not RuleSeverity severity)
+      {
+        throw new ArgumentException($"{value?.GetType().ToString()} != typeof({nameof(RuleSeverity)})", nameof(value));
+      }
+
       string uri = $"/Csla.Xaml;component/Resources/{severity}.png";
       StreamResourceInfo sr = Application.GetResourceStream(new Uri(uri, UriKind.Relative));
       BitmapImage bmp = new BitmapImage();
       bmp.BeginInit();
       bmp.StreamSource = sr.Stream;
       bmp.EndInit();
-      
+
       return bmp;
     }
 
@@ -48,7 +53,7 @@ public object Convert(object value, Type targetType, object parameter, System.Gl
     /// <param name="targetType">Desired output type (ignored).</param>
     /// <param name="parameter">Extra parameter (ignored).</param>
     /// <param name="culture">Desired culture (ignored).</param>
-    public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+    public object? ConvertBack(object? value, Type? targetType, object? parameter, System.Globalization.CultureInfo? culture)
     {
       return RuleSeverity.Error;
     }

Source/Csla.Xaml.Shared/BusyAnimation.cs

@@ -6,11 +6,11 @@
 // </copyright>
 // <summary>Displays a busy animation.</summary>
 //-----------------------------------------------------------------------
+using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Threading;
-using System.ComponentModel;
 
 namespace Csla.Xaml
 {
@@ -36,15 +36,15 @@ namespace Csla.Xaml
   [TemplateVisualState(Name = "state8", GroupName = "CommonStates")]
   public class BusyAnimation : Control
   {
-#region Constants
+    #region Constants
 
     private const int NUM_STATES = 8;
 
-#endregion
+    #endregion
 
-#region Member fields and properties
+    #region Member fields and properties
 
-    private DispatcherTimer _timer;
+    private DispatcherTimer? _timer;
     private int _state = -1;
 
     /// <summary>
@@ -56,7 +56,7 @@ public class BusyAnimation : Control
       typeof(BusyAnimation),
       new PropertyMetadata(
         TimeSpan.FromMilliseconds(100),
-        (o, e) => 
+        (o, e) =>
         {
           var busyAnimation = (BusyAnimation)o;
           busyAnimation.StepInterval = (TimeSpan)e.NewValue;
@@ -106,9 +106,9 @@ private void SetupRunningState(bool isRunning)
       GoToState(true);
     }
 
-#endregion
+    #endregion
 
-#region Constructor
+    #region Constructor
 
     /// <summary>
     /// Creates an instance of the control.
@@ -125,9 +125,9 @@ public BusyAnimation()
       LayoutUpdated += BusyAnimation_LayoutUpdated;
     }
 
-#endregion
+    #endregion
 
-#region Timer
+    #region Timer
 
     private void StartTimer()
     {
@@ -150,7 +150,7 @@ private void StopTimer()
       }
     }
 
-    void timer_Tick(object sender, EventArgs e)
+    void timer_Tick(object? sender, EventArgs e)
     {
       _state++;
       if (_state >= NUM_STATES)
@@ -159,9 +159,9 @@ void timer_Tick(object sender, EventArgs e)
       GoToState(true);
     }
 
-#endregion
+    #endregion
 
-#region State
+    #region State
 
     private void GoToState(bool useTransitions)
     {
@@ -175,16 +175,16 @@ private void GoToState(bool useTransitions)
       }
     }
 
-#endregion
+    #endregion
 
-#region Parts
+    #region Parts
 
-    void BusyAnimation_LayoutUpdated(object sender, EventArgs e)
+    void BusyAnimation_LayoutUpdated(object? sender, EventArgs e)
     {
       ArrangeParts();
     }
 
-    void BusyAnimation_SizeChanged(object sender, SizeChangedEventArgs e)
+    void BusyAnimation_SizeChanged(object? sender, SizeChangedEventArgs e)
     {
       ArrangeParts();
     }
@@ -196,7 +196,7 @@ private void ArrangeParts()
 
       for (int n = 0; n < NUM_STATES; n++)
       {
-        FrameworkElement item = (FrameworkElement)FindChild(this, "part" + (n + 1));
+        var item = (FrameworkElement?)FindChild(this, "part" + (n + 1));
         if (item != null)
         {
           double itemTheta = theta * n;
@@ -215,30 +215,31 @@ private void ArrangeParts()
       }
     }
 
-#endregion
+    #endregion
 
-#region Helpers
+    #region Helpers
 
-    private DependencyObject FindChild(DependencyObject parent, string name)
+    private DependencyObject? FindChild(DependencyObject parent, string name)
     {
-      DependencyObject found = null;
+      DependencyObject? found = null;
       int count = VisualTreeHelper.GetChildrenCount(parent);
       for (int x = 0; x < count; x++)
       {
         DependencyObject child = VisualTreeHelper.GetChild(parent, x);
-        string childName = child.GetValue(NameProperty) as string;
+        string? childName = child.GetValue(NameProperty) as string;
         if (childName == name)
         {
           found = child;
           break;
         }
-        else found = FindChild(child, name);
+        else
+          found = FindChild(child, name);
       }
 
       return found;
     }
 
-#endregion
+    #endregion
   }
 }
 #endif

Source/Csla.Xaml.Shared/ConfigurationExtensions.cs

@@ -21,6 +21,7 @@ public static class XamlConfigurationExtensions
   /// environments.
   /// </summary>
   /// <param name="config">CslaConfiguration object</param>
+  /// <exception cref="ArgumentNullException"><paramref name="config"/> is <see langword="null"/>.</exception>
   public static CslaOptions AddXaml(this CslaOptions config)
   {
     return AddXaml(config, null);
@@ -32,8 +33,12 @@ public static CslaOptions AddXaml(this CslaOptions config)
   /// </summary>
   /// <param name="config">CslaConfiguration object</param>
   /// <param name="options">XamlOptions action</param>
-  public static CslaOptions AddXaml(this CslaOptions config, Action<XamlOptions> options)
+  /// <exception cref="ArgumentNullException"><paramref name="config"/> is <see langword="null"/>.</exception>
+  public static CslaOptions AddXaml(this CslaOptions config, Action<XamlOptions>? options)
   {
+    if (config is null)
+      throw new ArgumentNullException(nameof(config));
+
     var xamlOptions = new XamlOptions();
     options?.Invoke(xamlOptions);
 
@@ -55,8 +60,12 @@ public static CslaOptions AddXaml(this CslaOptions config, Action<XamlOptions> o
   /// Initializes CSLA for use by Xaml apps.
   /// </summary>
   /// <param name="host"></param>
+  /// <exception cref="ArgumentNullException"><paramref name="host"/> is <see langword="null"/>.</exception>
   public static IHost UseCsla(this IHost host)
   {
+    if (host is null)
+      throw new ArgumentNullException(nameof(host));
+
     // create instance of ApplicationContext so the
     // Csla.Xaml.ApplicationContextManager gets a static
     // reference for use by UI helpers.
@@ -67,8 +76,3 @@ public static IHost UseCsla(this IHost host)
   }
 #endif
 }
-
-/// <summary>
-/// Configuration options for AddXaml method
-/// </summary>
-public class XamlOptions;

Source/Csla.Xaml.Shared/Csla.Xaml.Shared.projitems

@@ -30,5 +30,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)TriggerAction.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModelBase.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)XamlOptions.cs" />
   </ItemGroup>
 </Project>