diff --git a/App.config b/App.config deleted file mode 100644 index 736209e..0000000 --- a/App.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/OpenHardwareMonitor.csproj b/OpenHardwareMonitor.csproj index 8a0198a..e74d263 100644 --- a/OpenHardwareMonitor.csproj +++ b/OpenHardwareMonitor.csproj @@ -7,6 +7,7 @@ 9.0.30729 2.0 WinExe + win false OpenHardwareMonitor v4.5.2 @@ -62,8 +63,7 @@ - packages\Newtonsoft.Json.10.0.3\lib\net20\Newtonsoft.Json.dll - True + packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll @@ -175,7 +175,6 @@ - Designer diff --git a/OpenHardwareMonitor.sln b/OpenHardwareMonitor.sln index e9bc643..a768d98 100644 --- a/OpenHardwareMonitor.sln +++ b/OpenHardwareMonitor.sln @@ -1,7 +1,9 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenHardwareMonitorLib", "OpenHardwareMonitorLib.csproj", "{B0397530-545A-471D-BB74-027AE456DF1A}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27004.2009 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenHardwareMonitorLib", "OpenHardwareMonitorLib.csproj", "{B0397530-545A-471D-BB74-027AE456DF1A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenHardwareMonitor", "OpenHardwareMonitor.csproj", "{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}" ProjectSection(ProjectDependencies) = postProject @@ -44,20 +46,22 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {6A8EF661-2BD7-498F-8FB9-28182B3B0BE5} + EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution StartupItem = OpenHardwareMonitor.csproj Policies = $0 $0.DotNetNamingPolicy = $1 $1.DirectoryNamespaceAssociation = None $1.ResourceNamePolicy = FileFormatDefault - $0.TextStylePolicy = $2 + $0.TextStylePolicy = $3 $2.FileWidth = 120 $2.TabWidth = 2 $2.NoTabsAfterNonTabs = True $2.inheritsSet = VisualStudio $2.inheritsScope = text/plain $2.scope = text/plain - $0.TextStylePolicy = $3 $3.inheritsSet = null $3.scope = text/x-csharp $0.CSharpFormattingPolicy = $4 diff --git a/OpenHardwareMonitorLib.csproj b/OpenHardwareMonitorLib.csproj index fc4f117..678286c 100644 --- a/OpenHardwareMonitorLib.csproj +++ b/OpenHardwareMonitorLib.csproj @@ -1,63 +1,30 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {B0397530-545A-471D-BB74-027AE456DF1A} - Library - Properties + net452;netstandard2.0 + false OpenHardwareMonitor OpenHardwareMonitorLib - v4.5.2 - 512 - - - 3.5 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - + true + Library + win + false - - true - full - false - Bin\Debug\ - TRACE;DEBUG - prompt - 4 - AllRules.ruleset - false - - - none - true - Bin\Release\ - TRACE - prompt - 4 - AllRules.ruleset - false - - + + + + + + + + + + + + @@ -144,37 +111,17 @@ + - - - - - 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/OpenHardwareMonitorLibNetStandard.csproj b/OpenHardwareMonitorLibNetStandard.csproj deleted file mode 100644 index b4946a6..0000000 --- a/OpenHardwareMonitorLibNetStandard.csproj +++ /dev/null @@ -1,117 +0,0 @@ - - - - netstandard2.0 - false - - - - Auto - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OpenHardwareMonitorLibNetStandard.sln b/OpenHardwareMonitorLibNetStandard.sln deleted file mode 100644 index ebbf40f..0000000 --- a/OpenHardwareMonitorLibNetStandard.sln +++ /dev/null @@ -1,57 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenHardwareMonitorLib", "OpenHardwareMonitorLibNetStandard.csproj", "{B0397530-545A-471D-BB74-027AE456DF1A}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B0397530-545A-471D-BB74-027AE456DF1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B0397530-545A-471D-BB74-027AE456DF1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B0397530-545A-471D-BB74-027AE456DF1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B0397530-545A-471D-BB74-027AE456DF1A}.Release|Any CPU.Build.0 = Release|Any CPU - {F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Release|Any CPU.Build.0 = Release|Any CPU - {E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.Build.0 = Release|Any CPU - {BCC43E58-E473-403E-A84D-63FEDC723040}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BCC43E58-E473-403E-A84D-63FEDC723040}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BCC43E58-E473-403E-A84D-63FEDC723040}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCC43E58-E473-403E-A84D-63FEDC723040}.Release|Any CPU.Build.0 = Release|Any CPU - {D4554296-094E-4CAC-8EAE-44EB250666C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D4554296-094E-4CAC-8EAE-44EB250666C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D4554296-094E-4CAC-8EAE-44EB250666C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D4554296-094E-4CAC-8EAE-44EB250666C6}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = OpenHardwareMonitor.csproj - Policies = $0 - $0.DotNetNamingPolicy = $1 - $1.DirectoryNamespaceAssociation = None - $1.ResourceNamePolicy = FileFormatDefault - $0.TextStylePolicy = $2 - $2.FileWidth = 120 - $2.TabWidth = 2 - $2.NoTabsAfterNonTabs = True - $2.inheritsSet = VisualStudio - $2.inheritsScope = text/plain - $2.scope = text/plain - $0.TextStylePolicy = $3 - $3.inheritsSet = null - $3.scope = text/x-csharp - $0.CSharpFormattingPolicy = $4 - $4.inheritsSet = Mono - $4.inheritsScope = text/x-csharp - $4.scope = text/x-csharp - EndGlobalSection -EndGlobal diff --git a/packages.config b/packages.config index 86df876..c332ba7 100644 --- a/packages.config +++ b/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file