Add IAppHostNetCore interface + APIs for accessing primary .Core deps

mythz · mythz · commit a2ed103879cf · 2020-01-06T14:15:41.000-05:00
diff --git a/src/ServiceStack.Kestrel/AppSelfHostBase.cs b/src/ServiceStack.Kestrel/AppSelfHostBase.cs
@@ -21,7 +21,7 @@
 
 namespace ServiceStack
 {
-    public abstract class AppSelfHostBase : ServiceStackHost, IConfigureServices, IRequireConfiguration
+    public abstract class AppSelfHostBase : ServiceStackHost, IAppHostNetCore, IConfigureServices, IRequireConfiguration
     {
         public IConfiguration Configuration { get; set; }
         
@@ -35,6 +35,10 @@ protected AppSelfHostBase(string serviceName, params Assembly[] assembliesWithSe
         public IApplicationBuilder App => app;
         public IServiceProvider ApplicationServices => app?.ApplicationServices;
 
+        private IHostingEnvironment env;
+        public IHostingEnvironment HostingEnvironment => env 
+            ?? (env = app?.ApplicationServices.GetService<IHostingEnvironment>());  
+
         public virtual void Bind(IApplicationBuilder app)
         {
             this.app = app;
diff --git a/src/ServiceStack/AppHostBase.NetCore.cs b/src/ServiceStack/AppHostBase.NetCore.cs
@@ -23,7 +23,7 @@
 
 namespace ServiceStack
 {
-    public abstract class AppHostBase : ServiceStackHost, IConfigureServices, IRequireConfiguration
+    public abstract class AppHostBase : ServiceStackHost, IAppHostNetCore, IConfigureServices, IRequireConfiguration
     {
         protected AppHostBase(string serviceName, params Assembly[] assembliesWithServices)
             : base(serviceName, assembliesWithServices) 
@@ -274,8 +274,19 @@ public virtual void Configure(IServiceCollection services) {}
         public IConfiguration Configuration { get; set; }
     }
 
+    public interface IAppHostNetCore : IAppHost, IRequireConfiguration
+    {
+        IApplicationBuilder App { get; }
+        IHostingEnvironment HostingEnvironment { get; }
+    }
+
     public static class NetCoreAppHostExtensions
     {
+        public static IConfiguration GetConfiguration(this IAppHost appHost) => ((IAppHostNetCore)appHost).Configuration;
+        public static IApplicationBuilder GetApp(this IAppHost appHost) => ((IAppHostNetCore)appHost).App;
+        public static IServiceProvider GetApplicationServices(this IAppHost appHost) => ((IAppHostNetCore)appHost).App.ApplicationServices;
+        public static IHostingEnvironment GetHostingEnvironment(this IAppHost appHost) => ((IAppHostNetCore)appHost).HostingEnvironment;
+        
         public static IApplicationBuilder UseServiceStack(this IApplicationBuilder app, AppHostBase appHost)
         {
             appHost.Bind(app);

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`namespace ServiceStack`
`23`	`23`	`{`
`24`		`- public abstract class AppSelfHostBase : ServiceStackHost, IConfigureServices, IRequireConfiguration`
	`24`	`+ public abstract class AppSelfHostBase : ServiceStackHost, IAppHostNetCore, IConfigureServices, IRequireConfiguration`
`25`	`25`	`{`
`26`	`26`	`public IConfiguration Configuration { get; set; }`
`27`	`27`
`@@ -35,6 +35,10 @@ protected AppSelfHostBase(string serviceName, params Assembly[] assembliesWithSe`
`35`	`35`	`public IApplicationBuilder App => app;`
`36`	`36`	`public IServiceProvider ApplicationServices => app?.ApplicationServices;`
`37`	`37`
	`38`	`+ private IHostingEnvironment env;`
	`39`	`+ public IHostingEnvironment HostingEnvironment => env`
	`40`	`+ ?? (env = app?.ApplicationServices.GetService<IHostingEnvironment>());`
	`41`	`+`
`38`	`42`	`public virtual void Bind(IApplicationBuilder app)`
`39`	`43`	`{`
`40`	`44`	`this.app = app;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`namespace ServiceStack`
`25`	`25`	`{`
`26`		`- public abstract class AppHostBase : ServiceStackHost, IConfigureServices, IRequireConfiguration`
	`26`	`+ public abstract class AppHostBase : ServiceStackHost, IAppHostNetCore, IConfigureServices, IRequireConfiguration`
`27`	`27`	`{`
`28`	`28`	`protected AppHostBase(string serviceName, params Assembly[] assembliesWithServices)`
`29`	`29`	`: base(serviceName, assembliesWithServices)`
`@@ -274,8 +274,19 @@ public virtual void Configure(IServiceCollection services) {}`
`274`	`274`	`public IConfiguration Configuration { get; set; }`
`275`	`275`	`}`
`276`	`276`
	`277`	`+ public interface IAppHostNetCore : IAppHost, IRequireConfiguration`
	`278`	`+ {`
	`279`	`+ IApplicationBuilder App { get; }`
	`280`	`+ IHostingEnvironment HostingEnvironment { get; }`
	`281`	`+ }`
	`282`	`+`
`277`	`283`	`public static class NetCoreAppHostExtensions`
`278`	`284`	`{`
	`285`	`+ public static IConfiguration GetConfiguration(this IAppHost appHost) => ((IAppHostNetCore)appHost).Configuration;`
	`286`	`+ public static IApplicationBuilder GetApp(this IAppHost appHost) => ((IAppHostNetCore)appHost).App;`
	`287`	`+ public static IServiceProvider GetApplicationServices(this IAppHost appHost) => ((IAppHostNetCore)appHost).App.ApplicationServices;`
	`288`	`+ public static IHostingEnvironment GetHostingEnvironment(this IAppHost appHost) => ((IAppHostNetCore)appHost).HostingEnvironment;`
	`289`	`+`
`279`	`290`	`public static IApplicationBuilder UseServiceStack(this IApplicationBuilder app, AppHostBase appHost)`
`280`	`291`	`{`
`281`	`292`	`appHost.Bind(app);`