Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix windows compile + some version fix #137

Merged
merged 5 commits into from
Jun 19, 2024
Merged

Fix windows compile + some version fix #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ae06b1
Update Cargo.lock
wiiznokes Jun 19, 2024
2696ced
update lhm, some windows fixes
wiiznokes Jun 19, 2024
826f85e
fix windows build path
wiiznokes Jun 19, 2024
645aa50
change version
wiiznokes Jun 20, 2024
c0148eb
Update Cargo.toml
wiiznokes Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ obj/
/app/
net7.0/
LibreHardwareMonitorWrapper.sln.DotSettings.user
/res/lhmbuild

# Lmsensors
build/
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]

## [24.06] - 2024-06-19
## [2024.6] - 2024-06-20

### Added

- german translation
- italian translation
- new versioning
- update lhm

### Fixed

Expand Down
48 changes: 24 additions & 24 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ repository.workspace = true
keywords.workspace = true

[package.metadata.packager]
version = "24.06"
# workarround for making cargo packager happy
version = "2024.6.0"
before-each-package-command = "cargo build --release"
identifier = "io.github.wiiznokes.fan-control"
icons = ["res/windows/app_icon.ico"]
resources = ["res/icons", "res/windows/lhmbuild"]
resources = ["res/icons", "res/lhmbuild"]
category = "Utility"

[package.metadata.packager.windows]
Expand Down
2 changes: 1 addition & 1 deletion DEV.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Making a new release

- get the version: `date +"%y.%m"`
- get the version: `date +"%Y.%m"`
- new release in the [CHANGELOG](./CHANGELOG.md)
- update release section of [metadata file](./res/linux/metainfo.xml)
- change the version in [VERSION](./VERSION)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.06
2024.6
4 changes: 2 additions & 2 deletions hardware/LibreHardwareMonitorWrapper/LibreHardwareMonitorWrapper.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<OutputPath>.\..\..\res\windows\lhmbuild</OutputPath>
<OutputPath>.\..\..\res\lhmbuild</OutputPath>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="LibreHardwareMonitorLib" Version="0.9.3"/>
<PackageReference Include="LibreHardwareMonitorLib" Version="0.9.4-pre295" />
<PackageReference Include="Microsoft.Win32.SystemEvents" Version="8.0.0" />
</ItemGroup>

Expand Down
1 change: 0 additions & 1 deletion hardware/src/windows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,6 @@ mod test {
info!("");

bridge.update().unwrap();
std::thread::sleep(WindowsBridge::TIME_TO_UPDATE);

for h in &bridge.hardware().controls.clone() {
bench(
Expand Down
4 changes: 2 additions & 2 deletions res/linux/metainfo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@
</screenshots>

<releases>
<release version="24.06" date="2024-06-19">
<release version="2024.6" date="2024-06-20">
<url type="details">
https://github.com/wiiznokes/fan-control/blob/master/CHANGELOG.md#2406---2024-06-19</url>
https://github.com/wiiznokes/fan-control/blob/master/CHANGELOG.md#202406---2024-06-20</url>
</release>
</releases>

Expand Down