Refactor DesignerSerializationManager to replace HashTable and enable Nullability

[elachlan]

Refactored to replace HashTable
Refactored for null-ability annotations
General code cleanup

Dependent on runtime changes in:

• Fix IDesignerSerializationManager nullability runtime#79429
• Add nullability to CreateInstance in TypeDescriptor/TypeDescriptionProvider to match Activator.CreateInstance runtime#79776
• Fix nullability on IDesignerSerializationProvider.GetSerializer runtime#81203

Related: #8342, #8143

Microsoft Reviewers: Open in CodeFlow

[elachlan]

@RussKie, should IDesignerSerializationManager.CreateInstance return object??
runtime are taking a rightfully cautious approach with this, but I can't see how the code works without it.

dotnet/runtime#79429

[lonitra]

There seems to be a bug in the original code. Otherwise, mostly about cleaning up some old comments

[elachlan]

I think that TypeDescriptor.CreateInstance should change the args parameter from object[]? to object?[]?.
https://learn.microsoft.com/en-us/dotnet/api/system.componentmodel.typedescriptor.createinstance?view=net-7.0

[lonitra]

Small comment on whether a null check can be removed, otherwise LGTM!

[lonitra]

I think that TypeDescriptor.CreateInstance should change the args parameter from object[]? to object?[]?. https://learn.microsoft.com/en-us/dotnet/api/system.componentmodel.typedescriptor.createinstance?view=net-7.0

Looking at source code it may need to be addressed in TypeDescriptorProvider. I believe runtime owns TypeDescriptor. Feel free to raise in issue.

[elachlan]

@lonitra I'm digging through runtime now. Activator.CreateInstance() has object?[]? for args. So just need to update all the annotations up through the stack. I'll put together a PR.

[lonitra]

@lonitra I'm digging through runtime now. Activator.CreateInstance() has object?[]? for args. So just need to update all the annotations up through the stack. I'll put together a PR.

Thanks for doing that!

[lonitra]

This LGTM :) but looks like we have some build errors. If you build on command line (cd to winforms repo on command line and type 'build') these errors should show up

[elachlan]

Thanks, some of the build errors are related to the winforms PRs. I'll check over it again.

[elachlan]

Do we add exception information to XML comments?

[lonitra]

Do we add exception information to XML comments?

Sorry, I'm not sure I follow. Which XML comments?

[elachlan]

I apologize for the rebase/force push. Test should be fixed now.

[lonitra]

Thank you for your persistence on this!

[elachlan]

Thanks, I hope that the rest of the code base doesn't take me 2 months per code file.

[KalleOlaviNiemitalo]

I was looking at the source code and I think this PR caused a bug here:

winforms/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/DesignerSerializationManager.cs

Lines 421 to 429 in 2681167

	if(serializersis not null)
	{
	// I don't double hash here. It will be a very rare day where multiple types of serializers will be used in the same scheme. We still handle it, but we just don't cache.
	serializer=serializers[objectType];
	if(serializeris not null&&!serializerType.IsAssignableFrom(serializer.GetType()))
	{
	serializer=null;
	}
	}

When serializers was a Hashtable, serializers[objectType] returned null if there was no entry for objectType. Now that serializers is a Dictionary<Type, object>?, it's going to throw KeyNotFoundException instead. So this should call serializers.TryGetValue(objectType, out serializer) instead.

[elachlan]

I'll try and put in a pr to fix it soon.

[KalleOlaviNiemitalo]

The same may apply to other hashtables such as namesByInstance.

[dreddy-work]

The same may apply to other hashtables such as namesByInstance.

Thank you @KalleOlaviNiemitalo for pointing this out. @elachlan, lets take a look at these on case by case.

[elachlan]

Refactored to replace HashTable
Refactored for null-ability annotations
General code cleanup

Dependent on runtime changes in:

• Fix IDesignerSerializationManager nullability runtime#79429
• Add nullability to CreateInstance in TypeDescriptor/TypeDescriptionProvider to match Activator.CreateInstance runtime#79776
• Fix nullability on IDesignerSerializationProvider.GetSerializer runtime#81203

Related: #8342, #8143

