Migration to Visual Studio 2015.
SharpLibDisplay: Now closing client upon server request.
1.1 --- a/GUI/SharpDisplay.cs Mon Jan 25 21:05:35 2016 +0100
1.2 +++ b/GUI/SharpDisplay.cs Thu Jan 28 20:22:46 2016 +0100
1.3 @@ -18,7 +18,6 @@
1.4 using OpenHardwareMonitor.Hardware;
1.5 using OpenHardwareMonitor.Utilities;
1.6 using System.Runtime.InteropServices;
1.7 -using UacHelpers;
1.8 using System.ServiceModel;
1.9 using SharpLib.Display;
1.10
1.11 @@ -54,19 +53,26 @@
1.12 //Connect our client
1.13 //Instance context is then managed by our client class
1.14 iClient = new Client();
1.15 + iClient.CloseOrderEvent += OnCloseOrder;
1.16 //
1.17 - iTextFieldTop = new TextField("", ContentAlignment.MiddleLeft,0,0);
1.18 + iTextFieldTop = new TextField("", ContentAlignment.MiddleLeft,0,0);
1.19 iTextFieldBottom = new TextField("", ContentAlignment.MiddleLeft, 0, 1);
1.20 iTextFieldTopRight = new TextField("", ContentAlignment.MiddleRight,1,0);
1.21 iTextFieldBottomRight = new TextField("", ContentAlignment.MiddleRight,1,1);
1.22 //
1.23 iClient.Open();
1.24 iClient.SetName("Open Hardware Monitor");
1.25 - iClient.SetPriority(Priorities.SystemMonitor);
1.26 + iClient.SetPriority(Priorities.SystemMonitor);
1.27
1.28 - CreateFields();
1.29 + CreateFields();
1.30 }
1.31
1.32 + public void OnCloseOrder()
1.33 + {
1.34 + iClient.Close();
1.35 + }
1.36 +
1.37 +
1.38 private void HardwareRemoved(IHardware hardware)
1.39 {
1.40 hardware.SensorAdded -= new SensorEventHandler(SensorAdded);
1.41 @@ -136,8 +142,6 @@
1.42 {
1.43 const int KNumberOfTickBeforeSwitch = 4;
1.44 const int KMaxCharacterPerLine = 16;
1.45 - string packedFirstLine = ""; //We have 16 chars per line on our VFD
1.46 - string packedSecondLine = "";
1.47 int count = 0;
1.48
1.49 //string time = DateTime.Now.ToShortTimeString();
1.50 @@ -344,7 +348,6 @@
1.51 iTextFieldTop.Text = aUpperLine;
1.52 iTextFieldBottom.Text = aLowerLine;
1.53 iClient.SetFields(iTextFields);
1.54 -
1.55 }
1.56
1.57 public void Quit()
2.1 --- a/GUI/SoundGraphDisplay.cs Mon Jan 25 21:05:35 2016 +0100
2.2 +++ b/GUI/SoundGraphDisplay.cs Thu Jan 28 20:22:46 2016 +0100
2.3 @@ -21,11 +21,6 @@
2.4 using UacHelpers;
2.5
2.6
2.7 -
2.8 -
2.9 -
2.10 -
2.11 -
2.12 namespace OpenHardwareMonitor.GUI
2.13 {
2.14 public class SoundGraphDisplay : IDisposable
3.1 --- a/OpenHardwareMonitor.csproj Mon Jan 25 21:05:35 2016 +0100
3.2 +++ b/OpenHardwareMonitor.csproj Thu Jan 28 20:22:46 2016 +0100
3.3 @@ -227,7 +227,7 @@
3.4 <Name>OpenHardwareMonitorLib</Name>
3.5 </ProjectReference>
3.6 <ProjectReference Include="UacHelpers.CppLibrary\UacHelpers.CppLibrary.vcxproj">
3.7 - <Project>{D043A646-FE7A-4334-B23D-E327593C1AE2}</Project>
3.8 + <Project>{d043a646-fe7a-4334-b23d-e327593c1ae2}</Project>
3.9 <Name>UacHelpers.UserAccountControl</Name>
3.10 </ProjectReference>
3.11 </ItemGroup>
4.1 --- a/OpenHardwareMonitor.sln Mon Jan 25 21:05:35 2016 +0100
4.2 +++ b/OpenHardwareMonitor.sln Thu Jan 28 20:22:46 2016 +0100
4.3 @@ -1,6 +1,8 @@
4.4
4.5 -Microsoft Visual Studio Solution File, Format Version 11.00
4.6 -# Visual Studio 2010
4.7 +Microsoft Visual Studio Solution File, Format Version 12.00
4.8 +# Visual Studio 14
4.9 +VisualStudioVersion = 14.0.24720.0
4.10 +MinimumVisualStudioVersion = 10.0.40219.1
4.11 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenHardwareMonitorLib", "OpenHardwareMonitorLib.csproj", "{B0397530-545A-471D-BB74-027AE456DF1A}"
4.12 EndProject
4.13 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenHardwareMonitor", "OpenHardwareMonitor.csproj", "{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}"
4.14 @@ -81,14 +83,13 @@
4.15 $0.DotNetNamingPolicy = $1
4.16 $1.DirectoryNamespaceAssociation = None
4.17 $1.ResourceNamePolicy = FileFormatDefault
4.18 - $0.TextStylePolicy = $2
4.19 + $0.TextStylePolicy = $3
4.20 $2.FileWidth = 120
4.21 $2.TabWidth = 2
4.22 $2.NoTabsAfterNonTabs = True
4.23 $2.inheritsSet = VisualStudio
4.24 $2.inheritsScope = text/plain
4.25 $2.scope = text/plain
4.26 - $0.TextStylePolicy = $3
4.27 $3.inheritsSet = null
4.28 $3.scope = text/x-csharp
4.29 $0.CSharpFormattingPolicy = $4
5.1 --- a/UacHelpers.CppLibrary/UacHelpers.CppLibrary.vcxproj Mon Jan 25 21:05:35 2016 +0100
5.2 +++ b/UacHelpers.CppLibrary/UacHelpers.CppLibrary.vcxproj Thu Jan 28 20:22:46 2016 +0100
5.3 @@ -1,5 +1,5 @@
5.4 <?xml version="1.0" encoding="utf-8"?>
5.5 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5.6 +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5.7 <ItemGroup Label="ProjectConfigurations">
5.8 <ProjectConfiguration Include="Debug|Win32">
5.9 <Configuration>Debug</Configuration>
5.10 @@ -39,22 +39,26 @@
5.11 <CharacterSet>Unicode</CharacterSet>
5.12 <CLRSupport>true</CLRSupport>
5.13 <WholeProgramOptimization>true</WholeProgramOptimization>
5.14 + <PlatformToolset>v140</PlatformToolset>
5.15 </PropertyGroup>
5.16 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5.17 <ConfigurationType>DynamicLibrary</ConfigurationType>
5.18 <CharacterSet>Unicode</CharacterSet>
5.19 <CLRSupport>true</CLRSupport>
5.20 + <PlatformToolset>v140</PlatformToolset>
5.21 </PropertyGroup>
5.22 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5.23 <ConfigurationType>DynamicLibrary</ConfigurationType>
5.24 <CharacterSet>Unicode</CharacterSet>
5.25 <CLRSupport>true</CLRSupport>
5.26 <WholeProgramOptimization>true</WholeProgramOptimization>
5.27 + <PlatformToolset>v140</PlatformToolset>
5.28 </PropertyGroup>
5.29 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5.30 <ConfigurationType>DynamicLibrary</ConfigurationType>
5.31 <CharacterSet>Unicode</CharacterSet>
5.32 <CLRSupport>true</CLRSupport>
5.33 + <PlatformToolset>v140</PlatformToolset>
5.34 </PropertyGroup>
5.35 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5.36 <ImportGroup Label="ExtensionSettings">