From 36155507c7097a0f73af0b5e421029bcd6e375df Mon Sep 17 00:00:00 2001 From: Stefan Hirschmann Date: Sun, 14 Apr 2019 20:28:59 +0200 Subject: [PATCH] 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 fcdb873..724bd55 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 0000000..db6a792 --- /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 d303d04..f53c71f 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 cfce1f0..dfc43ab 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 2740ab2..7b52dfd 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 1a1ebd4..45b4bb2 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 596968f..a2ab7d1 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 99b042e..fecad8c 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 4f36f31..98fd214 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 e1ffc6c..1e8b02c 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 a516564..c70d8e4 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 a9e2fa7..313a6a4 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 e90de99..e19c76f 100644 --- a/Core/StagWare.BiosInfo/Properties/AssemblyInfo.cs +++ b/Core/StagWare.BiosInfo/Properties/AssemblyInfo.cs @@ -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. diff --git a/Core/StagWare.Configurations/Properties/AssemblyInfo.cs b/Core/StagWare.Configurations/Properties/AssemblyInfo.cs index f982afe..4bd70f0 100644 --- a/Core/StagWare.Configurations/Properties/AssemblyInfo.cs +++ b/Core/StagWare.Configurations/Properties/AssemblyInfo.cs @@ -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. diff --git a/Core/StagWare.FanControl.Service/StagWare.FanControl.Service.csproj b/Core/StagWare.FanControl.Service/StagWare.FanControl.Service.csproj index 56e4e81..212e9ba 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 5510bab..a13b37a 100644 --- a/Core/StagWare.FanControl/Properties/AssemblyInfo.cs +++ b/Core/StagWare.FanControl/Properties/AssemblyInfo.cs @@ -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. diff --git a/Core/StagWare.Settings/StagWare.Settings.csproj b/Core/StagWare.Settings/StagWare.Settings.csproj index 99d83b1..bb4aca0 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 ba55018..1e8ba8d 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 cf054b9..7028e83 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 6ac4d58..f33742d 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 5411b28..393e274 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 eb7bf04..794a839 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 f5816b0..d3afdb4 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 4b72689..c4abdb1 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 @@ - - - - +