conform to revised API

markolbert · markolbert · commit bcede1e17faf · 2022-07-30T16:53:11.000-07:00
diff --git a/GeoProcessor/GeoProcessor.csproj b/GeoProcessor/GeoProcessor.csproj
@@ -24,12 +24,11 @@
 
 	<ItemGroup>
 		<PackageReference Include="BingMapsRESTToolkit" Version="1.1.4" />
-		<PackageReference Include="GoogleApi" Version="4.0.6" />
+		<PackageReference Include="GoogleApi" Version="4.0.7" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\..\J4JLogging\J4JLogging\J4JLogging.csproj" />
-		<ProjectReference Include="..\..\ProgrammingUtilities\DependencyInjection\DependencyInjection.csproj" />
 		<ProjectReference Include="..\..\ProgrammingUtilities\VisualUtilities\VisualUtilities.csproj" />
 	</ItemGroup>
 
diff --git a/GeoProcessorApp/Program.cs b/GeoProcessorApp/Program.cs
@@ -49,7 +49,7 @@ internal class Program
 
         private static async Task Main( string[] args )
         {
-            var hostConfig = new J4JHostConfiguration()
+            var hostConfig = new J4JHostConfiguration(AppEnvironment.Console)
                 .ApplicationName( "GeoProcessor" )
                 .Publisher( "J4JSoftware" )
                 .AddApplicationConfigurationFile( "appConfig.json" )
@@ -101,7 +101,7 @@ private static void SetupConfiguration( IConfigurationBuilder builder )
             builder.AddUserSecrets<AppConfig>();
         }
 
-        private static void SetupLogging( IConfiguration config, J4JLoggerConfiguration loggerConfig )
+        private static void SetupLogging( IConfiguration config, J4JHostConfiguration hostConfig, J4JLoggerConfiguration loggerConfig )
             => loggerConfig.SerilogConfiguration.ReadFrom.Configuration( config );
 
         private static void SetupOptions( OptionCollection options )
diff --git a/GeoProcessorWPF/ViewModelLocator.cs b/GeoProcessorWPF/ViewModelLocator.cs
@@ -38,7 +38,7 @@ public ViewModelLocator()
 
         private IJ4JHost CreateHost()
         {
-            var hostConfig = new J4JHostConfiguration()
+            var hostConfig = new J4JHostConfiguration( AppEnvironment.Wpf )
                 .Publisher( "J4JSoftware" )
                 .ApplicationName( "GeoProcessor" )
                 .AddApplicationConfigurationFile( AppConfigFile )
@@ -68,7 +68,7 @@ private void ConfigurationInitializer(IConfigurationBuilder builder )
             builder.AddUserSecrets<AppConfig>();
         }
 
-        private void LoggerInitializer( IConfiguration config, J4JLoggerConfiguration loggerConfig )
+        private void LoggerInitializer( IConfiguration config, J4JHostConfiguration hostConfig, J4JLoggerConfiguration loggerConfig )
         {
             loggerConfig.SerilogConfiguration.ReadFrom.Configuration( config );
         }
diff --git a/Test.GeoProcessor/TestBase.cs b/Test.GeoProcessor/TestBase.cs
@@ -72,7 +72,7 @@ protected IExportConfig GetExportConfig()
 
         private IHost CreateHost()
         {
-            var hostConfig = new J4JHostConfiguration()
+            var hostConfig = new J4JHostConfiguration(AppEnvironment.Console)
                 .Publisher("J4JSoftware")
                 .ApplicationName("Tests.GeoProcessor")
                 .AddApplicationConfigurationFile("appConfig.json")
@@ -89,7 +89,7 @@ private IHost CreateHost()
             return retVal!;
         }
 
