Annotate System.ComponentModel for nullable (dotnet/corefx#41160)

* Annotate System.ComponentModel for nullable

* Applying feedback

Commit migrated from https://github.com/dotnet/corefx/commit/90870e3120f4998a70546798b02c4c903df2f4df

diff --git a/src/libraries/System.ComponentModel/ref/System.ComponentModel.cs b/src/libraries/System.ComponentModel/ref/System.ComponentModel.cs
index d1998dc..ba8d5b5 100644 (file)
--- a/src/libraries/System.ComponentModel/ref/System.ComponentModel.cs
+++ b/src/libraries/System.ComponentModel/ref/System.ComponentModel.cs
@@ -9,7 +9,7 @@ namespace System
 {
     public partial interface IServiceProvider
     {
-        object GetService(System.Type serviceType);
+        object? GetService(System.Type? serviceType);
     }
 }
 namespace System.ComponentModel

diff --git a/src/libraries/System.ComponentModel/ref/System.ComponentModel.csproj b/src/libraries/System.ComponentModel/ref/System.ComponentModel.csproj
index 3a86521..c0a520a 100644 (file)
--- a/src/libraries/System.ComponentModel/ref/System.ComponentModel.csproj
+++ b/src/libraries/System.ComponentModel/ref/System.ComponentModel.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Configurations>netcoreapp-Debug;netcoreapp-Release;uap-Debug;uap-Release</Configurations>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.ComponentModel.cs" />

diff --git a/src/libraries/System.ComponentModel/src/System.ComponentModel.csproj b/src/libraries/System.ComponentModel/src/System.ComponentModel.csproj
index 8354550..d4155cf 100644 (file)
--- a/src/libraries/System.ComponentModel/src/System.ComponentModel.csproj
+++ b/src/libraries/System.ComponentModel/src/System.ComponentModel.csproj
@@ -4,6 +4,7 @@
     <AssemblyName>System.ComponentModel</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Configurations>netcoreapp-Debug;netcoreapp-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release</Configurations>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\IServiceProvider.cs" />

diff --git a/src/libraries/System.ComponentModel/src/System/IServiceProvider.cs b/src/libraries/System.ComponentModel/src/System/IServiceProvider.cs
index fa9a1a3..e1bfa8d 100644 (file)
--- a/src/libraries/System.ComponentModel/src/System/IServiceProvider.cs
+++ b/src/libraries/System.ComponentModel/src/System/IServiceProvider.cs
@@ -6,6 +6,6 @@ namespace System
 {
     public interface IServiceProvider
     {
-        object GetService(Type serviceType);
+        object? GetService(Type serviceType);
     }
 }