From 44709a16fb716cb99fdd4f9fe7da8466f4135d20 Mon Sep 17 00:00:00 2001 From: Daniel Svensson Date: Sun, 9 Jun 2024 18:24:38 +0200 Subject: [PATCH] update NETFRAMEWORK only baselines --- .../Baselines/Default/LTS/Catalog_LTS.g.cs | 32 ++++++-- .../Baselines/Default/LTS/Catalog_LTS.g.vb | 16 ++-- .../Baselines/Default/LTS/Northwind_LTS.g.cs | 42 +++++++--- .../Baselines/Default/LTS/Northwind_LTS.g.vb | 24 +++--- .../Scenarios/LTSNorthwindScenarios.g.cs | 6 +- .../Scenarios/LTSNorthwindScenarios.g.vb | 4 +- .../Scenarios/MultipleProviderScenarios.g.cs | 82 ++++++++++++++----- .../Scenarios/MultipleProviderScenarios.g.cs | 82 ++++++++++++++----- 8 files changed, 203 insertions(+), 85 deletions(-) diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Catalog_LTS.g.cs b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Catalog_LTS.g.cs index 8eac6fdc3..5c580f005 100644 --- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Catalog_LTS.g.cs +++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Catalog_LTS.g.cs @@ -308,7 +308,9 @@ public string LoginID /// /// Gets or sets the associated entity. /// - [Association("Employee_Employee", "ManagerID", "EmployeeID", IsForeignKey=true)] + [EntityAssociation("Employee_Employee", new string[] { + "ManagerID"}, new string[] { + "EmployeeID"}, IsForeignKey=true)] public Employee Manager { get @@ -459,7 +461,9 @@ public string NationalIDNumber /// /// Gets the collection of associated entity instances. /// - [Association("Employee_PurchaseOrder", "EmployeeID", "EmployeeID")] + [EntityAssociation("Employee_PurchaseOrder", new string[] { + "EmployeeID"}, new string[] { + "EmployeeID"})] public EntityCollection PurchaseOrders { get @@ -475,7 +479,9 @@ public EntityCollection PurchaseOrders /// /// Gets the collection of associated entity instances. /// - [Association("Employee_Employee", "EmployeeID", "ManagerID")] + [EntityAssociation("Employee_Employee", new string[] { + "EmployeeID"}, new string[] { + "ManagerID"})] public EntityCollection Reports { get @@ -1164,7 +1170,9 @@ public Nullable ProductSubcategoryID /// /// Gets the collection of associated entity instances. /// - [Association("Product_PurchaseOrderDetail", "ProductID", "ProductID")] + [EntityAssociation("Product_PurchaseOrderDetail", new string[] { + "ProductID"}, new string[] { + "ProductID"})] public EntityCollection PurchaseOrderDetails { get @@ -1551,7 +1559,9 @@ public PurchaseOrder() /// /// Gets or sets the associated entity. /// - [Association("Employee_PurchaseOrder", "EmployeeID", "EmployeeID", IsForeignKey=true)] + [EntityAssociation("Employee_PurchaseOrder", new string[] { + "EmployeeID"}, new string[] { + "EmployeeID"}, IsForeignKey=true)] public Employee Employee { get @@ -1698,7 +1708,9 @@ public DateTime OrderDate /// /// Gets the collection of associated entity instances. /// - [Association("PurchaseOrder_PurchaseOrderDetail", "PurchaseOrderID", "PurchaseOrderID")] + [EntityAssociation("PurchaseOrder_PurchaseOrderDetail", new string[] { + "PurchaseOrderID"}, new string[] { + "PurchaseOrderID"})] public EntityCollection PurchaseOrderDetails { get @@ -2155,7 +2167,9 @@ public short OrderQty /// /// Gets or sets the associated entity. /// - [Association("Product_PurchaseOrderDetail", "ProductID", "ProductID", IsForeignKey=true)] + [EntityAssociation("Product_PurchaseOrderDetail", new string[] { + "ProductID"}, new string[] { + "ProductID"}, IsForeignKey=true)] public Product Product { get @@ -2224,7 +2238,9 @@ public int ProductID /// /// Gets or sets the associated entity. /// - [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/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Catalog_LTS.g.vb b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Catalog_LTS.g.vb index 3a0ca2fd3..b5c98b882 100644 --- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Catalog_LTS.g.vb +++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Catalog_LTS.g.vb @@ -324,7 +324,7 @@ Namespace DataTests.AdventureWorks.LTS ''' ''' Gets or sets the associated entity. ''' - _ + _ Public Property Manager() As Employee Get If (Me._manager Is Nothing) Then @@ -450,7 +450,7 @@ Namespace DataTests.AdventureWorks.LTS ''' ''' Gets the collection of associated entity instances. ''' - _ + _ Public ReadOnly Property PurchaseOrders() As EntityCollection(Of PurchaseOrder) Get If (Me._purchaseOrders Is Nothing) Then @@ -463,7 +463,7 @@ Namespace DataTests.AdventureWorks.LTS ''' ''' Gets the collection of associated entity instances. ''' - _ + _ Public ReadOnly Property Reports() As EntityCollection(Of Employee) Get If (Me._reports Is Nothing) Then @@ -1124,7 +1124,7 @@ Namespace DataTests.AdventureWorks.LTS ''' ''' Gets the collection of associated entity instances. ''' - _ + _ Public ReadOnly Property PurchaseOrderDetails() As EntityCollection(Of PurchaseOrderDetail) Get If (Me._purchaseOrderDetails Is Nothing) Then @@ -1495,7 +1495,7 @@ Namespace DataTests.AdventureWorks.LTS ''' ''' Gets or sets the associated entity. ''' - _ + _ Public Property Employee() As Employee Get If (Me._employee Is Nothing) Then @@ -1620,7 +1620,7 @@ Namespace DataTests.AdventureWorks.LTS ''' ''' Gets the collection of associated entity instances. ''' - _ + _ Public ReadOnly Property PurchaseOrderDetails() As EntityCollection(Of PurchaseOrderDetail) Get If (Me._purchaseOrderDetails Is Nothing) Then @@ -2052,7 +2052,7 @@ Namespace DataTests.AdventureWorks.LTS ''' ''' Gets or sets the associated entity. ''' - _ + _ Public Property Product() As Product Get If (Me._product Is Nothing) Then @@ -2108,7 +2108,7 @@ Namespace DataTests.AdventureWorks.LTS ''' ''' Gets or sets the associated entity. ''' - _ + _ Public Property PurchaseOrder() As PurchaseOrder Get If (Me._purchaseOrder Is Nothing) Then diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Northwind_LTS.g.cs b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Northwind_LTS.g.cs index d1c03e823..a4ee800ea 100644 --- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Northwind_LTS.g.cs +++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Northwind_LTS.g.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -173,7 +173,9 @@ public byte[] Picture /// /// Gets the collection of associated entity instances. /// - [Association("Category_Product", "CategoryID", "CategoryID")] + [EntityAssociation("Category_Product", new string[] { + "CategoryID"}, new string[] { + "CategoryID"})] public EntityCollection Products { get @@ -505,7 +507,9 @@ public string Fax /// /// Gets the collection of associated entity instances. /// - [Association("Customer_Order", "CustomerID", "CustomerID")] + [EntityAssociation("Customer_Order", new string[] { + "CustomerID"}, new string[] { + "CustomerID"})] public EntityCollection Orders { get @@ -717,7 +721,9 @@ public Order() /// /// Gets or sets the associated entity. /// - [Association("Customer_Order", "CustomerID", "CustomerID", IsForeignKey=true)] + [EntityAssociation("Customer_Order", new string[] { + "CustomerID"}, new string[] { + "CustomerID"}, IsForeignKey=true)] public Customer Customer { get @@ -865,7 +871,9 @@ public Nullable Freight /// /// Gets the collection of associated entity instances. /// - [Association("Order_Order_Detail", "OrderID", "OrderID")] + [EntityAssociation("Order_Order_Detail", new string[] { + "OrderID"}, new string[] { + "OrderID"})] public EntityCollection Order_Details { get @@ -1280,7 +1288,9 @@ public float Discount /// /// Gets or sets the associated entity. /// - [Association("Order_Order_Detail", "OrderID", "OrderID", IsForeignKey=true)] + [EntityAssociation("Order_Order_Detail", new string[] { + "OrderID"}, new string[] { + "OrderID"}, IsForeignKey=true)] public Order Order { get @@ -1350,7 +1360,9 @@ public int OrderID /// /// Gets or sets the associated entity. /// - [Association("Product_Order_Detail", "ProductID", "ProductID", IsForeignKey=true)] + [EntityAssociation("Product_Order_Detail", new string[] { + "ProductID"}, new string[] { + "ProductID"}, IsForeignKey=true)] public Product Product { get @@ -1576,7 +1588,9 @@ public Product() /// /// Gets or sets the associated entity. /// - [Association("Category_Product", "CategoryID", "CategoryID", IsForeignKey=true)] + [EntityAssociation("Category_Product", new string[] { + "CategoryID"}, new string[] { + "CategoryID"}, IsForeignKey=true)] public Category Category { get @@ -1696,7 +1710,9 @@ public bool Discontinued /// /// Gets the collection of associated entity instances. /// - [Association("Product_Order_Detail", "ProductID", "ProductID")] + [EntityAssociation("Product_Order_Detail", new string[] { + "ProductID"}, new string[] { + "ProductID"})] public EntityCollection Order_Details { get @@ -2278,8 +2294,10 @@ public int RegionID /// /// Gets the collection of associated entity instances. /// - [Association("Region_Territory", "RegionID", "RegionID")] [Composition()] + [EntityAssociation("Region_Territory", new string[] { + "RegionID"}, new string[] { + "RegionID"})] public EntityCollection Territories { get @@ -2360,7 +2378,9 @@ public Territory() /// /// Gets or sets the associated entity. /// - [Association("Region_Territory", "RegionID", "RegionID", IsForeignKey=true)] + [EntityAssociation("Region_Territory", new string[] { + "RegionID"}, new string[] { + "RegionID"}, IsForeignKey=true)] public Region Region { get diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Northwind_LTS.g.vb b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Northwind_LTS.g.vb index ac5228ae6..bd3de8964 100644 --- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Northwind_LTS.g.vb +++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/LTS/Northwind_LTS.g.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:4.0.30319.34209 +' Runtime Version:4.0.30319.42000 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. @@ -173,7 +173,7 @@ Namespace DataTests.Northwind.LTS ''' ''' Gets the collection of associated entity instances. ''' - _ + _ Public ReadOnly Property Products() As EntityCollection(Of Product) Get If (Me._products Is Nothing) Then @@ -489,7 +489,7 @@ Namespace DataTests.Northwind.LTS ''' ''' Gets the collection of associated entity instances. ''' - _ + _ Public ReadOnly Property Orders() As EntityCollection(Of Order) Get If (Me._orders Is Nothing) Then @@ -713,7 +713,7 @@ Namespace DataTests.Northwind.LTS ''' ''' Gets or sets the associated entity. ''' - _ + _ Public Property Customer() As Customer Get If (Me._customer Is Nothing) Then @@ -835,7 +835,7 @@ Namespace DataTests.Northwind.LTS ''' ''' Gets the collection of associated entity instances. ''' - _ + _ Public ReadOnly Property Order_Details() As EntityCollection(Of Order_Detail) Get If (Me._order_Details Is Nothing) Then @@ -1207,7 +1207,7 @@ Namespace DataTests.Northwind.LTS ''' ''' Gets or sets the associated entity. ''' - _ + _ Public Property Order() As Order Get If (Me._order Is Nothing) Then @@ -1264,7 +1264,7 @@ Namespace DataTests.Northwind.LTS ''' ''' Gets or sets the associated entity. ''' - _ + _ Public Property Product() As Product Get If (Me._product Is Nothing) Then @@ -1497,7 +1497,7 @@ Namespace DataTests.Northwind.LTS ''' ''' Gets or sets the associated entity. ''' - _ + _ Public Property Category() As Category Get If (Me._category Is Nothing) Then @@ -1596,7 +1596,7 @@ Namespace DataTests.Northwind.LTS ''' ''' Gets the collection of associated entity instances. ''' - _ + _ Public ReadOnly Property Order_Details() As EntityCollection(Of Order_Detail) Get If (Me._order_Details Is Nothing) Then @@ -2117,8 +2117,8 @@ Namespace DataTests.Northwind.LTS ''' ''' Gets the collection of associated entity instances. ''' - _ + _ Public ReadOnly Property Territories() As EntityCollection(Of Territory) Get If (Me._territories Is Nothing) Then @@ -2199,7 +2199,7 @@ Namespace DataTests.Northwind.LTS ''' ''' Gets or sets the associated entity. ''' - _ + _ Public Property Region() As Region Get If (Me._region Is Nothing) Then diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/LTSNorthwindScenarios.g.cs b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/LTSNorthwindScenarios.g.cs index ee3d96ab9..3ec831504 100644 --- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/LTSNorthwindScenarios.g.cs +++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/LTSNorthwindScenarios.g.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -674,7 +674,9 @@ public Order_Bug479436() /// /// Gets or sets the associated entity. /// - [Association("Customer_Bug479436_Order_Bug479436", "CustomerID", "CustomerID", IsForeignKey=true)] + [EntityAssociation("Customer_Bug479436_Order_Bug479436", new string[] { + "CustomerID"}, new string[] { + "CustomerID"}, IsForeignKey=true)] public Customer_Bug479436 Customer { get diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/LTSNorthwindScenarios.g.vb b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/LTSNorthwindScenarios.g.vb index c2e5c1b9e..30614056b 100644 --- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/LTSNorthwindScenarios.g.vb +++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/LTSNorthwindScenarios.g.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:4.0.30319.34209 +' Runtime Version:4.0.30319.42000 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. @@ -670,7 +670,7 @@ Namespace DataTests.Scenarios.LTS.Northwind ''' ''' Gets or sets the associated entity. ''' - _ + _ Public Property Customer() As Customer_Bug479436 Get If (Me._customer Is Nothing) Then diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/MultipleProviderScenarios.g.cs b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/MultipleProviderScenarios.g.cs index 40e5bdba7..d00973eae 100644 --- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/MultipleProviderScenarios.g.cs +++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/MultipleProviderScenarios.g.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -173,7 +173,9 @@ public byte[] Picture /// /// Gets the collection of associated entity instances. /// - [Association("Category_Product", "CategoryID", "CategoryID")] + [EntityAssociation("Category_Product", new string[] { + "CategoryID"}, new string[] { + "CategoryID"})] public EntityCollection Products { get @@ -505,7 +507,9 @@ public string Fax /// /// Gets the collection of associated entity instances. /// - [Association("Customer_Order", "CustomerID", "CustomerID")] + [EntityAssociation("Customer_Order", new string[] { + "CustomerID"}, new string[] { + "CustomerID"})] public EntityCollection Orders { get @@ -717,7 +721,9 @@ public Order() /// /// Gets or sets the associated entity. /// - [Association("Customer_Order", "CustomerID", "CustomerID", IsForeignKey=true)] + [EntityAssociation("Customer_Order", new string[] { + "CustomerID"}, new string[] { + "CustomerID"}, IsForeignKey=true)] public Customer Customer { get @@ -865,7 +871,9 @@ public Nullable Freight /// /// Gets the collection of associated entity instances. /// - [Association("Order_Order_Detail", "OrderID", "OrderID")] + [EntityAssociation("Order_Order_Detail", new string[] { + "OrderID"}, new string[] { + "OrderID"})] public EntityCollection Order_Details { get @@ -1280,7 +1288,9 @@ public float Discount /// /// Gets or sets the associated entity. /// - [Association("Order_Order_Detail", "OrderID", "OrderID", IsForeignKey=true)] + [EntityAssociation("Order_Order_Detail", new string[] { + "OrderID"}, new string[] { + "OrderID"}, IsForeignKey=true)] public Order Order { get @@ -1350,7 +1360,9 @@ public int OrderID /// /// Gets or sets the associated entity. /// - [Association("Product_Order_Detail", "ProductID", "ProductID", IsForeignKey=true)] + [EntityAssociation("Product_Order_Detail", new string[] { + "ProductID"}, new string[] { + "ProductID"}, IsForeignKey=true)] public Product Product { get @@ -1576,7 +1588,9 @@ public Product() /// /// Gets or sets the associated entity. /// - [Association("Category_Product", "CategoryID", "CategoryID", IsForeignKey=true)] + [EntityAssociation("Category_Product", new string[] { + "CategoryID"}, new string[] { + "CategoryID"}, IsForeignKey=true)] public Category Category { get @@ -1696,7 +1710,9 @@ public bool Discontinued /// /// Gets the collection of associated entity instances. /// - [Association("Product_Order_Detail", "ProductID", "ProductID")] + [EntityAssociation("Product_Order_Detail", new string[] { + "ProductID"}, new string[] { + "ProductID"})] public EntityCollection Order_Details { get @@ -2278,8 +2294,10 @@ public int RegionID /// /// Gets the collection of associated entity instances. /// - [Association("Region_Territory", "RegionID", "RegionID")] [Composition()] + [EntityAssociation("Region_Territory", new string[] { + "RegionID"}, new string[] { + "RegionID"})] public EntityCollection Territories { get @@ -2360,7 +2378,9 @@ public Territory() /// /// Gets or sets the associated entity. /// - [Association("Region_Territory", "RegionID", "RegionID", IsForeignKey=true)] + [EntityAssociation("Region_Territory", new string[] { + "RegionID"}, new string[] { + "RegionID"}, IsForeignKey=true)] public Region Region { get @@ -2660,7 +2680,9 @@ public byte[] Picture /// /// Gets the collection of associated entity instances. /// - [Association("Category_Product", "CategoryID", "CategoryID")] + [EntityAssociation("Category_Product", new string[] { + "CategoryID"}, new string[] { + "CategoryID"})] public EntityCollection Products { get @@ -2992,7 +3014,9 @@ public string Fax /// /// Gets the collection of associated entity instances. /// - [Association("Customer_Order", "CustomerID", "CustomerID")] + [EntityAssociation("Customer_Order", new string[] { + "CustomerID"}, new string[] { + "CustomerID"})] public EntityCollection Orders { get @@ -3204,7 +3228,9 @@ public Order() /// /// Gets or sets the associated entity. /// - [Association("Customer_Order", "CustomerID", "CustomerID", IsForeignKey=true)] + [EntityAssociation("Customer_Order", new string[] { + "CustomerID"}, new string[] { + "CustomerID"}, IsForeignKey=true)] public Customer Customer { get @@ -3351,7 +3377,9 @@ public Nullable Freight /// /// Gets the collection of associated entity instances. /// - [Association("Order_Order_Detail", "OrderID", "OrderID")] + [EntityAssociation("Order_Order_Detail", new string[] { + "OrderID"}, new string[] { + "OrderID"})] public EntityCollection Order_Details { get @@ -3766,7 +3794,9 @@ public float Discount /// /// Gets or sets the associated entity. /// - [Association("Order_Order_Detail", "OrderID", "OrderID", IsForeignKey=true)] + [EntityAssociation("Order_Order_Detail", new string[] { + "OrderID"}, new string[] { + "OrderID"}, IsForeignKey=true)] public Order Order { get @@ -3836,7 +3866,9 @@ public int OrderID /// /// Gets or sets the associated entity. /// - [Association("Product_Order_Detail", "ProductID", "ProductID", IsForeignKey=true)] + [EntityAssociation("Product_Order_Detail", new string[] { + "ProductID"}, new string[] { + "ProductID"}, IsForeignKey=true)] public Product Product { get @@ -4062,7 +4094,9 @@ public Product() /// /// Gets or sets the associated entity. /// - [Association("Category_Product", "CategoryID", "CategoryID", IsForeignKey=true)] + [EntityAssociation("Category_Product", new string[] { + "CategoryID"}, new string[] { + "CategoryID"}, IsForeignKey=true)] public Category Category { get @@ -4182,7 +4216,9 @@ public bool Discontinued /// /// Gets the collection of associated entity instances. /// - [Association("Product_Order_Detail", "ProductID", "ProductID")] + [EntityAssociation("Product_Order_Detail", new string[] { + "ProductID"}, new string[] { + "ProductID"})] public EntityCollection Order_Details { get @@ -4760,8 +4796,10 @@ public int RegionID /// /// Gets the collection of associated entity instances. /// - [Association("Region_Territory", "RegionID", "RegionID")] [Composition()] + [EntityAssociation("Region_Territory", new string[] { + "RegionID"}, new string[] { + "RegionID"})] public EntityCollection Territories { get @@ -4842,7 +4880,9 @@ public Territory() /// /// Gets or sets the associated entity. /// - [Association("Region_Territory", "RegionID", "RegionID", IsForeignKey=true)] + [EntityAssociation("Region_Territory", new string[] { + "RegionID"}, new string[] { + "RegionID"}, IsForeignKey=true)] public Region Region { get diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/FullTypeNames/Scenarios/MultipleProviderScenarios.g.cs b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/FullTypeNames/Scenarios/MultipleProviderScenarios.g.cs index 421852c23..bbe714fbe 100644 --- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/FullTypeNames/Scenarios/MultipleProviderScenarios.g.cs +++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/FullTypeNames/Scenarios/MultipleProviderScenarios.g.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -163,7 +163,9 @@ public byte[] Picture /// /// Gets the collection of associated entity instances. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Category_Product", "CategoryID", "CategoryID")] + [global::OpenRiaServices.EntityAssociationAttribute("Category_Product", new string[] { + "CategoryID"}, new string[] { + "CategoryID"})] public global::OpenRiaServices.Client.EntityCollection Products { get @@ -495,7 +497,9 @@ public string Fax /// /// Gets the collection of associated entity instances. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Customer_Order", "CustomerID", "CustomerID")] + [global::OpenRiaServices.EntityAssociationAttribute("Customer_Order", new string[] { + "CustomerID"}, new string[] { + "CustomerID"})] public global::OpenRiaServices.Client.EntityCollection Orders { get @@ -707,7 +711,9 @@ public Order() /// /// Gets or sets the associated entity. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Customer_Order", "CustomerID", "CustomerID", IsForeignKey=true)] + [global::OpenRiaServices.EntityAssociationAttribute("Customer_Order", new string[] { + "CustomerID"}, new string[] { + "CustomerID"}, IsForeignKey=true)] public global::DataTests.Northwind.LTS.Customer Customer { get @@ -855,7 +861,9 @@ public string FormattedName /// /// Gets the collection of associated entity instances. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Order_Order_Detail", "OrderID", "OrderID")] + [global::OpenRiaServices.EntityAssociationAttribute("Order_Order_Detail", new string[] { + "OrderID"}, new string[] { + "OrderID"})] public global::OpenRiaServices.Client.EntityCollection Order_Details { get @@ -1270,7 +1278,9 @@ public float Discount /// /// Gets or sets the associated entity. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Order_Order_Detail", "OrderID", "OrderID", IsForeignKey=true)] + [global::OpenRiaServices.EntityAssociationAttribute("Order_Order_Detail", new string[] { + "OrderID"}, new string[] { + "OrderID"}, IsForeignKey=true)] public global::DataTests.Northwind.LTS.Order Order { get @@ -1340,7 +1350,9 @@ public int OrderID /// /// Gets or sets the associated entity. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Product_Order_Detail", "ProductID", "ProductID", IsForeignKey=true)] + [global::OpenRiaServices.EntityAssociationAttribute("Product_Order_Detail", new string[] { + "ProductID"}, new string[] { + "ProductID"}, IsForeignKey=true)] public global::DataTests.Northwind.LTS.Product Product { get @@ -1566,7 +1578,9 @@ public Product() /// /// Gets or sets the associated entity. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Category_Product", "CategoryID", "CategoryID", IsForeignKey=true)] + [global::OpenRiaServices.EntityAssociationAttribute("Category_Product", new string[] { + "CategoryID"}, new string[] { + "CategoryID"}, IsForeignKey=true)] public global::DataTests.Northwind.LTS.Category Category { get @@ -1686,7 +1700,9 @@ public bool Discontinued /// /// Gets the collection of associated entity instances. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Product_Order_Detail", "ProductID", "ProductID")] + [global::OpenRiaServices.EntityAssociationAttribute("Product_Order_Detail", new string[] { + "ProductID"}, new string[] { + "ProductID"})] public global::OpenRiaServices.Client.EntityCollection Order_Details { get @@ -2268,7 +2284,9 @@ public int RegionID /// /// Gets the collection of associated entity instances. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Region_Territory", "RegionID", "RegionID")] + [global::OpenRiaServices.EntityAssociationAttribute("Region_Territory", new string[] { + "RegionID"}, new string[] { + "RegionID"})] [global::System.ComponentModel.DataAnnotations.CompositionAttribute()] public global::OpenRiaServices.Client.EntityCollection Territories { @@ -2350,7 +2368,9 @@ public Territory() /// /// Gets or sets the associated entity. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Region_Territory", "RegionID", "RegionID", IsForeignKey=true)] + [global::OpenRiaServices.EntityAssociationAttribute("Region_Territory", new string[] { + "RegionID"}, new string[] { + "RegionID"}, IsForeignKey=true)] public global::DataTests.Northwind.LTS.Region Region { get @@ -2640,7 +2660,9 @@ public byte[] Picture /// /// Gets the collection of associated entity instances. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Category_Product", "CategoryID", "CategoryID")] + [global::OpenRiaServices.EntityAssociationAttribute("Category_Product", new string[] { + "CategoryID"}, new string[] { + "CategoryID"})] public global::OpenRiaServices.Client.EntityCollection Products { get @@ -2972,7 +2994,9 @@ public string Fax /// /// Gets the collection of associated entity instances. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Customer_Order", "CustomerID", "CustomerID")] + [global::OpenRiaServices.EntityAssociationAttribute("Customer_Order", new string[] { + "CustomerID"}, new string[] { + "CustomerID"})] public global::OpenRiaServices.Client.EntityCollection Orders { get @@ -3184,7 +3208,9 @@ public Order() /// /// Gets or sets the associated entity. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Customer_Order", "CustomerID", "CustomerID", IsForeignKey=true)] + [global::OpenRiaServices.EntityAssociationAttribute("Customer_Order", new string[] { + "CustomerID"}, new string[] { + "CustomerID"}, IsForeignKey=true)] public global::NorthwindModel.Customer Customer { get @@ -3331,7 +3357,9 @@ public string FormattedName /// /// Gets the collection of associated entity instances. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Order_Order_Detail", "OrderID", "OrderID")] + [global::OpenRiaServices.EntityAssociationAttribute("Order_Order_Detail", new string[] { + "OrderID"}, new string[] { + "OrderID"})] public global::OpenRiaServices.Client.EntityCollection Order_Details { get @@ -3746,7 +3774,9 @@ public float Discount /// /// Gets or sets the associated entity. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Order_Order_Detail", "OrderID", "OrderID", IsForeignKey=true)] + [global::OpenRiaServices.EntityAssociationAttribute("Order_Order_Detail", new string[] { + "OrderID"}, new string[] { + "OrderID"}, IsForeignKey=true)] public global::NorthwindModel.Order Order { get @@ -3816,7 +3846,9 @@ public int OrderID /// /// Gets or sets the associated entity. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Product_Order_Detail", "ProductID", "ProductID", IsForeignKey=true)] + [global::OpenRiaServices.EntityAssociationAttribute("Product_Order_Detail", new string[] { + "ProductID"}, new string[] { + "ProductID"}, IsForeignKey=true)] public global::NorthwindModel.Product Product { get @@ -4042,7 +4074,9 @@ public Product() /// /// Gets or sets the associated entity. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Category_Product", "CategoryID", "CategoryID", IsForeignKey=true)] + [global::OpenRiaServices.EntityAssociationAttribute("Category_Product", new string[] { + "CategoryID"}, new string[] { + "CategoryID"}, IsForeignKey=true)] public global::NorthwindModel.Category Category { get @@ -4162,7 +4196,9 @@ public bool Discontinued /// /// Gets the collection of associated entity instances. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Product_Order_Detail", "ProductID", "ProductID")] + [global::OpenRiaServices.EntityAssociationAttribute("Product_Order_Detail", new string[] { + "ProductID"}, new string[] { + "ProductID"})] public global::OpenRiaServices.Client.EntityCollection Order_Details { get @@ -4740,7 +4776,9 @@ public int RegionID /// /// Gets the collection of associated entity instances. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Region_Territory", "RegionID", "RegionID")] + [global::OpenRiaServices.EntityAssociationAttribute("Region_Territory", new string[] { + "RegionID"}, new string[] { + "RegionID"})] [global::System.ComponentModel.DataAnnotations.CompositionAttribute()] public global::OpenRiaServices.Client.EntityCollection Territories { @@ -4822,7 +4860,9 @@ public Territory() /// /// Gets or sets the associated entity. /// - [global::System.ComponentModel.DataAnnotations.AssociationAttribute("Region_Territory", "RegionID", "RegionID", IsForeignKey=true)] + [global::OpenRiaServices.EntityAssociationAttribute("Region_Territory", new string[] { + "RegionID"}, new string[] { + "RegionID"}, IsForeignKey=true)] public global::NorthwindModel.Region Region { get