Add constraint to IDataPortal<T> and IChildDataPortal<T> to satisfy the constraint on the actual implementations.

StefanOssendorf · StefanOssendorf · commit e05797c8bdb7 · 2026-01-14T22:37:30.000+01:00
diff --git a/Source/Csla/DataPortalClient/DataPortalFactory.cs b/Source/Csla/DataPortalClient/DataPortalFactory.cs
@@ -9,6 +9,7 @@
 using Microsoft.Extensions.DependencyInjection;
 
 using System.Diagnostics.CodeAnalysis;
+using Csla.Core;
 
 namespace Csla.DataPortalClient
 {
@@ -35,6 +36,7 @@ public DataPortalFactory(IServiceProvider serviceProvider)
     /// </summary>
     /// <typeparam name="T">Root business object type</typeparam>
     public IDataPortal<T> GetPortal<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>()
+      where T : ICslaObject
     {
       return (IDataPortal<T>)_serviceProvider.GetRequiredService(typeof(IDataPortal<T>));
     }
diff --git a/Source/Csla/IChildDataPortalFactory.cs b/Source/Csla/IChildDataPortalFactory.cs
@@ -6,6 +6,7 @@
 // <summary>Implements a data portal service</summary>
 //-----------------------------------------------------------------------
 using System.Diagnostics.CodeAnalysis;
+using Csla.Core;
 
 namespace Csla
 {
@@ -20,6 +21,7 @@ public interface IChildDataPortalFactory
     /// Get a child data portal instance.
     /// </summary>
     /// <typeparam name="T">Child business object type</typeparam>
-    IChildDataPortal<T> GetPortal<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>();
+    IChildDataPortal<T> GetPortal<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>()
+      where T : ICslaObject;
   }
 }
diff --git a/Source/Csla/IChildDataPortalT.cs b/Source/Csla/IChildDataPortalT.cs
@@ -7,6 +7,7 @@
 //-----------------------------------------------------------------------
 
 using System.Diagnostics.CodeAnalysis;
