Merge branch 'dev'

hirschmann · Apr 14, 2019 · cb91840 · cb91840
2 parents 2c1fcfb + 3615550
commit cb91840
Show file tree

Hide file tree

Showing 24 changed files with 79 additions and 17 deletions.
diff --git 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
@@ -0,0 +1,5 @@
+using System.Reflection;
+
+[assembly: AssemblyVersion("1.6.3")]
+[assembly: AssemblyFileVersion("1.6.3")]
+[assembly: AssemblyInformationalVersion("1.6.3")]
diff --git a/Core/NbfcCli/NbfcCli.csproj b/Core/NbfcCli/NbfcCli.csproj
@@ -79,6 +79,9 @@
     <Compile Include="..\..\Common\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\Common\CommonAssemblyVersion.cs">
+      <Link>Properties\CommonAssemblyVersion.cs</Link>
+    </Compile>
     <Compile Include="CommandLineOptions\ConfigVerb.cs" />
     <Compile Include="CommandLineOptions\HelpGenerator.cs" />
     <Compile Include="CommandLineOptions\SetVerb.cs" />
@@ -150,4 +153,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/Core/NbfcProbe/NbfcProbe.csproj b/Core/NbfcProbe/NbfcProbe.csproj
@@ -63,6 +63,9 @@
     <Compile Include="..\..\Common\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\Common\CommonAssemblyVersion.cs">
+      <Link>Properties\CommonAssemblyVersion.cs</Link>
+    </Compile>
     <Compile Include="CommandLineOptions\ECMonitorVerb.cs" />
     <Compile Include="CommandLineOptions\ECWriteVerb.cs" />
     <Compile Include="CommandLineOptions\ECReadVerb.cs" />
@@ -91,4 +94,4 @@
     <None Include="App.manifest" />
     <None Include="packages.config" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/Core/NbfcService/NbfcService.csproj b/Core/NbfcService/NbfcService.csproj
@@ -74,6 +74,9 @@
     <Compile Include="..\..\Common\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\Common\CommonAssemblyVersion.cs">
+      <Link>Properties\CommonAssemblyVersion.cs</Link>
+    </Compile>
     <Compile Include="NbfcService.cs">
       <SubType>Component</SubType>
     </Compile>

diff --git a/Core/Plugins/StagWare.Hardware.LPC/StagWare.Hardware.LPC.csproj b/Core/Plugins/StagWare.Hardware.LPC/StagWare.Hardware.LPC.csproj
@@ -46,6 +46,9 @@
     <Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\Common\CommonAssemblyVersion.cs">
+      <Link>Properties\CommonAssemblyVersion.cs</Link>
+    </Compile>
     <Compile Include="EmbeddedControllerBase.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

diff --git a/Core/Plugins/StagWare.Hardware/StagWare.Hardware.csproj b/Core/Plugins/StagWare.Hardware/StagWare.Hardware.csproj
@@ -46,6 +46,9 @@
     <Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\Common\CommonAssemblyVersion.cs">
+      <Link>Properties\CommonAssemblyVersion.cs</Link>
+    </Compile>
     <Compile Include="HardwareMonitor.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

diff --git a/...gins/StagWare.Plugins.CpuTemperatureMonitor/StagWare.Plugins.CpuTemperatureMonitor.csproj b/...gins/StagWare.Plugins.CpuTemperatureMonitor/StagWare.Plugins.CpuTemperatureMonitor.csproj
@@ -63,6 +63,9 @@
     <Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\Common\CommonAssemblyVersion.cs">
+      <Link>Properties\CommonAssemblyVersion.cs</Link>
+    </Compile>
     <Compile Include="CpuTemperatureMonitor.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

diff --git a/Core/Plugins/StagWare.Plugins.ECLinux/StagWare.Plugins.ECLinux.csproj b/Core/Plugins/StagWare.Plugins.ECLinux/StagWare.Plugins.ECLinux.csproj
@@ -45,6 +45,9 @@
     <Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\Common\CommonAssemblyVersion.cs">
+      <Link>Properties\CommonAssemblyVersion.cs</Link>
+    </Compile>
     <Compile Include="ECLinux.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

diff --git a/Core/Plugins/StagWare.Plugins.ECSysLinux/StagWare.Plugins.ECSysLinux.csproj b/Core/Plugins/StagWare.Plugins.ECSysLinux/StagWare.Plugins.ECSysLinux.csproj
@@ -42,6 +42,9 @@
     <Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\Common\CommonAssemblyVersion.cs">
+      <Link>Properties\CommonAssemblyVersion.cs</Link>
+    </Compile>
     <Compile Include="ECSysLinux.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

diff --git a/Core/Plugins/StagWare.Plugins.ECWindows/StagWare.Plugins.ECWindows.csproj b/Core/Plugins/StagWare.Plugins.ECWindows/StagWare.Plugins.ECWindows.csproj
@@ -47,6 +47,9 @@
     <Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\Common\CommonAssemblyVersion.cs">
+      <Link>Properties\CommonAssemblyVersion.cs</Link>
+    </Compile>
     <Compile Include="ECWindows.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

diff --git a/...lugins/StagWare.Plugins.FSTemperatureMonitor/StagWare.Plugins.FSTemperatureMonitor.csproj b/...lugins/StagWare.Plugins.FSTemperatureMonitor/StagWare.Plugins.FSTemperatureMonitor.csproj
@@ -63,6 +63,9 @@
     <Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\Common\CommonAssemblyVersion.cs">
