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

* Annotate System.ComponentModel for nullable * Applying feedback Commit migrated from dotnet/corefx@90870e3
xiaoshzx · Sep 18, 2019 · 251a92f · 251a92f
1 parent 9d2dfad
commit 251a92f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -6,6 +6,6 @@ namespace System
 {
     public interface IServiceProvider
     {
-        object GetService(Type serviceType);
+        object? GetService(Type serviceType);
     }
 }