Skip to content

Commit 2cbe5a2

Browse files
sergiyesergiye
committed
build x64 & x86 versions
1 parent 6216003 commit 2cbe5a2

7 files changed

Lines changed: 156 additions & 15 deletions

File tree

‎.github/workflows/auto-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
run: nuget restore OpenHardwareMonitor.sln
2626

2727
- name: Build
28-
run: msbuild OpenHardwareMonitor.sln -p:Configuration=Release -m
28+
run: msbuild OpenHardwareMonitor.sln -p:Configuration=Release -p:Platform="Any CPU" -m
2929

3030
# - name: Publish build
3131
# uses: actions/upload-artifact@v4

‎Aga.Controls/Aga.Controls.csproj‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,38 @@
22
<PropertyGroup>
33
<ProductVersion>9.0.30729</ProductVersion>
44
<TargetFramework>net472</TargetFramework>
5+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
6+
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
57
<AssemblyTitle>Aga.Controls</AssemblyTitle>
68
<Description>http://sourceforge.net/projects/treeviewadv/</Description>
79
<Copyright>Copyright © Andrey Gliznetsov 2006 - 2009</Copyright>
810
<AssemblyVersion>1.7.0.0</AssemblyVersion>
911
<FileVersion>1.7.0.0</FileVersion>
1012
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1113
<OutputPath>bin\</OutputPath>
14+
<Platforms>AnyCPU;x64;x86</Platforms>
15+
<Configurations>Debug;Release</Configurations>
1216
</PropertyGroup>
1317
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1418
<DebugType>full</DebugType>
1519
<DefineConstants>TRACE;DEBUG;PERF_TEST</DefineConstants>
1620
</PropertyGroup>
21+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
22+
<DebugType>full</DebugType>
23+
<DefineConstants>TRACE;DEBUG;PERF_TEST</DefineConstants>
24+
</PropertyGroup>
25+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
26+
<DebugType>full</DebugType>
27+
<DefineConstants>TRACE;DEBUG;PERF_TEST</DefineConstants>
28+
</PropertyGroup>
1729
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
18-
<DebugType>pdbonly</DebugType>
30+
<DebugType>none</DebugType>
31+
</PropertyGroup>
32+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
33+
<DebugType>none</DebugType>
34+
</PropertyGroup>
35+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
36+
<DebugType>none</DebugType>
1937
</PropertyGroup>
2038
<ItemGroup>
2139
<Reference Include="System.Design" />

‎LibTest/LibTest.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>net472</TargetFramework>
4+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
5+
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
46
<OutputType>Exe</OutputType>
57
<RootNamespace>Test</RootNamespace>
68
<AssemblyName>Test</AssemblyName>
79
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
10+
<Platforms>AnyCPU;x64;x86</Platforms>
811
</PropertyGroup>
912
<ItemGroup>
1013
<PackageReference Include="OpenHardwareMonitorLib" Version="1.*" />

