Modified string formatting, as appropriate, to use interpolated strings.

Updated user manual to correct dome setup screenshot so that it matches the narrative.
Bumped version to 6.5.1.2

DeviceHub/App.xaml.cs

@@ -64,7 +64,7 @@ protected override void OnStartup( StartupEventArgs e )
 			}
 			catch ( Exception xcp )
 			{
-				string msg = String.Format( "DeviceHub caught a fatal exception during startup\r\n{0}", xcp.Message );
+				string msg = $"DeviceHub caught a fatal exception during startup\r\n{xcp.Message}";
 				MessageBox.Show( msg, "DeviceHub", MessageBoxButton.OK, MessageBoxImage.Stop );
 
 				if ( Application.Current != null )

DeviceHub/Business Object Classes/ASCOM Classes/DeviceDriverBase.cs

@@ -88,7 +88,7 @@ protected void CheckRange( string ident, double value, double min, double max )
 			{
 				LogMessage( ident, "{0} is out of range from {1} to {2}", value, min, max );
 
-				throw new InvalidValueException( ident, value.ToString( CultureInfo.CurrentCulture ), String.Format( CultureInfo.CurrentCulture, "{0} to {1}", min, max ) );
+				throw new InvalidValueException( ident, $"{value:f5}", $"{min:f5} to {max:f5}" );
 			}
 		}
 
@@ -103,17 +103,18 @@ protected void CheckRange( string ident, string valueProperty, double value, dou
 
 			if ( value < min || value > max )
 			{
-				LogMessage( ident, "{0} = {1} is out of range from {2} to {3}", valueProperty, value, min, max );
+				LogMessage( ident, $"{valueProperty} = {value:f5} is out of range from {min:f5} to {max:f5}" );
 
-				throw new InvalidValueException( ident, valueProperty + " = " + value.ToString( CultureInfo.CurrentCulture ), string.Format( CultureInfo.CurrentCulture, "{0} to {1}", min, max ) );
+				throw new InvalidValueException( ident, $"{valueProperty} = {value:f5}", $"{min:f5} to {max:f5}" );
 			}
 		}
 
 		protected virtual void LogMessage( string identifier, string message, params object[] args )
 		{
 			if ( _logger != null && _logger.Enabled )
 			{
-				var msg = string.Format( CultureInfo.CurrentCulture, message, args );
+				var msg = String.Format( message, args );
+
 				_logger.LogMessage( identifier, msg );
 			}
 		}

DeviceHub/Business Object Classes/ASCOM Classes/LocalServer.cs

@@ -68,8 +68,7 @@ internal static void Startup( string[] args )
 			// attached to the server for debugging.
 
 			//int procId = Process.GetCurrentProcess().Id;
-			//string msg = String.Format( "Attach the debugger to process #{0} now.", procId );
-			//MessageBox.Show( msg );
+			//MessageBox.Show( $"Attach the debugger to process #{procId} now." );
 
 			Globals.UISyncContext = TaskScheduler.FromCurrentSynchronizationContext();
 
