Migrated from .NET Framework version 2.0 to .NET Framework version 4.5.

This commit is contained in:
Michael Möller 2020-05-21 17:53:08 +02:00
parent 0f6932a7e3
commit 9abc8906e4
19 changed files with 110 additions and 3201 deletions

6
.gitignore vendored
View File

@ -1,5 +1,5 @@
*.user *.user
*.suo *.suo
/Bin Bin/
/Obj Obj/
/.vs .vs/

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" />
<supportedRuntime version="v2.0.50727"/>
</startup>
</configuration>

Binary file not shown.

View File

@ -26,7 +26,7 @@
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation> <UpgradeBackupLocation>
</UpgradeBackupLocation> </UpgradeBackupLocation>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl> <PublishUrl>publish\</PublishUrl>
<Install>true</Install> <Install>true</Install>
<InstallFrom>Disk</InstallFrom> <InstallFrom>Disk</InstallFrom>
@ -42,6 +42,7 @@
<IsWebBootstrapper>false</IsWebBootstrapper> <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -54,10 +55,10 @@
<CodeAnalysisRules> <CodeAnalysisRules>
</CodeAnalysisRules> </CodeAnalysisRules>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CodeAnalysisRuleSet>Migrated rules for Aga.Controls.ruleset</CodeAnalysisRuleSet> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>none</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>Bin\Release\</OutputPath> <OutputPath>Bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
@ -65,6 +66,7 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />

View File

@ -1,20 +0,0 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

View File

@ -6,10 +6,11 @@ using System.Security.Permissions;
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: CLSCompliant(false)] [assembly: CLSCompliant(false)]
[assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution = true)]
[assembly: AssemblyTitle("Aga.Controls")] [assembly: AssemblyTitle("Aga.Controls")]
[assembly: AssemblyCopyright("Copyright © Andrey Gliznetsov 2006 - 2009")] [assembly: AssemblyCopyright("Copyright © Andrey Gliznetsov 2006 - 2009")]
[assembly: AssemblyDescription("http://sourceforge.net/projects/treeviewadv/")] [assembly: AssemblyDescription("http://sourceforge.net/projects/treeviewadv/")]
[assembly: AssemblyVersion("1.7.0.0")] [assembly: AssemblyVersion("1.7.0.0")]
[assembly: DefaultDllImportSearchPaths(DllImportSearchPath.System32)]

