diff --git a/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs b/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs index 5f8fc463f66..8a898fc9e3a 100644 --- a/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs +++ b/src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs @@ -45,7 +45,7 @@ // to distinguish one build from another. AssemblyFileVersion is specified // in AssemblyVersionInfo.cs so that it can be easily incremented by the // automated build process. -[assembly: AssemblyVersion("3.5.0.6885")] +[assembly: AssemblyVersion("3.5.0.7395")] // By default, the "Product version" shown in the file properties window is @@ -64,4 +64,4 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyFileVersion("3.5.0.6885")] +[assembly: AssemblyFileVersion("3.5.0.7395")] diff --git a/src/DynamoCoreWpf/ViewModels/Preview/WatchViewModel.cs b/src/DynamoCoreWpf/ViewModels/Preview/WatchViewModel.cs index 733859f8db7..43affaa9cef 100644 --- a/src/DynamoCoreWpf/ViewModels/Preview/WatchViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/Preview/WatchViewModel.cs @@ -272,7 +272,15 @@ private static string GetStringFromObject(object obj) case TypeCode.DateTime: return ((DateTime)obj).ToString(PreferenceSettings.DefaultDateFormat, CultureInfo.InvariantCulture); case TypeCode.Object: + if (obj is byte[] byteArray) + return Encoding.UTF8.GetString(byteArray); return ObjectToLabelString(obj); + case TypeCode.Byte: + return ((byte)obj).ToString(CultureInfo.InvariantCulture); + case TypeCode.UInt32: + return ((uint)obj).ToString(CultureInfo.InvariantCulture); + case TypeCode.UInt64: + return ((ulong)obj).ToString(CultureInfo.InvariantCulture); default: return (string)obj; }; @@ -313,6 +321,12 @@ private string GetDisplayType(object obj) return nameof(TypeCode.Object); case TypeCode.String: return nameof(TypeCode.String); + case TypeCode.Byte: + return nameof(TypeCode.Byte); + case TypeCode.UInt32: + return nameof(TypeCode.UInt32); + case TypeCode.UInt64: + return nameof(TypeCode.UInt64); case TypeCode.Empty: return String.Empty; default: