Fix build errors due to ICommandObject usage

Author: rockfordlhotka

Source/Csla/DataPortalT.cs

@@ -24,7 +24,8 @@ namespace Csla
   /// <typeparam name="T">
   /// Type of business object.
   /// </typeparam>
-  public class DataPortal<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T> : IDataPortal<T>, IChildDataPortal<T>, IDataPortal, IChildDataPortal where T : notnull, ICslaObject
+  public class DataPortal<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T> 
+    : IDataPortal<T>, IChildDataPortal<T>, IDataPortal, IChildDataPortal where T : notnull, ICslaObject
   {
     /// <summary>
     /// Gets or sets the current ApplicationContext object.
@@ -739,12 +740,12 @@ public async Task UpdateChildAsync(T child, params object?[]? parameters)
     async Task<ICslaObject> IDataPortal.CreateAsync(params object?[]? criteria) => await CreateAsync(criteria);
     async Task<ICslaObject> IDataPortal.FetchAsync(params object?[]? criteria) => await FetchAsync(criteria);
     async Task<ICslaObject> IDataPortal.UpdateAsync(ICslaObject obj) => await UpdateAsync((T)obj);
-    async Task<ICommandObject> IDataPortal.ExecuteAsync(ICommandObject command) => await ExecuteAsync((T)command);
-    async Task<object> IDataPortal.ExecuteAsync(params object?[]? criteria) => await ExecuteAsync(criteria);
+    async Task<ICslaObject> IDataPortal.ExecuteAsync(ICslaObject command) => await ExecuteAsync((T)command);
+    async Task<ICslaObject> IDataPortal.ExecuteAsync(params object?[]? criteria) => await ExecuteAsync(criteria);
     ICslaObject IDataPortal.Create(params object?[]? criteria) => Create(criteria);
     ICslaObject IDataPortal.Fetch(params object?[]? criteria) => Fetch(criteria);
-    ICommandObject IDataPortal.Execute(ICommandObject obj) => Execute((T)obj);
-    object IDataPortal.Execute(params object?[]? criteria) => Execute(criteria);
+    ICslaObject IDataPortal.Execute(ICslaObject obj) => Execute((T)obj);
+    ICslaObject IDataPortal.Execute(params object?[]? criteria) => Execute(criteria);
     ICslaObject IDataPortal.Update(ICslaObject obj) => Update((T)obj);
 
     async Task<object> IChildDataPortal.CreateChildAsync(params object?[]? criteria) => Task.FromResult(await CreateChildAsync(criteria));

Source/Csla/IDataPortal.cs

@@ -44,15 +44,15 @@ public interface IDataPortal
     /// </summary>
     /// <param name="command">Command object to execute.</param>
     /// <exception cref="ArgumentNullException"><paramref name="command"/> is <see langword="null"/>.</exception>
-    Task<ICommandObject> ExecuteAsync(ICommandObject command);
+    Task<ICslaObject> ExecuteAsync(ICslaObject command);
     /// <summary>
     /// Execute a command on the logical server.
     /// </summary>
     /// <param name="criteria">
     /// Criteria provided to the command object.
     /// </param>
     /// <returns>The resulting command object.</returns>
-    Task<object> ExecuteAsync(params object?[]? criteria);
+    Task<ICslaObject> ExecuteAsync(params object?[]? criteria);
     /// <summary>
     /// Called by a factory method in a business class or
     /// by the UI to delete an object.
@@ -95,15 +95,15 @@ public interface IDataPortal
     /// <param name="obj">A reference to the Command object to be executed.</param>
     /// <returns>A reference to the updated Command object.</returns>
     /// <exception cref="ArgumentNullException"><paramref name="obj"/> is <see langword="null"/>.</exception>
-    ICommandObject Execute(ICommandObject obj);
+    ICslaObject Execute(ICslaObject obj);
     /// <summary>
     /// Execute a command on the logical server.
     /// </summary>
     /// <param name="criteria">
     /// Criteria provided to the command object.
     /// </param>
     /// <returns>The resulting command object.</returns>
-    object Execute(params object?[]? criteria);
+    ICslaObject Execute(params object?[]? criteria);
     /// <summary>
     /// Insert, update or delete an object in the database.
     /// </summary>