From 76ae5fa626a396e21d98b9139970b0c2edc4d6e2 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 19 Jan 2017 21:14:19 -0800 Subject: [PATCH] updated open hardware monitor and dependencies. increased version. --- .gitmodules | 2 +- OpenHardwareMonitor | 2 +- SidebarDiagnostics/ChangeLog.json | 7 ++++ SidebarDiagnostics/Properties/AssemblyInfo.cs | 4 +- SidebarDiagnostics/Properties/Resources.resx | 2 +- SidebarDiagnostics/SidebarDiagnostics.csproj | 40 ++++++++++++++----- SidebarDiagnostics/packages.config | 8 ++-- 7 files changed, 46 insertions(+), 19 deletions(-) diff --git a/.gitmodules b/.gitmodules index 505f6ee..94fd560 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "OpenHardwareMonitor"] path = OpenHardwareMonitor - url = git@github.com:openhardwaremonitor/openhardwaremonitor.git + url = https://github.com/openhardwaremonitor/openhardwaremonitor.git diff --git a/OpenHardwareMonitor b/OpenHardwareMonitor index da432ef..ba523c8 160000 --- a/OpenHardwareMonitor +++ b/OpenHardwareMonitor @@ -1 +1 @@ -Subproject commit da432ef07cf125c019afd3a27f447da428404611 +Subproject commit ba523c8f924dc7856cd76aa2bfa5ea3863a6d8d4 diff --git a/SidebarDiagnostics/ChangeLog.json b/SidebarDiagnostics/ChangeLog.json index 58e90fb..31d76cb 100644 --- a/SidebarDiagnostics/ChangeLog.json +++ b/SidebarDiagnostics/ChangeLog.json @@ -1,4 +1,11 @@ [ + { + "Version": "3.4.4", + "Changes": [ + "Updated to the latest version of Open Hardware Monitor with Kaby Lake support.", + "Updated dependencies." + ] + }, { "Version": "3.4.3", "Changes": [ diff --git a/SidebarDiagnostics/Properties/AssemblyInfo.cs b/SidebarDiagnostics/Properties/AssemblyInfo.cs index 231cc71..b9a0004 100644 --- a/SidebarDiagnostics/Properties/AssemblyInfo.cs +++ b/SidebarDiagnostics/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // 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.4.3.0")] -[assembly: AssemblyFileVersion("3.4.3.0")] +[assembly: AssemblyVersion("3.4.4.0")] +[assembly: AssemblyFileVersion("3.4.4.0")] diff --git a/SidebarDiagnostics/Properties/Resources.resx b/SidebarDiagnostics/Properties/Resources.resx index e210c07..3a954a2 100644 --- a/SidebarDiagnostics/Properties/Resources.resx +++ b/SidebarDiagnostics/Properties/Resources.resx @@ -678,7 +678,7 @@ Settings hardware data grid hardware column header - Enables this hardware. (Double click to change. Known bug.) + Enables this hardware. Settings hardware enabled checkbox tooltip diff --git a/SidebarDiagnostics/SidebarDiagnostics.csproj b/SidebarDiagnostics/SidebarDiagnostics.csproj index 4545fe1..63fa1eb 100644 --- a/SidebarDiagnostics/SidebarDiagnostics.csproj +++ b/SidebarDiagnostics/SidebarDiagnostics.csproj @@ -98,8 +98,8 @@ ..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll True - - ..\packages\gong-wpf-dragdrop.1.0.0\lib\net46\GongSolutions.Wpf.DragDrop.dll + + ..\packages\gong-wpf-dragdrop.1.1.0\lib\net46\GongSolutions.Wpf.DragDrop.dll True @@ -107,7 +107,7 @@ True - ..\packages\squirrel.windows.1.4.4\lib\Net45\ICSharpCode.SharpZipLib.dll + ..\packages\squirrel.windows.1.5.1\lib\Net45\ICSharpCode.SharpZipLib.dll True @@ -135,7 +135,7 @@ True - ..\packages\squirrel.windows.1.4.4\lib\Net45\NuGet.Squirrel.dll + ..\packages\squirrel.windows.1.5.1\lib\Net45\NuGet.Squirrel.dll True @@ -150,12 +150,12 @@ ..\packages\OxyPlot.Wpf.1.0.0\lib\net45\OxyPlot.Wpf.dll True - - ..\packages\Splat.1.6.2\lib\Net45\Splat.dll + + ..\packages\Splat.2.0.0\lib\Net45\Splat.dll True - - ..\packages\squirrel.windows.1.4.4\lib\Net45\Squirrel.dll + + ..\packages\squirrel.windows.1.5.1\lib\Net45\Squirrel.dll True @@ -173,8 +173,28 @@ - - ..\packages\Extended.Wpf.Toolkit.2.9\lib\net40\Xceed.Wpf.Toolkit.dll + + ..\packages\Extended.Wpf.Toolkit.3.0\lib\net40\Xceed.Wpf.AvalonDock.dll + True + + + ..\packages\Extended.Wpf.Toolkit.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll + True + + + ..\packages\Extended.Wpf.Toolkit.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll + True + + + ..\packages\Extended.Wpf.Toolkit.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll + True + + + ..\packages\Extended.Wpf.Toolkit.3.0\lib\net40\Xceed.Wpf.DataGrid.dll + True + + + ..\packages\Extended.Wpf.Toolkit.3.0\lib\net40\Xceed.Wpf.Toolkit.dll True diff --git a/SidebarDiagnostics/packages.config b/SidebarDiagnostics/packages.config index b5caac5..6ad76b4 100644 --- a/SidebarDiagnostics/packages.config +++ b/SidebarDiagnostics/packages.config @@ -1,14 +1,14 @@  - - + + - - + + \ No newline at end of file