Skip to content

Update MessagePack NuGet files and improve type handling #597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Daniel-Svensson merged 8 commits into from
Jul 30, 2026
Merged

Update MessagePack NuGet files and improve type handling #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0d8ecbd
Update messagepack nuget files
Daniel-Svensson Jul 30, 2026
7c9d971
Merge branch 'main' of https://github.com/OpenRIAServices/OpenRiaServ…
Daniel-Svensson Jul 30, 2026
552bc7f
Update generated code for classes with required properties to only ac…
Daniel-Svensson Jul 30, 2026
51966d3
update baselines
Daniel-Svensson Jul 30, 2026
7751333
Prevent duplicate discriminators for surrogate types
Daniel-Svensson Jul 30, 2026
0f1e6da
use safe name
Daniel-Svensson Jul 30, 2026
34d5049
update baselines
Daniel-Svensson Jul 30, 2026
23db6d9
fix nuget vulnerability varning
Daniel-Svensson Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 7 additions & 30 deletions NuGet/OpenRiaServices.Client.Core.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
<tags>WCF RIA Services RIAServices Silverlight OpenRiaServices</tags>
<dependencies>
<group targetFramework="net472">
<dependency id="Nerdbank.MessagePack" version="1.2.4" exclude="Build,Analyzers" />
<dependency id="Nerdbank.MessagePack" version="1.2.36" exclude="Build,Analyzers" />
<dependency id="System.IO.Hashing" version="10.0.9" exclude="Build,Analyzers" />
</group>
<group targetFramework="net8.0">
<dependency id="Nerdbank.MessagePack" version="1.2.4" exclude="Build,Analyzers" />
<dependency id="Nerdbank.MessagePack" version="1.2.36" exclude="Build,Analyzers" />
<dependency id="System.IO.Hashing" version="10.0.9" exclude="Build,Analyzers" />
</group>
<group targetFramework="net8.0-windows7.0">
<dependency id="Nerdbank.MessagePack" version="1.2.4" exclude="Build,Analyzers" />
<dependency id="Nerdbank.MessagePack" version="1.2.36" exclude="Build,Analyzers" />
<dependency id="System.IO.Hashing" version="10.0.9" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand All @@ -42,27 +42,12 @@
</frameworkAssemblies>
</metadata>
<files>
<!-- netstandard binaries -->
<!--
<file src="..\src\bin\Release\netstandard2.0\OpenRiaServices.Client.dll" target="lib\netstandard2.0\OpenRiaServices.Client.dll" />
<file src="..\src\bin\Release\netstandard2.0\OpenRiaServices.Client.pdb" target="lib\netstandard2.0\OpenRiaServices.Client.pdb" />
<file src="..\src\bin\Release\netstandard2.0\OpenRiaServices.Client.xml" target="lib\netstandard2.0\OpenRiaServices.Client.xml" />
<file src="..\src\bin\Release\netstandard2.0\OpenRiaServices.Client.Web.dll" target="lib\netstandard2.0\OpenRiaServices.Client.Web.dll" />
<file src="..\src\bin\Release\netstandard2.0\OpenRiaServices.Client.Web.pdb" target="lib\netstandard2.0\OpenRiaServices.Client.Web.pdb" />
<file src="..\src\bin\Release\netstandard2.0\OpenRiaServices.Client.Web.xml" target="lib\netstandard2.0\OpenRiaServices.Client.Web.xml" />
<file src="..\src\bin\Release\netstandard2.0\OpenRiaServices.Client.DomainClients.Http.dll" target="lib\netstandard2.0\OpenRiaServices.Client.DomainClients.Http.dll" />
<file src="..\src\bin\Release\netstandard2.0\OpenRiaServices.Client.DomainClients.Http.pdb" target="lib\netstandard2.0\OpenRiaServices.Client.DomainClients.Http.pdb" />
<file src="..\src\bin\Release\netstandard2.0\OpenRiaServices.Client.DomainClients.Http.xml" target="lib\netstandard2.0\OpenRiaServices.Client.DomainClients.Http.xml" />
-->

<!-- Desktop binaries -->
<file src="..\src\bin\Release\net472\OpenRiaServices.Client.dll" target="lib\net472\OpenRiaServices.Client.dll" />
<file src="..\src\bin\Release\net472\OpenRiaServices.Client.pdb" target="lib\net472\OpenRiaServices.Client.pdb" />
<file src="..\src\bin\Release\net472\OpenRiaServices.Client.xml" target="lib\net472\OpenRiaServices.Client.xml" />
<!--
<file src="..\src\bin\Release\net472\OpenRiaServices.Client.Web.dll" target="lib\net472\OpenRiaServices.Client.Web.dll" />
<file src="..\src\bin\Release\net472\OpenRiaServices.Client.Web.pdb" target="lib\net472\OpenRiaServices.Client.Web.pdb" />
<file src="..\src\bin\Release\net472\OpenRiaServices.Client.Web.xml" target="lib\net472\OpenRiaServices.Client.Web.xml" />
-->

