diff --git a/NuGet/OpenRiaServices.Client.Core.nuspec b/NuGet/OpenRiaServices.Client.Core.nuspec
index 01c7d372b..de1d5090f 100644
--- a/NuGet/OpenRiaServices.Client.Core.nuspec
+++ b/NuGet/OpenRiaServices.Client.Core.nuspec
@@ -18,15 +18,15 @@
WCF RIA Services RIAServices Silverlight OpenRiaServices
-
+
-
+
-
+
@@ -42,27 +42,12 @@
-
-
+
-
+
@@ -71,11 +56,7 @@
-
+
@@ -84,11 +65,7 @@
-
+
diff --git a/src/OpenRiaServices.Client.DomainClients.Http/Framework/OpenRiaServices.Client.DomainClients.Http.csproj b/src/OpenRiaServices.Client.DomainClients.Http/Framework/OpenRiaServices.Client.DomainClients.Http.csproj
index 74065a2e8..c38ea2fcc 100644
--- a/src/OpenRiaServices.Client.DomainClients.Http/Framework/OpenRiaServices.Client.DomainClients.Http.csproj
+++ b/src/OpenRiaServices.Client.DomainClients.Http/Framework/OpenRiaServices.Client.DomainClients.Http.csproj
@@ -24,7 +24,8 @@
-
+
+
diff --git a/src/OpenRiaServices.Client/Framework/OpenRiaServices.Client.csproj b/src/OpenRiaServices.Client/Framework/OpenRiaServices.Client.csproj
index 85b27e8ca..3bb75d3ab 100644
--- a/src/OpenRiaServices.Client/Framework/OpenRiaServices.Client.csproj
+++ b/src/OpenRiaServices.Client/Framework/OpenRiaServices.Client.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/src/OpenRiaServices.Hosting.AspNetCore/Framework/AspNetCore/Serialization/MessagePackSerializationProvider.cs b/src/OpenRiaServices.Hosting.AspNetCore/Framework/AspNetCore/Serialization/MessagePackSerializationProvider.cs
index fea7193e0..e47fc342a 100644
--- a/src/OpenRiaServices.Hosting.AspNetCore/Framework/AspNetCore/Serialization/MessagePackSerializationProvider.cs
+++ b/src/OpenRiaServices.Hosting.AspNetCore/Framework/AspNetCore/Serialization/MessagePackSerializationProvider.cs
@@ -36,6 +36,7 @@ private MessagePackSerializer CreateSerializerForDomainService(Type domainServic
Wcf.DomainServiceSerializationSurrogate surrogateProvider = new Wcf.DomainServiceSerializationSurrogate(description);
// Create converters to handle surrogates,
+ Dictionary derivedTypeUnions = _serializer.DerivedTypeUnions.ToDictionary(du => du.BaseType);
List converters = new();
foreach (var entityType in description.EntityTypes.Concat(description.ComplexTypes))
{
@@ -43,6 +44,9 @@ private MessagePackSerializer CreateSerializerForDomainService(Type domainServic
{
converters.Add((MessagePackConverter)
Activator.CreateInstance(typeof(SurrogateConverter<,>).MakeGenericType(surrogateType, entityType), args: [description, surrogateProvider])!);
+
+ // Prevent Nerdbank.MessagePack from adding an additional discriminator.
+ derivedTypeUnions[entityType] = DerivedTypeUnion.CreateDisabled(entityType);
}
}
@@ -52,7 +56,8 @@ private MessagePackSerializer CreateSerializerForDomainService(Type domainServic
return _serializer with
{
- Converters = [.. _serializer.Converters, .. converters]
+ Converters = [.. _serializer.Converters, .. converters],
+ DerivedTypeUnions = [.. derivedTypeUnions.Values],
};
}
}
diff --git a/src/OpenRiaServices.Hosting.AspNetCore/Framework/OpenRiaServices.Hosting.AspNetCore.csproj b/src/OpenRiaServices.Hosting.AspNetCore/Framework/OpenRiaServices.Hosting.AspNetCore.csproj
index ad4dd09e8..567321ec9 100644
--- a/src/OpenRiaServices.Hosting.AspNetCore/Framework/OpenRiaServices.Hosting.AspNetCore.csproj
+++ b/src/OpenRiaServices.Hosting.AspNetCore/Framework/OpenRiaServices.Hosting.AspNetCore.csproj
@@ -26,7 +26,8 @@
-
+
+
diff --git a/src/OpenRiaServices.Tools.TextTemplate/Framework/CSharpGenerators/CSharpComplexObjectGenerator.cs b/src/OpenRiaServices.Tools.TextTemplate/Framework/CSharpGenerators/CSharpComplexObjectGenerator.cs
index e833c7500..21870570d 100644
--- a/src/OpenRiaServices.Tools.TextTemplate/Framework/CSharpGenerators/CSharpComplexObjectGenerator.cs
+++ b/src/OpenRiaServices.Tools.TextTemplate/Framework/CSharpGenerators/CSharpComplexObjectGenerator.cs
@@ -315,28 +315,18 @@ protected virtual void GenerateConstructor()
- if (!this.IsAbstract)
- {
- var properties = TypeDescriptor.GetProperties(this.Type);
- bool hasRequiredProperty = properties.Cast()
- .Any(p => p.Attributes.OfType().Any(a => a.IsRequired)
- && ShouldDeclareProperty(p)
- && CanGenerateProperty(p));
-
- if (hasRequiredProperty)
- {
- var pd = properties.Cast()
- .FirstOrDefault(p => !p.Attributes.OfType().Any(a => a.IsRequired)
- && ShouldDeclareProperty(p)
- && CanGenerateProperty(p));
-
- if (pd is null)
- {
- this.ClientCodeGenerator.Error($"The type '{this.Type}' has only required properties, cannot generate PolyType compatible constructor");
- }
- else
- {
- string parameterName = pd.Name;
+ if (!this.IsAbstract)
+ {
+ var requiredProperties = TypeDescriptor.GetProperties(this.Type)
+ .Cast()
+ .Where(p => p.Attributes.OfType().Any(a => a.IsRequired)
+ && ShouldDeclareProperty(p)
+ && CanGenerateProperty(p))
+ .ToList();
+
+ if (requiredProperties.Count > 0)
+ {
+ string parameterDeclarations = string.Join(", ", requiredProperties.Select(pd => $"{CodeGenUtilities.GetTypeName(pd.PropertyType)} {CodeGenUtilities.GetSafeName(pd.Name)}"));
this.Write("\r\n[PolyType.ConstructorShape]\r\nprivate ");
@@ -344,27 +334,34 @@ protected virtual void GenerateConstructor()
this.Write("(");
-this.Write(this.ToStringHelper.ToStringWithCulture(CodeGenUtilities.GetTypeName(pd.PropertyType)));
+this.Write(this.ToStringHelper.ToStringWithCulture(parameterDeclarations));
-this.Write(" ");
+this.Write(")\r\n{\r\n\tthis.OnCreated();\r\n\tbase.OnDeserializing(default(System.Runtime.Serializat" +
+ "ion.StreamingContext));\r\n");
-this.Write(this.ToStringHelper.ToStringWithCulture(parameterName));
-this.Write(")\r\n{\r\n\tthis.OnCreated();\r\n base.OnDeserializing(default(System.Runtime.Seriali" +
- "zation.StreamingContext));\r\n this.");
+ foreach (var pd in requiredProperties)
+ {
+ string safeName = CodeGenUtilities.GetSafeName(pd.Name);
-this.Write(this.ToStringHelper.ToStringWithCulture(pd.Name));
+this.Write("\tthis.");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(safeName));
this.Write(" = ");
-this.Write(this.ToStringHelper.ToStringWithCulture(parameterName));
+this.Write(this.ToStringHelper.ToStringWithCulture(safeName));
-this.Write(";\r\n}\r\n");
+this.Write(";\r\n");
- }
- }
- }
+ }
+
+this.Write("}\r\n");
+
+
+ }
+ }
}
private void GeneratePropertiesInternal()
diff --git a/src/OpenRiaServices.Tools.TextTemplate/Framework/CSharpGenerators/CSharpEntityGenerator.cs b/src/OpenRiaServices.Tools.TextTemplate/Framework/CSharpGenerators/CSharpEntityGenerator.cs
index ccd074399..ae7a77c70 100644
--- a/src/OpenRiaServices.Tools.TextTemplate/Framework/CSharpGenerators/CSharpEntityGenerator.cs
+++ b/src/OpenRiaServices.Tools.TextTemplate/Framework/CSharpGenerators/CSharpEntityGenerator.cs
@@ -396,28 +396,18 @@ protected virtual void GenerateConstructor()
- if (!this.IsAbstract)
- {
- var properties = TypeDescriptor.GetProperties(this.Type);
- bool hasRequiredProperty = properties.Cast()
- .Any(p => p.Attributes.OfType().Any(a => a.IsRequired)
- && ShouldDeclareProperty(p)
- && CanGenerateProperty(p));
-
- if (hasRequiredProperty)
- {
- var pd = properties.Cast()
- .FirstOrDefault(p => !p.Attributes.OfType().Any(a => a.IsRequired)
- && ShouldDeclareProperty(p)
- && CanGenerateProperty(p));
-
- if (pd is null)
- {
- this.ClientCodeGenerator.Error($"The type '{this.Type}' has only required properties, cannot generate PolyType compatible constructor");
- }
- else
- {
- string parameterName = pd.Name;
+ if (!this.IsAbstract)
+ {
+ var requiredProperties = TypeDescriptor.GetProperties(this.Type)
+ .Cast()
+ .Where(p => p.Attributes.OfType().Any(a => a.IsRequired)
+ && ShouldDeclareProperty(p)
+ && CanGenerateProperty(p))
+ .ToList();
+
+ if (requiredProperties.Count > 0)
+ {
+ string parameterDeclarations = string.Join(", ", requiredProperties.Select(pd => $"{CodeGenUtilities.GetTypeName(pd.PropertyType)} {CodeGenUtilities.GetSafeName(pd.Name)}"));
this.Write("\r\n[PolyType.ConstructorShape]\r\nprivate ");
@@ -425,27 +415,34 @@ protected virtual void GenerateConstructor()
this.Write("(");
-this.Write(this.ToStringHelper.ToStringWithCulture(CodeGenUtilities.GetTypeName(pd.PropertyType)));
+this.Write(this.ToStringHelper.ToStringWithCulture(parameterDeclarations));
-this.Write(" ");
+this.Write(")\r\n{\r\n\tthis.OnCreated();\r\n\tbase.OnDeserializing(default(System.Runtime.Serializat" +
+ "ion.StreamingContext));\r\n");
-this.Write(this.ToStringHelper.ToStringWithCulture(parameterName));
-this.Write(")\r\n{\r\n\tthis.OnCreated();\r\n base.OnDeserializing(default(System.Runtime.Seriali" +
- "zation.StreamingContext));\r\n this.");
+ foreach (var pd in requiredProperties)
+ {
+ string safeName = CodeGenUtilities.GetSafeName(pd.Name);
-this.Write(this.ToStringHelper.ToStringWithCulture(pd.Name));
+this.Write("\tthis.");
+
+this.Write(this.ToStringHelper.ToStringWithCulture(safeName));
this.Write(" = ");
-this.Write(this.ToStringHelper.ToStringWithCulture(parameterName));
+this.Write(this.ToStringHelper.ToStringWithCulture(safeName));
-this.Write(";\r\n}\r\n");
+this.Write(";\r\n");
- }
- }
- }
+ }
+
+this.Write("}\r\n");
+
+
+ }
+ }
}
private void GeneratePropertiesInternal()
diff --git a/src/OpenRiaServices.Tools.TextTemplate/Framework/CSharpGenerators/Templates/DataContractGeneratorTemplate.ttinclude b/src/OpenRiaServices.Tools.TextTemplate/Framework/CSharpGenerators/Templates/DataContractGeneratorTemplate.ttinclude
index f9c9db577..c8f7fcf72 100644
--- a/src/OpenRiaServices.Tools.TextTemplate/Framework/CSharpGenerators/Templates/DataContractGeneratorTemplate.ttinclude
+++ b/src/OpenRiaServices.Tools.TextTemplate/Framework/CSharpGenerators/Templates/DataContractGeneratorTemplate.ttinclude
@@ -66,41 +66,38 @@ namespace <#= this.Type.Namespace #>
}
<#+
- if (!this.IsAbstract)
- {
- var properties = TypeDescriptor.GetProperties(this.Type);
- bool hasRequiredProperty = properties.Cast()
- .Any(p => p.Attributes.OfType().Any(a => a.IsRequired)
- && ShouldDeclareProperty(p)
- && CanGenerateProperty(p));
-
- if (hasRequiredProperty)
- {
- var pd = properties.Cast()
- .FirstOrDefault(p => !p.Attributes.OfType().Any(a => a.IsRequired)
- && ShouldDeclareProperty(p)
- && CanGenerateProperty(p));
+ if (!this.IsAbstract)
+ {
+ var requiredProperties = TypeDescriptor.GetProperties(this.Type)
+ .Cast()
+ .Where(p => p.Attributes.OfType().Any(a => a.IsRequired)
+ && ShouldDeclareProperty(p)
+ && CanGenerateProperty(p))
+ .ToList();
- if (pd is null)
- {
- this.ClientCodeGenerator.Error($"The type '{this.Type}' has only required properties, cannot generate PolyType compatible constructor");
- }
- else
- {
- string parameterName = pd.Name;
+ if (requiredProperties.Count > 0)
+ {
+ string parameterDeclarations = string.Join(", ", requiredProperties.Select(pd => $"{CodeGenUtilities.GetTypeName(pd.PropertyType)} {CodeGenUtilities.GetSafeName(pd.Name)}"));
#>
[PolyType.ConstructorShape]
-private <#= typeName #>(<#= CodeGenUtilities.GetTypeName(pd.PropertyType) #> <#= parameterName #>)
+private <#= typeName #>(<#= parameterDeclarations #>)
{
this.OnCreated();
- base.OnDeserializing(default(System.Runtime.Serialization.StreamingContext));
- this.<#= pd.Name #> = <#= parameterName #>;
+ base.OnDeserializing(default(System.Runtime.Serialization.StreamingContext));
+<#+
+ foreach (var pd in requiredProperties)
+ {
+ string safeName = CodeGenUtilities.GetSafeName(pd.Name);
+#>
+ this.<#= safeName #> = <#= safeName #>;
+<#+
+ }
+#>
}
<#+
- }
- }
- }
+ }
+ }
}
private void GeneratePropertiesInternal()
diff --git a/src/OpenRiaServices.Tools/Framework/DataContractProxyGenerator.cs b/src/OpenRiaServices.Tools/Framework/DataContractProxyGenerator.cs
index 61db58b4d..8fc03f709 100644
--- a/src/OpenRiaServices.Tools/Framework/DataContractProxyGenerator.cs
+++ b/src/OpenRiaServices.Tools/Framework/DataContractProxyGenerator.cs
@@ -213,58 +213,52 @@ public override void Generate()
private void GeneratePolyTypeDeserializationConstructor()
{
- var properties = TypeDescriptor.GetProperties(this.Type);
- bool hasRequiredProperty = properties.Cast()
- .Any(p => p.Attributes.OfType().Any(a => a.IsRequired)
+ var requiredProperties = TypeDescriptor.GetProperties(this.Type)
+ .Cast()
+ .Where(p => p.Attributes.OfType().Any(a => a.IsRequired)
&& ShouldDeclareProperty(p)
- && CanGenerateProperty(p));
+ && CanGenerateProperty(p))
+ .ToList();
- if (hasRequiredProperty)
+ if (requiredProperties.Count > 0)
{
- var pd = properties.Cast()
- .FirstOrDefault(p => !p.Attributes.OfType().Any(a => a.IsRequired)
- && ShouldDeclareProperty(p)
- && CanGenerateProperty(p));
- if (pd != null)
- {
- var deserializingConstructor = new CodeConstructor();
- deserializingConstructor.Attributes = MemberAttributes.Private;
+ var deserializingConstructor = new CodeConstructor();
+ deserializingConstructor.Attributes = MemberAttributes.Private;
- // [ConstructorShape]
- deserializingConstructor.CustomAttributes.Add(new CodeAttributeDeclaration("PolyType.ConstructorShapeAttribute"));
+ // [ConstructorShape]
+ deserializingConstructor.CustomAttributes.Add(new CodeAttributeDeclaration("PolyType.ConstructorShapeAttribute"));
- // Add constructor parameter from selected property descriptor
- string parameterName = pd.Name;
+ foreach (var pd in requiredProperties)
+ {
deserializingConstructor.Parameters.Add(
new CodeParameterDeclarationExpression(
CodeGenUtilities.GetTypeReference(pd.PropertyType, this.ClientProxyGenerator, this.ProxyClass),
- parameterName));
+ pd.Name));
+ }
- // add default ctor doc comments
- string comment = "Deserialization ctor for MessagePack support, when any Property is required";
- deserializingConstructor.Comments.AddRange(CodeGenUtilities.GenerateSummaryCodeComment(comment, this.ClientProxyGenerator.IsCSharp));
+ // add default ctor doc comments
+ string comment = "Deserialization ctor for MessagePack support, when any Property is required";
+ deserializingConstructor.Comments.AddRange(CodeGenUtilities.GenerateSummaryCodeComment(comment, this.ClientProxyGenerator.IsCSharp));
- // add call to default OnCreated method
- deserializingConstructor.Statements.Add(this.NotificationMethodGen.OnCreatedMethodInvokeExpression);
+ // add call to default OnCreated method
+ deserializingConstructor.Statements.Add(this.NotificationMethodGen.OnCreatedMethodInvokeExpression);
- // Generate: base.OnDeserializing(default);
- deserializingConstructor.Statements.Add(
- new CodeMethodInvokeExpression(
- new CodeMethodReferenceExpression(new CodeBaseReferenceExpression(), "OnDeserializing"),
- new CodeDefaultValueExpression(new CodeTypeReference(typeof(StreamingContext)))));
+ // Generate: base.OnDeserializing(default);
+ deserializingConstructor.Statements.Add(
+ new CodeMethodInvokeExpression(
+ new CodeMethodReferenceExpression(new CodeBaseReferenceExpression(), "OnDeserializing"),
+ new CodeDefaultValueExpression(new CodeTypeReference(typeof(StreamingContext)))));
+ foreach (var pd in requiredProperties)
+ {
// Set property from constructor parameter: this. = ;
deserializingConstructor.Statements.Add(
new CodeAssignStatement(
new CodePropertyReferenceExpression(new CodeThisReferenceExpression(), pd.Name),
- new CodeArgumentReferenceExpression(parameterName)));
-
- this.ProxyClass.Members.Add(deserializingConstructor);
- }
- else
- {
- throw new InvalidOperationException($"The type '{this.Type}' has only required properties, cannot generate PolyType compatible constructor");
+ new CodeArgumentReferenceExpression(pd.Name)));
}
+
+ this.ProxyClass.Members.Add(deserializingConstructor);
}
}
diff --git a/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj b/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj
index 8efdf8f87..ed93eb545 100644
--- a/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj
+++ b/src/OpenRiaServices.Tools/Test/OpenRiaServices.Tools.Test.csproj
@@ -40,6 +40,7 @@
+
diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Mocks/MockCustomers.g.cs b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Mocks/MockCustomers.g.cs
index 0c7aefd32..2da2d0a72 100644
--- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Mocks/MockCustomers.g.cs
+++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Mocks/MockCustomers.g.cs
@@ -496,11 +496,11 @@ public MockReport()
/// Deserialization ctor for MessagePack support, when any Property is required
///
[PolyType.ConstructorShapeAttribute()]
- private MockReport(int CustomerId)
+ private MockReport(string ReportTitle)
{
this.OnCreated();
base.OnDeserializing(default(System.Runtime.Serialization.StreamingContext));
- this.CustomerId = CustomerId;
+ this.ReportTitle = ReportTitle;
}
///
diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Mocks/MockCustomers.g.vb b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Mocks/MockCustomers.g.vb
index 19e3280fb..fa601457b 100644
--- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Mocks/MockCustomers.g.vb
+++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Mocks/MockCustomers.g.vb
@@ -477,11 +477,11 @@ Namespace TestDomainServices
''' Deserialization ctor for MessagePack support, when any Property is required
'''
_
- Private Sub New(ByVal CustomerId As Integer)
+ Private Sub New(ByVal ReportTitle As String)
MyBase.New
Me.OnCreated
MyBase.OnDeserializing(CType(Nothing, System.Runtime.Serialization.StreamingContext))
- Me.CustomerId = CustomerId
+ Me.ReportTitle = ReportTitle
End Sub
'''
diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/TestProvider_Scenarios_CodeGen.g.cs b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/TestProvider_Scenarios_CodeGen.g.cs
index 2b2571e73..6d0a53a14 100644
--- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/TestProvider_Scenarios_CodeGen.g.cs
+++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/TestProvider_Scenarios_CodeGen.g.cs
@@ -1330,11 +1330,11 @@ public TestEntity_DataMemberBuddy()
/// Deserialization ctor for MessagePack support, when any Property is required
///
[PolyType.ConstructorShapeAttribute()]
- private TestEntity_DataMemberBuddy(int ID)
+ private TestEntity_DataMemberBuddy(int Prop1)
{
this.OnCreated();
base.OnDeserializing(default(System.Runtime.Serialization.StreamingContext));
- this.ID = ID;
+ this.Prop1 = Prop1;
}
///
diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/TestProvider_Scenarios_CodeGen.g.vb b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/TestProvider_Scenarios_CodeGen.g.vb
index adf1b2011..24c7ca21f 100644
--- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/TestProvider_Scenarios_CodeGen.g.vb
+++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/Default/Scenarios/TestProvider_Scenarios_CodeGen.g.vb
@@ -1220,11 +1220,11 @@ Namespace TestDomainServices
''' Deserialization ctor for MessagePack support, when any Property is required
'''
_
- Private Sub New(ByVal ID As Integer)
+ Private Sub New(ByVal Prop1 As Integer)
MyBase.New
Me.OnCreated
MyBase.OnDeserializing(CType(Nothing, System.Runtime.Serialization.StreamingContext))
- Me.ID = ID
+ Me.Prop1 = Prop1
End Sub
'''
diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/FullTypeNames/Scenarios/TestProvider_Scenarios_CodeGen.g.cs b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/FullTypeNames/Scenarios/TestProvider_Scenarios_CodeGen.g.cs
index ac71a7be5..0ffa49ed4 100644
--- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/FullTypeNames/Scenarios/TestProvider_Scenarios_CodeGen.g.cs
+++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/FullTypeNames/Scenarios/TestProvider_Scenarios_CodeGen.g.cs
@@ -1318,11 +1318,11 @@ public TestEntity_DataMemberBuddy()
/// Deserialization ctor for MessagePack support, when any Property is required
///
[global::PolyType.ConstructorShapeAttribute()]
- private TestEntity_DataMemberBuddy(int ID)
+ private TestEntity_DataMemberBuddy(int Prop1)
{
this.OnCreated();
base.OnDeserializing(default(global::System.Runtime.Serialization.StreamingContext));
- this.ID = ID;
+ this.Prop1 = Prop1;
}
///
diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/FullTypeNames/Scenarios/TestProvider_Scenarios_CodeGen.g.vb b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/FullTypeNames/Scenarios/TestProvider_Scenarios_CodeGen.g.vb
index a91a069fe..4a414a25b 100644
--- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/FullTypeNames/Scenarios/TestProvider_Scenarios_CodeGen.g.vb
+++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Baselines/FullTypeNames/Scenarios/TestProvider_Scenarios_CodeGen.g.vb
@@ -1208,11 +1208,11 @@ Namespace TestDomainServices
''' Deserialization ctor for MessagePack support, when any Property is required
'''
_
- Private Sub New(ByVal ID As Integer)
+ Private Sub New(ByVal Prop1 As Integer)
MyBase.New
Me.OnCreated
MyBase.OnDeserializing(CType(Nothing, Global.System.Runtime.Serialization.StreamingContext))
- Me.ID = ID
+ Me.Prop1 = Prop1
End Sub
'''