From 4689efa226da1ed677f7adcfe9482fc40214116f Mon Sep 17 00:00:00 2001
From: Lachlan Ennis <2433737+elachlan@users.noreply.github.com>
Date: Fri, 9 Dec 2022 12:03:30 +1000
Subject: [PATCH 1/3] Add nullable annotation based off documentation
---
.../Serialization/IDesignerSerializationManager.cs | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/Serialization/IDesignerSerializationManager.cs b/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/Serialization/IDesignerSerializationManager.cs
index a207346fc3617a..17795a1f52a2af 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/Serialization/IDesignerSerializationManager.cs
+++ b/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/Serialization/IDesignerSerializationManager.cs
@@ -71,30 +71,30 @@ public interface IDesignerSerializationManager : IServiceProvider
/// of named instances. Objects that implement IComponent will be
/// added to the design time container if addToContainer is true.
///
- object CreateInstance(Type type, ICollection arguments, string name, bool addToContainer);
+ object CreateInstance(Type type, ICollection arguments, string? name, bool addToContainer);
///
/// Retrieves an instance of a created object of the given name, or
/// null if that object does not exist.
///
- object GetInstance(string name);
+ object? GetInstance(string name);
///
/// Retrieves a name for the specified object, or null if the object
/// has no name.
///
- string GetName(object value);
+ string? GetName(object value);
///
/// Retrieves a serializer of the requested type for the given
/// object type.
///
- object GetSerializer(Type objectType, Type serializerType);
+ object? GetSerializer(Type objectType, Type serializerType);
///
/// Retrieves a type of the given name.
///
- Type GetType(string typeName);
+ Type? GetType(string typeName);
///
/// Removes a previously added serialization provider.
From ccf1e414ddc1c4372d2f6985acf9e53e6f04b3c2 Mon Sep 17 00:00:00 2001
From: Lachlan Ennis <2433737+elachlan@users.noreply.github.com>
Date: Fri, 9 Dec 2022 12:32:04 +1000
Subject: [PATCH 2/3] changes from review
---
.../Design/Serialization/IDesignerSerializationManager.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/Serialization/IDesignerSerializationManager.cs b/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/Serialization/IDesignerSerializationManager.cs
index 17795a1f52a2af..d28a8e95e2c51f 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/Serialization/IDesignerSerializationManager.cs
+++ b/src/libraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/Design/Serialization/IDesignerSerializationManager.cs
@@ -71,7 +71,7 @@ public interface IDesignerSerializationManager : IServiceProvider
/// of named instances. Objects that implement IComponent will be
/// added to the design time container if addToContainer is true.
///
- object CreateInstance(Type type, ICollection arguments, string? name, bool addToContainer);
+ object CreateInstance(Type type, ICollection? arguments, string? name, bool addToContainer);
///
/// Retrieves an instance of a created object of the given name, or
@@ -89,7 +89,7 @@ public interface IDesignerSerializationManager : IServiceProvider
/// Retrieves a serializer of the requested type for the given
/// object type.
///
- object? GetSerializer(Type objectType, Type serializerType);
+ object? GetSerializer(Type? objectType, Type serializerType);
///
/// Retrieves a type of the given name.
From 7e52c7e48659ae2931d25d07e80b31d1c321da2a Mon Sep 17 00:00:00 2001
From: Lachlan Ennis <2433737+elachlan@users.noreply.github.com>
Date: Fri, 9 Dec 2022 12:36:28 +1000
Subject: [PATCH 3/3] further changes from review
---
.../ref/System.ComponentModel.TypeConverter.cs | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.cs b/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.cs
index 8e77546fccb685..a89d14c9753826 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.cs
+++ b/src/libraries/System.ComponentModel.TypeConverter/ref/System.ComponentModel.TypeConverter.cs
@@ -2192,11 +2192,11 @@ public partial interface IDesignerSerializationManager : System.IServiceProvider
event System.ComponentModel.Design.Serialization.ResolveNameEventHandler ResolveName;
event System.EventHandler SerializationComplete;
void AddSerializationProvider(System.ComponentModel.Design.Serialization.IDesignerSerializationProvider provider);
- object CreateInstance(System.Type type, System.Collections.ICollection arguments, string name, bool addToContainer);
- object GetInstance(string name);
- string GetName(object value);
- object GetSerializer(System.Type objectType, System.Type serializerType);
- System.Type GetType(string typeName);
+ object CreateInstance(System.Type type, System.Collections.ICollection? arguments, string? name, bool addToContainer);
+ object? GetInstance(string name);
+ string? GetName(object value);
+ object? GetSerializer(System.Type? objectType, System.Type serializerType);
+ System.Type? GetType(string typeName);
void RemoveSerializationProvider(System.ComponentModel.Design.Serialization.IDesignerSerializationProvider provider);
void ReportError(object errorInformation);
void SetName(object instance, string name);