Skip to content

Commit 11209a9

Browse files
committed
few ShortcutKeys added; default outputs restored
1 parent 7b4a32a commit 11209a9

7 files changed

Lines changed: 19 additions & 13 deletions

File tree

.github/workflows/auto-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ jobs:
3232
# with:
3333
# name: OpenHardwareMonitor
3434
# path: |
35-
# bin/OpenHardwareMonitor
35+
# OpenHardwareMonitor/bin/net472
3636

3737
- name: Publish Lib build
3838
uses: actions/upload-artifact@v4
3939
with:
4040
name: OpenHardwareMonitorLib
4141
path: |
42-
bin/OpenHardwareMonitorLib
42+
OpenHardwareMonitorLib/bin

Aga.Controls/Aga.Controls.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<AssemblyVersion>1.7.0.0</AssemblyVersion>
99
<FileVersion>1.7.0.0</FileVersion>
1010
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
11-
<OutputPath>..\bin\</OutputPath>
11+
<OutputPath>bin\</OutputPath>
1212
</PropertyGroup>
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1414
<DebugType>full</DebugType>

Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
44
<!-- <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> -->
55
<!-- <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> -->
6-
<BaseIntermediateOutputPath>$(SolutionDir)\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
7-
<MSBUildProjectExtensionsPath>$(SolutionDir)\obj\$(MSBuildProjectName)</MSBUildProjectExtensionsPath>
8-
<OutDir>$(SolutionDir)\bin\$(MSBuildProjectName)\$(TargetFramework)</OutDir>
6+
<!-- <BaseIntermediateOutputPath>$(SolutionDir)\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath> -->
7+
<!-- <MSBUildProjectExtensionsPath>$(SolutionDir)\obj\$(MSBuildProjectName)</MSBUildProjectExtensionsPath> -->
8+
<!-- <OutDir>$(SolutionDir)\bin\$(MSBuildProjectName)\$(TargetFramework)</OutDir> -->
99
<NoWarn>$(NoWarn);NU1701;NU1702;NU1901;NU1902;NU1903;NU1904</NoWarn>
1010
<MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);NU1701;NU1702;NU1901;NU1902;NU1903;NU1904</MSBuildWarningsAsMessages>
1111
</PropertyGroup>

OpenHardwareMonitor/OpenHardwareMonitor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ApplicationManifest>Resources\app.manifest</ApplicationManifest>
99
<StartupObject>OpenHardwareMonitor.Program</StartupObject>
1010
<UseWindowsForms>true</UseWindowsForms>
11-
<OutputPath>..\bin\</OutputPath>
11+
<OutputPath>bin\</OutputPath>
1212
<LangVersion>latest</LangVersion>
1313
<PlatformTarget>AnyCPU</PlatformTarget>
1414
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

OpenHardwareMonitor/UI/MainForm.Designer.cs

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

OpenHardwareMonitorLib/OpenHardwareMonitorLib.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,12 @@
3131
<Version>$(AssemblyVersion)</Version>
3232
<IncludeSymbols>false</IncludeSymbols>
3333
<PackageLicenseExpression>MPL-2.0</PackageLicenseExpression>
34-
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
34+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
35+
<OutputPath>bin\</OutputPath>
3536
</PropertyGroup>
3637
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
37-
<OutputPath>..\bin\</OutputPath>
3838
</PropertyGroup>
3939
<PropertyGroup Condition="'$(Configuration)'=='Release'">
40-
<OutputPath>..\bin\</OutputPath>
4140
</PropertyGroup>
4241
<ItemGroup>
4342
<None Include="packageicon.png" Pack="true" PackagePath="" />

clean.bat

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
rmdir /s /q .vs
44
rmdir /s /q .idea
55

6-
rmdir /s /q .\bin
7-
rmdir /s /q .\obj
6+
for /f "delims=" %%e in ('dir /A:D /S /B *bin^|find /i "\bin"') do @if exist "%%e" (@rmdir /S /Q %%e)
7+
for /f "delims=" %%e in ('dir /A:D /S /B *obj^|find /i "\obj"') do @if exist "%%e" (@rmdir /S /Q %%e)
8+
for /f "delims=" %%e in ('dir /A:D /S /B *.vs^|find /i "\.vs"') do @if exist "%%e" (@rmdir /S /Q %%e)
89

9-
del /s /s OpenHardwareMonitor\FodyWeavers.xsd
10+
del /s OpenHardwareMonitor\FodyWeavers.xsd
11+
del /s OpenHardwareMonitor.sln.DotSettings.user

0 commit comments

Comments
 (0)