<file src="..\src\bin\Release\net472\OpenRiaServices.Client.DomainClients.Http.dll" target="lib\net472\OpenRiaServices.Client.DomainClients.Http.dll" />
<file src="..\src\bin\Release\net472\OpenRiaServices.Client.DomainClients.Http.pdb" target="lib\net472\OpenRiaServices.Client.DomainClients.Http.pdb" />
<file src="..\src\bin\Release\net472\OpenRiaServices.Client.DomainClients.Http.xml" target="lib\net472\OpenRiaServices.Client.DomainClients.Http.xml" />
Expand All @@ -71,11 +56,7 @@
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.dll" target="lib\net8.0\OpenRiaServices.Client.dll" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.pdb" target="lib\net8.0\OpenRiaServices.Client.pdb" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.xml" target="lib\net8.0\OpenRiaServices.Client.xml" />
<!--
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.Web.dll" target="lib\net8.0\OpenRiaServices.Client.Web.dll" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.Web.pdb" target="lib\net8.0\OpenRiaServices.Client.Web.pdb" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.Web.xml" target="lib\net8.0\OpenRiaServices.Client.Web.xml" />
-->

<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.DomainClients.Http.dll" target="lib\net8.0\OpenRiaServices.Client.DomainClients.Http.dll" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.DomainClients.Http.pdb" target="lib\net8.0\OpenRiaServices.Client.DomainClients.Http.pdb" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.DomainClients.Http.xml" target="lib\net8.0\OpenRiaServices.Client.DomainClients.Http.xml" />
Expand All @@ -84,11 +65,7 @@
<file src="..\src\bin\Release\net8.0-windows\OpenRiaServices.Client.dll" target="lib\net8.0-windows7.0\OpenRiaServices.Client.dll" />
<file src="..\src\bin\Release\net8.0-windows\OpenRiaServices.Client.pdb" target="lib\net8.0-windows7.0\OpenRiaServices.Client.pdb" />
<file src="..\src\bin\Release\net8.0-windows\OpenRiaServices.Client.xml" target="lib\net8.0-windows7.0\OpenRiaServices.Client.xml" />
<!--
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.Web.dll" target="lib\net8.0-windows7.0\OpenRiaServices.Client.Web.dll" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.Web.pdb" target="lib\net8.0-windows7.0\OpenRiaServices.Client.Web.pdb" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.Web.xml" target="lib\net8.0-windows7.0\OpenRiaServices.Client.Web.xml" />
-->

<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.DomainClients.Http.dll" target="lib\net8.0-windows7.0\OpenRiaServices.Client.DomainClients.Http.dll" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.DomainClients.Http.pdb" target="lib\net8.0-windows7.0\OpenRiaServices.Client.DomainClients.Http.pdb" />
<file src="..\src\bin\Release\net8.0\OpenRiaServices.Client.DomainClients.Http.xml" target="lib\net8.0-windows7.0\OpenRiaServices.Client.DomainClients.Http.xml" />
Expand Down
3 changes: 2 additions & 1 deletion ...ices.Client.DomainClients.Http/Framework/OpenRiaServices.Client.DomainClients.Http.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
<ProjectReference Include="..\..\OpenRiaServices.Client\Framework\OpenRiaServices.Client.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Nerdbank.MessagePack" Version="1.2.4" />
<PackageReference Include="Nerdbank.MessagePack" Version="1.2.36" />
<PackageReference Include="PolyType" Version="1.4.1" />
<PackageReference Include="System.IO.Hashing" Version="10.0.9" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/OpenRiaServices.Client/Framework/OpenRiaServices.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Nerdbank.MessagePack" Version="1.2.4" />
<PackageReference Include="Nerdbank.MessagePack" Version="1.2.36" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
Expand Down
7 changes: 6 additions & 1 deletion ...Hosting.AspNetCore/Framework/AspNetCore/Serialization/MessagePackSerializationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,17 @@ private MessagePackSerializer CreateSerializerForDomainService(Type domainServic
Wcf.DomainServiceSerializationSurrogate surrogateProvider = new Wcf.DomainServiceSerializationSurrogate(description);

// Create converters to handle surrogates,
Dictionary<Type, DerivedTypeUnion> derivedTypeUnions = _serializer.DerivedTypeUnions.ToDictionary(du => du.BaseType);
List<MessagePackConverter> converters = new();
foreach (var entityType in description.EntityTypes.Concat(description.ComplexTypes))
{
if (surrogateProvider.GetSurrogateType(entityType) is Type surrogateType)
{
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);
}
}