Microsoft Reviewers: Open in CodeFlow

[elachlan]

@RussKie, should IDesignerSerializationManager.CreateInstance return object??
runtime are taking a rightfully cautious approach with this, but I can't see how the code works without it.

dotnet/runtime#79429

[lonitra]

There seems to be a bug in the original code. Otherwise, mostly about cleaning up some old comments

[elachlan]

I think that TypeDescriptor.CreateInstance should change the args parameter from object[]? to object?[]?.
https://learn.microsoft.com/en-us/dotnet/api/system.componentmodel.typedescriptor.createinstance?view=net-7.0

[lonitra]

Small comment on whether a null check can be removed, otherwise LGTM!

[lonitra]

I think that TypeDescriptor.CreateInstance should change the args parameter from object[]? to object?[]?. https://learn.microsoft.com/en-us/dotnet/api/system.componentmodel.typedescriptor.createinstance?view=net-7.0

Looking at source code it may need to be addressed in TypeDescriptorProvider. I believe runtime owns TypeDescriptor. Feel free to raise in issue.

[elachlan]

@lonitra I'm digging through runtime now. Activator.CreateInstance() has object?[]? for args. So just need to update all the annotations up through the stack. I'll put together a PR.

[lonitra]

@lonitra I'm digging through runtime now. Activator.CreateInstance() has object?[]? for args. So just need to update all the annotations up through the stack. I'll put together a PR.

Thanks for doing that!

[lonitra]

This LGTM :) but looks like we have some build errors. If you build on command line (cd to winforms repo on command line and type 'build') these errors should show up

[elachlan]

Thanks, some of the build errors are related to the winforms PRs. I'll check over it again.

[elachlan]

Do we add exception information to XML comments?

[lonitra]

Do we add exception information to XML comments?

Sorry, I'm not sure I follow. Which XML comments?

[elachlan]

I apologize for the rebase/force push. Test should be fixed now.

[lonitra]

Thank you for your persistence on this!

[elachlan]

Thanks, I hope that the rest of the code base doesn't take me 2 months per code file.

[KalleOlaviNiemitalo]

I was looking at the source code and I think this PR caused a bug here:

winforms/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/DesignerSerializationManager.cs

Lines 421 to 429 in 2681167

	if(serializersis not null)
	{
	// I don't double hash here. It will be a very rare day where multiple types of serializers will be used in the same scheme. We still handle it, but we just don't cache.
	serializer=serializers[objectType];
	if(serializeris not null&&!serializerType.IsAssignableFrom(serializer.GetType()))
	{
	serializer=null;
	}
	}

When serializers was a Hashtable, serializers[objectType] returned null if there was no entry for objectType. Now that serializers is a Dictionary<Type, object>?, it's going to throw KeyNotFoundException instead. So this should call serializers.TryGetValue(objectType, out serializer) instead.

[elachlan]

I'll try and put in a pr to fix it soon.

[KalleOlaviNiemitalo]

The same may apply to other hashtables such as namesByInstance.

[dreddy-work]

The same may apply to other hashtables such as namesByInstance.

Thank you @KalleOlaviNiemitalo for pointing this out. @elachlan, lets take a look at these on case by case.

[elachlan]

Refactored to replace HashTable
Refactored for null-ability annotations
General code cleanup

Dependent on runtime changes in:

• Fix IDesignerSerializationManager nullability runtime#79429
• Add nullability to CreateInstance in TypeDescriptor/TypeDescriptionProvider to match Activator.CreateInstance runtime#79776
• Fix nullability on IDesignerSerializationProvider.GetSerializer runtime#81203

Related: #8342, #8143

Microsoft Reviewers: Open in CodeFlow

[elachlan]

@RussKie, should IDesignerSerializationManager.CreateInstance return object??
runtime are taking a rightfully cautious approach with this, but I can't see how the code works without it.

dotnet/runtime#79429

[lonitra]

There seems to be a bug in the original code. Otherwise, mostly about cleaning up some old comments

[elachlan]

I think that TypeDescriptor.CreateInstance should change the args parameter from object[]? to object?[]?.
https://learn.microsoft.com/en-us/dotnet/api/system.componentmodel.typedescriptor.createinstance?view=net-7.0

