JMR-dev/ReLibreHardwareMonitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Switch to new csproj format. (#308)

Browse Source 
* Switch to new csproj
This commit is contained in:
PhyxionNL
2020-10-02 15:05:52 +02:00
committed by GitHub
parent f82baea56a
commit 8210cc2516
11 changed files with 93 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LibreHardwareMonitor/LibreHardwareMonitor.csproj
+40 -288
View File
@@ -1,324 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectUId>{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}</ProjectUId>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<OutputType>WinExe</OutputType>
<RuntimeIdentifiers>win</RuntimeIdentifiers>
<NoStandardLibraries>false</NoStandardLibraries>
<TargetFramework>net452</TargetFramework>
<AssemblyName>LibreHardwareMonitor</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<RootNamespace>LibreHardwareMonitor</RootNamespace>
<AssemblyTitle>Libre Hardware Monitor</AssemblyTitle>
<Copyright>LibreHardwareMonitor</Copyright>
<Version>0.8.5</Version>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<ApplicationIcon>Resources\icon.ico</ApplicationIcon>
<ApplicationManifest>Resources\app.manifest</ApplicationManifest>
<StartupObject>LibreHardwareMonitor.Program</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
<ProjectGuid>{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}</ProjectGuid>
<UseWindowsForms>true</UseWindowsForms>
<OutputPath>..\bin\$(Configuration)\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<UseVSHostingProcess>true</UseVSHostingProcess>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Win32.TaskScheduler, Version=2.8.15.0, Culture=neutral, PublicKeyToken=c416bc1b32d97233, processorArchitecture=MSIL">
<HintPath>..\packages\TaskScheduler.2.8.15\lib\net452\Microsoft.Win32.TaskScheduler.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
<HintPath>..\packages\OxyPlot.Core.1.0.0\lib\net45\OxyPlot.dll</HintPath>
</Reference>
<Reference Include="OxyPlot.WindowsForms, Version=1.0.0.0, Culture=neutral, PublicKeyToken=245eacd6b5d2d338, processorArchitecture=MSIL">
<HintPath>..\packages\OxyPlot.WindowsForms.1.0.0\lib\net45\OxyPlot.WindowsForms.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration.Install" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Management" />
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="TaskScheduler" Version="2.8.21" />
<PackageReference Include="OxyPlot.Core" Version="2.0.0" />
<PackageReference Include="OxyPlot.WindowsForms" Version="2.0.0" />
<PackageReference Include="System.Management" Version="4.7.0" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\LibreHardwareMonitorLib\Properties\AssemblyVersion.cs">
<Link>Properties\AssemblyVersion.cs</Link>
</Compile>
<Compile Include="UI\AuthForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\AuthForm.Designer.cs">
<DependentUpon>AuthForm.cs</DependentUpon>
</Compile>
<Compile Include="UI\IExpandPersistNode.cs" />
<Compile Include="UI\ScaledPlotModel.cs" />
<Compile Include="UI\GadgetWindow.cs" />
<Compile Include="UI\Gadget.cs" />
<Compile Include="UI\HardwareTypeImage.cs" />
<Compile Include="UI\NotifyIconAdv.cs" />
<Compile Include="UI\PlotPanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="UI\PortForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\PortForm.Designer.cs">
<DependentUpon>PortForm.cs</DependentUpon>
</Compile>
<Compile Include="UI\Node.cs" />
<Compile Include="UI\ParameterForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\ParameterForm.Designer.cs">
<DependentUpon>ParameterForm.cs</DependentUpon>
</Compile>
<Compile Include="UI\SensorGadget.cs" />
<Compile Include="UI\SensorNotifyIcon.cs" />
<Compile Include="UI\ShowDesktop.cs" />
<Compile Include="UI\SplitContainerAdv.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="UI\SystemTray.cs" />
<Compile Include="UI\StartupManager.cs" />
<Compile Include="UI\TreeModel.cs" />
<Compile Include="UI\TypeNode.cs" />
<Compile Include="UI\UnitManager.cs" />
<Compile Include="UI\UpdateVisitor.cs" />
<Compile Include="UI\UserOption.cs" />
<Compile Include="UI\UserRadioGroup.cs" />
<Compile Include="Utilities\HttpServer.cs" />
<Compile Include="Utilities\Logger.cs" />
<Compile Include="Utilities\PersistentSettings.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="UI\AboutBox.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\AboutBox.Designer.cs">
<Reference Include="System.Web" />
<Reference Include="System.Configuration.Install" />
</ItemGroup>
<ItemGroup>
<Compile Update="UI\AboutBox.Designer.cs">
<DependentUpon>AboutBox.cs</DependentUpon>
</Compile>
<Compile Include="UI\HardwareNode.cs" />
<Compile Include="UI\MainForm.cs">
<SubType>Form</SubType>
<Compile Update="UI\AuthForm.Designer.cs">
<DependentUpon>AuthForm.cs</DependentUpon>
</Compile>
<Compile Include="UI\MainForm.Designer.cs">
<Compile Update="UI\MainForm.Designer.cs">
<DependentUpon>MainForm.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="UI\SensorNode.cs" />
<Compile Include="Utilities\EmbeddedResources.cs" />
<Compile Include="Utilities\IconFactory.cs" />
<Compile Include="WMI\Hardware.cs" />
<Compile Include="WMI\IWmiObject.cs" />
<Compile Include="WMI\Sensor.cs" />
<Compile Include="WMI\WmiProvider.cs">
<SubType>Component</SubType>
<Compile Update="UI\ParameterForm.Designer.cs">
<DependentUpon>ParameterForm.cs</DependentUpon>
</Compile>
<Compile Update="UI\PortForm.Designer.cs">
<DependentUpon>PortForm.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="UI\AboutBox.resx">
<EmbeddedResource Update="UI\AboutBox.resx">
<DependentUpon>AboutBox.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="UI\AuthForm.resx">
<EmbeddedResource Update="UI\AuthForm.resx">
<DependentUpon>AuthForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\PortForm.resx">
<EmbeddedResource Update="UI\MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="UI\ParameterForm.resx">
<DependentUpon>ParameterForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="UI\PortForm.resx">
<DependentUpon>PortForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Resources\clock.png" />
<EmbeddedResource Include="Resources\computer.png" />
<EmbeddedResource Include="Resources\cpu.png" />
<EmbeddedResource Include="Resources\fan.png" />
<EmbeddedResource Include="Resources\temperature.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\chip.png" />
<EmbeddedResource Include="Resources\hdd.png" />
<EmbeddedResource Include="Resources\load.png" />
<EmbeddedResource Include="Resources\voltage.png" />
<EmbeddedResource Include="Resources\nvidia.png" />
<EmbeddedResource Include="Resources\nic.png" />
<ProjectReference Include="..\Aga.Controls\Aga.Controls.csproj" />
<ProjectReference Include="..\LibreHardwareMonitorLib\LibreHardwareMonitorLib.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="Resources\app.manifest">
<SubType>Designer</SubType>
</None>
<EmbeddedResource Include="Resources\**" />
<None Include="Resources\app.manifest" />
<None Include="Resources\icon.ico" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\smallicon.ico" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="UI\ParameterForm.resx">
<DependentUpon>ParameterForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Resources\flow.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\mainboard.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="UI\MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Resources\control.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Aga.Controls\Aga.Controls.csproj">
<Project>{e73bb233-d88b-44a7-a98f-d71ee158381d}</Project>
<Name>Aga.Controls</Name>
</ProjectReference>
<ProjectReference Include="..\LibreHardwareMonitorLib\LibreHardwareMonitorLib.csproj">
<Project>{B0397530-545A-471D-BB74-027AE456DF1A}</Project>
<Name>LibreHardwareMonitorLib</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\barback.png" />
<EmbeddedResource Include="Resources\barblue.png" />
<EmbeddedResource Include="Resources\gadget.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\level.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\power.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\data.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\throughput.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\factor.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Web\js\jquery-ui-1.8.16.custom.min.js" />
<EmbeddedResource Include="Resources\Web\js\jquery.tmpl.min.js" />
<EmbeddedResource Include="Resources\Web\js\jquery.treeTable.min.js" />
<EmbeddedResource Include="Resources\Web\js\ohm_web.js" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Web\images\toggle-collapse-dark.png" />
<EmbeddedResource Include="Resources\Web\images\toggle-collapse-light.png" />
<EmbeddedResource Include="Resources\Web\images\toggle-expand-dark.png" />
<EmbeddedResource Include="Resources\Web\images\toggle-expand-light.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Web\css\custom-theme\images\ui-bg_flat_0_aaaaaa_40x100.png" />
<EmbeddedResource Include="Resources\Web\css\custom-theme\images\ui-bg_glass_55_fbf9ee_1x400.png" />
<EmbeddedResource Include="Resources\Web\css\custom-theme\images\ui-bg_glass_65_ffffff_1x400.png" />
<EmbeddedResource Include="Resources\Web\css\custom-theme\images\ui-bg_glass_75_dadada_1x400.png" />
<EmbeddedResource Include="Resources\Web\css\custom-theme\images\ui-bg_glass_75_e6e6e6_1x400.png" />
<EmbeddedResource Include="Resources\Web\css\custom-theme\images\ui-bg_glass_75_ffffff_1x400.png" />
<EmbeddedResource Include="Resources\Web\css\custom-theme\images\ui-bg_highlight-soft_75_cccccc_1x100.png" />
<EmbeddedResource Include="Resources\Web\css\custom-theme\images\ui-bg_inset-soft_95_fef1ec_1x100.png" />
<EmbeddedResource Include="Resources\Web\css\custom-theme\images\ui-icons_222222_256x240.png" />
<EmbeddedResource Include="Resources\Web\css\custom-theme\images\ui-icons_2e83ff_256x240.png" />
<EmbeddedResource Include="Resources\Web\css\custom-theme\images\ui-icons_454545_256x240.png" />
<EmbeddedResource Include="Resources\Web\css\custom-theme\images\ui-icons_888888_256x240.png" />
<EmbeddedResource Include="Resources\Web\css\custom-theme\images\ui-icons_cd0a0a_256x240.png" />
<EmbeddedResource Include="Resources\Web\css\custom-theme\jquery-ui-1.8.16.custom.css" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Web\css\jquery.treeTable.css" />
<EmbeddedResource Include="Resources\Web\css\ohm_web.css" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Web\index.html" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Web\images\transparent.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Web\js\jquery-1.7.2.min.js" />
<EmbeddedResource Include="Resources\Web\js\knockout-2.1.0.min.js" />
<EmbeddedResource Include="Resources\Web\js\knockout.mapping-latest.min.js" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\ram.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\amd.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\ati.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Web\favicon.ico" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<VisualStudio AllowExistingFolder="true" />
</ProjectExtensions>
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
</Project>
LibreHardwareMonitor/Properties/AssemblyInfo.cs
-19
View File
@@ -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 <mmoeller@openhardwaremonitor.org> 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)]
LibreHardwareMonitor/UI/MainForm.cs
-7
View File
@@ -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"));
LibreHardwareMonitor/packages.config
-7
View File
@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net452" />
<package id="TaskScheduler" version="2.8.15" targetFramework="net452" />
<package id="OxyPlot.Core" version="1.0.0" targetFramework="net452" />
<package id="OxyPlot.WindowsForms" version="1.0.0" targetFramework="net452" />
</packages>