update baselines

OpenRIAServices · Jun 9, 2024 · ec7829b · ec7829b
1 parent e97d331
commit ec7829b
Show file tree

Hide file tree

Showing 44 changed files with 845 additions and 453 deletions.
diff --git a/...t/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Cities/Cities.g.cs b/...t/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Cities/Cities.g.cs
@@ -112,7 +112,11 @@ public string CalculatedCounty
         /// <summary>
         /// Gets or sets the associated <see cref="County"/> entity.
         /// </summary>
-        [Association("County_City", "CountyName,StateName", "Name,StateName", IsForeignKey=true)]
+        [EntityAssociation("County_City", new string[] {
+                "CountyName",
+                "StateName"}, new string[] {
+                "Name",
+                "StateName"}, IsForeignKey=true)]
         public County County
         {
             get
@@ -241,7 +245,13 @@ public string StateName
         /// <summary>
         /// Gets the collection of associated <see cref="Zip"/> entity instances.
         /// </summary>
-        [Association("City_Zip", "Name, CountyName, StateName", "CityName,  CountyName, StateName")]
+        [EntityAssociation("City_Zip", new string[] {
+                "Name",
+                "CountyName",
+                "StateName"}, new string[] {
+                "CityName",
+                "CountyName",
+                "StateName"})]
         public EntityCollection<Zip> ZipCodes
         {
             get
@@ -1587,7 +1597,13 @@ public string Info
         /// <summary>
         /// Gets the collection of associated <see cref="ZipWithInfo"/> entity instances.
         /// </summary>
-        [Association("CityWithInfo_ZipWithInfo", "Name, CountyName, StateName", "CityName,  CountyName, StateName")]
+        [EntityAssociation("CityWithInfo_ZipWithInfo", new string[] {
+                "Name",
+                "CountyName",
+                "StateName"}, new string[] {
+                "CityName",
+                "CountyName",
+                "StateName"})]
         public EntityCollection<ZipWithInfo> ZipCodesWithInfo
         {
             get
@@ -1685,7 +1701,11 @@ public County()
         /// <summary>
         /// Gets the collection of associated <see cref="City"/> entity instances.
         /// </summary>
-        [Association("County_City", "Name,StateName", "CountyName,StateName")]
+        [EntityAssociation("County_City", new string[] {
+                "Name",
+                "StateName"}, new string[] {
+                "CountyName",
+                "StateName"})]
         public EntityCollection<City> Cities
         {
             get
@@ -1730,7 +1750,9 @@ public string Name
         /// <summary>
         /// Gets or sets the associated <see cref="State"/> entity.
         /// </summary>
-        [Association("State_County", "StateName", "Name", IsForeignKey=true)]
+        [EntityAssociation("State_County", new string[] {
+                "StateName"}, new string[] {
+                "Name"}, IsForeignKey=true)]
         public State State
         {
             get
@@ -1906,9 +1928,11 @@ public State()
         /// <summary>
         /// Gets the collection of associated <see cref="County"/> entity instances.
         /// </summary>
-        [Association("State_County", "Name", "StateName")]
         [CustomValidation(typeof(CountiesValidator), "AreCountiesValid")]
         [Editable(false)]
+        [EntityAssociation("State_County", new string[] {
+                "Name"}, new string[] {
+                "StateName"})]
         [ReadOnly(true)]
         public EntityCollection<County> Counties
         {
@@ -2117,8 +2141,14 @@ public Zip()
         /// <summary>
         /// Gets or sets the associated <see cref="City"/> entity.
         /// </summary>
-        [Association("City_Zip", "CityName,  CountyName, StateName", "Name, CountyName, StateName", IsForeignKey=true)]
         [CustomValidation(typeof(CityPropertyValidator), "IsValidCity")]
+        [EntityAssociation("City_Zip", new string[] {
+                "CityName",
+                "CountyName",
+                "StateName"}, new string[] {
+                "Name",
+                "CountyName",
+                "StateName"}, IsForeignKey=true)]
         public City City
         {
             get

diff --git a/...t/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Cities/Cities.g.vb b/...t/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Cities/Cities.g.vb
@@ -131,7 +131,7 @@ Namespace Cities
         ''' <summary>
         ''' Gets or sets the associated <see cref="County"/> entity.
         ''' </summary>
-        <Association("County_City", "CountyName,StateName", "Name,StateName", IsForeignKey:=true)>  _
+        <EntityAssociation("County_City", New String() {"CountyName", "StateName"}, New String() {"Name", "StateName"}, IsForeignKey:=true)>  _
         Public Property County() As County
             Get
                 If (Me._county Is Nothing) Then
@@ -238,7 +238,7 @@ Namespace Cities
         ''' <summary>
         ''' Gets the collection of associated <see cref="Zip"/> entity instances.
         ''' </summary>
-        <Association("City_Zip", "Name, CountyName, StateName", "CityName,  CountyName, StateName")>  _
+        <EntityAssociation("City_Zip", New String() {"Name", "CountyName", "StateName"}, New String() {"CityName", "CountyName", "StateName"})>  _
         Public ReadOnly Property ZipCodes() As EntityCollection(Of Zip)
             Get
                 If (Me._zipCodes Is Nothing) Then
@@ -1497,7 +1497,7 @@ Namespace Cities
         ''' <summary>
         ''' Gets the collection of associated <see cref="ZipWithInfo"/> entity instances.
         ''' </summary>
-        <Association("CityWithInfo_ZipWithInfo", "Name, CountyName, StateName", "CityName,  CountyName, StateName")>  _
+        <EntityAssociation("CityWithInfo_ZipWithInfo", New String() {"Name", "CountyName", "StateName"}, New String() {"CityName", "CountyName", "StateName"})>  _
         Public ReadOnly Property ZipCodesWithInfo() As EntityCollection(Of ZipWithInfo)
             Get
                 If (Me._zipCodesWithInfo Is Nothing) Then
@@ -1590,7 +1590,7 @@ Namespace Cities
         ''' <summary>
         ''' Gets the collection of associated <see cref="City"/> entity instances.
         ''' </summary>
-        <Association("County_City", "Name,StateName", "CountyName,StateName")>  _
+        <EntityAssociation("County_City", New String() {"Name", "StateName"}, New String() {"CountyName", "StateName"})>  _
         Public ReadOnly Property Cities() As EntityCollection(Of City)
             Get
                 If (Me._cities Is Nothing) Then
@@ -1628,7 +1628,7 @@ Namespace Cities
         ''' <summary>
         ''' Gets or sets the associated <see cref="State"/> entity.
         ''' </summary>
-        <Association("State_County", "StateName", "Name", IsForeignKey:=true)>  _
+        <EntityAssociation("State_County", New String() {"StateName"}, New String() {"Name"}, IsForeignKey:=true)>  _
         Public Property State() As State
             Get
                 If (Me._state Is Nothing) Then
@@ -1791,9 +1791,9 @@ Namespace Cities
         ''' <summary>
         ''' Gets the collection of associated <see cref="County"/> entity instances.
         ''' </summary>
-        <Association("State_County", "Name", "StateName"),  _
-         CustomValidation(GetType(CountiesValidator), "AreCountiesValid"),  _
+        <CustomValidation(GetType(CountiesValidator), "AreCountiesValid"),  _
          Editable(false),  _
+         EntityAssociation("State_County", New String() {"Name"}, New String() {"StateName"}),  _
          [ReadOnly](true)>  _
         Public ReadOnly Property Counties() As EntityCollection(Of County)
             Get
@@ -1995,8 +1995,8 @@ Namespace Cities
         ''' <summary>
         ''' Gets or sets the associated <see cref="City"/> entity.
         ''' </summary>
-        <Association("City_Zip", "CityName,  CountyName, StateName", "Name, CountyName, StateName", IsForeignKey:=true),  _
-         CustomValidation(GetType(CityPropertyValidator), "IsValidCity")>  _
+        <CustomValidation(GetType(CityPropertyValidator), "IsValidCity"),  _
+         EntityAssociation("City_Zip", New String() {"CityName", "CountyName", "StateName"}, New String() {"Name", "CountyName", "StateName"}, IsForeignKey:=true)>  _
         Public Property City() As City
             Get
                 If (Me._city Is Nothing) Then

diff --git a/...t/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/EF/Catalog_EF.g.cs b/...t/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/EF/Catalog_EF.g.cs
@@ -1,7 +1,6 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34209
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -296,7 +295,9 @@ public string LoginID
         /// <summary>
         /// Gets or sets the associated <see cref="Employee"/> entity.
         /// </summary>
-        [Association("Employee_Employee", "ManagerID", "EmployeeID", IsForeignKey=true)]
+        [EntityAssociation("Employee_Employee", new string[] {
+                "ManagerID"}, new string[] {
+                "EmployeeID"}, IsForeignKey=true)]
         public Employee Manager
         {
             get
@@ -440,7 +441,9 @@ public string NationalIDNumber
         /// <summary>
         /// Gets the collection of associated <see cref="PurchaseOrder"/> entity instances.
         /// </summary>
-        [Association("Employee_PurchaseOrder", "EmployeeID", "EmployeeID")]
+        [EntityAssociation("Employee_PurchaseOrder", new string[] {
+                "EmployeeID"}, new string[] {
+                "EmployeeID"})]
         public EntityCollection<PurchaseOrder> PurchaseOrders
         {
             get
@@ -456,7 +459,9 @@ public EntityCollection<PurchaseOrder> PurchaseOrders
         /// <summary>
         /// Gets the collection of associated <see cref="Employee"/> entity instances.
         /// </summary>
-        [Association("Employee_Employee", "EmployeeID", "ManagerID")]
+        [EntityAssociation("Employee_Employee", new string[] {
+                "EmployeeID"}, new string[] {
+                "ManagerID"})]
         public EntityCollection<Employee> Reports
         {
             get
@@ -1260,7 +1265,9 @@ public Nullable<int> ProductSubcategoryID
         /// <summary>
         /// Gets the collection of associated <see cref="PurchaseOrderDetail"/> entity instances.
         /// </summary>
-        [Association("Product_PurchaseOrderDetail", "ProductID", "ProductID")]
+        [EntityAssociation("Product_PurchaseOrderDetail", new string[] {
+                "ProductID"}, new string[] {
+                "ProductID"})]
         public EntityCollection<PurchaseOrderDetail> PurchaseOrderDetails
         {
             get
@@ -1630,7 +1637,9 @@ public PurchaseOrder()
         /// <summary>
         /// Gets or sets the associated <see cref="Employee"/> entity.
         /// </summary>
-        [Association("Employee_PurchaseOrder", "EmployeeID", "EmployeeID", IsForeignKey=true)]
+        [EntityAssociation("Employee_PurchaseOrder", new string[] {
+                "EmployeeID"}, new string[] {
+                "EmployeeID"}, IsForeignKey=true)]
         public Employee Employee
         {
             get
@@ -1770,7 +1779,9 @@ public DateTime OrderDate
         /// <summary>
         /// Gets the collection of associated <see cref="PurchaseOrderDetail"/> entity instances.
         /// </summary>
-        [Association("PurchaseOrder_PurchaseOrderDetail", "PurchaseOrderID", "PurchaseOrderID")]
+        [EntityAssociation("PurchaseOrder_PurchaseOrderDetail", new string[] {
+                "PurchaseOrderID"}, new string[] {
+                "PurchaseOrderID"})]
         public EntityCollection<PurchaseOrderDetail> PurchaseOrderDetails
         {
             get
@@ -2206,7 +2217,9 @@ public short OrderQty
         /// <summary>
         /// Gets or sets the associated <see cref="Product"/> entity.
         /// </summary>
-        [Association("Product_PurchaseOrderDetail", "ProductID", "ProductID", IsForeignKey=true)]
+        [EntityAssociation("Product_PurchaseOrderDetail", new string[] {
+                "ProductID"}, new string[] {
+                "ProductID"}, IsForeignKey=true)]
         public Product Product
         {
             get
@@ -2274,7 +2287,9 @@ public int ProductID
         /// <summary>
         /// Gets or sets the associated <see cref="PurchaseOrder"/> entity.
         /// </summary>
-        [Association("PurchaseOrder_PurchaseOrderDetail", "PurchaseOrderID", "PurchaseOrderID", IsForeignKey=true)]
+        [EntityAssociation("PurchaseOrder_PurchaseOrderDetail", new string[] {
+                "PurchaseOrderID"}, new string[] {
+                "PurchaseOrderID"}, IsForeignKey=true)]
         public PurchaseOrder PurchaseOrder
         {
             get

diff --git a/...t/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/EF/Catalog_EF.g.vb b/...t/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/EF/Catalog_EF.g.vb
@@ -1,7 +1,6 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:4.0.30319.34209
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -312,7 +311,7 @@ Namespace AdventureWorksModel
         ''' <summary>
         ''' Gets or sets the associated <see cref="Employee"/> entity.
         ''' </summary>
-        <Association("Employee_Employee", "ManagerID", "EmployeeID", IsForeignKey:=true)>  _
+        <EntityAssociation("Employee_Employee", New String() {"ManagerID"}, New String() {"EmployeeID"}, IsForeignKey:=true)>  _
         Public Property Manager() As Employee
             Get
                 If (Me._manager Is Nothing) Then
@@ -431,7 +430,7 @@ Namespace AdventureWorksModel
         ''' <summary>
         ''' Gets the collection of associated <see cref="PurchaseOrder"/> entity instances.
         ''' </summary>
-        <Association("Employee_PurchaseOrder", "EmployeeID", "EmployeeID")>  _
+        <EntityAssociation("Employee_PurchaseOrder", New String() {"EmployeeID"}, New String() {"EmployeeID"})>  _
         Public ReadOnly Property PurchaseOrders() As EntityCollection(Of PurchaseOrder)
             Get
                 If (Me._purchaseOrders Is Nothing) Then
@@ -444,7 +443,7 @@ Namespace AdventureWorksModel
         ''' <summary>
         ''' Gets the collection of associated <see cref="Employee"/> entity instances.
         ''' </summary>
-        <Association("Employee_Employee", "EmployeeID", "ManagerID")>  _
+        <EntityAssociation("Employee_Employee", New String() {"EmployeeID"}, New String() {"ManagerID"})>  _
         Public ReadOnly Property Reports() As EntityCollection(Of Employee)
             Get
                 If (Me._reports Is Nothing) Then
@@ -1214,7 +1213,7 @@ Namespace AdventureWorksModel
         ''' <summary>
         ''' Gets the collection of associated <see cref="PurchaseOrderDetail"/> entity instances.
         ''' </summary>
-        <Association("Product_PurchaseOrderDetail", "ProductID", "ProductID")>  _
+        <EntityAssociation("Product_PurchaseOrderDetail", New String() {"ProductID"}, New String() {"ProductID"})>  _
         Public ReadOnly Property PurchaseOrderDetails() As EntityCollection(Of PurchaseOrderDetail)
             Get
                 If (Me._purchaseOrderDetails Is Nothing) Then
@@ -1568,7 +1567,7 @@ Namespace AdventureWorksModel
         ''' <summary>
         ''' Gets or sets the associated <see cref="Employee"/> entity.
         ''' </summary>
-        <Association("Employee_PurchaseOrder", "EmployeeID", "EmployeeID", IsForeignKey:=true)>  _
+        <EntityAssociation("Employee_PurchaseOrder", New String() {"EmployeeID"}, New String() {"EmployeeID"}, IsForeignKey:=true)>  _
         Public Property Employee() As Employee
             Get
                 If (Me._employee Is Nothing) Then
@@ -1686,7 +1685,7 @@ Namespace AdventureWorksModel
         ''' <summary>
         ''' Gets the collection of associated <see cref="PurchaseOrderDetail"/> entity instances.
         ''' </summary>
-        <Association("PurchaseOrder_PurchaseOrderDetail", "PurchaseOrderID", "PurchaseOrderID")>  _
+        <EntityAssociation("PurchaseOrder_PurchaseOrderDetail", New String() {"PurchaseOrderID"}, New String() {"PurchaseOrderID"})>  _
         Public ReadOnly Property PurchaseOrderDetails() As EntityCollection(Of PurchaseOrderDetail)
             Get
                 If (Me._purchaseOrderDetails Is Nothing) Then
@@ -2097,7 +2096,7 @@ Namespace AdventureWorksModel
         ''' <summary>
         ''' Gets or sets the associated <see cref="Product"/> entity.
         ''' </summary>
-        <Association("Product_PurchaseOrderDetail", "ProductID", "ProductID", IsForeignKey:=true)>  _
+        <EntityAssociation("Product_PurchaseOrderDetail", New String() {"ProductID"}, New String() {"ProductID"}, IsForeignKey:=true)>  _
         Public Property Product() As Product
             Get
                 If (Me._product Is Nothing) Then
@@ -2152,7 +2151,7 @@ Namespace AdventureWorksModel
         ''' <summary>
         ''' Gets or sets the associated <see cref="PurchaseOrder"/> entity.
         ''' </summary>
-        <Association("PurchaseOrder_PurchaseOrderDetail", "PurchaseOrderID", "PurchaseOrderID", IsForeignKey:=true)>  _
+        <EntityAssociation("PurchaseOrder_PurchaseOrderDetail", New String() {"PurchaseOrderID"}, New String() {"PurchaseOrderID"}, IsForeignKey:=true)>  _
         Public Property PurchaseOrder() As PurchaseOrder
             Get
                 If (Me._purchaseOrder Is Nothing) Then