[lonitra]

Small comment on whether a null check can be removed, otherwise LGTM!

[lonitra]

I think that TypeDescriptor.CreateInstance should change the args parameter from object[]? to object?[]?. https://learn.microsoft.com/en-us/dotnet/api/system.componentmodel.typedescriptor.createinstance?view=net-7.0

Looking at source code it may need to be addressed in TypeDescriptorProvider. I believe runtime owns TypeDescriptor. Feel free to raise in issue.

[elachlan]

@lonitra I'm digging through runtime now. Activator.CreateInstance() has object?[]? for args. So just need to update all the annotations up through the stack. I'll put together a PR.

[lonitra]

@lonitra I'm digging through runtime now. Activator.CreateInstance() has object?[]? for args. So just need to update all the annotations up through the stack. I'll put together a PR.

Thanks for doing that!

[lonitra]

This LGTM :) but looks like we have some build errors. If you build on command line (cd to winforms repo on command line and type 'build') these errors should show up

[elachlan]

Thanks, some of the build errors are related to the winforms PRs. I'll check over it again.

[elachlan]

Do we add exception information to XML comments?

[lonitra]

Do we add exception information to XML comments?

Sorry, I'm not sure I follow. Which XML comments?

[elachlan]

I apologize for the rebase/force push. Test should be fixed now.

[lonitra]

Thank you for your persistence on this!

[elachlan]

Thanks, I hope that the rest of the code base doesn't take me 2 months per code file.

[KalleOlaviNiemitalo]

I was looking at the source code and I think this PR caused a bug here:

winforms/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/DesignerSerializationManager.cs

Lines 421 to 429 in 2681167

	if(serializersis not null)
	{
	// I don't double hash here. It will be a very rare day where multiple types of serializers will be used in the same scheme. We still handle it, but we just don't cache.
	serializer=serializers[objectType];
	if(serializeris not null&&!serializerType.IsAssignableFrom(serializer.GetType()))
	{
	serializer=null;
	}
	}

When serializers was a Hashtable, serializers[objectType] returned null if there was no entry for objectType. Now that serializers is a Dictionary<Type, object>?, it's going to throw KeyNotFoundException instead. So this should call serializers.TryGetValue(objectType, out serializer) instead.

[elachlan]

I'll try and put in a pr to fix it soon.

[KalleOlaviNiemitalo]

The same may apply to other hashtables such as namesByInstance.

[dreddy-work]

The same may apply to other hashtables such as namesByInstance.

Thank you @KalleOlaviNiemitalo for pointing this out. @elachlan, lets take a look at these on case by case.

[elachlan]

Refactored to replace HashTable
Refactored for null-ability annotations
General code cleanup

Dependent on runtime changes in:

• Fix IDesignerSerializationManager nullability runtime#79429
• Add nullability to CreateInstance in TypeDescriptor/TypeDescriptionProvider to match Activator.CreateInstance runtime#79776
• Fix nullability on IDesignerSerializationProvider.GetSerializer runtime#81203

Related: #8342, #8143

Microsoft Reviewers: Open in CodeFlow

[elachlan]

@RussKie, should IDesignerSerializationManager.CreateInstance return object??
runtime are taking a rightfully cautious approach with this, but I can't see how the code works without it.

dotnet/runtime#79429

[lonitra]

There seems to be a bug in the original code. Otherwise, mostly about cleaning up some old comments

[elachlan]

I think that TypeDescriptor.CreateInstance should change the args parameter from object[]? to object?[]?.
https://learn.microsoft.com/en-us/dotnet/api/system.componentmodel.typedescriptor.createinstance?view=net-7.0

[lonitra]

Small comment on whether a null check can be removed, otherwise LGTM!

[lonitra]

I think that TypeDescriptor.CreateInstance should change the args parameter from object[]? to object?[]?. https://learn.microsoft.com/en-us/dotnet/api/system.componentmodel.typedescriptor.createinstance?view=net-7.0

Looking at source code it may need to be addressed in TypeDescriptorProvider. I believe runtime owns TypeDescriptor. Feel free to raise in issue.

[elachlan]

