Fix DefaultDiagnosticPort_Supported_ListenModeOnNonWindows

Author: sbomer

src/Tools/dotnet-monitor/CommonOptionsExtensions.cs

@@ -99,10 +99,11 @@ private static void MapRootOptions(RootOptions obj, string prefix, string separa
             MapGlobalCounterOptions(obj.GlobalCounter, FormattableString.Invariant($"{prefix}{nameof(obj.GlobalCounter)}"), separator, map);
             // InProcessFeaturesOptions
             // CorsConfigurationOptions
+            MapDiagnosticPortOptions(obj.DiagnosticPort, FormattableString.Invariant($"{prefix}{nameof(obj.DiagnosticPort)}"), separator, map);
             // DiagnosticPortOptions
             // EgressOptions
             // MetricsOptions
-            // StorageOptions
+            MapStorageOptions(obj.Storage, FormattableString.Invariant($"{prefix}{nameof(obj.Storage)}"), separator, map);
             // ProcessFilterOptions
             // CollectionRuleDefaultsOptions
             // Templates
@@ -146,14 +147,6 @@ private static void MapMonitorApiKeyOptions(MonitorApiKeyOptions? obj, string va
             }
         }
 
-        private static void MapString(string? value, string valueName, IDictionary<string, string> map)
-        {
-            if (null != value)
-            {
-                map.Add(valueName, value);
-            }
-        }
-
         private static void MapAzureAdOptions(AzureAdOptions? obj, string valueName, string separator, IDictionary<string, string> map)
         {
             if (null != obj)
@@ -210,6 +203,45 @@ private static void MapGlobalCounterOptions(GlobalCounterOptions? obj, string va
             }
         }
 
+        private static void MapDiagnosticPortOptions(DiagnosticPortOptions? obj, string valueName, string separator, IDictionary<string, string> map)
+        {
+            if (null != obj)
+            {
+                string prefix = FormattableString.Invariant($"{valueName}{separator}");
+                MapDiagnosticPortConnectionMode(obj.ConnectionMode, FormattableString.Invariant($"{prefix}{nameof(obj.ConnectionMode)}"), map);
+                MapString(obj.EndpointName, FormattableString.Invariant($"{prefix}{nameof(obj.EndpointName)}"), map);
+                MapInt(obj.MaxConnections, FormattableString.Invariant($"{prefix}{nameof(obj.MaxConnections)}"), map);
+                MapBool(obj.DeleteEndpointOnStartup, FormattableString.Invariant($"{prefix}{nameof(obj.DeleteEndpointOnStartup)}"), map);
+            }
+        }
+
+        private static void MapDiagnosticPortConnectionMode(DiagnosticPortConnectionMode? value, string valueName, IDictionary<string, string> map)
+        {
+            if (null != value)
+            {
+                map.Add(valueName, ConvertUtils.ToString(value, CultureInfo.InvariantCulture));
+            }
+        }
+
+        private static void MapStorageOptions(StorageOptions? obj, string valueName, string separator, IDictionary<string, string> map)
+        {
+            if (null != obj)
+            {
+                string prefix = FormattableString.Invariant($"{valueName}{separator}");
+                MapString(obj.DefaultSharedPath, FormattableString.Invariant($"{prefix}{nameof(obj.DefaultSharedPath)}"), map);
+                MapString(obj.DumpTempFolder, FormattableString.Invariant($"{prefix}{nameof(obj.DumpTempFolder)}"), map);
+                MapString(obj.SharedLibraryPath, FormattableString.Invariant($"{prefix}{nameof(obj.SharedLibraryPath)}"), map);
+            }
+        }
+
+        private static void MapString(string? value, string valueName, IDictionary<string, string> map)
+        {
+            if (null != value)
+            {
+                map.Add(valueName, ConvertUtils.ToString(value, CultureInfo.InvariantCulture));
+            }
+        }
+
         private static void MapFloat(float? value, string valueName, IDictionary<string, string> map)
         {
             if (null != value)
@@ -226,6 +258,14 @@ private static void MapInt(int? value, string valueName, IDictionary<string, str
             }
         }
 
+        private static void MapBool(bool? value, string valueName, IDictionary<string, string> map)
+        {
+            if (null != value)
+            {
+                map.Add(valueName, ConvertUtils.ToString(value, CultureInfo.InvariantCulture));
+            }
+        }
+
         // private static void MapValue(object? value, string valueName, string separator, IDictionary<string, string> map)
         // {
         //     if (null != value)