mir/nbfc
2
0
Fork 0
mirror of https://github.com/hirschmann/nbfc synced 2025-08-22 01:49:34 +00:00
Code Issues Releases Wiki Activity

Fix version conflicts during setup on Windows (caused by native images)

Browse Source
This commit is contained in:
Stefan Hirschmann 2019-04-14 20:28:59 +02:00
parent 4e3fe83d4a
commit 36155507c7
24 changed files with 79 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Common/CommonAssemblyInfo.cs
View File

@ -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")]

5
Common/CommonAssemblyVersion.cs Normal file
View File

@ -0,0 +1,5 @@
using System.Reflection;
[assembly: AssemblyVersion("1.6.3")]
[assembly: AssemblyFileVersion("1.6.3")]
[assembly: AssemblyInformationalVersion("1.6.3")]

5
Core/NbfcCli/NbfcCli.csproj
View File

@ -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>

5
Core/NbfcProbe/NbfcProbe.csproj
View File

@ -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>

3
Core/NbfcService/NbfcService.csproj
View File

@ -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>

3
Core/Plugins/StagWare.Hardware.LPC/StagWare.Hardware.LPC.csproj
View File

@ -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>

3
Core/Plugins/StagWare.Hardware/StagWare.Hardware.csproj
View File

@ -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>

3
Core/Plugins/StagWare.Plugins.CpuTemperatureMonitor/StagWare.Plugins.CpuTemperatureMonitor.csproj
View File

@ -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>

3
Core/Plugins/StagWare.Plugins.ECLinux/StagWare.Plugins.ECLinux.csproj
View File

@ -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>

3
Core/Plugins/StagWare.Plugins.ECSysLinux/StagWare.Plugins.ECSysLinux.csproj
View File

@ -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>

3
Core/Plugins/StagWare.Plugins.ECWindows/StagWare.Plugins.ECWindows.csproj
View File

@ -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>

3
Core/Plugins/StagWare.Plugins.FSTemperatureMonitor/StagWare.Plugins.FSTemperatureMonitor.csproj
View File

@ -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" />

4
Core/StagWare.BiosInfo/Properties/AssemblyInfo.cs
View File

@ -10,6 +10,10 @@ using System.Runtime.InteropServices;
[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.

4
Core/StagWare.Configurations/Properties/AssemblyInfo.cs
View File

@ -10,6 +10,10 @@ using System.Runtime.InteropServices;
[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.

3
Core/StagWare.FanControl.Service/StagWare.FanControl.Service.csproj
View File

@ -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" />

4
Core/StagWare.FanControl/Properties/AssemblyInfo.cs
View File

@ -12,6 +12,10 @@ using System.Runtime.InteropServices;
[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.

3
Core/StagWare.Settings/StagWare.Settings.csproj
View File

@ -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" />

5
NoteBookFanControl.sln
View File

@ -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

3
Tests/StagWare.FanControl.Configurations.Tests/StagWare.FanControl.Configurations.Tests.csproj
View File

@ -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" />

3
Tests/StagWare.FanControl.Tests/StagWare.FanControl.Tests.csproj
View File

@ -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" />

3
Windows/ConfigEditor/ConfigEditor.csproj
View File

@ -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" />

3
Windows/NbfcClient/NbfcClient.csproj
View File

@ -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" />

3
Windows/Setup/DriverSetupWixAction/DriverSetupWixAction.csproj
View File

@ -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" />

13
Windows/Setup/NbfcSetup/Product.wxs
View File

@ -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"/>