@lonitra I'm digging through runtime now. Activator.CreateInstance() has object?[]? for args. So just need to update all the annotations up through the stack. I'll put together a PR.

[lonitra]

@lonitra I'm digging through runtime now. Activator.CreateInstance() has object?[]? for args. So just need to update all the annotations up through the stack. I'll put together a PR.

Thanks for doing that!

[lonitra]

This LGTM :) but looks like we have some build errors. If you build on command line (cd to winforms repo on command line and type 'build') these errors should show up

[elachlan]

Thanks, some of the build errors are related to the winforms PRs. I'll check over it again.

[elachlan]

Do we add exception information to XML comments?

[lonitra]

Do we add exception information to XML comments?

Sorry, I'm not sure I follow. Which XML comments?

[elachlan]

I apologize for the rebase/force push. Test should be fixed now.

[lonitra]

Thank you for your persistence on this!

[elachlan]

Thanks, I hope that the rest of the code base doesn't take me 2 months per code file.

[KalleOlaviNiemitalo]

I was looking at the source code and I think this PR caused a bug here:

winforms/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/DesignerSerializationManager.cs

Lines 421 to 429 in 2681167

	if(serializersis not null)
	{
	// I don't double hash here. It will be a very rare day where multiple types of serializers will be used in the same scheme. We still handle it, but we just don't cache.
	serializer=serializers[objectType];
	if(serializeris not null&&!serializerType.IsAssignableFrom(serializer.GetType()))
	{
	serializer=null;
	}
	}

When serializers was a Hashtable, serializers[objectType] returned null if there was no entry for objectType. Now that serializers is a Dictionary<Type, object>?, it's going to throw KeyNotFoundException instead. So this should call serializers.TryGetValue(objectType, out serializer) instead.

[elachlan]

I'll try and put in a pr to fix it soon.

[KalleOlaviNiemitalo]

The same may apply to other hashtables such as namesByInstance.

[dreddy-work]

The same may apply to other hashtables such as namesByInstance.

Thank you @KalleOlaviNiemitalo for pointing this out. @elachlan, lets take a look at these on case by case.

[elachlan]

Refactored to replace HashTable
Refactored for null-ability annotations
General code cleanup

Dependent on runtime changes in:

• Fix IDesignerSerializationManager nullability runtime#79429
• Add nullability to CreateInstance in TypeDescriptor/TypeDescriptionProvider to match Activator.CreateInstance runtime#79776
• Fix nullability on IDesignerSerializationProvider.GetSerializer runtime#81203

Related: #8342, #8143

Microsoft Reviewers: Open in CodeFlow

[elachlan]

@RussKie, should IDesignerSerializationManager.CreateInstance return object??
runtime are taking a rightfully cautious approach with this, but I can't see how the code works without it.

dotnet/runtime#79429

[lonitra]

There seems to be a bug in the original code. Otherwise, mostly about cleaning up some old comments

[elachlan]

I think that TypeDescriptor.CreateInstance should change the args parameter from object[]? to object?[]?.
https://learn.microsoft.com/en-us/dotnet/api/system.componentmodel.typedescriptor.createinstance?view=net-7.0

[lonitra]

Small comment on whether a null check can be removed, otherwise LGTM!

[lonitra]

I think that TypeDescriptor.CreateInstance should change the args parameter from object[]? to object?[]?. https://learn.microsoft.com/en-us/dotnet/api/system.componentmodel.typedescriptor.createinstance?view=net-7.0

Looking at source code it may need to be addressed in TypeDescriptorProvider. I believe runtime owns TypeDescriptor. Feel free to raise in issue.

[elachlan]

@lonitra I'm digging through runtime now. Activator.CreateInstance() has object?[]? for args. So just need to update all the annotations up through the stack. I'll put together a PR.

[lonitra]

@lonitra I'm digging through runtime now. Activator.CreateInstance() has object?[]? for args. So just need to update all the annotations up through the stack. I'll put together a PR.

Thanks for doing that!

[lonitra]

This LGTM :) but looks like we have some build errors. If you build on command line (cd to winforms repo on command line and type 'build') these errors should show up

[elachlan]

Thanks, some of the build errors are related to the winforms PRs. I'll check over it again.

