dotnet
diff --git a/‎src/System.CommandLine/Binding/BindingContext.cs
Copy file name to clipboardExpand all lines: src/System.CommandLine/Binding/BindingContext.cs
+2-2Lines changed: 2 additions & 2 deletions b/‎src/System.CommandLine/Binding/BindingContext.cs
Copy file name to clipboardExpand all lines: src/System.CommandLine/Binding/BindingContext.cs
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/System.CommandLine/Invocation/ServiceProvider.cs
Copy file name to clipboardExpand all lines: src/System.CommandLine/Invocation/ServiceProvider.cs
+5-5Lines changed: 5 additions & 5 deletions b/‎src/System.CommandLine/Invocation/ServiceProvider.cs
Copy file name to clipboardExpand all lines: src/System.CommandLine/Invocation/ServiceProvider.cs
+5-5Lines changed: 5 additions & 5 deletions
@@ -31,7 +31,7 @@ public BindingContext(
 
         internal IConsoleFactory? ConsoleFactory { get; set; }
 
-        internal IHelpBuilder HelpBuilder => (IHelpBuilder)ServiceProvider.GetService(typeof(IHelpBuilder));
+        internal IHelpBuilder HelpBuilder => (IHelpBuilder)ServiceProvider.GetService(typeof(IHelpBuilder))!;
 
         public IConsole Console
         {
@@ -70,7 +70,7 @@ public void AddService<T>(Func<IServiceProvider, T> factory)
                 throw new ArgumentNullException(nameof(factory));
             }
 
-            ServiceProvider.AddService(typeof(T), s => factory(s)!);
+            ServiceProvider.AddService(typeof(T), s => factory(s));
         }
 
         internal bool TryGetValueSource(
 
@@ -13,11 +13,11 @@ namespace System.CommandLine.Invocation
 {
     internal class ServiceProvider : IServiceProvider
     {
-        private readonly Dictionary<Type, Func<IServiceProvider, object>> _services;
+        private readonly Dictionary<Type, Func<IServiceProvider, object?>> _services;
 
         public ServiceProvider(BindingContext bindingContext)
         {
-            _services = new Dictionary<Type, Func<IServiceProvider, object>>
+            _services = new Dictionary<Type, Func<IServiceProvider, object?>>
                         {
                             [typeof(ParseResult)] = _ => bindingContext.ParseResult,
                             [typeof(IConsole)] = _ => bindingContext.Console,
@@ -29,18 +29,18 @@ public ServiceProvider(BindingContext bindingContext)
 
         public void AddService<T>(Func<IServiceProvider, T> factory) => _services[typeof(T)] = p => factory(p)!;
 
-        public void AddService(Type serviceType, Func<IServiceProvider, object> factory) => _services[serviceType] = factory;
+        public void AddService(Type serviceType, Func<IServiceProvider, object?> factory) => _services[serviceType] = factory;
 
         public IReadOnlyCollection<Type> AvailableServiceTypes => _services.Keys;
 
-        public object GetService(Type serviceType)
+        public object? GetService(Type serviceType)
         {
             if (_services.TryGetValue(serviceType, out var factory))
             {
                 return factory(this);
             }
 
-            return null!;
+            return null;
         }
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public BindingContext(`
`31`	`31`
`32`	`32`	`internal IConsoleFactory? ConsoleFactory { get; set; }`
`33`	`33`
`34`		`- internal IHelpBuilder HelpBuilder => (IHelpBuilder)ServiceProvider.GetService(typeof(IHelpBuilder));`
	`34`	`+ internal IHelpBuilder HelpBuilder => (IHelpBuilder)ServiceProvider.GetService(typeof(IHelpBuilder))!;`
`35`	`35`
`36`	`36`	`public IConsole Console`
`37`	`37`	`{`
`@@ -70,7 +70,7 @@ public void AddService<T>(Func<IServiceProvider, T> factory)`
`70`	`70`	`throw new ArgumentNullException(nameof(factory));`
`71`	`71`	`}`
`72`	`72`
`73`		`- ServiceProvider.AddService(typeof(T), s => factory(s)!);`
	`73`	`+ ServiceProvider.AddService(typeof(T), s => factory(s));`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`internal bool TryGetValueSource(`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@ namespace System.CommandLine.Invocation`
`13`	`13`	`{`
`14`	`14`	`internal class ServiceProvider : IServiceProvider`
`15`	`15`	`{`
`16`		`- private readonly Dictionary<Type, Func<IServiceProvider, object>> _services;`
	`16`	`+ private readonly Dictionary<Type, Func<IServiceProvider, object?>> _services;`
`17`	`17`
`18`	`18`	`public ServiceProvider(BindingContext bindingContext)`
`19`	`19`	`{`
`20`		`- _services = new Dictionary<Type, Func<IServiceProvider, object>>`
	`20`	`+ _services = new Dictionary<Type, Func<IServiceProvider, object?>>`
`21`	`21`	`{`
`22`	`22`	`[typeof(ParseResult)] = _ => bindingContext.ParseResult,`
`23`	`23`	`[typeof(IConsole)] = _ => bindingContext.Console,`
`@@ -29,18 +29,18 @@ public ServiceProvider(BindingContext bindingContext)`
`29`	`29`
`30`	`30`	`public void AddService<T>(Func<IServiceProvider, T> factory) => _services[typeof(T)] = p => factory(p)!;`
`31`	`31`
`32`		`- public void AddService(Type serviceType, Func<IServiceProvider, object> factory) => _services[serviceType] = factory;`
	`32`	`+ public void AddService(Type serviceType, Func<IServiceProvider, object?> factory) => _services[serviceType] = factory;`
`33`	`33`
`34`	`34`	`public IReadOnlyCollection<Type> AvailableServiceTypes => _services.Keys;`
`35`	`35`
`36`		`- public object GetService(Type serviceType)`
	`36`	`+ public object? GetService(Type serviceType)`
`37`	`37`	`{`
`38`	`38`	`if (_services.TryGetValue(serviceType, out var factory))`
`39`	`39`	`{`
`40`	`40`	`return factory(this);`
`41`	`41`	`}`
`42`	`42`
`43`		`- return null!;`
	`43`	`+ return null;`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`}`