Skip to content

Commit cb91840

Browse files
hirschmannhirschmann
committed
Merge branch 'dev'
2 parents 2c1fcfb + 3615550 commit cb91840

File tree

24 files changed

+79
-17
lines changed

24 files changed

+79
-17
lines changed

‎Common/CommonAssemblyInfo.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
using System.Resources;
33

44
[assembly: AssemblyCompany("StagWare")]
5-
[assembly: AssemblyCopyright("Copyright © 2012-2018 Stefan Hirschmann")]
5+
[assembly: AssemblyCopyright("Copyright © 2012-2019 Stefan Hirschmann")]
66
[assembly: AssemblyTrademark("")]
77
[assembly: NeutralResourcesLanguage("en")]
8-
9-
[assembly: AssemblyVersion("1.6.1")]
10-
[assembly: AssemblyFileVersion("1.6.1")]
11-
[assembly: AssemblyInformationalVersion("1.6 beta2")]

‎Common/CommonAssemblyVersion.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
using System.Reflection;
2+
3+
[assembly: AssemblyVersion("1.6.3")]
4+
[assembly: AssemblyFileVersion("1.6.3")]
5+
[assembly: AssemblyInformationalVersion("1.6.3")]

‎Core/NbfcCli/NbfcCli.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@
7979
<Compile Include="..\..\Common\CommonAssemblyInfo.cs">
8080
<Link>Properties\CommonAssemblyInfo.cs</Link>
8181
</Compile>
82+
<Compile Include="..\..\Common\CommonAssemblyVersion.cs">
83+
<Link>Properties\CommonAssemblyVersion.cs</Link>
84+
</Compile>
8285
<Compile Include="CommandLineOptions\ConfigVerb.cs" />
8386
<Compile Include="CommandLineOptions\HelpGenerator.cs" />
8487
<Compile Include="CommandLineOptions\SetVerb.cs" />
@@ -150,4 +153,4 @@
150153
<Target Name="AfterBuild">
151154
</Target>
152155
-->
153-
</Project>
156+
</Project>

‎Core/NbfcProbe/NbfcProbe.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@
6363
<Compile Include="..\..\Common\CommonAssemblyInfo.cs">
6464
<Link>Properties\CommonAssemblyInfo.cs</Link>
6565
</Compile>
66+
<Compile Include="..\..\Common\CommonAssemblyVersion.cs">
67+
<Link>Properties\CommonAssemblyVersion.cs</Link>
68+
</Compile>
6669
<Compile Include="CommandLineOptions\ECMonitorVerb.cs" />
6770
<Compile Include="CommandLineOptions\ECWriteVerb.cs" />
6871
<Compile Include="CommandLineOptions\ECReadVerb.cs" />
@@ -91,4 +94,4 @@
9194
<None Include="App.manifest" />
9295
<None Include="packages.config" />
9396
</ItemGroup>
94-
</Project>
97+
</Project>

‎Core/NbfcService/NbfcService.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@
7474
<Compile Include="..\..\Common\CommonAssemblyInfo.cs">
7575
<Link>Properties\CommonAssemblyInfo.cs</Link>
7676
</Compile>
77+
<Compile Include="..\..\Common\CommonAssemblyVersion.cs">
78+
<Link>Properties\CommonAssemblyVersion.cs</Link>
79+
</Compile>
7780
<Compile Include="NbfcService.cs">
7881
<SubType>Component</SubType>
7982
</Compile>

‎Core/Plugins/StagWare.Hardware.LPC/StagWare.Hardware.LPC.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@
4646
<Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
4747
<Link>Properties\CommonAssemblyInfo.cs</Link>
4848
</Compile>
49+
<Compile Include="..\..\..\Common\CommonAssemblyVersion.cs">
50+
<Link>Properties\CommonAssemblyVersion.cs</Link>
51+
</Compile>
4952
<Compile Include="EmbeddedControllerBase.cs" />
5053
<Compile Include="Properties\AssemblyInfo.cs" />
5154
</ItemGroup>

