diff --git a/Aga.Controls/Aga.Controls.csproj b/Aga.Controls/Aga.Controls.csproj index ac10761..6322afc 100644 --- a/Aga.Controls/Aga.Controls.csproj +++ b/Aga.Controls/Aga.Controls.csproj @@ -1,264 +1,121 @@ - - + - Debug - AnyCPU 9.0.30729 - 2.0 - {E73BB233-D88B-44A7-A98F-D71EE158381D} - Library - Properties - Aga.Controls - Aga.Controls - - - - - - - - - false - - - - - 3.5 - - - v4.5.2 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - + net452 + Aga.Controls + http://sourceforge.net/projects/treeviewadv/ + Copyright © Andrey Gliznetsov 2006 - 2009 + 1.7.0.0 + 1.7.0.0 + true + ..\bin\$(Configuration)\ - true full - false - ..\bin\Debug\ TRACE;DEBUG;PERF_TEST - prompt - 4 - - - true - AllRules.ruleset - false pdbonly - true - ..\bin\Release\ - TRACE - prompt - 4 - true - AllRules.ruleset - false - - - - - - - - - + True True Resources.resx - - - - - - - - - - + Component - + Component - + Component - + Component - + Component - - - - - - - - + Component - + Component - + Component - - - - - + Component - - - + Component - - - - + Component - + Component - + Component - - - - - + Component - - - - - - - - - - - - - + Component - - + Component - + Component - + Component - - - + Component - + Component - - + Component - - - - + Component - + TreeViewAdv.cs - - - - - - - - - - + - + Designer ResXFileCodeGenerator Resources.Designer.cs - + TreeViewAdv.cs - - - + + - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - \ No newline at end of file diff --git a/Aga.Controls/Properties/AssemblyInfo.cs b/Aga.Controls/Properties/AssemblyInfo.cs deleted file mode 100644 index a55abae..0000000 --- a/Aga.Controls/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System; -using System.Security.Permissions; - -[assembly: ComVisible(false)] -[assembly: CLSCompliant(false)] - -[assembly: AssemblyTitle("Aga.Controls")] -[assembly: AssemblyCopyright("Copyright © Andrey Gliznetsov 2006 - 2009")] -[assembly: AssemblyDescription("http://sourceforge.net/projects/treeviewadv/")] - -[assembly: AssemblyVersion("1.7.0.0")] diff --git a/LibreHardwareMonitor.sln b/LibreHardwareMonitor.sln index 2baf7ba..77b7bf5 100644 --- a/LibreHardwareMonitor.sln +++ b/LibreHardwareMonitor.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.29306.81 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreHardwareMonitorLib", "LibreHardwareMonitorLib\LibreHardwareMonitorLib.csproj", "{B0397530-545A-471D-BB74-027AE456DF1A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibreHardwareMonitor", "LibreHardwareMonitor\LibreHardwareMonitor.csproj", "{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreHardwareMonitor", "LibreHardwareMonitor\LibreHardwareMonitor.csproj", "{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}" ProjectSection(ProjectDependencies) = postProject {B0397530-545A-471D-BB74-027AE456DF1A} = {B0397530-545A-471D-BB74-027AE456DF1A} EndProjectSection diff --git a/LibreHardwareMonitor/LibreHardwareMonitor.csproj b/LibreHardwareMonitor/LibreHardwareMonitor.csproj index 25a9fce..b9b32e5 100644 --- a/LibreHardwareMonitor/LibreHardwareMonitor.csproj +++ b/LibreHardwareMonitor/LibreHardwareMonitor.csproj @@ -1,324 +1,76 @@ - - + - Debug - AnyCPU - {F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880} - 9.0.30729 - 2.0 WinExe - win - false + net452 LibreHardwareMonitor - v4.5.2 - 512 - LibreHardwareMonitor + Libre Hardware Monitor + LibreHardwareMonitor + 0.8.5 + true Resources\icon.ico Resources\app.manifest LibreHardwareMonitor.Program - - - 3.5 - - false - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - - {F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880} + true + ..\bin\$(Configuration)\ - true full - false - ..\bin\Debug\ - TRACE;DEBUG - prompt - 4 - true - AllRules.ruleset - AnyCPU - false none - true - ..\bin\Release\ - TRACE - prompt - 4 - false - AllRules.ruleset - false - - ..\packages\TaskScheduler.2.8.15\lib\net452\Microsoft.Win32.TaskScheduler.dll - - - ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - - - ..\packages\OxyPlot.Core.1.0.0\lib\net45\OxyPlot.dll - - - ..\packages\OxyPlot.WindowsForms.1.0.0\lib\net45\OxyPlot.WindowsForms.dll - - - - - - - - - + + + + + - - Properties\AssemblyVersion.cs - - - Form - - - AuthForm.cs - - - - - - - - - UserControl - - - Form - - - PortForm.cs - - - - Form - - - ParameterForm.cs - - - - - - Component - - - - - - - - - - - - - - - Form - - + + + + + AboutBox.cs - - - Form + + AuthForm.cs - + MainForm.cs - - - - - - - - - Component + + ParameterForm.cs + + + PortForm.cs - + AboutBox.cs - Designer - + AuthForm.cs - + + MainForm.cs + + + ParameterForm.cs + + PortForm.cs - - - - - - - - - - - + + - - - Designer - + + - - - - - - ParameterForm.cs - - - - - - - - - MainForm.cs - Designer - - - - - - {e73bb233-d88b-44a7-a98f-d71ee158381d} - Aga.Controls - - - {B0397530-545A-471D-BB74-027AE456DF1A} - LibreHardwareMonitorLib - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/LibreHardwareMonitor/Properties/AssemblyInfo.cs b/LibreHardwareMonitor/Properties/AssemblyInfo.cs deleted file mode 100644 index 4195231..0000000 --- a/LibreHardwareMonitor/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,19 +0,0 @@ -// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. -// If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. -// Copyright (C) LibreHardwareMonitor and Contributors. -// Partial Copyright (C) Michael Möller and Contributors. -// All Rights Reserved. - -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("Libre Hardware Monitor")] -[assembly: AssemblyDescription("Libre Hardware Monitor, a fork of Open Hardware Monitor.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Libre Hardware Monitor")] -[assembly: AssemblyCopyright("Copyright © Libre Hardware Monitor contributors")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: ComVisible(false)] diff --git a/LibreHardwareMonitor/UI/MainForm.cs b/LibreHardwareMonitor/UI/MainForm.cs index 3678df3..342e7da 100644 --- a/LibreHardwareMonitor/UI/MainForm.cs +++ b/LibreHardwareMonitor/UI/MainForm.cs @@ -66,13 +66,6 @@ namespace LibreHardwareMonitor.UI { InitializeComponent(); - // check if the LibreHardwareMonitorLib assembly has the correct version - if (Assembly.GetAssembly(typeof(Computer)).GetName().Version != Assembly.GetExecutingAssembly().GetName().Version) - { - MessageBox.Show("The version of the file LibreHardwareMonitorLib.dll is incompatible.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); - Environment.Exit(0); - } - _settings = new PersistentSettings(); _settings.Load(Path.ChangeExtension(Application.ExecutablePath, ".config")); diff --git a/LibreHardwareMonitor/packages.config b/LibreHardwareMonitor/packages.config deleted file mode 100644 index 2753d92..0000000 --- a/LibreHardwareMonitor/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/LibreHardwareMonitorLib/Hardware/Ring0.cs b/LibreHardwareMonitorLib/Hardware/Ring0.cs index 01952b6..bde4a80 100644 --- a/LibreHardwareMonitorLib/Hardware/Ring0.cs +++ b/LibreHardwareMonitorLib/Hardware/Ring0.cs @@ -84,13 +84,12 @@ namespace LibreHardwareMonitor.Hardware { if (names[i].Replace('\\', '.') == resourceName) { - using (Stream stream = GetAssembly().GetManifestResourceStream(names[i])) + using Stream stream = GetAssembly().GetManifestResourceStream(names[i]); + + if (stream != null) { - if (stream != null) - { - buffer = new byte[stream.Length]; - stream.Read(buffer, 0, buffer.Length); - } + buffer = new byte[stream.Length]; + stream.Read(buffer, 0, buffer.Length); } } } @@ -101,11 +100,10 @@ namespace LibreHardwareMonitor.Hardware try { - using (FileStream target = new FileStream(fileName, FileMode.Create)) - { - target.Write(buffer, 0, buffer.Length); - target.Flush(); - } + using FileStream target = new FileStream(fileName, FileMode.Create); + + target.Write(buffer, 0, buffer.Length); + target.Flush(); } catch (IOException) { diff --git a/LibreHardwareMonitorLib/LibreHardwareMonitorLib.csproj b/LibreHardwareMonitorLib/LibreHardwareMonitorLib.csproj index ea8f96f..8ebbbb6 100644 --- a/LibreHardwareMonitorLib/LibreHardwareMonitorLib.csproj +++ b/LibreHardwareMonitorLib/LibreHardwareMonitorLib.csproj @@ -1,159 +1,33 @@  - net452;netstandard2.0 - false - false - LibreHardwareMonitor LibreHardwareMonitorLib + LibreHardwareMonitor + 0.8.5 true Library - win - false true + LibreHardwareMonitor false - Libre Hardware Monitor contributors LibreHardwareMonitorLib - LICENSE + https://github.com/LibreHardwareMonitor/LibreHardwareMonitor/blob/master/Licenses/LICENSE https://github.com/LibreHardwareMonitor/LibreHardwareMonitor libre open hardware monitor monitoring system logging cpu gpu + $(Version) true https://github.com/LibreHardwareMonitor/LibreHardwareMonitor latest - ..\bin\Debug\ - ..\bin\Release\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 4.7.0 @@ -162,7 +36,6 @@ 4.7.0 - diff --git a/LibreHardwareMonitorLib/Properties/AssemblyLibInfo.cs b/LibreHardwareMonitorLib/Properties/AssemblyLibInfo.cs deleted file mode 100644 index 8a2571e..0000000 --- a/LibreHardwareMonitorLib/Properties/AssemblyLibInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. -// If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. -// Copyright (C) LibreHardwareMonitor and Contributors. -// Partial Copyright (C) Michael Möller and Contributors. -// All Rights Reserved. - -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("Libre Hardware Monitor Library")] -[assembly: AssemblyDescription("Libre Hardware Monitor Library, a fork of Open Hardware Monitor.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Libre Hardware Monitor Library")] -[assembly: AssemblyCopyright("Copyright © Libre Hardware Monitor contributors")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: ComVisible(false)] - - diff --git a/LibreHardwareMonitorLib/Properties/AssemblyVersion.cs b/LibreHardwareMonitorLib/Properties/AssemblyVersion.cs deleted file mode 100644 index 450769e..0000000 --- a/LibreHardwareMonitorLib/Properties/AssemblyVersion.cs +++ /dev/null @@ -1,10 +0,0 @@ -// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. -// If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. -// Copyright (C) LibreHardwareMonitor and Contributors.. -// Partial Copyright (C) Michael Möller and Contributors.. -// All Rights Reserved.. - -using System.Reflection; - -[assembly: AssemblyVersion("0.8.1.0")] -[assembly: AssemblyInformationalVersion("0.8.1.0")]