Fix windows compile + some version fix (#137)

* Update Cargo.lock * update lhm, some windows fixes * fix windows build path * change version * Update Cargo.toml
wiiznokes · Jun 19, 2024 · ce0f9c7 · ce0f9c7
1 parent d35e9d1
commit ce0f9c7
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,7 @@ obj/
 /app/
 net7.0/
 LibreHardwareMonitorWrapper.sln.DotSettings.user
+/res/lhmbuild
 
 # Lmsensors
 build/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -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]

diff --git a/DEV.md b/DEV.md
@@ -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)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-24.06
+2024.6
diff --git a/hardware/LibreHardwareMonitorWrapper/LibreHardwareMonitorWrapper.csproj b/hardware/LibreHardwareMonitorWrapper/LibreHardwareMonitorWrapper.csproj
@@ -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>
 

diff --git a/hardware/src/windows.rs b/hardware/src/windows.rs
@@ -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(

diff --git a/res/linux/metainfo.xml b/res/linux/metainfo.xml
@@ -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>
-Original file 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 @@