From ed1afa8b3226d40c8ed18e35ac37381f59b4dff0 Mon Sep 17 00:00:00 2001 From: Staffan Gustafsson Date: Fri, 20 Nov 2020 01:24:45 +0100 Subject: [PATCH 1/2] Enable nullable: System.Management.Automation.LanguagePrimitives.IConversionData --- .../engine/LanguagePrimitives.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/System.Management.Automation/engine/LanguagePrimitives.cs b/src/System.Management.Automation/engine/LanguagePrimitives.cs index 703fbcd46e4..ee622b759e4 100644 --- a/src/System.Management.Automation/engine/LanguagePrimitives.cs +++ b/src/System.Management.Automation/engine/LanguagePrimitives.cs @@ -4349,20 +4349,24 @@ internal delegate T PSConverter(object valueToConvert, internal delegate object PSNullConverter(object nullOrAutomationNull); +#nullable enable + internal interface IConversionData { object Converter { get; } ConversionRank Rank { get; } - object Invoke(object valueToConvert, + object? Invoke(object? valueToConvert, Type resultType, bool recurse, - PSObject originalValueToConvert, - IFormatProvider formatProvider, - TypeTable backupTable); + PSObject? originalValueToConvert, + IFormatProvider? formatProvider, + TypeTable? backupTable); } +#nullable restore + [System.Diagnostics.DebuggerDisplay("{_converter.Method.Name}")] internal class ConversionData : IConversionData { From 8206bc7c5368197bd5bb091bc84a25e2393a48a5 Mon Sep 17 00:00:00 2001 From: Staffan Gustafsson Date: Fri, 20 Nov 2020 18:54:30 +0100 Subject: [PATCH 2/2] Removing whitespace before/after nullable pragma --- src/System.Management.Automation/engine/LanguagePrimitives.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/System.Management.Automation/engine/LanguagePrimitives.cs b/src/System.Management.Automation/engine/LanguagePrimitives.cs index ee622b759e4..23f4e830b61 100644 --- a/src/System.Management.Automation/engine/LanguagePrimitives.cs +++ b/src/System.Management.Automation/engine/LanguagePrimitives.cs @@ -4350,7 +4350,6 @@ internal delegate T PSConverter(object valueToConvert, internal delegate object PSNullConverter(object nullOrAutomationNull); #nullable enable - internal interface IConversionData { object Converter { get; } @@ -4364,7 +4363,6 @@ internal interface IConversionData IFormatProvider? formatProvider, TypeTable? backupTable); } - #nullable restore [System.Diagnostics.DebuggerDisplay("{_converter.Method.Name}")]