‎OpenHardwareMonitor.sln‎

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,61 @@ EndProject
2424
Global
2525
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2626
Debug|Any CPU = Debug|Any CPU
27+
Debug|x64 = Debug|x64
28+
Debug|x86 = Debug|x86
2729
Release|Any CPU = Release|Any CPU
30+
Release|x64 = Release|x64
31+
Release|x86 = Release|x86
2832
EndGlobalSection
2933
GlobalSection(ProjectConfigurationPlatforms) = postSolution
30-
{B0397530-545A-471D-BB74-027AE456DF1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31-
{B0397530-545A-471D-BB74-027AE456DF1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
32-
{B0397530-545A-471D-BB74-027AE456DF1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
33-
{B0397530-545A-471D-BB74-027AE456DF1A}.Release|Any CPU.Build.0 = Release|Any CPU
3434
{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3535
{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Debug|Any CPU.Build.0 = Debug|Any CPU
36+
{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Debug|x64.ActiveCfg = Debug|x64
37+
{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Debug|x64.Build.0 = Debug|x64
38+
{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Debug|x86.ActiveCfg = Debug|x86
39+
{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Debug|x86.Build.0 = Debug|x86
3640
{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Release|Any CPU.ActiveCfg = Release|Any CPU
3741
{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Release|Any CPU.Build.0 = Release|Any CPU
42+
{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Release|x64.ActiveCfg = Release|x64
43+
{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Release|x64.Build.0 = Release|x64
44+
{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Release|x86.ActiveCfg = Release|x86
45+
{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Release|x86.Build.0 = Release|x86
46+
{B0397530-545A-471D-BB74-027AE456DF1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47+
{B0397530-545A-471D-BB74-027AE456DF1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
48+
{B0397530-545A-471D-BB74-027AE456DF1A}.Debug|x64.ActiveCfg = Debug|x64
49+
{B0397530-545A-471D-BB74-027AE456DF1A}.Debug|x64.Build.0 = Debug|x64
50+
{B0397530-545A-471D-BB74-027AE456DF1A}.Debug|x86.ActiveCfg = Debug|x86
51+
{B0397530-545A-471D-BB74-027AE456DF1A}.Debug|x86.Build.0 = Debug|x86
52+
{B0397530-545A-471D-BB74-027AE456DF1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
53+
{B0397530-545A-471D-BB74-027AE456DF1A}.Release|Any CPU.Build.0 = Release|Any CPU
54+
{B0397530-545A-471D-BB74-027AE456DF1A}.Release|x64.ActiveCfg = Release|x64
55+
{B0397530-545A-471D-BB74-027AE456DF1A}.Release|x64.Build.0 = Release|x64
56+
{B0397530-545A-471D-BB74-027AE456DF1A}.Release|x86.ActiveCfg = Release|x86
57+
{B0397530-545A-471D-BB74-027AE456DF1A}.Release|x86.Build.0 = Release|x86
3858
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3959
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.Build.0 = Debug|Any CPU
60+
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|x64.ActiveCfg = Debug|x64
61+
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|x64.Build.0 = Debug|x64
62+
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|x86.ActiveCfg = Debug|x86
63+
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|x86.Build.0 = Debug|x86
4064
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.ActiveCfg = Release|Any CPU
4165
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.Build.0 = Release|Any CPU
66+
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|x64.ActiveCfg = Release|x64
67+
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|x64.Build.0 = Release|x64
68+
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|x86.ActiveCfg = Release|x86
69+
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|x86.Build.0 = Release|x86
4270
{0A8B894D-B19C-41E5-BF7B-3B95C8746E52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4371
{0A8B894D-B19C-41E5-BF7B-3B95C8746E52}.Debug|Any CPU.Build.0 = Debug|Any CPU
72+
{0A8B894D-B19C-41E5-BF7B-3B95C8746E52}.Debug|x64.ActiveCfg = Debug|x64
73+
{0A8B894D-B19C-41E5-BF7B-3B95C8746E52}.Debug|x64.Build.0 = Debug|x64
74+
{0A8B894D-B19C-41E5-BF7B-3B95C8746E52}.Debug|x86.ActiveCfg = Debug|x86
75+
{0A8B894D-B19C-41E5-BF7B-3B95C8746E52}.Debug|x86.Build.0 = Debug|x86
4476
{0A8B894D-B19C-41E5-BF7B-3B95C8746E52}.Release|Any CPU.ActiveCfg = Release|Any CPU
4577
{0A8B894D-B19C-41E5-BF7B-3B95C8746E52}.Release|Any CPU.Build.0 = Release|Any CPU
78+
{0A8B894D-B19C-41E5-BF7B-3B95C8746E52}.Release|x64.ActiveCfg = Release|x64
79+
{0A8B894D-B19C-41E5-BF7B-3B95C8746E52}.Release|x64.Build.0 = Release|x64
80+
{0A8B894D-B19C-41E5-BF7B-3B95C8746E52}.Release|x86.ActiveCfg = Release|x86
81+
{0A8B894D-B19C-41E5-BF7B-3B95C8746E52}.Release|x86.Build.0 = Release|x86
4682
EndGlobalSection
4783
GlobalSection(SolutionProperties) = preSolution
4884
HideSolutionNode = FALSE

‎OpenHardwareMonitor/OpenHardwareMonitor.csproj‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,55 @@
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
44
<TargetFramework>net472</TargetFramework>
5-
<AssemblyName>OpenHardwareMonitor</AssemblyName>
5+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
6+
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
67
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
78
<ApplicationIcon>Resources\icon.ico</ApplicationIcon>
89
<ApplicationManifest>Resources\app.manifest</ApplicationManifest>
910
<StartupObject>OpenHardwareMonitor.Program</StartupObject>
1011
<UseWindowsForms>true</UseWindowsForms>
1112
<OutputPath>bin\</OutputPath>
1213
<LangVersion>latest</LangVersion>
13-
<PlatformTarget>AnyCPU</PlatformTarget>
1414
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1515
<Deterministic>false</Deterministic>
16+
<Platforms>AnyCPU;x64;x86</Platforms>
17+
<Configurations>Debug;Release</Configurations>
1618
</PropertyGroup>
1719
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20+
<DefineConstants>TRACE;DEBUG</DefineConstants>
21+
<DebugType>full</DebugType>
22+
<AssemblyName>OpenHardwareMonitor</AssemblyName>
23+
<PlatformTarget>AnyCPU</PlatformTarget>
24+
</PropertyGroup>
25+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
26+
<DefineConstants>TRACE;DEBUG</DefineConstants>
27+
<DebugType>full</DebugType>
28+
<AssemblyName>OpenHardwareMonitor_x86</AssemblyName>
29+
<PlatformTarget>x86</PlatformTarget>
30+
</PropertyGroup>
31+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
32+
<DefineConstants>TRACE;DEBUG</DefineConstants>
1833
<DebugType>full</DebugType>
34+
<AssemblyName>OpenHardwareMonitor_x64</AssemblyName>
35+
<PlatformTarget>x64</PlatformTarget>
1936
</PropertyGroup>
2037
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
38+
<Optimize>True</Optimize>
39+
<DebugType>none</DebugType>
40+
<AssemblyName>OpenHardwareMonitor</AssemblyName>
41+
<PlatformTarget>AnyCPU</PlatformTarget>
42+
</PropertyGroup>
43+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
44+
<Optimize>True</Optimize>
45+
<DebugType>none</DebugType>
46+
<AssemblyName>OpenHardwareMonitor_x64</AssemblyName>
47+
<PlatformTarget>x64</PlatformTarget>
48+
</PropertyGroup>
49+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
50+
<Optimize>True</Optimize>
2151
<DebugType>none</DebugType>
52+
<AssemblyName>OpenHardwareMonitor_x86</AssemblyName>
53+
<PlatformTarget>x86</PlatformTarget>
2254
</PropertyGroup>
2355
<ItemGroup>
2456
<PackageReference Include="sergiye.Common.UI" Version="1.*" />

‎OpenHardwareMonitorLib/OpenHardwareMonitorLib.csproj‎

Lines changed: 44 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
4-
<AssemblyName>OpenHardwareMonitorLib</AssemblyName>
4+
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
5+
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
56
<RootNamespace>OpenHardwareMonitor</RootNamespace>
67
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
78
<PackageId>$(AssemblyName)</PackageId>
@@ -15,6 +16,8 @@
1516
<AssemblyVersion>1.0.9363</AssemblyVersion>
1617
<GenerateDocumentationFile>false</GenerateDocumentationFile>
1718
<Deterministic>true</Deterministic>
19+
<Platforms>AnyCPU;x64;x86</Platforms>
20+
<Configurations>Debug;Release</Configurations>
1821
</PropertyGroup>
1922
<PropertyGroup>
2023
<SignAssembly>false</SignAssembly>
@@ -34,18 +37,54 @@
3437
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
3538
<OutputPath>bin\</OutputPath>
3639
</PropertyGroup>
37-
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
40+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
41+
<DefineConstants>TRACE;DEBUG</DefineConstants>
42+
<DebugType>full</DebugType>
43+
<AssemblyName>OpenHardwareMonitorLib</AssemblyName>
44+
<PlatformTarget>AnyCPU</PlatformTarget>
45+
</PropertyGroup>
46+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
47+
<DefineConstants>TRACE;DEBUG</DefineConstants>
48+
<DebugType>full</DebugType>
49+
<AssemblyName>OpenHardwareMonitorLib_x86</AssemblyName>
50+
<PlatformTarget>x86</PlatformTarget>
51+
</PropertyGroup>
52+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
53+
<DefineConstants>TRACE;DEBUG</DefineConstants>
54+
<DebugType>full</DebugType>
55+
<AssemblyName>OpenHardwareMonitorLib_x64</AssemblyName>
56+
<PlatformTarget>x64</PlatformTarget>
57+
</PropertyGroup>
58+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
59+
<AssemblyName>OpenHardwareMonitorLib</AssemblyName>
60+
<Optimize>True</Optimize>
61+
<DebugType>none</DebugType>
62+
<PlatformTarget>AnyCPU</PlatformTarget>
3863
</PropertyGroup>
39-
<PropertyGroup Condition="'$(Configuration)'=='Release'">
64+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
65+
<AssemblyName>OpenHardwareMonitorLib_x64</AssemblyName>
66+
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
67+
<Optimize>True</Optimize>
68+
<DebugType>none</DebugType>
69+
<PlatformTarget>x64</PlatformTarget>
70+
</PropertyGroup>
71+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
72+
<AssemblyName>OpenHardwareMonitorLib_x86</AssemblyName>
73+
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
74+
<Optimize>True</Optimize>
75+
<DebugType>none</DebugType>
76+
<PlatformTarget>x86</PlatformTarget>
4077
</PropertyGroup>
4178
<ItemGroup>
4279
<None Include="packageicon.png" Pack="true" PackagePath="" />
4380
<None Include="..\README.md" Pack="true" PackagePath="\" />
4481
</ItemGroup>
45-
<ItemGroup>
82+
<ItemGroup Condition="'$(Platform)'=='x86' Or '$(Platform)'=='AnyCPU'">
4683
<EmbeddedResource Include="Resources\inpout32.gz" />
47-
<EmbeddedResource Include="Resources\inpoutx64.gz" />
4884
<EmbeddedResource Include="Resources\WinRing0.gz" />
85+
</ItemGroup>
86+
<ItemGroup Condition="'$(Platform)'=='x64' Or '$(Platform)'=='AnyCPU'">
87+
<EmbeddedResource Include="Resources\inpoutx64.gz" />
4988
<EmbeddedResource Include="Resources\WinRing0x64.gz" />
5089
</ItemGroup>
5190
<ItemGroup>

‎make.bat‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,23 @@ SET msbuild="%%F"
55
)
66
ECHO %msbuild%
77

8-
@%msbuild% OpenHardwareMonitor.sln /t:restore /p:RestorePackagesConfig=true
9-
@%msbuild% OpenHardwareMonitor.sln /t:Rebuild /p:DebugType=None /p:Configuration=Release
8+
@%msbuild% OpenHardwareMonitor.sln /t:restore /p:RestorePackagesConfig=true /p:Configuration=Release /p:Platform="Any CPU"
9+
if errorlevel 1 goto error
10+
@%msbuild% OpenHardwareMonitor.sln /t:Rebuild /p:Configuration=Release /p:Platform="Any CPU"
11+
if errorlevel 1 goto error
12+
13+
if [%1]==[all] (
14+
15+
@%msbuild% OpenHardwareMonitor.sln /t:restore /p:RestorePackagesConfig=true /p:Configuration=Release /p:Platform="x64"
16+
if errorlevel 1 goto error
17+
@%msbuild% OpenHardwareMonitor.sln /t:Rebuild /p:Configuration=Release /p:Platform="x64"
18+
if errorlevel 1 goto error
1019

20+
@%msbuild% OpenHardwareMonitor.sln /t:restore /p:RestorePackagesConfig=true /p:Configuration=Release /p:Platform="x86"
1121
if errorlevel 1 goto error
22+
@%msbuild% OpenHardwareMonitor.sln /t:Rebuild /p:Configuration=Release /p:Platform="x86"
23+
if errorlevel 1 goto error
24+
)
1225

1326
goto exit
1427
:error

0 commit comments

Comments
 (0)