From 92ff059054346e10f410441214e4365770648953 Mon Sep 17 00:00:00 2001
From: Staffan Gustafsson <staffangu@outlook.com>
Date: Thu, 19 Nov 2020 23:04:34 +0100
Subject: [PATCH 1/4] Enable nullable:
 System.Management.Automation.IResourceSupplier

---
 src/System.Management.Automation/engine/ErrorPackage.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/ErrorPackage.cs b/src/System.Management.Automation/engine/ErrorPackage.cs
index 4d1627dff93..8a957ea4795 100644
--- a/src/System.Management.Automation/engine/ErrorPackage.cs
+++ b/src/System.Management.Automation/engine/ErrorPackage.cs
@@ -1790,6 +1790,8 @@ public interface IContainsErrorRecord
         ErrorRecord ErrorRecord { get; }
     }
 
+#nullable enable
+
     /// <summary>
     /// Objects implementing this interface can be used by
     /// <see cref="System.Management.Automation.ErrorDetails(IResourceSupplier,string,string,object[])"/>
@@ -1833,7 +1835,7 @@ public interface IResourceSupplier
         /// <param name="baseName">The base resource name.</param>
         /// <param name="resourceId">The resource id.</param>
         /// <returns>The error message template string corresponding to baseName and resourceId.</returns>
-        string GetResourceString(string baseName, string resourceId);
+        string? GetResourceString(string baseName, string resourceId);
     }
 }
 

From c852e7c8aae1460681f8c11aeec4c301dd70cd7a Mon Sep 17 00:00:00 2001
From: Staffan Gustafsson <staffangu@outlook.com>
Date: Fri, 20 Nov 2020 19:03:16 +0100
Subject: [PATCH 2/4] Removing whitespace before/after nullable pragma

---
 src/System.Management.Automation/engine/ErrorPackage.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/ErrorPackage.cs b/src/System.Management.Automation/engine/ErrorPackage.cs
index 8a957ea4795..e5957dd2494 100644
--- a/src/System.Management.Automation/engine/ErrorPackage.cs
+++ b/src/System.Management.Automation/engine/ErrorPackage.cs
@@ -1791,7 +1791,6 @@ public interface IContainsErrorRecord
     }
 
 #nullable enable
-
     /// <summary>
     /// Objects implementing this interface can be used by
     /// <see cref="System.Management.Automation.ErrorDetails(IResourceSupplier,string,string,object[])"/>

From 1ae052266bf3dd1c12b3aa1a11ce0dfa61e12670 Mon Sep 17 00:00:00 2001
From: Staffan Gustafsson <staffangu@outlook.com>
Date: Fri, 20 Nov 2020 19:42:32 +0100
Subject: [PATCH 3/4] Removing whitespace before/after nullable pragma

---
 src/System.Management.Automation/engine/ErrorPackage.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/ErrorPackage.cs b/src/System.Management.Automation/engine/ErrorPackage.cs
index e5957dd2494..9a855145e54 100644
--- a/src/System.Management.Automation/engine/ErrorPackage.cs
+++ b/src/System.Management.Automation/engine/ErrorPackage.cs
@@ -1790,7 +1790,6 @@ public interface IContainsErrorRecord
         ErrorRecord ErrorRecord { get; }
     }
 
-#nullable enable
     /// <summary>
     /// Objects implementing this interface can be used by
     /// <see cref="System.Management.Automation.ErrorDetails(IResourceSupplier,string,string,object[])"/>
@@ -1811,6 +1810,7 @@ public interface IContainsErrorRecord
     /// since the improved
     /// information about the error may help enable future scenarios.
     /// </remarks>
+#nullable enable
     public interface IResourceSupplier
     {
         /// <summary>

From 0575c68c8289bd08b8c8d856605dee66b2439406 Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Wed, 19 May 2021 21:17:27 +0500
Subject: [PATCH 4/4] Update
 src/System.Management.Automation/engine/ErrorPackage.cs

---
 src/System.Management.Automation/engine/ErrorPackage.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/ErrorPackage.cs b/src/System.Management.Automation/engine/ErrorPackage.cs
index 9a855145e54..0dbc237c4b7 100644
--- a/src/System.Management.Automation/engine/ErrorPackage.cs
+++ b/src/System.Management.Automation/engine/ErrorPackage.cs
@@ -1834,7 +1834,7 @@ public interface IResourceSupplier
         /// <param name="baseName">The base resource name.</param>
         /// <param name="resourceId">The resource id.</param>
         /// <returns>The error message template string corresponding to baseName and resourceId.</returns>
-        string? GetResourceString(string baseName, string resourceId);
+        string GetResourceString(string baseName, string resourceId);
     }
 }