Merge pull request #333 from emoacht/develop

Develop
emoacht · Jun 4, 2022 · c3e1ac2 · c3e1ac2
2 parents 4fa3ec8 + 2f3ca7b
commit c3e1ac2
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 18 deletions.
diff --git a/Source/Installer/Product.wxs b/Source/Installer/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="3.11.2"
+  <Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="3.11.3"
            Language="1033" Codepage="1252" UpgradeCode="{81A4D148-75D3-462E-938D-8C208FB48E3C}">
     <Package Id="*" InstallerVersion="500" Compressed="yes"
              InstallScope="perMachine" InstallPrivileges="elevated"

diff --git a/Source/Monitorian.Core/Models/Monitor/DisplayConfig.cs b/Source/Monitorian.Core/Models/Monitor/DisplayConfig.cs
@@ -274,21 +274,26 @@ public class DisplayItem : IDisplayItem
 			public bool IsInternal { get; }
 
 			[DataMember(Order = 3)]
-			public string ConnectionDescription { get; }
+			public float RefreshRate { get; }
 
 			[DataMember(Order = 4)]
+			public string ConnectionDescription { get; }
+
+			[DataMember(Order = 5)]
 			public bool IsAvailable { get; }
 
 			public DisplayItem(
 				string deviceInstanceId,
 				string displayName,
 				bool isInternal,
+				float refreshRate,
 				string connectionDescription,
 				bool isAvailable)
 			{
 				this.DeviceInstanceId = deviceInstanceId;
 				this.DisplayName = displayName;
 				this.IsInternal = isInternal;
+				this.RefreshRate = refreshRate;
 				this.ConnectionDescription = connectionDescription;
 				this.IsAvailable = isAvailable;
 			}
@@ -339,6 +344,7 @@ public static IEnumerable<DisplayItem> EnumerateDisplayConfigs()
 					deviceInstanceId: deviceInstanceId,
 					displayName: deviceName.monitorFriendlyDeviceName,
 					isInternal: (deviceName.outputTechnology == DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY.DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INTERNAL),
+					refreshRate: displayPath.targetInfo.refreshRate.Numerator / (float)displayPath.targetInfo.refreshRate.Denominator,
 					connectionDescription: GetConnectionDescription(deviceName.outputTechnology),
 					isAvailable: displayPath.targetInfo.targetAvailable);
 			}

diff --git a/Source/Monitorian.Core/Models/Monitor/MonitorManager.cs b/Source/Monitorian.Core/Models/Monitor/MonitorManager.cs
@@ -293,31 +293,28 @@ private class MonitorData
 			[DataMember(Order = 0)]
 			public string System { get; private set; }
 
-			[DataMember(Order = 1)]
-			public string OS { get; private set; }
-
 			// When Name property of DataMemberAttribute contains a space or specific character 
 			// (e.g. !, ?), DataContractJsonSerializer.WriteObject method will internally throw 
 			// a System.Xml.XmlException while it will work fine.
-			[DataMember(Order = 2, Name = "Device Context - DeviceItems")]
+			[DataMember(Order = 1, Name = "Device Context - DeviceItems")]
 			public DeviceContext.DeviceItem[] DeviceItems { get; private set; }
 
-			[DataMember(Order = 3, Name = "DisplayMonitor - DisplayItems")]
+			[DataMember(Order = 2, Name = "DisplayMonitor - DisplayItems")]
 			public DisplayMonitor.DisplayItem[] DisplayMonitorItems { get; private set; }
 
-			[DataMember(Order = 4, Name = "Display Config - DisplayItems")]
+			[DataMember(Order = 3, Name = "Display Config - DisplayItems")]
 			public DisplayConfig.DisplayItem[] DisplayConfigItems { get; private set; }
 
-			[DataMember(Order = 5, Name = "Device Installation - InstalledItems")]
+			[DataMember(Order = 4, Name = "Device Installation - InstalledItems")]
 			public DeviceInformation.InstalledItem[] InstalledItems { get; private set; }
 
-			[DataMember(Order = 6, Name = "Monitor Configuration - PhysicalItems")]
+			[DataMember(Order = 5, Name = "Monitor Configuration - PhysicalItems")]
 			public Dictionary<DeviceContext.HandleItem, PhysicalItemPlus[]> PhysicalItems { get; private set; }
 
-			[DataMember(Order = 7, Name = "MSMonitorClass - DesktopItems")]
+			[DataMember(Order = 6, Name = "MSMonitorClass - DesktopItems")]
 			public MSMonitor.DesktopItem[] DesktopItems { get; private set; }
 
-			[DataMember(Order = 8)]
+			[DataMember(Order = 7)]
 			public string[] ElapsedTime { get; private set; }
 
 			public MonitorData()
@@ -326,7 +323,6 @@ public MonitorData()
 			public async Task PopulateAsync()
 			{
 				System = GetSystem();
-				OS = Environment.OSVersion.Version.ToString();
 
 				var sw = new Stopwatch();
 
@@ -377,7 +373,7 @@ private string GetSystem()
 			{
 				using var @class = new ManagementClass("Win32_ComputerSystem");
 				using var instance = @class.GetInstances().Cast<ManagementObject>().FirstOrDefault();
-				return $"Manufacturer: {instance?["Manufacturer"]}, Model: {instance?["Model"]}";
+				return $"Manufacturer: {instance?["Manufacturer"]}, Model: {instance?["Model"]}, OS: {Environment.OSVersion.Version}";
 			}
 		}
 

diff --git a/Source/Monitorian.Core/Properties/AssemblyInfo.cs b/Source/Monitorian.Core/Properties/AssemblyInfo.cs
@@ -33,8 +33,8 @@
 // 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: AssemblyVersion("3.11.2.0")]
-[assembly: AssemblyFileVersion("3.11.2.0")]
+[assembly: AssemblyVersion("3.11.3.0")]
+[assembly: AssemblyFileVersion("3.11.3.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 // For unit test

diff --git a/Source/Monitorian/Properties/AssemblyInfo.cs b/Source/Monitorian/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // 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: AssemblyVersion("3.11.2.0")]
-[assembly: AssemblyFileVersion("3.11.2.0")]
+[assembly: AssemblyVersion("3.11.3.0")]
+[assembly: AssemblyFileVersion("3.11.3.0")]
 [assembly: Guid("a4cc5362-9b08-465b-ad64-5cfabc72a4c7")]
 [assembly: NeutralResourcesLanguage("en-US")]