From 4a3d0041687edea5bc96717570c2a4e0f9e24453 Mon Sep 17 00:00:00 2001 From: Tobias Hein Date: Sat, 10 Nov 2018 13:22:30 +0100 Subject: [PATCH 01/12] Add Lenovo ThinkPad x220i config (#588) --- Configs/Lenovo ThinkPad x220i.xml | 46 +++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 Configs/Lenovo ThinkPad x220i.xml diff --git a/Configs/Lenovo ThinkPad x220i.xml b/Configs/Lenovo ThinkPad x220i.xml new file mode 100644 index 00000000..5e9d0f8b --- /dev/null +++ b/Configs/Lenovo ThinkPad x220i.xml @@ -0,0 +1,46 @@ + + + LENOVO 4290W1A + Tobias Hein + 3000 + false + 80 + + + 47 + 47 + 0 + 7 + false + 0 + 0 + true + 128 + System Fan + + + 0 + 0 + 0 + + + 65 + 55 + 14.2857151 + + + 70 + 60 + 42.8571434 + + + 75 + 65 + 100 + + + + + + + \ No newline at end of file From 79d36ed914bb0440ac7cede39447ca9075ec2a15 Mon Sep 17 00:00:00 2001 From: Chandradeep Dey Date: Sat, 10 Nov 2018 17:55:12 +0530 Subject: [PATCH 02/12] Add Acer Predator G3-572 config (#586) --- Configs/Acer Predator G3-572.xml | 242 +++++++++++++++++++++++++++++++ 1 file changed, 242 insertions(+) create mode 100644 Configs/Acer Predator G3-572.xml diff --git a/Configs/Acer Predator G3-572.xml b/Configs/Acer Predator G3-572.xml new file mode 100644 index 00000000..28ecb5be --- /dev/null +++ b/Configs/Acer Predator G3-572.xml @@ -0,0 +1,242 @@ + + + Acer Predator G3-572 + Chandradeep Dey + 3000 + true + 90 + + + 19 + 55 + 0 + 100 + true + 0 + 6122 + true + 50 + CPU fan + + + 0 + 0 + 0 + + + 40 + 40 + 30 + + + 42 + 41 + 32 + + + 44 + 43 + 34 + + + 48 + 46 + 36 + + + 52 + 50 + 38 + + + 54 + 53 + 41 + + + 58 + 56 + 44 + + + 62 + 60 + 47 + + + 64 + 63 + 50 + + + 68 + 66 + 55 + + + 72 + 70 + 61 + + + 74 + 73 + 68 + + + 78 + 76 + 76 + + + 82 + 80 + 85 + + + 84 + 83 + 94 + + + 88 + 86 + 100 + + + + + + 21 + 58 + 0 + 100 + true + 0 + 6122 + true + 50 + GPU fan + + + 0 + 0 + 0 + + + 40 + 40 + 22 + + + 42 + 41 + 24 + + + 44 + 43 + 26 + + + 48 + 46 + 28 + + + 52 + 50 + 30 + + + 54 + 53 + 34 + + + 58 + 56 + 38 + + + 62 + 60 + 42 + + + 64 + 63 + 46 + + + 68 + 66 + 52 + + + 72 + 70 + 59 + + + 74 + 73 + 67 + + + 78 + 76 + 76 + + + 82 + 80 + 86 + + + 84 + 83 + 96 + + + 88 + 86 + 100 + + + + + + + + Set + OnInitialization + 34 + 12 + true + 4 + Set + CPU fan manual mode + + + Set + OnInitialization + 33 + 48 + true + 16 + Set + GPU fan manual mode + + + Set + OnInitialization + 16 + 0 + true + 1 + Set + CoolBoost off + + + From e4299e3cb45d6174015368f2832bc08c25e76070 Mon Sep 17 00:00:00 2001 From: qqgg231 Date: Sun, 6 Jan 2019 23:42:37 +0100 Subject: [PATCH 03/12] Fix reset value in Lenovo ThinkPad 13 config (#604) I see that my e580 seems to behave in the same way, and I think this is a bug: Author of this config probably wanted to set 80 as hex not as decimal. on my device this is what happens on exit: hex 80 = dec 128 => factory auto mode hex 50 = dec 80 => full speed of fan --- Configs/Lenovo ThinkPad 13.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Configs/Lenovo ThinkPad 13.xml b/Configs/Lenovo ThinkPad 13.xml index 8176cb85..5be93ddf 100644 --- a/Configs/Lenovo ThinkPad 13.xml +++ b/Configs/Lenovo ThinkPad 13.xml @@ -15,7 +15,7 @@ 0 22 true - 80 + 128 System Fan @@ -43,4 +43,4 @@ - \ No newline at end of file + From 8b19604116d650a7125817017f37751f2ce60f39 Mon Sep 17 00:00:00 2001 From: Gert-dev Date: Sun, 6 Jan 2019 23:49:02 +0100 Subject: [PATCH 04/12] Add Asus ROG G752VS configuration (#610) This configuration is an exact copy of "Asus ROG G752VT" as it also works here. In case it turns out to be important in the future: this is for a ROG G752VS 7th Gen (since there may also be versions with 6th Gen Intel processors). --- Configs/Asus ROG G752VS.xml | 112 ++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 Configs/Asus ROG G752VS.xml diff --git a/Configs/Asus ROG G752VS.xml b/Configs/Asus ROG G752VS.xml new file mode 100644 index 00000000..71cfc685 --- /dev/null +++ b/Configs/Asus ROG G752VS.xml @@ -0,0 +1,112 @@ + + + G752VS + Slartibartfast + 150 + false + 90 + + + 151 + 151 + 0 + 8 + false + 0 + 0 + true + 8 + CPU FAN + + + 0 + 0 + 0 + + + 65 + 55 + 25 + + + 70 + 60 + 50 + + + 80 + 65 + 75 + + + 85 + 75 + 100 + + + + + + 152 + 152 + 0 + 8 + false + 0 + 0 + true + 8 + GPU FAN + + + 0 + 0 + 0 + + + 65 + 55 + 25 + + + 70 + 60 + 50 + + + 80 + 65 + 75 + + + 85 + 75 + 100 + + + + + + + + Set + OnWriteFanSpeed + 160 + 10 + true + 10 + Set + CPU FAN + + + Set + OnWriteFanSpeed + 166 + 10 + true + 10 + Set + GPU FAN + + + \ No newline at end of file From 4354594f65a756aee458ef4982c40de427225454 Mon Sep 17 00:00:00 2001 From: matso167 <39828861+matso167@users.noreply.github.com> Date: Tue, 8 Jan 2019 21:43:51 +0200 Subject: [PATCH 05/12] Add HP Laptop 14-cm0xxx config (#615) --- Configs/HP Laptop 14-cm0xxx.xml | 67 +++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 Configs/HP Laptop 14-cm0xxx.xml diff --git a/Configs/HP Laptop 14-cm0xxx.xml b/Configs/HP Laptop 14-cm0xxx.xml new file mode 100644 index 00000000..3b49e0fc --- /dev/null +++ b/Configs/HP Laptop 14-cm0xxx.xml @@ -0,0 +1,67 @@ + + + HP Laptop 14-cm0xxx + Matias Hiltunen + 200 + false + 80 + + + 113 + 219 + 55 + 75 + true + 5 + 12 + false + 255 + CPU fan + + + 0 + 0 + 0 + + + 68 + 54 + 10 + + + 71 + 62 + 20 + + + 73 + 66 + 50 + + + 75 + 70 + 70 + + + 78 + 74 + 100 + + + + + 0 + 0 + Write + + + 100 + 75 + Write + + + + + + \ No newline at end of file From c3dd9dc6f94f2382428a65009c0f750cf0bc64f0 Mon Sep 17 00:00:00 2001 From: Ivan Date: Sun, 13 Jan 2019 23:51:16 +0300 Subject: [PATCH 06/12] Improve config for HP ProBook 4530s (#618) --- Configs/HP ProBook 4530s.xml | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) mode change 100644 => 100755 Configs/HP ProBook 4530s.xml diff --git a/Configs/HP ProBook 4530s.xml b/Configs/HP ProBook 4530s.xml old mode 100644 new mode 100755 index 4fdbc3a6..586352ca --- a/Configs/HP ProBook 4530s.xml +++ b/Configs/HP ProBook 4530s.xml @@ -15,36 +15,61 @@ 255 CPU fan + 0 0 0 + - 63 + 55 + 50 + 12.5 + + + + 59 48 - 10 + 25 + + + + 61 + 53 + 30 + 65 55 - 22.5 + 35 + 67 59 40 + + + 68 + 63 + 50 + + 69 65 65 + 71 67 100 + @@ -74,4 +99,4 @@ Fake thermal zone temperature - \ No newline at end of file + From 439c5f0db991162e2eda4078dbc779d9f55d0178 Mon Sep 17 00:00:00 2001 From: guster23 <46794802+guster23@users.noreply.github.com> Date: Mon, 4 Feb 2019 19:32:50 -0300 Subject: [PATCH 07/12] Add Asus Zenbook UX330UA config (#620) Based on Asus Zenbook UX310UA config --- Asus Zenbook UX330UA.xml | 64 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 Asus Zenbook UX330UA.xml diff --git a/Asus Zenbook UX330UA.xml b/Asus Zenbook UX330UA.xml new file mode 100644 index 00000000..7fc228ee --- /dev/null +++ b/Asus Zenbook UX330UA.xml @@ -0,0 +1,64 @@ + + + Asus Zenbook UX330UA + 150 + false + 90 + guster + + + 151 + 151 + 0 + 8 + true + 9 + + + 36 + 0 + 0 + + + 42 + 36 + 12.571428571428569 + + + 52 + 42 + 48.142857142857139 + + + 72 + 52 + 68.714285714285708 + + + 99 + 72 + 99 + + + + + + + + Set + OnWriteFanSpeed + 160 + 10 + true + 10 + + + Set + OnWriteFanSpeed + 166 + 10 + true + 10 + + + \ No newline at end of file From bd60b6821b607bf7a12e517d206c61c090fe8616 Mon Sep 17 00:00:00 2001 From: xponen Date: Mon, 15 Apr 2019 03:42:51 +0800 Subject: [PATCH 08/12] Add HP Compaq Presario CQ40 Turion X2 RM-74 config (#643) --- ...P Compaq Presario CQ40 Turion X2 RM-74.xml | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 Configs/HP Compaq Presario CQ40 Turion X2 RM-74.xml diff --git a/Configs/HP Compaq Presario CQ40 Turion X2 RM-74.xml b/Configs/HP Compaq Presario CQ40 Turion X2 RM-74.xml new file mode 100644 index 00000000..a8c15de4 --- /dev/null +++ b/Configs/HP Compaq Presario CQ40 Turion X2 RM-74.xml @@ -0,0 +1,81 @@ + + + HP Compaq Presario CQ40 + msafwan + 3000 + false + 75 + + + 176 + 176 + 41 + 79 + false + 48 + 57 + false + 0 + CPU Fan + + + 42 + 40 + 10 + + + 45 + 43 + 14 + + + 48 + 46 + 23 + + + 51 + 49 + 32 + + + 54 + 52 + 41 + + + 57 + 55 + 50 + + + 60 + 58 + 59 + + + 63 + 61 + 68 + + + 66 + 64 + 77 + + + 69 + 67 + 86 + + + 72 + 70 + 100 + + + + + + + From 34134d42811117b34a04c7c1bc2b7cd9b94a4f46 Mon Sep 17 00:00:00 2001 From: cymug <37985852+cymug@users.noreply.github.com> Date: Sun, 14 Apr 2019 15:44:49 -0400 Subject: [PATCH 09/12] Add config Acer Aspire E5-575G config (#651) --- Configs/Acer Aspire E5-575G.xml | 66 +++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 Configs/Acer Aspire E5-575G.xml diff --git a/Configs/Acer Aspire E5-575G.xml b/Configs/Acer Aspire E5-575G.xml new file mode 100644 index 00000000..ae4d01a7 --- /dev/null +++ b/Configs/Acer Aspire E5-575G.xml @@ -0,0 +1,66 @@ + + + Aspire E5-575G + cymug + 500 + false + 93 + + + 85 + 85 + 0 + 8 + false + 0 + 0 + true + 0 + + + 44 + 0 + 12.5 + + + 45 + 41 + 37.5 + + + 56 + 53 + 50 + + + 66 + 61 + 87.5 + + + 62 + 57 + 75 + + + 69 + 67 + 100 + + + + + + + + Set + OnInitialization + 147 + 20 + true + 4 + Set + Set EC to manual control + + + From 2c1fcfb251a0c77259d7a889fe6f39e506996e18 Mon Sep 17 00:00:00 2001 From: Daniel Fischer Date: Sun, 14 Apr 2019 15:47:28 -0400 Subject: [PATCH 10/12] Add Dell Inspiron 7375 config (#654) --- Asus Zenbook UX330UA.xml | 64 ------------------------- Configs/Dell Inspiron 7375.xml | 85 ++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 64 deletions(-) delete mode 100644 Asus Zenbook UX330UA.xml create mode 100644 Configs/Dell Inspiron 7375.xml diff --git a/Asus Zenbook UX330UA.xml b/Asus Zenbook UX330UA.xml deleted file mode 100644 index 7fc228ee..00000000 --- a/Asus Zenbook UX330UA.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - Asus Zenbook UX330UA - 150 - false - 90 - guster - - - 151 - 151 - 0 - 8 - true - 9 - - - 36 - 0 - 0 - - - 42 - 36 - 12.571428571428569 - - - 52 - 42 - 48.142857142857139 - - - 72 - 52 - 68.714285714285708 - - - 99 - 72 - 99 - - - - - - - - Set - OnWriteFanSpeed - 160 - 10 - true - 10 - - - Set - OnWriteFanSpeed - 166 - 10 - true - 10 - - - \ No newline at end of file diff --git a/Configs/Dell Inspiron 7375.xml b/Configs/Dell Inspiron 7375.xml new file mode 100644 index 00000000..651288ad --- /dev/null +++ b/Configs/Dell Inspiron 7375.xml @@ -0,0 +1,85 @@ + + + Inspiron 7375 + danielfm123 + 1000 + false + 95 + + + 149 + 148 + 255 + 75 + false + 0 + 0 + true + 14 + + + + 0 + 50 + 0 + + + + 45 + 55 + 62 + + + + 47 + 60 + 77 + + + + 52 + 65 + 87 + + + + 60 + 80 + 93 + + + + 75 + 88 + 97 + + + + 85 + 90 + 100 + + + + + + 73 + 10 + ReadWrite + + + + + + + Set + OnWriteFanSpeed + 147 + 255 + true + 14 + Set + Set EC to manual control + + + From 36155507c7097a0f73af0b5e421029bcd6e375df Mon Sep 17 00:00:00 2001 From: Stefan Hirschmann Date: Sun, 14 Apr 2019 20:28:59 +0200 Subject: [PATCH 11/12] Fix version conflicts during setup on Windows (caused by native images) --- Common/CommonAssemblyInfo.cs | 6 +----- Common/CommonAssemblyVersion.cs | 5 +++++ Core/NbfcCli/NbfcCli.csproj | 5 ++++- Core/NbfcProbe/NbfcProbe.csproj | 5 ++++- Core/NbfcService/NbfcService.csproj | 3 +++ .../StagWare.Hardware.LPC.csproj | 3 +++ .../StagWare.Hardware/StagWare.Hardware.csproj | 3 +++ .../StagWare.Plugins.CpuTemperatureMonitor.csproj | 3 +++ .../StagWare.Plugins.ECLinux.csproj | 3 +++ .../StagWare.Plugins.ECSysLinux.csproj | 3 +++ .../StagWare.Plugins.ECWindows.csproj | 3 +++ .../StagWare.Plugins.FSTemperatureMonitor.csproj | 3 +++ Core/StagWare.BiosInfo/Properties/AssemblyInfo.cs | 4 ++++ .../Properties/AssemblyInfo.cs | 4 ++++ .../StagWare.FanControl.Service.csproj | 3 +++ Core/StagWare.FanControl/Properties/AssemblyInfo.cs | 4 ++++ Core/StagWare.Settings/StagWare.Settings.csproj | 3 +++ NoteBookFanControl.sln | 5 +++-- .../StagWare.FanControl.Configurations.Tests.csproj | 3 +++ .../StagWare.FanControl.Tests.csproj | 3 +++ Windows/ConfigEditor/ConfigEditor.csproj | 3 +++ Windows/NbfcClient/NbfcClient.csproj | 3 +++ .../DriverSetupWixAction.csproj | 3 +++ Windows/Setup/NbfcSetup/Product.wxs | 13 +++++-------- 24 files changed, 79 insertions(+), 17 deletions(-) create mode 100644 Common/CommonAssemblyVersion.cs diff --git a/Common/CommonAssemblyInfo.cs b/Common/CommonAssemblyInfo.cs index fcdb8730..724bd55d 100644 --- a/Common/CommonAssemblyInfo.cs +++ b/Common/CommonAssemblyInfo.cs @@ -2,10 +2,6 @@ using System.Resources; [assembly: AssemblyCompany("StagWare")] -[assembly: AssemblyCopyright("Copyright © 2012-2018 Stefan Hirschmann")] +[assembly: AssemblyCopyright("Copyright © 2012-2019 Stefan Hirschmann")] [assembly: AssemblyTrademark("")] [assembly: NeutralResourcesLanguage("en")] - -[assembly: AssemblyVersion("1.6.1")] -[assembly: AssemblyFileVersion("1.6.1")] -[assembly: AssemblyInformationalVersion("1.6 beta2")] diff --git a/Common/CommonAssemblyVersion.cs b/Common/CommonAssemblyVersion.cs new file mode 100644 index 00000000..db6a792b --- /dev/null +++ b/Common/CommonAssemblyVersion.cs @@ -0,0 +1,5 @@ +using System.Reflection; + +[assembly: AssemblyVersion("1.6.3")] +[assembly: AssemblyFileVersion("1.6.3")] +[assembly: AssemblyInformationalVersion("1.6.3")] \ No newline at end of file diff --git a/Core/NbfcCli/NbfcCli.csproj b/Core/NbfcCli/NbfcCli.csproj index d303d045..f53c71fd 100644 --- a/Core/NbfcCli/NbfcCli.csproj +++ b/Core/NbfcCli/NbfcCli.csproj @@ -79,6 +79,9 @@ Properties\CommonAssemblyInfo.cs + + Properties\CommonAssemblyVersion.cs + @@ -150,4 +153,4 @@ --> - + \ No newline at end of file diff --git a/Core/NbfcProbe/NbfcProbe.csproj b/Core/NbfcProbe/NbfcProbe.csproj index cfce1f0e..dfc43ab2 100644 --- a/Core/NbfcProbe/NbfcProbe.csproj +++ b/Core/NbfcProbe/NbfcProbe.csproj @@ -63,6 +63,9 @@ Properties\CommonAssemblyInfo.cs + + Properties\CommonAssemblyVersion.cs + @@ -91,4 +94,4 @@ - + \ No newline at end of file diff --git a/Core/NbfcService/NbfcService.csproj b/Core/NbfcService/NbfcService.csproj index 2740ab2c..7b52dfd1 100644 --- a/Core/NbfcService/NbfcService.csproj +++ b/Core/NbfcService/NbfcService.csproj @@ -74,6 +74,9 @@ Properties\CommonAssemblyInfo.cs + + Properties\CommonAssemblyVersion.cs + Component diff --git a/Core/Plugins/StagWare.Hardware.LPC/StagWare.Hardware.LPC.csproj b/Core/Plugins/StagWare.Hardware.LPC/StagWare.Hardware.LPC.csproj index 1a1ebd48..45b4bb2d 100644 --- a/Core/Plugins/StagWare.Hardware.LPC/StagWare.Hardware.LPC.csproj +++ b/Core/Plugins/StagWare.Hardware.LPC/StagWare.Hardware.LPC.csproj @@ -46,6 +46,9 @@ Properties\CommonAssemblyInfo.cs + + Properties\CommonAssemblyVersion.cs + diff --git a/Core/Plugins/StagWare.Hardware/StagWare.Hardware.csproj b/Core/Plugins/StagWare.Hardware/StagWare.Hardware.csproj index 596968f2..a2ab7d14 100644 --- a/Core/Plugins/StagWare.Hardware/StagWare.Hardware.csproj +++ b/Core/Plugins/StagWare.Hardware/StagWare.Hardware.csproj @@ -46,6 +46,9 @@ Properties\CommonAssemblyInfo.cs + + Properties\CommonAssemblyVersion.cs + diff --git a/Core/Plugins/StagWare.Plugins.CpuTemperatureMonitor/StagWare.Plugins.CpuTemperatureMonitor.csproj b/Core/Plugins/StagWare.Plugins.CpuTemperatureMonitor/StagWare.Plugins.CpuTemperatureMonitor.csproj index 99b042eb..fecad8ce 100644 --- a/Core/Plugins/StagWare.Plugins.CpuTemperatureMonitor/StagWare.Plugins.CpuTemperatureMonitor.csproj +++ b/Core/Plugins/StagWare.Plugins.CpuTemperatureMonitor/StagWare.Plugins.CpuTemperatureMonitor.csproj @@ -63,6 +63,9 @@ Properties\CommonAssemblyInfo.cs + + Properties\CommonAssemblyVersion.cs + diff --git a/Core/Plugins/StagWare.Plugins.ECLinux/StagWare.Plugins.ECLinux.csproj b/Core/Plugins/StagWare.Plugins.ECLinux/StagWare.Plugins.ECLinux.csproj index 4f36f314..98fd2147 100644 --- a/Core/Plugins/StagWare.Plugins.ECLinux/StagWare.Plugins.ECLinux.csproj +++ b/Core/Plugins/StagWare.Plugins.ECLinux/StagWare.Plugins.ECLinux.csproj @@ -45,6 +45,9 @@ Properties\CommonAssemblyInfo.cs + + Properties\CommonAssemblyVersion.cs + diff --git a/Core/Plugins/StagWare.Plugins.ECSysLinux/StagWare.Plugins.ECSysLinux.csproj b/Core/Plugins/StagWare.Plugins.ECSysLinux/StagWare.Plugins.ECSysLinux.csproj index e1ffc6cc..1e8b02c8 100644 --- a/Core/Plugins/StagWare.Plugins.ECSysLinux/StagWare.Plugins.ECSysLinux.csproj +++ b/Core/Plugins/StagWare.Plugins.ECSysLinux/StagWare.Plugins.ECSysLinux.csproj @@ -42,6 +42,9 @@ Properties\CommonAssemblyInfo.cs + + Properties\CommonAssemblyVersion.cs + diff --git a/Core/Plugins/StagWare.Plugins.ECWindows/StagWare.Plugins.ECWindows.csproj b/Core/Plugins/StagWare.Plugins.ECWindows/StagWare.Plugins.ECWindows.csproj index a516564a..c70d8e44 100644 --- a/Core/Plugins/StagWare.Plugins.ECWindows/StagWare.Plugins.ECWindows.csproj +++ b/Core/Plugins/StagWare.Plugins.ECWindows/StagWare.Plugins.ECWindows.csproj @@ -47,6 +47,9 @@ Properties\CommonAssemblyInfo.cs + + Properties\CommonAssemblyVersion.cs + diff --git a/Core/Plugins/StagWare.Plugins.FSTemperatureMonitor/StagWare.Plugins.FSTemperatureMonitor.csproj b/Core/Plugins/StagWare.Plugins.FSTemperatureMonitor/StagWare.Plugins.FSTemperatureMonitor.csproj index a9e2fa7e..313a6a44 100644 --- a/Core/Plugins/StagWare.Plugins.FSTemperatureMonitor/StagWare.Plugins.FSTemperatureMonitor.csproj +++ b/Core/Plugins/StagWare.Plugins.FSTemperatureMonitor/StagWare.Plugins.FSTemperatureMonitor.csproj @@ -63,6 +63,9 @@ Properties\CommonAssemblyInfo.cs + + Properties\CommonAssemblyVersion.cs + diff --git a/Core/StagWare.BiosInfo/Properties/AssemblyInfo.cs b/Core/StagWare.BiosInfo/Properties/AssemblyInfo.cs index e90de992..e19c76f2 100644 --- a/Core/StagWare.BiosInfo/Properties/AssemblyInfo.cs +++ b/Core/StagWare.BiosInfo/Properties/AssemblyInfo.cs @@ -10,6 +10,10 @@ [assembly: AssemblyProduct("StagWare.BiosInfo")] [assembly: AssemblyCulture("")] +// Version +[assembly: AssemblyVersion("2.0.1.0")] +[assembly: AssemblyFileVersion("2.0.1.0")] + // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. diff --git a/Core/StagWare.Configurations/Properties/AssemblyInfo.cs b/Core/StagWare.Configurations/Properties/AssemblyInfo.cs index f982afe0..4bd70f0a 100644 --- a/Core/StagWare.Configurations/Properties/AssemblyInfo.cs +++ b/Core/StagWare.Configurations/Properties/AssemblyInfo.cs @@ -10,6 +10,10 @@ [assembly: AssemblyProduct("StagWare.FanControl.Configurations")] [assembly: AssemblyCulture("")] +// Version +[assembly: AssemblyVersion("2.5.1.0")] +[assembly: AssemblyFileVersion("2.5.1.0")] + // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. diff --git a/Core/StagWare.FanControl.Service/StagWare.FanControl.Service.csproj b/Core/StagWare.FanControl.Service/StagWare.FanControl.Service.csproj index 56e4e814..212e9ba1 100644 --- a/Core/StagWare.FanControl.Service/StagWare.FanControl.Service.csproj +++ b/Core/StagWare.FanControl.Service/StagWare.FanControl.Service.csproj @@ -67,6 +67,9 @@ Properties\CommonAssemblyInfo.cs + + Properties\CommonAssemblyVersion.cs + diff --git a/Core/StagWare.FanControl/Properties/AssemblyInfo.cs b/Core/StagWare.FanControl/Properties/AssemblyInfo.cs index 5510bab1..a13b37a0 100644 --- a/Core/StagWare.FanControl/Properties/AssemblyInfo.cs +++ b/Core/StagWare.FanControl/Properties/AssemblyInfo.cs @@ -12,6 +12,10 @@ [assembly: AssemblyProduct("StagWare.FanControl")] [assembly: AssemblyCulture("")] +// Version +[assembly: AssemblyVersion("2.5.2.0")] +[assembly: AssemblyFileVersion("2.5.2.0")] + // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. diff --git a/Core/StagWare.Settings/StagWare.Settings.csproj b/Core/StagWare.Settings/StagWare.Settings.csproj index 99d83b12..bb4aca00 100644 --- a/Core/StagWare.Settings/StagWare.Settings.csproj +++ b/Core/StagWare.Settings/StagWare.Settings.csproj @@ -43,6 +43,9 @@ Properties\CommonAssemblyInfo.cs + + Properties\CommonAssemblyVersion.cs + diff --git a/NoteBookFanControl.sln b/NoteBookFanControl.sln index ba55018a..1e8ba8da 100644 --- a/NoteBookFanControl.sln +++ b/NoteBookFanControl.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.6 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28803.156 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StagWare.FanControl", "Core\StagWare.FanControl\StagWare.FanControl.csproj", "{12084B38-C1A2-414C-80A7-B8D02D6F5B84}" EndProject @@ -68,6 +68,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{C7CC8ECD-A3E9-4391-B933-2F010ED24767}" ProjectSection(SolutionItems) = preProject Common\CommonAssemblyInfo.cs = Common\CommonAssemblyInfo.cs + Common\CommonAssemblyVersion.cs = Common\CommonAssemblyVersion.cs EndProjectSection EndProject Global diff --git a/Tests/StagWare.FanControl.Configurations.Tests/StagWare.FanControl.Configurations.Tests.csproj b/Tests/StagWare.FanControl.Configurations.Tests/StagWare.FanControl.Configurations.Tests.csproj index cf054b90..7028e835 100644 --- a/Tests/StagWare.FanControl.Configurations.Tests/StagWare.FanControl.Configurations.Tests.csproj +++ b/Tests/StagWare.FanControl.Configurations.Tests/StagWare.FanControl.Configurations.Tests.csproj @@ -68,6 +68,9 @@ Properties\CommonAssemblyInfo.cs + + Properties\CommonAssemblyVersion.cs + diff --git a/Tests/StagWare.FanControl.Tests/StagWare.FanControl.Tests.csproj b/Tests/StagWare.FanControl.Tests/StagWare.FanControl.Tests.csproj index 6ac4d583..f33742de 100644 --- a/Tests/StagWare.FanControl.Tests/StagWare.FanControl.Tests.csproj +++ b/Tests/StagWare.FanControl.Tests/StagWare.FanControl.Tests.csproj @@ -63,6 +63,9 @@ Properties\CommonAssemblyInfo.cs + + Properties\CommonAssemblyVersion.cs + diff --git a/Windows/ConfigEditor/ConfigEditor.csproj b/Windows/ConfigEditor/ConfigEditor.csproj index 5411b28b..393e274f 100644 --- a/Windows/ConfigEditor/ConfigEditor.csproj +++ b/Windows/ConfigEditor/ConfigEditor.csproj @@ -87,6 +87,9 @@ Properties\CommonAssemblyInfo.cs + + Properties\CommonAssemblyVersion.cs + diff --git a/Windows/NbfcClient/NbfcClient.csproj b/Windows/NbfcClient/NbfcClient.csproj index eb7bf042..794a8393 100644 --- a/Windows/NbfcClient/NbfcClient.csproj +++ b/Windows/NbfcClient/NbfcClient.csproj @@ -115,6 +115,9 @@ Properties\CommonAssemblyInfo.cs + + Properties\CommonAssemblyVersion.cs + diff --git a/Windows/Setup/DriverSetupWixAction/DriverSetupWixAction.csproj b/Windows/Setup/DriverSetupWixAction/DriverSetupWixAction.csproj index f5816b07..d3afdb45 100644 --- a/Windows/Setup/DriverSetupWixAction/DriverSetupWixAction.csproj +++ b/Windows/Setup/DriverSetupWixAction/DriverSetupWixAction.csproj @@ -47,6 +47,9 @@ Properties\CommonAssemblyInfo.cs + + Properties\CommonAssemblyVersion.cs + diff --git a/Windows/Setup/NbfcSetup/Product.wxs b/Windows/Setup/NbfcSetup/Product.wxs index 4b726899..c4abdb1b 100644 --- a/Windows/Setup/NbfcSetup/Product.wxs +++ b/Windows/Setup/NbfcSetup/Product.wxs @@ -21,9 +21,10 @@ Description="$(var.ProductName) Installer"/> - - + @@ -81,11 +82,7 @@ - - - - + From 0b64c0f7c1177785b37e317d14a5ddaab64ae048 Mon Sep 17 00:00:00 2001 From: Stefan Hirschmann Date: Sun, 14 Apr 2019 22:27:53 +0200 Subject: [PATCH 12/12] Add new configs to setup --- Windows/Setup/NbfcSetup/Configs.wxs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Windows/Setup/NbfcSetup/Configs.wxs b/Windows/Setup/NbfcSetup/Configs.wxs index ef5ec424..2bde495e 100644 --- a/Windows/Setup/NbfcSetup/Configs.wxs +++ b/Windows/Setup/NbfcSetup/Configs.wxs @@ -50,6 +50,9 @@ + + + @@ -116,6 +119,9 @@ + + + @@ -158,6 +164,9 @@ + + + @@ -242,6 +251,9 @@ + + + @@ -281,6 +293,9 @@ + + + @@ -323,6 +338,9 @@ + + + @@ -446,6 +464,9 @@ + + +