+      <Link>Properties\CommonAssemblyVersion.cs</Link>
+    </Compile>
     <Compile Include="FSTemperatureMonitor.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TemperatureSource.cs" />

diff --git 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
@@ -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
@@ -67,6 +67,9 @@
     <Compile Include="..\..\Common\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\Common\CommonAssemblyVersion.cs">
+      <Link>Properties\CommonAssemblyVersion.cs</Link>
+    </Compile>
     <Compile Include="FanControlInfo.cs" />
     <Compile Include="FanControlService.cs" />
     <Compile Include="FanStatus.cs" />

diff --git 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
@@ -43,6 +43,9 @@
     <Compile Include="..\..\Common\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\Common\CommonAssemblyVersion.cs">
+      <Link>Properties\CommonAssemblyVersion.cs</Link>
+    </Compile>
     <Compile Include="DefaultValueAttribute.cs" />
     <Compile Include="LoadSettingsFailedEventArgs.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

diff --git 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/.../StagWare.FanControl.Configurations.Tests/StagWare.FanControl.Configurations.Tests.csproj b/.../StagWare.FanControl.Configurations.Tests/StagWare.FanControl.Configurations.Tests.csproj
@@ -68,6 +68,9 @@
     <Compile Include="..\..\Common\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\Common\CommonAssemblyVersion.cs">
+      <Link>Properties\CommonAssemblyVersion.cs</Link>
+    </Compile>
     <Compile Include="ConfigManagerTests.cs" />
     <Compile Include="ConfigsTests.cs" />
     <Compile Include="ExtensionMethods\StringExtensionMethodsTests.cs" />

diff --git a/Tests/StagWare.FanControl.Tests/StagWare.FanControl.Tests.csproj b/Tests/StagWare.FanControl.Tests/StagWare.FanControl.Tests.csproj
@@ -63,6 +63,9 @@
     <Compile Include="..\..\Common\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\Common\CommonAssemblyVersion.cs">
+      <Link>Properties\CommonAssemblyVersion.cs</Link>
+    </Compile>
     <Compile Include="ArithmeticMeanTemperatureFilterTests.cs" />
     <Compile Include="FanControlTests.cs" />
     <Compile Include="FanTests.cs" />

diff --git a/Windows/ConfigEditor/ConfigEditor.csproj b/Windows/ConfigEditor/ConfigEditor.csproj
@@ -87,6 +87,9 @@
     <Compile Include="..\..\Common\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\Common\CommonAssemblyVersion.cs">
+      <Link>Properties\CommonAssemblyVersion.cs</Link>
+    </Compile>
     <Compile Include="Behaviors\SelectionChangedBehavior.cs" />
     <Compile Include="Commands\RelayCommand.cs" />
     <Compile Include="ExtensionMethods\IconExtensionMethods.cs" />

diff --git a/Windows/NbfcClient/NbfcClient.csproj b/Windows/NbfcClient/NbfcClient.csproj
@@ -115,6 +115,9 @@
     <Compile Include="..\..\Common\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\Common\CommonAssemblyVersion.cs">
+      <Link>Properties\CommonAssemblyVersion.cs</Link>
+    </Compile>
     <Compile Include="AppSettings.cs" />
     <Compile Include="AutorunEntry.cs" />
     <Compile Include="DesignData\FanControllerViewModelCollection.cs" />

diff --git a/Windows/Setup/DriverSetupWixAction/DriverSetupWixAction.csproj b/Windows/Setup/DriverSetupWixAction/DriverSetupWixAction.csproj
@@ -47,6 +47,9 @@
     <Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\Common\CommonAssemblyVersion.cs">
+      <Link>Properties\CommonAssemblyVersion.cs</Link>
+    </Compile>
     <Compile Include="CustomAction.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Content Include="CustomAction.config" />

diff --git a/Windows/Setup/NbfcSetup/Product.wxs b/Windows/Setup/NbfcSetup/Product.wxs
@@ -21,9 +21,10 @@
              Description="$(var.ProductName) Installer"/>
 
     <!--Upgrade-->
-    <!--Use Upgrade instead of MajorUpgrade because the latter doesn't support removing previous versions
-        before installing upgrades (without checking file versions)-->
-    <Upgrade Id="$(var.UpgradeGuid)"/>
+    <MajorUpgrade Schedule="afterInstallInitialize"
+                  AllowDowngrades="no"
+                  AllowSameVersionUpgrades="no"
+                  DowngradeErrorMessage="A newer version of $(var.ProductName) is already installed." />
 
     <!--Media-->
     <Media Id="1" Cabinet="NBFC.cab" EmbedCab="yes" CompressionLevel="high"/>
@@ -81,11 +82,7 @@
     <util:CloseApplication Id="CloseNbfcClientOld" Target="NoteBook FanControl.exe" EndSessionMessage="yes" />
 
     <!--Do actions-->
-    <InstallExecuteSequence>
-      <!--Always uninstall existing products before installing updated versions 
-          to avoid problems during up/downgrade-->
-      <RemoveExistingProducts Before='InstallInitialize' />
-
+    <InstallExecuteSequence>      
       <Custom Action="SetInstallFolderForUninstallDriver" Before="UninstallDriver"/>
       <Custom Action="UninstallDriver" After="DeleteServices"/>