‎Core/Plugins/StagWare.Hardware/StagWare.Hardware.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@
4646
<Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
4747
<Link>Properties\CommonAssemblyInfo.cs</Link>
4848
</Compile>
49+
<Compile Include="..\..\..\Common\CommonAssemblyVersion.cs">
50+
<Link>Properties\CommonAssemblyVersion.cs</Link>
51+
</Compile>
4952
<Compile Include="HardwareMonitor.cs" />
5053
<Compile Include="Properties\AssemblyInfo.cs" />
5154
</ItemGroup>

‎Core/Plugins/StagWare.Plugins.CpuTemperatureMonitor/StagWare.Plugins.CpuTemperatureMonitor.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@
6363
<Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
6464
<Link>Properties\CommonAssemblyInfo.cs</Link>
6565
</Compile>
66+
<Compile Include="..\..\..\Common\CommonAssemblyVersion.cs">
67+
<Link>Properties\CommonAssemblyVersion.cs</Link>
68+
</Compile>
6669
<Compile Include="CpuTemperatureMonitor.cs" />
6770
<Compile Include="Properties\AssemblyInfo.cs" />
6871
</ItemGroup>

‎Core/Plugins/StagWare.Plugins.ECLinux/StagWare.Plugins.ECLinux.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@
4545
<Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
4646
<Link>Properties\CommonAssemblyInfo.cs</Link>
4747
</Compile>
48+
<Compile Include="..\..\..\Common\CommonAssemblyVersion.cs">
49+
<Link>Properties\CommonAssemblyVersion.cs</Link>
50+
</Compile>
4851
<Compile Include="ECLinux.cs" />
4952
<Compile Include="Properties\AssemblyInfo.cs" />
5053
</ItemGroup>

‎Core/Plugins/StagWare.Plugins.ECSysLinux/StagWare.Plugins.ECSysLinux.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
<Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
4343
<Link>Properties\CommonAssemblyInfo.cs</Link>
4444
</Compile>
45+
<Compile Include="..\..\..\Common\CommonAssemblyVersion.cs">
46+
<Link>Properties\CommonAssemblyVersion.cs</Link>
47+
</Compile>
4548
<Compile Include="ECSysLinux.cs" />
4649
<Compile Include="Properties\AssemblyInfo.cs" />
4750
</ItemGroup>

‎Core/Plugins/StagWare.Plugins.ECWindows/StagWare.Plugins.ECWindows.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
<Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
4848
<Link>Properties\CommonAssemblyInfo.cs</Link>
4949
</Compile>
50+
<Compile Include="..\..\..\Common\CommonAssemblyVersion.cs">
51+
<Link>Properties\CommonAssemblyVersion.cs</Link>
52+
</Compile>
5053
<Compile Include="ECWindows.cs" />
5154
<Compile Include="Properties\AssemblyInfo.cs" />
5255
</ItemGroup>

‎Core/Plugins/StagWare.Plugins.FSTemperatureMonitor/StagWare.Plugins.FSTemperatureMonitor.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@
6363
<Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
6464
<Link>Properties\CommonAssemblyInfo.cs</Link>
6565
</Compile>
66+
<Compile Include="..\..\..\Common\CommonAssemblyVersion.cs">
67+
<Link>Properties\CommonAssemblyVersion.cs</Link>
68+
</Compile>
6669
<Compile Include="FSTemperatureMonitor.cs" />
6770
<Compile Include="Properties\AssemblyInfo.cs" />
6871
<Compile Include="TemperatureSource.cs" />

‎Core/StagWare.BiosInfo/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
[assembly: AssemblyProduct("StagWare.BiosInfo")]
1111
[assembly: AssemblyCulture("")]
1212

13+
// Version
14+
[assembly: AssemblyVersion("2.0.1.0")]
15+
[assembly: AssemblyFileVersion("2.0.1.0")]
16+
1317
// Setting ComVisible to false makes the types in this assembly not visible
1418
// to COM components. If you need to access a type in this assembly from
1519
// COM, set the ComVisible attribute to true on that type.

