Conform to revised J4JCommandLine API

markolbert · markolbert · commit 513d6fc28ea9 · 2021-09-21T10:27:39.000-07:00
diff --git a/GeoProcessorApp/Program.cs b/GeoProcessorApp/Program.cs
@@ -52,13 +52,13 @@ private static async Task Main( string[] args )
             var hostConfig = new J4JHostConfiguration()
                 .ApplicationName( "GeoProcessor" )
                 .Publisher( "J4JSoftware" )
-                .OperatingSystem( OSNames.Windows )
-                .AddApplicationConfigurationFile("appConfig.json")
-                .AddUserConfigurationFile("userConfig.json")
-                .AddConfigurationInitializers(SetupConfiguration)
+                .AddApplicationConfigurationFile( "appConfig.json" )
+                .AddUserConfigurationFile( "userConfig.json" )
+                .AddConfigurationInitializers( SetupConfiguration )
                 .LoggerInitializer( SetupLogging )
-                .FilePathTrimmer(FilePathTrimmer)
-                .OptionsInitializer( SetupOptions )
+                .FilePathTrimmer( FilePathTrimmer )
+                .CommandLineOperatingSystem( CommandLineOperatingSystems.Windows )
+                .CommandLineOptionsInitializer( SetupOptions )
                 .AddDependencyInjectionInitializers( SetupDependencyInjection )
                 .AddServicesInitializers( SetupServices );
 
diff --git a/GeoProcessorWPF/ViewModelLocator.cs b/GeoProcessorWPF/ViewModelLocator.cs
@@ -39,7 +39,6 @@ public ViewModelLocator()
         private IHost CreateHost()
         {
             var hostConfig = new J4JHostConfiguration()
-                .OperatingSystem( OSNames.Windows )
                 .Publisher( "J4JSoftware" )
                 .ApplicationName( "GeoProcessor" )
                 .AddApplicationConfigurationFile( AppConfigFile )
diff --git a/Test.GeoProcessor/TestBase.cs b/Test.GeoProcessor/TestBase.cs
@@ -73,7 +73,6 @@ protected IExportConfig GetExportConfig()
         private IHost CreateHost()
         {
             var hostConfig = new J4JHostConfiguration()
-                .OperatingSystem(OSNames.Windows)
                 .Publisher("J4JSoftware")
                 .ApplicationName("Tests.GeoProcessor")
                 .AddApplicationConfigurationFile("appConfig.json")

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ public ViewModelLocator()`
`39`	`39`	`private IHost CreateHost()`
`40`	`40`	`{`
`41`	`41`	`var hostConfig = new J4JHostConfiguration()`
`42`		`- .OperatingSystem( OSNames.Windows )`
`43`	`42`	`.Publisher( "J4JSoftware" )`
`44`	`43`	`.ApplicationName( "GeoProcessor" )`
`45`	`44`	`.AddApplicationConfigurationFile( AppConfigFile )`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,6 @@ protected IExportConfig GetExportConfig()`
`73`	`73`	`private IHost CreateHost()`
`74`	`74`	`{`
`75`	`75`	`var hostConfig = new J4JHostConfiguration()`
`76`		`- .OperatingSystem(OSNames.Windows)`
`77`	`76`	`.Publisher("J4JSoftware")`
`78`	`77`	`.ApplicationName("Tests.GeoProcessor")`
`79`	`78`	`.AddApplicationConfigurationFile("appConfig.json")`