-        private void LoggerInitializer( IConfiguration config, J4JLoggerConfiguration loggerConfig ) =>
+        private void LoggerInitializer( IConfiguration config, J4JHostConfiguration hostConfig, J4JLoggerConfiguration loggerConfig ) =>
             loggerConfig.SerilogConfiguration.WriteTo.Debug();
 
         private void SetupConfigurationEnvironment( IConfigurationBuilder builder )

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ internal class Program`
`49`	`49`
`50`	`50`	`private static async Task Main( string[] args )`
`51`	`51`	`{`
`52`		`- var hostConfig = new J4JHostConfiguration()`
	`52`	`+ var hostConfig = new J4JHostConfiguration(AppEnvironment.Console)`
`53`	`53`	`.ApplicationName( "GeoProcessor" )`
`54`	`54`	`.Publisher( "J4JSoftware" )`
`55`	`55`	`.AddApplicationConfigurationFile( "appConfig.json" )`
`@@ -101,7 +101,7 @@ private static void SetupConfiguration( IConfigurationBuilder builder )`
`101`	`101`	`builder.AddUserSecrets<AppConfig>();`
`102`	`102`	`}`
`103`	`103`
`104`		`- private static void SetupLogging( IConfiguration config, J4JLoggerConfiguration loggerConfig )`
	`104`	`+ private static void SetupLogging( IConfiguration config, J4JHostConfiguration hostConfig, J4JLoggerConfiguration loggerConfig )`
`105`	`105`	`=> loggerConfig.SerilogConfiguration.ReadFrom.Configuration( config );`
`106`	`106`
`107`	`107`	`private static void SetupOptions( OptionCollection options )`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public ViewModelLocator()`
`38`	`38`
`39`	`39`	`private IJ4JHost CreateHost()`
`40`	`40`	`{`
`41`		`- var hostConfig = new J4JHostConfiguration()`
	`41`	`+ var hostConfig = new J4JHostConfiguration( AppEnvironment.Wpf )`
`42`	`42`	`.Publisher( "J4JSoftware" )`
`43`	`43`	`.ApplicationName( "GeoProcessor" )`
`44`	`44`	`.AddApplicationConfigurationFile( AppConfigFile )`
`@@ -68,7 +68,7 @@ private void ConfigurationInitializer(IConfigurationBuilder builder )`
`68`	`68`	`builder.AddUserSecrets<AppConfig>();`
`69`	`69`	`}`
`70`	`70`
`71`		`- private void LoggerInitializer( IConfiguration config, J4JLoggerConfiguration loggerConfig )`
	`71`	`+ private void LoggerInitializer( IConfiguration config, J4JHostConfiguration hostConfig, J4JLoggerConfiguration loggerConfig )`
`72`	`72`	`{`
`73`	`73`	`loggerConfig.SerilogConfiguration.ReadFrom.Configuration( config );`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ protected IExportConfig GetExportConfig()`
`72`	`72`
`73`	`73`	`private IHost CreateHost()`
`74`	`74`	`{`
`75`		`- var hostConfig = new J4JHostConfiguration()`
	`75`	`+ var hostConfig = new J4JHostConfiguration(AppEnvironment.Console)`
`76`	`76`	`.Publisher("J4JSoftware")`
`77`	`77`	`.ApplicationName("Tests.GeoProcessor")`
`78`	`78`	`.AddApplicationConfigurationFile("appConfig.json")`
`@@ -89,7 +89,7 @@ private IHost CreateHost()`
`89`	`89`	`return retVal!;`
`90`	`90`	`}`
`91`	`91`
`92`		`- private void LoggerInitializer( IConfiguration config, J4JLoggerConfiguration loggerConfig ) =>`
	`92`	`+ private void LoggerInitializer( IConfiguration config, J4JHostConfiguration hostConfig, J4JLoggerConfiguration loggerConfig ) =>`
`93`	`93`	`loggerConfig.SerilogConfiguration.WriteTo.Debug();`
`94`	`94`
`95`	`95`	`private void SetupConfigurationEnvironment( IConfigurationBuilder builder )`