‎Core/StagWare.Configurations/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
[assembly: AssemblyProduct("StagWare.FanControl.Configurations")]
1111
[assembly: AssemblyCulture("")]
1212

13+
// Version
14+
[assembly: AssemblyVersion("2.5.1.0")]
15+
[assembly: AssemblyFileVersion("2.5.1.0")]
16+
1317
// Setting ComVisible to false makes the types in this assembly not visible
1418
// to COM components. If you need to access a type in this assembly from
1519
// COM, set the ComVisible attribute to true on that type.

‎Core/StagWare.FanControl.Service/StagWare.FanControl.Service.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@
6767
<Compile Include="..\..\Common\CommonAssemblyInfo.cs">
6868
<Link>Properties\CommonAssemblyInfo.cs</Link>
6969
</Compile>
70+
<Compile Include="..\..\Common\CommonAssemblyVersion.cs">
71+
<Link>Properties\CommonAssemblyVersion.cs</Link>
72+
</Compile>
7073
<Compile Include="FanControlInfo.cs" />
7174
<Compile Include="FanControlService.cs" />
7275
<Compile Include="FanStatus.cs" />

‎Core/StagWare.FanControl/Properties/AssemblyInfo.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
[assembly: AssemblyProduct("StagWare.FanControl")]
1313
[assembly: AssemblyCulture("")]
1414

15+
// Version
16+
[assembly: AssemblyVersion("2.5.2.0")]
17+
[assembly: AssemblyFileVersion("2.5.2.0")]
18+
1519
// Setting ComVisible to false makes the types in this assembly not visible
1620
// to COM components. If you need to access a type in this assembly from
1721
// COM, set the ComVisible attribute to true on that type.

‎Core/StagWare.Settings/StagWare.Settings.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
<Compile Include="..\..\Common\CommonAssemblyInfo.cs">
4444
<Link>Properties\CommonAssemblyInfo.cs</Link>
4545
</Compile>
46+
<Compile Include="..\..\Common\CommonAssemblyVersion.cs">
47+
<Link>Properties\CommonAssemblyVersion.cs</Link>
48+
</Compile>
4649
<Compile Include="DefaultValueAttribute.cs" />
4750
<Compile Include="LoadSettingsFailedEventArgs.cs" />
4851
<Compile Include="Properties\AssemblyInfo.cs" />

‎NoteBookFanControl.sln

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26430.6
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.28803.156
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StagWare.FanControl", "Core\StagWare.FanControl\StagWare.FanControl.csproj", "{12084B38-C1A2-414C-80A7-B8D02D6F5B84}"
77
EndProject
@@ -68,6 +68,7 @@ EndProject
6868
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{C7CC8ECD-A3E9-4391-B933-2F010ED24767}"
6969
ProjectSection(SolutionItems) = preProject
7070
Common\CommonAssemblyInfo.cs = Common\CommonAssemblyInfo.cs
71+
Common\CommonAssemblyVersion.cs = Common\CommonAssemblyVersion.cs
7172
EndProjectSection
7273
EndProject
7374
Global

‎Tests/StagWare.FanControl.Configurations.Tests/StagWare.FanControl.Configurations.Tests.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@
6868
<Compile Include="..\..\Common\CommonAssemblyInfo.cs">
6969
<Link>Properties\CommonAssemblyInfo.cs</Link>
7070
</Compile>
71+
<Compile Include="..\..\Common\CommonAssemblyVersion.cs">
72+
<Link>Properties\CommonAssemblyVersion.cs</Link>
73+
</Compile>
7174
<Compile Include="ConfigManagerTests.cs" />
7275
<Compile Include="ConfigsTests.cs" />
7376
<Compile Include="ExtensionMethods\StringExtensionMethodsTests.cs" />