[elachlan]

Do we add exception information to XML comments?

[lonitra]

Do we add exception information to XML comments?

Sorry, I'm not sure I follow. Which XML comments?

[elachlan]

I apologize for the rebase/force push. Test should be fixed now.

[lonitra]

Thank you for your persistence on this!

[elachlan]

Thanks, I hope that the rest of the code base doesn't take me 2 months per code file.

[KalleOlaviNiemitalo]

I was looking at the source code and I think this PR caused a bug here:

winforms/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/DesignerSerializationManager.cs

Lines 421 to 429 in 2681167

	if(serializersis not null)
	{
	// I don't double hash here. It will be a very rare day where multiple types of serializers will be used in the same scheme. We still handle it, but we just don't cache.
	serializer=serializers[objectType];
	if(serializeris not null&&!serializerType.IsAssignableFrom(serializer.GetType()))
	{
	serializer=null;
	}
	}

When serializers was a Hashtable, serializers[objectType] returned null if there was no entry for objectType. Now that serializers is a Dictionary<Type, object>?, it's going to throw KeyNotFoundException instead. So this should call serializers.TryGetValue(objectType, out serializer) instead.

[elachlan]

I'll try and put in a pr to fix it soon.

[KalleOlaviNiemitalo]

The same may apply to other hashtables such as namesByInstance.

[dreddy-work]

The same may apply to other hashtables such as namesByInstance.

Thank you @KalleOlaviNiemitalo for pointing this out. @elachlan, lets take a look at these on case by case.

[elachlan]

Refactored to replace HashTable
Refactored for null-ability annotations
General code cleanup

Dependent on runtime changes in:

• Fix IDesignerSerializationManager nullability runtime#79429
• Add nullability to CreateInstance in TypeDescriptor/TypeDescriptionProvider to match Activator.CreateInstance runtime#79776
• Fix nullability on IDesignerSerializationProvider.GetSerializer runtime#81203

Related: #8342, #8143

Microsoft Reviewers: Open in CodeFlow

[elachlan]

@RussKie, should IDesignerSerializationManager.CreateInstance return object??
runtime are taking a rightfully cautious approach with this, but I can't see how the code works without it.

dotnet/runtime#79429

[lonitra]

There seems to be a bug in the original code. Otherwise, mostly about cleaning up some old comments

[elachlan]

I think that TypeDescriptor.CreateInstance should change the args parameter from object[]? to object?[]?.
https://learn.microsoft.com/en-us/dotnet/api/system.componentmodel.typedescriptor.createinstance?view=net-7.0

[lonitra]

Small comment on whether a null check can be removed, otherwise LGTM!

[lonitra]

I think that TypeDescriptor.CreateInstance should change the args parameter from object[]? to object?[]?. https://learn.microsoft.com/en-us/dotnet/api/system.componentmodel.typedescriptor.createinstance?view=net-7.0

Looking at source code it may need to be addressed in TypeDescriptorProvider. I believe runtime owns TypeDescriptor. Feel free to raise in issue.

[elachlan]

@lonitra I'm digging through runtime now. Activator.CreateInstance() has object?[]? for args. So just need to update all the annotations up through the stack. I'll put together a PR.

[lonitra]

@lonitra I'm digging through runtime now. Activator.CreateInstance() has object?[]? for args. So just need to update all the annotations up through the stack. I'll put together a PR.

Thanks for doing that!

[lonitra]

This LGTM :) but looks like we have some build errors. If you build on command line (cd to winforms repo on command line and type 'build') these errors should show up

[elachlan]

Thanks, some of the build errors are related to the winforms PRs. I'll check over it again.

[elachlan]

Do we add exception information to XML comments?

[lonitra]

Do we add exception information to XML comments?

Sorry, I'm not sure I follow. Which XML comments?

[elachlan]

I apologize for the rebase/force push. Test should be fixed now.

[lonitra]

Thank you for your persistence on this!

[elachlan]

Thanks, I hope that the rest of the code base doesn't take me 2 months per code file.

[KalleOlaviNiemitalo]

I was looking at the source code and I think this PR caused a bug here:

winforms/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/DesignerSerializationManager.cs