@@ -194,6 +193,9 @@ public static int ObjectsCount
 
 		public static int CountObject( DeviceTypeEnum devType )
 		{
+
+			string name = devType.GetDisplayName();
+
 			int retval;
 
 			// Increment the count of objects for the specified device type.
@@ -389,8 +391,8 @@ private static void MainWindow_Closing( object sender, System.ComponentModel.Can
 
 			if ( ObjectsCount > 0 )
 			{
-				string text = String.Format( "Device Hub has {0} client connection{1}. Are you sure that you want to shut down?"
-											, ObjectsCount, ( ObjectsCount > 1 ) ? "s" : "" );
+				string text = $"Device Hub has {ObjectsCount} client connection{(ObjectsCount > 1 ? "s" : "")}. "
+								+ "Are you sure that you want to shut down ? ";
 				string title = "Confirm Forced Shutdown";
 
 				MessageBoxResult result = msgSvc.Show( text, title, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No, MessageBoxOptions.None );
@@ -405,7 +407,7 @@ private static void MainWindow_Closing( object sender, System.ComponentModel.Can
 
 				if ( deviceConnections )
 				{
-					string text = String.Format( "Device Hub is still connected to one or more devices. Are you sure that you want to shut down?", Server.ObjectsCount );
+					string text = "Device Hub is still connected to one or more devices. Are you sure that you want to shut down?";
 					string title = "Confirm Forced Shutdown";
 
 					MessageBoxResult result = msgSvc.Show( text, title, MessageBoxButton.YesNo, MessageBoxImage.Question, System.Windows.MessageBoxResult.No, System.Windows.MessageBoxOptions.None );
@@ -498,7 +500,7 @@ private static void LoadComObjectAssemblies()
 				}
 				catch ( Exception e )
 				{
-					string msg = String.Format( "Failed to load served COM class assembly {0} - {1}", file.Name, e.Message );
+					string msg = $"Failed to load served COM class assembly {file.Name} - {e.Message}";
 					throw new Exception( msg, e );
 				}
 			}
@@ -637,8 +639,7 @@ private static void RegisterObjects( bool rerunningAsElevated = false )
 
 					// HKCR\APPID\exename.ext
 
-				using ( RegistryKey key = Registry.ClassesRoot.CreateSubKey( string.Format( "APPID\\{0}",
-						GetExecutableFileName() ) ) )
+				using ( RegistryKey key = Registry.ClassesRoot.CreateSubKey( $"APPID\\{GetExecutableFileName()}" ) )
 				{
 					key.SetValue( "AppID", _appId );
 				}
@@ -668,7 +669,7 @@ private static void RegisterObjects( bool rerunningAsElevated = false )
 
 					string deviceType = type.Name;
 
-					using ( RegistryKey key = Registry.ClassesRoot.CreateSubKey( string.Format( "CLSID\\{0}", clsid ) ) )
+					using ( RegistryKey key = Registry.ClassesRoot.CreateSubKey( $"CLSID\\{clsid}" ) )
 					{
 						key.SetValue( null, progid );                     // Could be assyTitle/Desc??, but .NET components show ProgId here
 						key.SetValue( "AppId", _appId );
@@ -776,8 +777,8 @@ private static void UnregisterObjects( bool keepProfile, bool rerunningAsElevate
 
 			// Local server's DCOM/AppID information
 
-			Registry.ClassesRoot.DeleteSubKey( String.Format( "APPID\\{0}", _appId ), false );
-			Registry.ClassesRoot.DeleteSubKey( String.Format( "APPID\\{0}", GetExecutableFileName() ), false );
+			Registry.ClassesRoot.DeleteSubKey( $"APPID\\{_appId}", false );
+			Registry.ClassesRoot.DeleteSubKey( $"APPID\\{GetExecutableFileName()}", false );
 
 			// For each of the driver assemblies
 
@@ -791,17 +792,17 @@ private static void UnregisterObjects( bool keepProfile, bool rerunningAsElevate
 
 				// HKCR\progid
 
-				Registry.ClassesRoot.DeleteSubKey( String.Format( "{0}\\CLSID", progid ), false );
+				Registry.ClassesRoot.DeleteSubKey( $"{progid}\\CLSID", false );
 				Registry.ClassesRoot.DeleteSubKey( progid, false );
 
 				// HKCR\CLSID\clsid
 
-				Registry.ClassesRoot.DeleteSubKey( String.Format( "CLSID\\{0}\\Implemented Categories\\{{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}}", clsid ), false );
-				Registry.ClassesRoot.DeleteSubKey( String.Format( "CLSID\\{0}\\Implemented Categories", clsid ), false );
-				Registry.ClassesRoot.DeleteSubKey( String.Format( "CLSID\\{0}\\ProgId", clsid ), false );
-				Registry.ClassesRoot.DeleteSubKey( String.Format( "CLSID\\{0}\\LocalServer32", clsid ), false );
-				Registry.ClassesRoot.DeleteSubKey( String.Format( "CLSID\\{0}\\Programmable", clsid ), false );
-				Registry.ClassesRoot.DeleteSubKey( String.Format( "CLSID\\{0}", clsid ), false );
+				Registry.ClassesRoot.DeleteSubKey( $"CLSID\\{clsid}\\Implemented Categories\\{{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}}", false );
+				Registry.ClassesRoot.DeleteSubKey( $"CLSID\\{clsid}\\Implemented Categories", false );
+				Registry.ClassesRoot.DeleteSubKey( $"CLSID\\{clsid}\\ProgId", false );
+				Registry.ClassesRoot.DeleteSubKey( $"CLSID\\{clsid}\\LocalServer32", false );
+				Registry.ClassesRoot.DeleteSubKey( $"CLSID\\{clsid}\\Programmable", false );
+				Registry.ClassesRoot.DeleteSubKey( $"CLSID\\{clsid}", false );
 
 				if ( !keepProfile )
 				{

DeviceHub/Business Object Classes/DisplayAttribute.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ASCOM.DeviceHub
+{
+	class DisplayAttribute : Attribute
+	{
+		public string Name { get; set; }
+	}
+}

DeviceHub/Business Object Classes/Dome Classes/DevHubDomeStatus.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Diagnostics;
+
 using ASCOM.DeviceInterface;
 
 namespace ASCOM.DeviceHub
@@ -101,6 +103,7 @@ private string FormatShutterPosition( DomeManager mgr )
 		{
 			string position = "Unknown";
 			ShutterState shutterStatus = this.ShutterStatus;
+
 			double fractionOpen = ( mgr.Capabilities.CanSetAltitude ) ? this.Altitude / 90.0 : Double.NaN;
 			bool useFraction = ( !Double.IsNaN( fractionOpen ) );
 
@@ -111,23 +114,28 @@ private string FormatShutterPosition( DomeManager mgr )
 					break;
 
 				case ShutterState.shutterClosing:
-					position = "Closing" + ( ( useFraction ) ? String.Format( " at {0:P0}", fractionOpen ) : "" );
+					position = "Closing";
+
 					break;
 
 				case ShutterState.shutterError:
 					position = "Unknown";
+
 					break;
 
 				case ShutterState.shutterOpen:
-					position = "Open" + ( ( useFraction ) ? String.Format( " at {0:P0}", fractionOpen ) : "" );
+					position = "Open";
+
 					break;
 
 				case ShutterState.shutterOpening:
-					position = "Opening" + ( ( useFraction ) ? String.Format( " at {0:P0}", fractionOpen ) : "" );
+					position = "Opening";
 
 					break;
 			}
 
+			position += ( useFraction ) ? $" at {fractionOpen:P0}" : "";
+
 			return position;
 		}
 

DeviceHub/Business Object Classes/Enumerations.cs

@@ -1,9 +1,43 @@
-namespace ASCOM.DeviceHub
+using System;
+
+namespace ASCOM.DeviceHub
 {
-	public enum DeviceTypeEnum { Unknown, Telescope, Dome, Focuser };
+	public enum DeviceTypeEnum 
+    { 
+        [Display(Name = "Unknown")]
+        Unknown,
+        [Display(Name = "Telescope")]
+        Telescope,
+        [Display(Name = "Dome")]
+        Dome,
+        [Display(Name = "Focuser")]
+        Focuser
+    };
 	public enum ParkingStateEnum { Unparked, ParkInProgress, IsAtPark, ParkFailed };
 	public enum HomingStateEnum { NotAtHome, HomingInProgress, IsAtHome, HomeFailed };
 	public enum MoveDirections { None = -1, North, South, East, West, Up, Down, Left, Right, Clockwise, CounterClockwise };
 	public enum ScopeMoveEnum { Variable, Fixed };
 	public enum FocuserMoveCompletionState { Success, Timeout, Cancelled };
+
+	public static class EnumExtensions
+	{
+        public static string GetDisplayName( this Enum GenericEnum )
+        {
+
+            Type genericEnumType = GenericEnum.GetType();
+            System.Reflection.MemberInfo[] memberInfo = genericEnumType.GetMember(GenericEnum.ToString());
+
+            if ( ( memberInfo != null && memberInfo.Length > 0 ) )
+            {
+                dynamic _Attribs = memberInfo[0].GetCustomAttributes(typeof(DisplayAttribute), false);
+
+                if ( ( _Attribs != null && _Attribs.Length > 0 ) )
+                {
+                    return ( (DisplayAttribute)_Attribs[0] ).Name;
+                }
+            }
+
+            return GenericEnum.ToString();
+        }
+    }
 }

DeviceHub/Business Object Classes/Telescope Classes/DegreesConverter.cs

@@ -13,7 +13,7 @@ protected DegreesConverter( decimal rawDegrees, int minDegrees, int maxDegrees )
 
 			if ( rawDegrees < minDegrees || rawDegrees > maxDegrees )
 			{
-				string msg = String.Format( "Degree value must be greater than or equal to {0} and less than or equal to {1}.", minDegrees, maxDegrees );
+				string msg = $"Degree value must be greater than or equal to {minDegrees} and less than or equal to {maxDegrees}.";
 
 				throw new ASCOM.InvalidValueException( msg );
 			}
@@ -34,7 +34,7 @@ protected DegreesConverter( int degrees, int minutes, int seconds, decimal minDe
 
 			if ( degrees < minDegrees || degrees > maxDegrees )
 			{
-				string msg = String.Format( "Degrees must be greater than or equal to {0} and less than or equal to {1}.", minDegrees, maxDegrees );
+				string msg = $"Degrees must be greater than or equal to {minDegrees} and less than or equal to {maxDegrees}.";
 
 				throw new ASCOM.InvalidValueException( msg );
 			}
@@ -90,7 +90,7 @@ public override string ToString()
 			char signChar = ( _degrees < 0.0 ) ? '-' : ' ';
 			decimal degrees = Math.Abs( _degrees );
 
-			return String.Format( "{0}{1:000}° {2:00}' {3:00}\"", signChar, degrees, _minutes, _seconds );
+			return $"{signChar}{degrees:000}° {_minutes:00}' {_seconds:00}\"";
 		}
 
 		private decimal DmsToDec( int degrees, int minutes, int seconds )

DeviceHub/Business Object Classes/Telescope Classes/HoursConverter.cs

@@ -13,9 +13,8 @@ public HoursConverter( decimal rawHours, int minHours, int maxHours )
 
 			if ( rawHours < minHours || rawHours >= maxHours )
 			{
-				string msg = String.Format( "Hour value must be greater than or equal to {0} and less than  {1}.", minHours, maxHours );
-
-				throw new ASCOM.InvalidValueException( msg );
+				throw new ASCOM.InvalidValueException( 
+							$"Hour value must be greater than or equal to {minHours} and less than {maxHours}." );
 			}
 
 			_minHours = minHours;
@@ -34,9 +33,8 @@ public HoursConverter( int hours, int minutes, int seconds, int minHours, int ma
 
 			if ( hours < minHours || hours > maxHours )
 			{
-				string msg = String.Format( "Hour value must be greater than or equal to {0} and less than or equal to {1}.", minHours, maxHours );
-
-				throw new ASCOM.InvalidValueException( msg );
+				throw new ASCOM.InvalidValueException(
+							$"Hour value must be greater than or equal to {minHours} and less than or equal to {maxHours}." );
 			}
 
 			if ( ( hours == minHours || hours == maxHours )
@@ -85,8 +83,7 @@ public override string ToString()
 		{
 			decimal hours = Math.Abs( _hours );
 
-			return String.Format( "{0}{1:00}:{2:00}:{3:00}"
-				, ( _hours < 0.0 ) ? "-" : "", hours, _minutes, _seconds );
+			return $"{( _hours < 0.0 ? "-" : "" )}{hours:00}:{_minutes:00}:{_seconds:00}";
 		}
 
 		private decimal HmsToHours( int hours, int minutes, int seconds )

DeviceHub/Business Object Classes/Telescope Classes/JogRates.cs

@@ -140,11 +140,11 @@ private static string GetRateString( double rateValue )
 
 			if ( factor < 100 )
 			{
-				retval = String.Format( "{0:###}X Sidereal", factor );
+				retval = $"{factor:###}X Sidereal";
 			}
 			else 
 			{			
-				retval = String.Format( "{0:0.##} °/sec", rateValue );
+				retval = $"{rateValue:0.##} °/sec";
 			}
 
 			return retval;

DeviceHub/Business Object Classes/Value Converters/DeviceConnectedValueConverter.cs

@@ -13,7 +13,7 @@ public object Convert( object value, Type targetType, object parameter, System.G
 			string device = parameter.ToString();
 
 
-			return String.Format( "{0} {1}", isConnected ? "Disconnect" : "Connect", device );
+			return $"{(isConnected ? "Disconnect" : "Connect")} {device}";
 		}
 
 		public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )

DeviceHub/Business Object Classes/Value Converters/DeviceIDConverter.cs

@@ -11,7 +11,7 @@ public object Convert( object value, Type targetType, object parameter, CultureI
 			string deviceType = parameter.ToString();
 			string id = ( value != null ) ? value.ToString() : "";
 
-			return ( String.IsNullOrEmpty( id ) ) ? String.Format("(No {0})", deviceType) : id;
+			return ( String.IsNullOrEmpty( id ) ) ? $"(No {deviceType})" : id;
 		}
 
 		public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )

DeviceHub/Business Object Classes/Value Converters/FocuserTemperatureValueConverter.cs

@@ -38,7 +38,7 @@ public object Convert( object[] values, Type targetType, object parameter, Cultu
 					rawTemp = rawTemp * 1.8 + 32.0;
 				}
 
-				retval = String.Format( "{0:F1}", rawTemp );
+				retval = $"{rawTemp:F1}";
 			}
 
 			return retval;

DeviceHub/Business Object Classes/Value Converters/MoveValueConverter.cs

@@ -10,7 +10,7 @@ public object Convert( object value, Type targetType, object parameter, CultureI
 		{
 			int moveAmount = (int)value;
 
-			return String.Format( "{0} step{1}/move", moveAmount, moveAmount == 1 ? "" : "s" );
+			return $"{moveAmount} step{(moveAmount == 1 ? "" : "s")}/move";
 		}
 
 		public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )

DeviceHub/Business Object Classes/Value Converters/ValueTextConverter.cs

@@ -9,7 +9,8 @@ public object Convert( object value, Type targetType, object parameter,
 				  System.Globalization.CultureInfo culture )
 		{
 			double v = (double)value;
-			return String.Format( "{0:F2}", v );
+
+			return $"{v:F2}";
 		}
 
 		public object ConvertBack( object value, Type targetType, object parameter,