‎Tests/StagWare.FanControl.Tests/StagWare.FanControl.Tests.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@
6363
<Compile Include="..\..\Common\CommonAssemblyInfo.cs">
6464
<Link>Properties\CommonAssemblyInfo.cs</Link>
6565
</Compile>
66+
<Compile Include="..\..\Common\CommonAssemblyVersion.cs">
67+
<Link>Properties\CommonAssemblyVersion.cs</Link>
68+
</Compile>
6669
<Compile Include="ArithmeticMeanTemperatureFilterTests.cs" />
6770
<Compile Include="FanControlTests.cs" />
6871
<Compile Include="FanTests.cs" />

‎Windows/ConfigEditor/ConfigEditor.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@
8787
<Compile Include="..\..\Common\CommonAssemblyInfo.cs">
8888
<Link>Properties\CommonAssemblyInfo.cs</Link>
8989
</Compile>
90+
<Compile Include="..\..\Common\CommonAssemblyVersion.cs">
91+
<Link>Properties\CommonAssemblyVersion.cs</Link>
92+
</Compile>
9093
<Compile Include="Behaviors\SelectionChangedBehavior.cs" />
9194
<Compile Include="Commands\RelayCommand.cs" />
9295
<Compile Include="ExtensionMethods\IconExtensionMethods.cs" />

‎Windows/NbfcClient/NbfcClient.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@
115115
<Compile Include="..\..\Common\CommonAssemblyInfo.cs">
116116
<Link>Properties\CommonAssemblyInfo.cs</Link>
117117
</Compile>
118+
<Compile Include="..\..\Common\CommonAssemblyVersion.cs">
119+
<Link>Properties\CommonAssemblyVersion.cs</Link>
120+
</Compile>
118121
<Compile Include="AppSettings.cs" />
119122
<Compile Include="AutorunEntry.cs" />
120123
<Compile Include="DesignData\FanControllerViewModelCollection.cs" />

‎Windows/Setup/DriverSetupWixAction/DriverSetupWixAction.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
<Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
4848
<Link>Properties\CommonAssemblyInfo.cs</Link>
4949
</Compile>
50+
<Compile Include="..\..\..\Common\CommonAssemblyVersion.cs">
51+
<Link>Properties\CommonAssemblyVersion.cs</Link>
52+
</Compile>
5053
<Compile Include="CustomAction.cs" />
5154
<Compile Include="Properties\AssemblyInfo.cs" />
5255
<Content Include="CustomAction.config" />

‎Windows/Setup/NbfcSetup/Product.wxs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@
2121
Description="$(var.ProductName) Installer"/>
2222

2323
<!--Upgrade-->
24-
<!--Use Upgrade instead of MajorUpgrade because the latter doesn't support removing previous versions
25-
before installing upgrades (without checking file versions)-->
26-
<Upgrade Id="$(var.UpgradeGuid)"/>
24+
<MajorUpgrade Schedule="afterInstallInitialize"
25+
AllowDowngrades="no"
26+
AllowSameVersionUpgrades="no"
27+
DowngradeErrorMessage="A newer version of $(var.ProductName) is already installed." />
2728

2829
<!--Media-->
2930
<Media Id="1" Cabinet="NBFC.cab" EmbedCab="yes" CompressionLevel="high"/>
@@ -81,11 +82,7 @@
8182
<util:CloseApplication Id="CloseNbfcClientOld" Target="NoteBook FanControl.exe" EndSessionMessage="yes" />
8283

8384
<!--Do actions-->
84-
<InstallExecuteSequence>
85-
<!--Always uninstall existing products before installing updated versions
86-
to avoid problems during up/downgrade-->
87-
<RemoveExistingProducts Before='InstallInitialize' />
88-
85+
<InstallExecuteSequence>
8986
<Custom Action="SetInstallFolderForUninstallDriver" Before="UninstallDriver"/>
9087
<Custom Action="UninstallDriver" After="DeleteServices"/>
9188

0 commit comments

Comments
 (0)