Lines 421 to 429 in 2681167

	if(serializersis not null)
	{
	// I don't double hash here. It will be a very rare day where multiple types of serializers will be used in the same scheme. We still handle it, but we just don't cache.
	serializer=serializers[objectType];
	if(serializeris not null&&!serializerType.IsAssignableFrom(serializer.GetType()))
	{
	serializer=null;
	}
	}

When serializers was a Hashtable, serializers[objectType] returned null if there was no entry for objectType. Now that serializers is a Dictionary<Type, object>?, it's going to throw KeyNotFoundException instead. So this should call serializers.TryGetValue(objectType, out serializer) instead.

[elachlan]

I'll try and put in a pr to fix it soon.

[KalleOlaviNiemitalo]

The same may apply to other hashtables such as namesByInstance.

[dreddy-work]

The same may apply to other hashtables such as namesByInstance.

Thank you @KalleOlaviNiemitalo for pointing this out. @elachlan, lets take a look at these on case by case.

[elachlan]

Refactored to replace HashTable
Refactored for null-ability annotations
General code cleanup

Dependent on runtime changes in:

• Fix IDesignerSerializationManager nullability runtime#79429
• Add nullability to CreateInstance in TypeDescriptor/TypeDescriptionProvider to match Activator.CreateInstance runtime#79776
• Fix nullability on IDesignerSerializationProvider.GetSerializer runtime#81203

Related: #8342, #8143

Microsoft Reviewers: Open in CodeFlow

[elachlan]

@RussKie, should IDesignerSerializationManager.CreateInstance return object??
runtime are taking a rightfully cautious approach with this, but I can't see how the code works without it.

dotnet/runtime#79429

[lonitra]

There seems to be a bug in the original code. Otherwise, mostly about cleaning up some old comments

[elachlan]

I think that TypeDescriptor.CreateInstance should change the args parameter from object[]? to object?[]?.
https://learn.microsoft.com/en-us/dotnet/api/system.componentmodel.typedescriptor.createinstance?view=net-7.0

[lonitra]

Small comment on whether a null check can be removed, otherwise LGTM!

[lonitra]

I think that TypeDescriptor.CreateInstance should change the args parameter from object[]? to object?[]?. https://learn.microsoft.com/en-us/dotnet/api/system.componentmodel.typedescriptor.createinstance?view=net-7.0

Looking at source code it may need to be addressed in TypeDescriptorProvider. I believe runtime owns TypeDescriptor. Feel free to raise in issue.

[elachlan]

@lonitra I'm digging through runtime now. Activator.CreateInstance() has object?[]? for args. So just need to update all the annotations up through the stack. I'll put together a PR.

[lonitra]

@lonitra I'm digging through runtime now. Activator.CreateInstance() has object?[]? for args. So just need to update all the annotations up through the stack. I'll put together a PR.

Thanks for doing that!

[lonitra]

This LGTM :) but looks like we have some build errors. If you build on command line (cd to winforms repo on command line and type 'build') these errors should show up

[elachlan]

Thanks, some of the build errors are related to the winforms PRs. I'll check over it again.

[elachlan]

Do we add exception information to XML comments?

[lonitra]

Do we add exception information to XML comments?

Sorry, I'm not sure I follow. Which XML comments?

[elachlan]

I apologize for the rebase/force push. Test should be fixed now.

[lonitra]

Thank you for your persistence on this!

[elachlan]

Thanks, I hope that the rest of the code base doesn't take me 2 months per code file.

[KalleOlaviNiemitalo]

I was looking at the source code and I think this PR caused a bug here:

winforms/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/DesignerSerializationManager.cs

Lines 421 to 429 in 2681167

	if(serializersis not null)
	{
	// I don't double hash here. It will be a very rare day where multiple types of serializers will be used in the same scheme. We still handle it, but we just don't cache.
	serializer=serializers[objectType];
	if(serializeris not null&&!serializerType.IsAssignableFrom(serializer.GetType()))
	{
	serializer=null;
	}
	}

When serializers was a Hashtable, serializers[objectType] returned null if there was no entry for objectType. Now that serializers is a Dictionary<Type, object>?, it's going to throw KeyNotFoundException instead. So this should call serializers.TryGetValue(objectType, out serializer) instead.