+using Csla.Core;
 
 namespace Csla
 {
@@ -15,6 +16,7 @@ namespace Csla
   /// </summary>
   /// <typeparam name="T"></typeparam>
   public interface IChildDataPortal<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>
+    where T : ICslaObject
   {
     /// <summary>
     /// Starts an asynchronous data portal operation to
diff --git a/Source/Csla/IDataPortalFactory.cs b/Source/Csla/IDataPortalFactory.cs
@@ -6,6 +6,7 @@
 // <summary>Implements a data portal service</summary>
 //-----------------------------------------------------------------------
 using System.Diagnostics.CodeAnalysis;
+using Csla.Core;
 
 namespace Csla
 {
@@ -20,6 +21,7 @@ public interface IDataPortalFactory
     /// Get a client-side data portal instance.
     /// </summary>
     /// <typeparam name="T">Root business object type</typeparam>
-    IDataPortal<T> GetPortal<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>();
+    IDataPortal<T> GetPortal<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>()
+      where T : ICslaObject;
   }
 }
diff --git a/Source/Csla/IDataPortalT.cs b/Source/Csla/IDataPortalT.cs
@@ -7,6 +7,7 @@
 //-----------------------------------------------------------------------
 
 using System.Diagnostics.CodeAnalysis;
+using Csla.Core;
 
 namespace Csla
 {
@@ -15,6 +16,7 @@ namespace Csla
   /// </summary>
   /// <typeparam name="T"></typeparam>
   public interface IDataPortal<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>
+    where T : ICslaObject
   {
     /// <summary>
     /// Starts an asynchronous data portal operation to
diff --git a/Source/Csla/Server/ChildDataPortalFactory.cs b/Source/Csla/Server/ChildDataPortalFactory.cs
@@ -7,7 +7,7 @@
 //-----------------------------------------------------------------------
 
 using System.Diagnostics.CodeAnalysis;
-
+using Csla.Core;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Csla.Server
@@ -35,6 +35,7 @@ public ChildDataPortalFactory(IServiceProvider serviceProvider)
     /// </summary>
     /// <typeparam name="T">Root business object type</typeparam>
     public IChildDataPortal<T> GetPortal<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]T>()
+      where T : ICslaObject
     {
       return _serviceProvider.GetRequiredService<IChildDataPortal<T>>();
     }
diff --git a/Source/tests/Csla.TestHelpers/DataPortalFactory.cs b/Source/tests/Csla.TestHelpers/DataPortalFactory.cs
@@ -6,6 +6,7 @@
 // <summary>Factory for dataportal instances for use in tests</summary>
 //-----------------------------------------------------------------------
 
+using Csla.Core;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Csla.TestHelpers
@@ -19,7 +20,7 @@ public static class DataPortalFactory
     /// <typeparam name="T">The type which the data portal is to service</typeparam>
     /// <param name="context">The context from which configuration can be retrieved</param>
     /// <returns>An instance of IDataPortal<typeparamref name="T"/> for use in data access during tests</returns>
-    public static IDataPortal<T> CreateDataPortal<T>(TestDIContext context)
+    public static IDataPortal<T> CreateDataPortal<T>(TestDIContext context) where T : ICslaObject
     {
       IDataPortal<T> dataPortal;
 
@@ -33,7 +34,7 @@ public static IDataPortal<T> CreateDataPortal<T>(TestDIContext context)
     /// <typeparam name="T">The type which the child data portal is to service</typeparam>
     /// <param name="context">The context from which configuration can be retrieved</param>
     /// <returns>An instance of IChildDataPortal<typeparamref name="T"/> for use in data access during tests</returns>
-    public static IChildDataPortal<T> CreateChildDataPortal<T>(TestDIContext context)
+    public static IChildDataPortal<T> CreateChildDataPortal<T>(TestDIContext context) where T : ICslaObject
     {
       IChildDataPortal<T> dataPortal;
 
diff --git a/Source/tests/Csla.TestHelpers/TestDIContextExtensions.cs b/Source/tests/Csla.TestHelpers/TestDIContextExtensions.cs
@@ -6,6 +6,8 @@
 // <summary>Extension methods for the TestDIContext type</summary>
 //-----------------------------------------------------------------------
 
+using Csla.Core;
+
 namespace Csla.TestHelpers
 {
 
@@ -30,7 +32,7 @@ public static ApplicationContext CreateTestApplicationContext(this TestDIContext
     /// </summary>
     /// <param name="context">The context from which configuration can be retrieved</param>
     /// <returns>An instance of IDataPortal<typeparamref name="T"/> for use in testing</returns>
-    public static IDataPortal<T> CreateDataPortal<T>(this TestDIContext context)
+    public static IDataPortal<T> CreateDataPortal<T>(this TestDIContext context) where T : ICslaObject
     {
       return DataPortalFactory.CreateDataPortal<T>(context);
     }
@@ -40,7 +42,7 @@ public static IDataPortal<T> CreateDataPortal<T>(this TestDIContext context)
     /// </summary>
     /// <param name="context">The context from which configuration can be retrieved</param>
     /// <returns>An instance of IChildDataPortal<typeparamref name="T"/> for use in testing</returns>
-    public static IChildDataPortal<T> CreateChildDataPortal<T>(this TestDIContext context)
+    public static IChildDataPortal<T> CreateChildDataPortal<T>(this TestDIContext context) where T : ICslaObject
     {
       return DataPortalFactory.CreateChildDataPortal<T>(context);
     }
diff --git a/Source/tests/Csla.test/BusinessBase/BusynessTests.cs b/Source/tests/Csla.test/BusinessBase/BusynessTests.cs
@@ -6,6 +6,7 @@
 // <summary>no summary</summary>
 //-----------------------------------------------------------------------
 using Csla;
+using Csla.Core;
 using Csla.TestHelpers;
 using Csla.Test;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -97,7 +98,7 @@ public void IsBusyShouldNotGoInMinus()
       }
     }
 
-    private T CreateWithoutCriteria<T>()
+    private T CreateWithoutCriteria<T>() where T : ICslaObject
     {
       IDataPortal<T> dataPortal = _testDIContext.CreateDataPortal<T>();
 
diff --git a/Source/tests/Csla.test/PropertyGetSet/EditableGetSet.cs b/Source/tests/Csla.test/PropertyGetSet/EditableGetSet.cs
@@ -6,6 +6,7 @@
 // <summary>no summary</summary>
 //-----------------------------------------------------------------------
 
+using Csla.Core;
 using Csla.Serialization.Mobile;
 
 namespace Csla.Test.PropertyGetSet
@@ -294,7 +295,7 @@ protected override void OnSetState(SerializationInfo info, Core.StateMode mode)
     /// </summary>
     /// <typeparam name="T">The type which is to be accessed</typeparam>
     /// <returns>An instance of IDataPortal for use in data access</returns>
-    private IDataPortal<T> GetDataPortal<T>() where T:class
+    private IDataPortal<T> GetDataPortal<T>() where T : ICslaObject
     {
       return ApplicationContext.GetRequiredService<IDataPortal<T>>();
     }
diff --git a/Source/tests/Csla.test/ValidationRules/HasChildren.cs b/Source/tests/Csla.test/ValidationRules/HasChildren.cs
@@ -75,7 +75,7 @@ private Task Create()
     /// </summary>
     /// <typeparam name="T">The type which is to be accessed</typeparam>
     /// <returns>An instance of IDataPortal for use in data access</returns>
-    private IDataPortal<T> GetDataPortal<T>() where T : class
+    private IDataPortal<T> GetDataPortal<T>() where T : ICslaObject
     {
       return ApplicationContext.GetRequiredService<IDataPortal<T>>();
     }
diff --git a/Source/tests/Csla.test/ValidationRules/ValidationTests.cs b/Source/tests/Csla.test/ValidationRules/ValidationTests.cs
@@ -463,21 +463,21 @@ public void BrokenRulesPriority()
       Assert.AreEqual("Check capitalization", root.BrokenRulesCollection.GetFirstBrokenRule("Name").Description, "'Check capitalization' should be broken (GetFirstBrokenRule)");
     }
 
-    private T CreateWithoutCriteria<T>()
+    private T CreateWithoutCriteria<T>() where T : ICslaObject
     {
       IDataPortal<T> dataPortal = _testDIContext.CreateDataPortal<T>();
 
       return dataPortal.Create();
     }
 
-    private async Task<T> CreateWithoutCriteriaAsync<T>()
+    private async Task<T> CreateWithoutCriteriaAsync<T>() where T : ICslaObject
     {
       IDataPortal<T> dataPortal = _testDIContext.CreateDataPortal<T>();
 
       return await dataPortal.CreateAsync();
     }
 
-    private T CreateChildWithoutCriteria<T>()
+    private T CreateChildWithoutCriteria<T>() where T : ICslaObject
     {
       IChildDataPortal<T> dataPortal = _testDIContext.CreateChildDataPortal<T>();
 
diff --git a/Source/tests/GraphMergerTest/GraphMergerTest.Business/Factory/FactoryBase.cs b/Source/tests/GraphMergerTest/GraphMergerTest.Business/Factory/FactoryBase.cs
@@ -1,8 +1,10 @@
 ﻿using Csla;
+using Csla.Core;
 
 namespace GraphMergerTest.Business
 {
   public abstract class FactoryBase<T>
+    where T : ICslaObject
   {
     protected IDataPortal<T> DataPortal { get; set; }
 

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`using Microsoft.Extensions.DependencyInjection;`
`10`	`10`
`11`	`11`	`using System.Diagnostics.CodeAnalysis;`
	`12`	`+using Csla.Core;`
`12`	`13`
`13`	`14`	`namespace Csla.DataPortalClient`
`14`	`15`	`{`
`@@ -35,6 +36,7 @@ public DataPortalFactory(IServiceProvider serviceProvider)`
`35`	`36`	`/// </summary>`
`36`	`37`	`/// <typeparam name="T">Root business object type</typeparam>`
`37`	`38`	`public IDataPortal<T> GetPortal<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>()`
	`39`	`+ where T : ICslaObject`
`38`	`40`	`{`
`39`	`41`	`return (IDataPortal<T>)_serviceProvider.GetRequiredService(typeof(IDataPortal<T>));`
`40`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`// <summary>Implements a data portal service</summary>`
`7`	`7`	`//-----------------------------------------------------------------------`
`8`	`8`	`using System.Diagnostics.CodeAnalysis;`
	`9`	`+using Csla.Core;`
`9`	`10`
`10`	`11`	`namespace Csla`
`11`	`12`	`{`
`@@ -20,6 +21,7 @@ public interface IChildDataPortalFactory`
`20`	`21`	`/// Get a child data portal instance.`
`21`	`22`	`/// </summary>`
`22`	`23`	`/// <typeparam name="T">Child business object type</typeparam>`
`23`		`- IChildDataPortal<T> GetPortal<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>();`
	`24`	`+ IChildDataPortal<T> GetPortal<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>()`
	`25`	`+ where T : ICslaObject;`
`24`	`26`	`}`
`25`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`//-----------------------------------------------------------------------`
`8`	`8`
`9`	`9`	`using System.Diagnostics.CodeAnalysis;`
	`10`	`+using Csla.Core;`
`10`	`11`
`11`	`12`	`namespace Csla`
`12`	`13`	`{`
`@@ -15,6 +16,7 @@ namespace Csla`
`15`	`16`	`/// </summary>`
`16`	`17`	`/// <typeparam name="T"></typeparam>`
`17`	`18`	`public interface IChildDataPortal<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>`
	`19`	`+ where T : ICslaObject`
`18`	`20`	`{`
`19`	`21`	`/// <summary>`
`20`	`22`	`/// Starts an asynchronous data portal operation to`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`//-----------------------------------------------------------------------`
`8`	`8`
`9`	`9`	`using System.Diagnostics.CodeAnalysis;`
`10`		`-`
	`10`	`+using Csla.Core;`
`11`	`11`	`using Microsoft.Extensions.DependencyInjection;`
`12`	`12`
`13`	`13`	`namespace Csla.Server`
`@@ -35,6 +35,7 @@ public ChildDataPortalFactory(IServiceProvider serviceProvider)`
`35`	`35`	`/// </summary>`
`36`	`36`	`/// <typeparam name="T">Root business object type</typeparam>`
`37`	`37`	`public IChildDataPortal<T> GetPortal<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]T>()`
	`38`	`+ where T : ICslaObject`
`38`	`39`	`{`
`39`	`40`	`return _serviceProvider.GetRequiredService<IChildDataPortal<T>>();`
`40`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`	`// <summary>Extension methods for the TestDIContext type</summary>`
`7`	`7`	`//-----------------------------------------------------------------------`
`8`	`8`
	`9`	`+using Csla.Core;`
	`10`	`+`
`9`	`11`	`namespace Csla.TestHelpers`
`10`	`12`	`{`
`11`	`13`
`@@ -30,7 +32,7 @@ public static ApplicationContext CreateTestApplicationContext(this TestDIContext`
`30`	`32`	`/// </summary>`
`31`	`33`	`/// <param name="context">The context from which configuration can be retrieved</param>`
`32`	`34`	`/// <returns>An instance of IDataPortal<typeparamref name="T"/> for use in testing</returns>`
`33`		`- public static IDataPortal<T> CreateDataPortal<T>(this TestDIContext context)`
	`35`	`+ public static IDataPortal<T> CreateDataPortal<T>(this TestDIContext context) where T : ICslaObject`
`34`	`36`	`{`
`35`	`37`	`return DataPortalFactory.CreateDataPortal<T>(context);`
`36`	`38`	`}`
`@@ -40,7 +42,7 @@ public static IDataPortal<T> CreateDataPortal<T>(this TestDIContext context)`
`40`	`42`	`/// </summary>`
`41`	`43`	`/// <param name="context">The context from which configuration can be retrieved</param>`
`42`	`44`	`/// <returns>An instance of IChildDataPortal<typeparamref name="T"/> for use in testing</returns>`
`43`		`- public static IChildDataPortal<T> CreateChildDataPortal<T>(this TestDIContext context)`
	`45`	`+ public static IChildDataPortal<T> CreateChildDataPortal<T>(this TestDIContext context) where T : ICslaObject`
`44`	`46`	`{`
`45`	`47`	`return DataPortalFactory.CreateChildDataPortal<T>(context);`
`46`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`// <summary>no summary</summary>`
`7`	`7`	`//-----------------------------------------------------------------------`
`8`	`8`	`using Csla;`
	`9`	`+using Csla.Core;`
`9`	`10`	`using Csla.TestHelpers;`
`10`	`11`	`using Csla.Test;`
`11`	`12`	`using Microsoft.VisualStudio.TestTools.UnitTesting;`
`@@ -97,7 +98,7 @@ public void IsBusyShouldNotGoInMinus()`
`97`	`98`	`}`
`98`	`99`	`}`
`99`	`100`
`100`		`- private T CreateWithoutCriteria<T>()`
	`101`	`+ private T CreateWithoutCriteria<T>() where T : ICslaObject`
`101`	`102`	`{`
`102`	`103`	`IDataPortal<T> dataPortal = _testDIContext.CreateDataPortal<T>();`
`103`	`104`