Skip to content

Fix VersionConverter for versions without Build/Revision #136423

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
jkotas merged 1 commit into from
Oct 24, 2026
+59 −4
Merged

Fix VersionConverter for versions without Build/Revision #136423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 23 additions & 4 deletions ...braries/System.ComponentModel.TypeConverter/src/System/ComponentModel/VersionConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public override bool CanConvertTo(ITypeDescriptorContext? context, [NotNullWhen(

if (value is Version version)
{
return new Version(version.Major, version.Minor, version.Build, version.Revision); // return new instance
return version.Clone(); // return new instance
}

return base.ConvertFrom(context, culture, value);
Expand All @@ -71,9 +71,28 @@ public override bool CanConvertTo(ITypeDescriptorContext? context, [NotNullWhen(
{
if (destinationType == typeof(InstanceDescriptor))
{
ConstructorInfo? ctor = typeof(Version).GetConstructor(BindingFlags.Public | BindingFlags.Instance, null, new Type[] { typeof(int), typeof(int), typeof(int), typeof(int) }, null);
ConstructorInfo? ctor;
object[] arguments;

// Build and Revision are -1 when undefined, which the four-argument constructor rejects.
if (version.Build < 0)
{
ctor = typeof(Version).GetConstructor([typeof(int), typeof(int)]);
arguments = [version.Major, version.Minor];
}
else if (version.Revision < 0)
{
ctor = typeof(Version).GetConstructor([typeof(int), typeof(int), typeof(int)]);
arguments = [version.Major, version.Minor, version.Build];
}
else
{
ctor = typeof(Version).GetConstructor([typeof(int), typeof(int), typeof(int), typeof(int)]);
arguments = [version.Major, version.Minor, version.Build, version.Revision];
}

Debug.Assert(ctor != null, "Couldn't find constructor");
return new InstanceDescriptor(ctor, new object[] { version.Major, version.Minor, version.Build, version.Revision });
return new InstanceDescriptor(ctor, arguments);
}

if (destinationType == typeof(string))
Expand All @@ -83,7 +102,7 @@ public override bool CanConvertTo(ITypeDescriptorContext? context, [NotNullWhen(

if (destinationType == typeof(Version))
{
return new Version(version.Major, version.Minor, version.Build, version.Revision);
return version.Clone();
}
}

Expand Down
36 changes: 36 additions & 0 deletions src/libraries/System.ComponentModel.TypeConverter/tests/VersionConverterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,41 @@ public static void ConvertFromInvalidVersion_WithContext_ThrowsFormatException(s
Assert.Throws<FormatException>(
() => VersionConverterTests.s_converter.ConvertFrom(TypeConverterTests.s_context, null, version));
}

public static TheoryData<Version> Versions => new()
{
new Version(1, 2),
new Version(1, 2, 3),
new Version(1, 2, 3, 4),
};

[Theory]
[MemberData(nameof(Versions))]
public static void ConvertFrom_Version_ReturnsEqualCopy(Version version)
{
object result = s_converter.ConvertFrom(TypeConverterTests.s_context, null, version);
Assert.Equal(version, result);
Assert.NotSame(version, result);
}

[Theory]
[MemberData(nameof(Versions))]
public static void ConvertTo_Version_ReturnsEqualCopy(Version version)
{
object result = s_converter.ConvertTo(TypeConverterTests.s_context, null, version, typeof(Version));
Assert.Equal(version, result);
Assert.NotSame(version, result);
}

[Theory]
[MemberData(nameof(Versions))]
public static void ConvertTo_InstanceDescriptor_RoundTrips(Version version)
{
InstanceDescriptor descriptor = Assert.IsType<InstanceDescriptor>(
s_converter.ConvertTo(TypeConverterTests.s_context, null, version, typeof(InstanceDescriptor)));

Assert.Equal(version, descriptor.Invoke());
Assert.Equal(version, s_converter.ConvertFrom(TypeConverterTests.s_context, null, descriptor));
}
}
}
Loading