[elachlan]

I'll try and put in a pr to fix it soon.

[KalleOlaviNiemitalo]

The same may apply to other hashtables such as namesByInstance.

[dreddy-work]

The same may apply to other hashtables such as namesByInstance.

Thank you @KalleOlaviNiemitalo for pointing this out. @elachlan, lets take a look at these on case by case.

[elachlan]

Refactored to replace HashTable
Refactored for null-ability annotations
General code cleanup

Dependent on runtime changes in:

• Fix IDesignerSerializationManager nullability runtime#79429
• Add nullability to CreateInstance in TypeDescriptor/TypeDescriptionProvider to match Activator.CreateInstance runtime#79776
• Fix nullability on IDesignerSerializationProvider.GetSerializer runtime#81203

Related: #8342, #8143

Microsoft Reviewers: Open in CodeFlow

[elachlan]

@RussKie, should IDesignerSerializationManager.CreateInstance return object??
runtime are taking a rightfully cautious approach with this, but I can't see how the code works without it.

dotnet/runtime#79429

[lonitra]

There seems to be a bug in the original code. Otherwise, mostly about cleaning up some old comments

[elachlan]

I think that TypeDescriptor.CreateInstance should change the args parameter from object[]? to object?[]?.
https://learn.microsoft.com/en-us/dotnet/api/system.componentmodel.typedescriptor.createinstance?view=net-7.0

[lonitra]

Small comment on whether a null check can be removed, otherwise LGTM!

[lonitra]

I think that TypeDescriptor.CreateInstance should change the args parameter from object[]? to object?[]?. https://learn.microsoft.com/en-us/dotnet/api/system.componentmodel.typedescriptor.createinstance?view=net-7.0

Looking at source code it may need to be addressed in TypeDescriptorProvider. I believe runtime owns TypeDescriptor. Feel free to raise in issue.

[elachlan]

@lonitra I'm digging through runtime now. Activator.CreateInstance() has object?[]? for args. So just need to update all the annotations up through the stack. I'll put together a PR.

[lonitra]

@lonitra I'm digging through runtime now. Activator.CreateInstance() has object?[]? for args. So just need to update all the annotations up through the stack. I'll put together a PR.

Thanks for doing that!

[lonitra]

This LGTM :) but looks like we have some build errors. If you build on command line (cd to winforms repo on command line and type 'build') these errors should show up

[elachlan]

Thanks, some of the build errors are related to the winforms PRs. I'll check over it again.

[elachlan]

Do we add exception information to XML comments?

[lonitra]

Do we add exception information to XML comments?

Sorry, I'm not sure I follow. Which XML comments?

[elachlan]

I apologize for the rebase/force push. Test should be fixed now.

[lonitra]

Thank you for your persistence on this!

[elachlan]

Thanks, I hope that the rest of the code base doesn't take me 2 months per code file.

[KalleOlaviNiemitalo]

I was looking at the source code and I think this PR caused a bug here:

winforms/src/System.Windows.Forms.Design/src/System/ComponentModel/Design/Serialization/DesignerSerializationManager.cs

Lines 421 to 429 in 2681167

	if(serializersis not null)
	{
	// I don't double hash here. It will be a very rare day where multiple types of serializers will be used in the same scheme. We still handle it, but we just don't cache.
	serializer=serializers[objectType];
	if(serializeris not null&&!serializerType.IsAssignableFrom(serializer.GetType()))
	{
	serializer=null;
	}
	}

When serializers was a Hashtable, serializers[objectType] returned null if there was no entry for objectType. Now that serializers is a Dictionary<Type, object>?, it's going to throw KeyNotFoundException instead. So this should call serializers.TryGetValue(objectType, out serializer) instead.

[elachlan]

I'll try and put in a pr to fix it soon.

[KalleOlaviNiemitalo]

The same may apply to other hashtables such as namesByInstance.

[dreddy-work]

The same may apply to other hashtables such as namesByInstance.

Thank you @KalleOlaviNiemitalo for pointing this out. @elachlan, lets take a look at these on case by case.