Expand All @@ -52,7 +56,8 @@ private MessagePackSerializer CreateSerializerForDomainService(Type domainServic

return _serializer with
{
Converters = [.. _serializer.Converters, .. converters]
Converters = [.. _serializer.Converters, .. converters],
DerivedTypeUnions = [.. derivedTypeUnions.Values],
};
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/OpenRiaServices.Hosting.AspNetCore/Framework/OpenRiaServices.Hosting.AspNetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Nerdbank.MessagePack" Version="1.2.4" />
<PackageReference Include="Nerdbank.MessagePack" Version="1.2.36" />
<PackageReference Include="PolyType" Version="1.4.1" />
<PackageReference Include="System.IO.Hashing" Version="10.0.9" />
</ItemGroup>

Expand Down
63 changes: 30 additions & 33 deletions ...RiaServices.Tools.TextTemplate/Framework/CSharpGenerators/CSharpComplexObjectGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,56 +315,53 @@



if (!this.IsAbstract)
{
var properties = TypeDescriptor.GetProperties(this.Type);
bool hasRequiredProperty = properties.Cast<PropertyDescriptor>()
.Any(p => p.Attributes.OfType<DataMemberAttribute>().Any(a => a.IsRequired)
&& ShouldDeclareProperty(p)
&& CanGenerateProperty(p));

if (hasRequiredProperty)
{
var pd = properties.Cast<PropertyDescriptor>()
.FirstOrDefault(p => !p.Attributes.OfType<DataMemberAttribute>().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<PropertyDescriptor>()
.Where(p => p.Attributes.OfType<DataMemberAttribute>().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 ");

this.Write(this.ToStringHelper.ToStringWithCulture(typeName));

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");


}
}
}
}
Comment thread
Daniel-Svensson marked this conversation as resolved.
Dismissed

this.Write("}\r\n");


}
}
}

private void GeneratePropertiesInternal()
Expand Down
63 changes: 30 additions & 33 deletions src/OpenRiaServices.Tools.TextTemplate/Framework/CSharpGenerators/CSharpEntityGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,56 +396,53 @@



if (!this.IsAbstract)
{
var properties = TypeDescriptor.GetProperties(this.Type);
bool hasRequiredProperty = properties.Cast<PropertyDescriptor>()
.Any(p => p.Attributes.OfType<DataMemberAttribute>().Any(a => a.IsRequired)
&& ShouldDeclareProperty(p)
&& CanGenerateProperty(p));

if (hasRequiredProperty)
{
var pd = properties.Cast<PropertyDescriptor>()
.FirstOrDefault(p => !p.Attributes.OfType<DataMemberAttribute>().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<PropertyDescriptor>()
.Where(p => p.Attributes.OfType<DataMemberAttribute>().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 ");

this.Write(this.ToStringHelper.ToStringWithCulture(typeName));

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");


}
}
}
}
Comment thread
Daniel-Svensson marked this conversation as resolved.
Dismissed

this.Write("}\r\n");


}
}
}

private void GeneratePropertiesInternal()
Expand Down
51 changes: 24 additions & 27 deletions ...TextTemplate/Framework/CSharpGenerators/Templates/DataContractGeneratorTemplate.ttinclude
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,41 +66,38 @@ namespace <#= this.Type.Namespace #>
}
<#+

if (!this.IsAbstract)
{
var properties = TypeDescriptor.GetProperties(this.Type);
bool hasRequiredProperty = properties.Cast<PropertyDescriptor>()
.Any(p => p.Attributes.OfType<DataMemberAttribute>().Any(a => a.IsRequired)
&& ShouldDeclareProperty(p)
&& CanGenerateProperty(p));

if (hasRequiredProperty)
{
var pd = properties.Cast<PropertyDescriptor>()
.FirstOrDefault(p => !p.Attributes.OfType<DataMemberAttribute>().Any(a => a.IsRequired)
&& ShouldDeclareProperty(p)
&& CanGenerateProperty(p));
if (!this.IsAbstract)
{
var requiredProperties = TypeDescriptor.GetProperties(this.Type)
.Cast<PropertyDescriptor>()
.Where(p => p.Attributes.OfType<DataMemberAttribute>().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 #>;
<#+
}
#>
}
<#+
}
}
}
}
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

private void GeneratePropertiesInternal()
Expand Down
Loading
Loading