View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.235 // Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@ -19,7 +19,7 @@ namespace Aga.Controls.Properties {
// class via a tool like ResGen or Visual Studio. // class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen // To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project. // with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
@ -60,6 +60,9 @@ namespace Aga.Controls.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap check { internal static System.Drawing.Bitmap check {
get { get {
object obj = ResourceManager.GetObject("check", resourceCulture); object obj = ResourceManager.GetObject("check", resourceCulture);
@ -67,6 +70,9 @@ namespace Aga.Controls.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] DVSplit { internal static byte[] DVSplit {
get { get {
object obj = ResourceManager.GetObject("DVSplit", resourceCulture); object obj = ResourceManager.GetObject("DVSplit", resourceCulture);
@ -74,6 +80,9 @@ namespace Aga.Controls.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Folder { internal static System.Drawing.Bitmap Folder {
get { get {
object obj = ResourceManager.GetObject("Folder", resourceCulture); object obj = ResourceManager.GetObject("Folder", resourceCulture);
@ -81,6 +90,9 @@ namespace Aga.Controls.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap FolderClosed { internal static System.Drawing.Bitmap FolderClosed {
get { get {
object obj = ResourceManager.GetObject("FolderClosed", resourceCulture); object obj = ResourceManager.GetObject("FolderClosed", resourceCulture);
@ -88,6 +100,9 @@ namespace Aga.Controls.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Leaf { internal static System.Drawing.Bitmap Leaf {
get { get {
object obj = ResourceManager.GetObject("Leaf", resourceCulture); object obj = ResourceManager.GetObject("Leaf", resourceCulture);
@ -95,6 +110,9 @@ namespace Aga.Controls.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] loading_icon { internal static byte[] loading_icon {
get { get {
object obj = ResourceManager.GetObject("loading_icon", resourceCulture); object obj = ResourceManager.GetObject("loading_icon", resourceCulture);
@ -102,6 +120,9 @@ namespace Aga.Controls.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap minus { internal static System.Drawing.Bitmap minus {
get { get {
object obj = ResourceManager.GetObject("minus", resourceCulture); object obj = ResourceManager.GetObject("minus", resourceCulture);
@ -109,6 +130,9 @@ namespace Aga.Controls.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap plus { internal static System.Drawing.Bitmap plus {
get { get {
object obj = ResourceManager.GetObject("plus", resourceCulture); object obj = ResourceManager.GetObject("plus", resourceCulture);
@ -116,6 +140,9 @@ namespace Aga.Controls.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap uncheck { internal static System.Drawing.Bitmap uncheck {
get { get {
object obj = ResourceManager.GetObject("uncheck", resourceCulture); object obj = ResourceManager.GetObject("uncheck", resourceCulture);
@ -123,6 +150,9 @@ namespace Aga.Controls.Properties {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap unknown { internal static System.Drawing.Bitmap unknown {
get { get {
object obj = ResourceManager.GetObject("unknown", resourceCulture); object obj = ResourceManager.GetObject("unknown", resourceCulture);

Binary file not shown.

BIN
External/OxyPlot.dll vendored

Binary file not shown.

View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OxyPlot.WindowsForms</RootNamespace> <RootNamespace>OxyPlot.WindowsForms</RootNamespace>
<AssemblyName>OxyPlot.WindowsForms</AssemblyName> <AssemblyName>OxyPlot.WindowsForms</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile> <TargetFrameworkProfile>
</TargetFrameworkProfile> </TargetFrameworkProfile>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
@ -23,9 +23,10 @@
<DefineConstants>TRACE;DEBUG</DefineConstants> <DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>none</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>Bin\Release\</OutputPath> <OutputPath>Bin\Release\</OutputPath>
<IntermediateOutputPath>obj\Release\NET40\</IntermediateOutputPath> <IntermediateOutputPath>obj\Release\NET40\</IntermediateOutputPath>
@ -34,6 +35,7 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<DocumentationFile> <DocumentationFile>
</DocumentationFile> </DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>

View File

@ -1,26 +0,0 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OxyPlot", "OxyPlot\OxyPlot.csproj", "{BCC43E58-E473-403E-A84D-63FEDC723040}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OxyPlot.WindowsForms", "OxyPlot.WindowsForms\OxyPlot.WindowsForms.csproj", "{D4554296-094E-4CAC-8EAE-44EB250666C6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{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
EndGlobal

File diff suppressed because it is too large Load Diff

View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OxyPlot</RootNamespace> <RootNamespace>OxyPlot</RootNamespace>
<AssemblyName>OxyPlot</AssemblyName> <AssemblyName>OxyPlot</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile> <TargetFrameworkProfile>
</TargetFrameworkProfile> </TargetFrameworkProfile>
@ -22,9 +22,10 @@
<DefineConstants>TRACE;DEBUG;LINQBRIDGE_LIB</DefineConstants> <DefineConstants>TRACE;DEBUG;LINQBRIDGE_LIB</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>none</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>Bin\Release\</OutputPath> <OutputPath>Bin\Release\</OutputPath>
<DefineConstants>TRACE;LINQBRIDGE_LIB</DefineConstants> <DefineConstants>TRACE;LINQBRIDGE_LIB</DefineConstants>
@ -32,6 +33,7 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<DocumentationFile> <DocumentationFile>
</DocumentationFile> </DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
@ -93,7 +95,6 @@
<Compile Include="Foundation\IDataPoint.cs" /> <Compile Include="Foundation\IDataPoint.cs" />
<Compile Include="Foundation\ReflectionHelper.cs" /> <Compile Include="Foundation\ReflectionHelper.cs" />
<Compile Include="Foundation\ScreenPointHelper.cs" /> <Compile Include="Foundation\ScreenPointHelper.cs" />
<Compile Include="LinqBridge.cs" />
<Compile Include="Manipulators\ZoomManipulator.cs" /> <Compile Include="Manipulators\ZoomManipulator.cs" />
<Compile Include="Manipulators\ZoomStepManipulator.cs" /> <Compile Include="Manipulators\ZoomStepManipulator.cs" />
<Compile Include="Manipulators\ResetManipulator.cs" /> <Compile Include="Manipulators\ResetManipulator.cs" />

View File

@ -29,7 +29,8 @@ namespace OpenHardwareMonitor.Hardware {
new Dictionary<Pair<DllImportAttribute, Type>, Type>(); new Dictionary<Pair<DllImportAttribute, Type>, Type>();
public static void CreateDelegate<T>(DllImportAttribute dllImportAttribute, public static void CreateDelegate<T>(DllImportAttribute dllImportAttribute,
out T newDelegate) where T : class out T newDelegate, DllImportSearchPath dllImportSearchPath =
DllImportSearchPath.System32) where T : class
{ {
Type wrapperType; Type wrapperType;
Pair<DllImportAttribute, Type> key = Pair<DllImportAttribute, Type> key =
@ -37,7 +38,7 @@ namespace OpenHardwareMonitor.Hardware {
wrapperTypes.TryGetValue(key, out wrapperType); wrapperTypes.TryGetValue(key, out wrapperType);
if (wrapperType == null) { if (wrapperType == null) {
wrapperType = CreateWrapperType(typeof(T), dllImportAttribute); wrapperType = CreateWrapperType(typeof(T), dllImportAttribute, dllImportSearchPath);
wrapperTypes.Add(key, wrapperType); wrapperTypes.Add(key, wrapperType);
} }
@ -45,9 +46,10 @@ namespace OpenHardwareMonitor.Hardware {
dllImportAttribute.EntryPoint) as T; dllImportAttribute.EntryPoint) as T;
} }
private static Type CreateWrapperType(Type delegateType, private static Type CreateWrapperType(Type delegateType,
DllImportAttribute dllImportAttribute) { DllImportAttribute dllImportAttribute,
DllImportSearchPath dllImportSearchPath)
{
TypeBuilder typeBuilder = moduleBuilder.DefineType( TypeBuilder typeBuilder = moduleBuilder.DefineType(
"PInvokeDelegateFactoryInternalWrapperType" + wrapperTypes.Count); "PInvokeDelegateFactoryInternalWrapperType" + wrapperTypes.Count);
@ -69,6 +71,11 @@ namespace OpenHardwareMonitor.Hardware {
dllImportAttribute.CallingConvention, dllImportAttribute.CallingConvention,
dllImportAttribute.CharSet); dllImportAttribute.CharSet);
methodBuilder.SetCustomAttribute(new CustomAttributeBuilder(
typeof(DefaultDllImportSearchPathsAttribute).GetConstructor(
new Type[] { typeof(DllImportSearchPath) }),
new object[] { dllImportSearchPath }));
foreach (ParameterInfo parameterInfo in parameterInfos) foreach (ParameterInfo parameterInfo in parameterInfos)
methodBuilder.DefineParameter(parameterInfo.Position + 1, methodBuilder.DefineParameter(parameterInfo.Position + 1,
parameterInfo.Attributes, parameterInfo.Name); parameterInfo.Attributes, parameterInfo.Name);

View File

@ -9,7 +9,7 @@
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<NoStandardLibraries>false</NoStandardLibraries> <NoStandardLibraries>false</NoStandardLibraries>
<AssemblyName>OpenHardwareMonitor</AssemblyName> <AssemblyName>OpenHardwareMonitor</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<RootNamespace>OpenHardwareMonitor</RootNamespace> <RootNamespace>OpenHardwareMonitor</RootNamespace>
<ApplicationIcon>Resources\icon.ico</ApplicationIcon> <ApplicationIcon>Resources\icon.ico</ApplicationIcon>
@ -34,6 +34,7 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion> <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -46,6 +47,7 @@
<UseVSHostingProcess>true</UseVSHostingProcess> <UseVSHostingProcess>true</UseVSHostingProcess>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType> <DebugType>none</DebugType>
@ -56,24 +58,15 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess> <UseVSHostingProcess>false</UseVSHostingProcess>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="OxyPlot">
<HintPath>External\OxyPlot.dll</HintPath>
</Reference>
<Reference Include="OxyPlot.WindowsForms">
<HintPath>External\OxyPlot.WindowsForms.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration.Install" /> <Reference Include="System.Configuration.Install" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Management" /> <Reference Include="System.Management" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="Aga.Controls, Version=1.7.0.0, Culture=neutral, PublicKeyToken=fcc90fbf924463a3">
<SpecificVersion>False</SpecificVersion>
<HintPath>External\Aga.Controls.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="GUI\GadgetWindow.cs" /> <Compile Include="GUI\GadgetWindow.cs" />
@ -178,7 +171,6 @@
<EmbeddedResource Include="Resources\nvidia.png" /> <EmbeddedResource Include="Resources\nvidia.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="App.config" />
<None Include="Resources\app.manifest"> <None Include="Resources\app.manifest">
<SubType>Designer</SubType> <SubType>Designer</SubType>
</None> </None>
@ -210,6 +202,18 @@
<EmbeddedResource Include="Resources\control.png" /> <EmbeddedResource Include="Resources\control.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="External\Aga.Controls\Aga.Controls.csproj">
<Project>{e73bb233-d88b-44a7-a98f-d71ee158381d}</Project>
<Name>Aga.Controls</Name>
</ProjectReference>
<ProjectReference Include="External\OxyPlot\OxyPlot.WindowsForms\OxyPlot.WindowsForms.csproj">
<Project>{d4554296-094e-4cac-8eae-44eb250666c6}</Project>
<Name>OxyPlot.WindowsForms</Name>
</ProjectReference>
<ProjectReference Include="External\OxyPlot\OxyPlot\OxyPlot.csproj">
<Project>{bcc43e58-e473-403e-a84d-63fedc723040}</Project>
<Name>OxyPlot</Name>
</ProjectReference>
<ProjectReference Include="OpenHardwareMonitorLib.csproj"> <ProjectReference Include="OpenHardwareMonitorLib.csproj">
<Project>{B0397530-545A-471D-BB74-027AE456DF1A}</Project> <Project>{B0397530-545A-471D-BB74-027AE456DF1A}</Project>
<Name>OpenHardwareMonitorLib</Name> <Name>OpenHardwareMonitorLib</Name>
@ -305,7 +309,6 @@
<PropertyGroup> <PropertyGroup>
<PreBuildEvent> <PreBuildEvent>
</PreBuildEvent> </PreBuildEvent>
<PostBuildEvent>copy "$(ProjectDir)External\*.*" "$(TargetDir)" <PostBuildEvent>copy "$(ProjectDir)Licenses\*.*" "$(TargetDir)"</PostBuildEvent>
copy "$(ProjectDir)Licenses\*.*" "$(TargetDir)"</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

View File

@ -15,6 +15,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.editorconfig = .editorconfig .editorconfig = .editorconfig
EndProjectSection EndProjectSection
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Controls", "Controls", "{D6DBF0DC-C594-4030-B478-6CDB75E59A5C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "External\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OxyPlot", "External\OxyPlot\OxyPlot\OxyPlot.csproj", "{BCC43E58-E473-403E-A84D-63FEDC723040}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OxyPlot.WindowsForms", "External\OxyPlot\OxyPlot.WindowsForms\OxyPlot.WindowsForms.csproj", "{D4554296-094E-4CAC-8EAE-44EB250666C6}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -29,10 +37,27 @@ Global
{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Debug|Any CPU.Build.0 = 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.ActiveCfg = Release|Any CPU
{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Release|Any CPU.Build.0 = 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 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{E73BB233-D88B-44A7-A98F-D71EE158381D} = {D6DBF0DC-C594-4030-B478-6CDB75E59A5C}
{BCC43E58-E473-403E-A84D-63FEDC723040} = {D6DBF0DC-C594-4030-B478-6CDB75E59A5C}
{D4554296-094E-4CAC-8EAE-44EB250666C6} = {D6DBF0DC-C594-4030-B478-6CDB75E59A5C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0DCCC854-BBF2-40AC-81A2-10387E4E2868} SolutionGuid = {0DCCC854-BBF2-40AC-81A2-10387E4E2868}
EndGlobalSection EndGlobalSection

View File

@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OpenHardwareMonitor</RootNamespace> <RootNamespace>OpenHardwareMonitor</RootNamespace>
<AssemblyName>OpenHardwareMonitorLib</AssemblyName> <AssemblyName>OpenHardwareMonitorLib</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
@ -31,6 +31,7 @@
<IsWebBootstrapper>false</IsWebBootstrapper> <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -41,6 +42,7 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType> <DebugType>none</DebugType>
@ -50,6 +52,7 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />

View File

@ -23,3 +23,5 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: DefaultDllImportSearchPaths(DllImportSearchPath.System32)]

View File

@ -24,3 +24,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: CLSCompliant(true)] [assembly: CLSCompliant(true)]
[assembly: DefaultDllImportSearchPaths(DllImportSearchPath.System32)]