Merge pull request #332 from emoacht/develop

Develop
emoacht · Jun 2, 2022 · a34849e · a34849e
2 parents d6b0c2b + 4a682ee
commit a34849e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 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.1"
+  <Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="3.11.2"
            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/MonitorManager.cs b/Source/Monitorian.Core/Models/Monitor/MonitorManager.cs
@@ -293,28 +293,31 @@ 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 = 1, Name = "Device Context - DeviceItems")]
+			[DataMember(Order = 2, Name = "Device Context - DeviceItems")]
 			public DeviceContext.DeviceItem[] DeviceItems { get; private set; }
 
-			[DataMember(Order = 2, Name = "DisplayMonitor - DisplayItems")]
+			[DataMember(Order = 3, Name = "DisplayMonitor - DisplayItems")]
 			public DisplayMonitor.DisplayItem[] DisplayMonitorItems { get; private set; }
 
-			[DataMember(Order = 3, Name = "Display Config - DisplayItems")]
+			[DataMember(Order = 4, Name = "Display Config - DisplayItems")]
 			public DisplayConfig.DisplayItem[] DisplayConfigItems { get; private set; }
 
-			[DataMember(Order = 4, Name = "Device Installation - InstalledItems")]
+			[DataMember(Order = 5, Name = "Device Installation - InstalledItems")]
 			public DeviceInformation.InstalledItem[] InstalledItems { get; private set; }
 
-			[DataMember(Order = 5, Name = "Monitor Configuration - PhysicalItems")]
+			[DataMember(Order = 6, Name = "Monitor Configuration - PhysicalItems")]
 			public Dictionary<DeviceContext.HandleItem, PhysicalItemPlus[]> PhysicalItems { get; private set; }
 
-			[DataMember(Order = 6, Name = "MSMonitorClass - DesktopItems")]
+			[DataMember(Order = 7, Name = "MSMonitorClass - DesktopItems")]
 			public MSMonitor.DesktopItem[] DesktopItems { get; private set; }
 
-			[DataMember(Order = 7)]
+			[DataMember(Order = 8)]
 			public string[] ElapsedTime { get; private set; }
 
 			public MonitorData()
@@ -323,6 +326,7 @@ public MonitorData()
 			public async Task PopulateAsync()
 			{
 				System = GetSystem();
+				OS = Environment.OSVersion.Version.ToString();
 
 				var sw = new Stopwatch();
 

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.1.0")]
-[assembly: AssemblyFileVersion("3.11.1.0")]
+[assembly: AssemblyVersion("3.11.2.0")]
+[assembly: AssemblyFileVersion("3.11.2.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 // For unit test

diff --git a/Source/Monitorian.Core/ViewModels/MonitorViewModel.cs b/Source/Monitorian.Core/ViewModels/MonitorViewModel.cs
@@ -417,7 +417,7 @@ public string Message
 		{
 			get
 			{
-				if (0 < _controllableCount)
+				if (IsReachable && (0 < _controllableCount))
 					return null;
 
 				LanguageService.Switch();

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.1.0")]
-[assembly: AssemblyFileVersion("3.11.1.0")]
+[assembly: AssemblyVersion("3.11.2.0")]
+[assembly: AssemblyFileVersion("3.11.2.0")]
 [assembly: Guid("a4cc5362-9b08-465b-ad64-5cfabc72a4c7")]
 [assembly: NeutralResourcesLanguage("en-US")]