From 0d270b1444d24feeed31555cb464e41e24e4a99f Mon Sep 17 00:00:00 2001 From: dbuechel Date: Fri, 29 Mar 2019 10:52:00 +0100 Subject: [PATCH] SEBWIN-226: Trying to use CI to set correct version and build number for assemblies. --- SafeExamBrowser.Browser/Properties/AssemblyInfo.cs | 1 + .../Properties/AssemblyInfo.cs | 1 + SafeExamBrowser.Client/Properties/AssemblyInfo.cs | 1 + .../Properties/AssemblyInfo.cs | 1 + SafeExamBrowser.Communication/Properties/AssemblyInfo.cs | 1 + .../Properties/AssemblyInfo.cs | 1 + SafeExamBrowser.Configuration/Properties/AssemblyInfo.cs | 1 + SafeExamBrowser.Contracts/Properties/AssemblyInfo.cs | 1 + .../Properties/AssemblyInfo.cs | 1 + SafeExamBrowser.Core/Properties/AssemblyInfo.cs | 1 + .../Properties/AssemblyInfo.cs | 1 + SafeExamBrowser.I18n/Properties/AssemblyInfo.cs | 1 + .../Properties/AssemblyInfo.cs | 1 + SafeExamBrowser.Logging/Properties/AssemblyInfo.cs | 1 + SafeExamBrowser.Monitoring/Properties/AssemblyInfo.cs | 1 + .../Properties/AssemblyInfo.cs | 1 + SafeExamBrowser.Runtime/Properties/AssemblyInfo.cs | 6 +++--- .../Properties/AssemblyInfo.cs | 1 + .../Properties/AssemblyInfo.cs | 1 + .../Properties/AssemblyInfo.cs | 1 + SafeExamBrowser.WindowsApi/Properties/AssemblyInfo.cs | 1 + appveyor.yml | 9 ++++++++- 22 files changed, 31 insertions(+), 4 deletions(-) diff --git a/SafeExamBrowser.Browser/Properties/AssemblyInfo.cs b/SafeExamBrowser.Browser/Properties/AssemblyInfo.cs index 2f5866ad..e827a509 100644 --- a/SafeExamBrowser.Browser/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.Browser/Properties/AssemblyInfo.cs @@ -30,3 +30,4 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.Client.UnitTests/Properties/AssemblyInfo.cs b/SafeExamBrowser.Client.UnitTests/Properties/AssemblyInfo.cs index de73e95b..eb3eb7e7 100644 --- a/SafeExamBrowser.Client.UnitTests/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.Client.UnitTests/Properties/AssemblyInfo.cs @@ -14,3 +14,4 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.Client/Properties/AssemblyInfo.cs b/SafeExamBrowser.Client/Properties/AssemblyInfo.cs index decf74b4..d0f5099d 100644 --- a/SafeExamBrowser.Client/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.Client/Properties/AssemblyInfo.cs @@ -50,3 +50,4 @@ using System.Windows; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.Communication.UnitTests/Properties/AssemblyInfo.cs b/SafeExamBrowser.Communication.UnitTests/Properties/AssemblyInfo.cs index 2b78d918..5ab9fbc1 100644 --- a/SafeExamBrowser.Communication.UnitTests/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.Communication.UnitTests/Properties/AssemblyInfo.cs @@ -14,3 +14,4 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.Communication/Properties/AssemblyInfo.cs b/SafeExamBrowser.Communication/Properties/AssemblyInfo.cs index 9bab7661..383e8aa7 100644 --- a/SafeExamBrowser.Communication/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.Communication/Properties/AssemblyInfo.cs @@ -30,3 +30,4 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.Configuration.UnitTests/Properties/AssemblyInfo.cs b/SafeExamBrowser.Configuration.UnitTests/Properties/AssemblyInfo.cs index e5f7e770..57deae24 100644 --- a/SafeExamBrowser.Configuration.UnitTests/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.Configuration.UnitTests/Properties/AssemblyInfo.cs @@ -14,3 +14,4 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.Configuration/Properties/AssemblyInfo.cs b/SafeExamBrowser.Configuration/Properties/AssemblyInfo.cs index 3c509876..a067e947 100644 --- a/SafeExamBrowser.Configuration/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.Configuration/Properties/AssemblyInfo.cs @@ -32,3 +32,4 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.Contracts/Properties/AssemblyInfo.cs b/SafeExamBrowser.Contracts/Properties/AssemblyInfo.cs index 6c506b7f..96a94877 100644 --- a/SafeExamBrowser.Contracts/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.Contracts/Properties/AssemblyInfo.cs @@ -30,3 +30,4 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.Core.UnitTests/Properties/AssemblyInfo.cs b/SafeExamBrowser.Core.UnitTests/Properties/AssemblyInfo.cs index 667158db..719c83f5 100644 --- a/SafeExamBrowser.Core.UnitTests/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.Core.UnitTests/Properties/AssemblyInfo.cs @@ -14,3 +14,4 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.Core/Properties/AssemblyInfo.cs b/SafeExamBrowser.Core/Properties/AssemblyInfo.cs index b99d5c41..ded74b47 100644 --- a/SafeExamBrowser.Core/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.Core/Properties/AssemblyInfo.cs @@ -32,3 +32,4 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.I18n.UnitTests/Properties/AssemblyInfo.cs b/SafeExamBrowser.I18n.UnitTests/Properties/AssemblyInfo.cs index 02c8a804..56ce7535 100644 --- a/SafeExamBrowser.I18n.UnitTests/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.I18n.UnitTests/Properties/AssemblyInfo.cs @@ -14,3 +14,4 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.I18n/Properties/AssemblyInfo.cs b/SafeExamBrowser.I18n/Properties/AssemblyInfo.cs index 6a062e3d..2ae91b8d 100644 --- a/SafeExamBrowser.I18n/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.I18n/Properties/AssemblyInfo.cs @@ -30,3 +30,4 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.Logging.UnitTests/Properties/AssemblyInfo.cs b/SafeExamBrowser.Logging.UnitTests/Properties/AssemblyInfo.cs index 81e1a701..ed6903f5 100644 --- a/SafeExamBrowser.Logging.UnitTests/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.Logging.UnitTests/Properties/AssemblyInfo.cs @@ -14,3 +14,4 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.Logging/Properties/AssemblyInfo.cs b/SafeExamBrowser.Logging/Properties/AssemblyInfo.cs index 638dc1fd..f4612296 100644 --- a/SafeExamBrowser.Logging/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.Logging/Properties/AssemblyInfo.cs @@ -30,3 +30,4 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.Monitoring/Properties/AssemblyInfo.cs b/SafeExamBrowser.Monitoring/Properties/AssemblyInfo.cs index 61dc419e..9492b4cb 100644 --- a/SafeExamBrowser.Monitoring/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.Monitoring/Properties/AssemblyInfo.cs @@ -30,3 +30,4 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.Runtime.UnitTests/Properties/AssemblyInfo.cs b/SafeExamBrowser.Runtime.UnitTests/Properties/AssemblyInfo.cs index 9f4c2dcc..f51cc5e7 100644 --- a/SafeExamBrowser.Runtime.UnitTests/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.Runtime.UnitTests/Properties/AssemblyInfo.cs @@ -14,3 +14,4 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.Runtime/Properties/AssemblyInfo.cs b/SafeExamBrowser.Runtime/Properties/AssemblyInfo.cs index f2ade251..45eea74b 100644 --- a/SafeExamBrowser.Runtime/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.Runtime/Properties/AssemblyInfo.cs @@ -48,6 +48,6 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.0.0")] -[assembly: AssemblyFileVersion("3.0.0")] -[assembly: AssemblyInformationalVersion("3.0.0 (alpha)")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.SystemComponents/Properties/AssemblyInfo.cs b/SafeExamBrowser.SystemComponents/Properties/AssemblyInfo.cs index b3c5dc64..5a8016e0 100644 --- a/SafeExamBrowser.SystemComponents/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.SystemComponents/Properties/AssemblyInfo.cs @@ -30,3 +30,4 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.UserInterface.Desktop/Properties/AssemblyInfo.cs b/SafeExamBrowser.UserInterface.Desktop/Properties/AssemblyInfo.cs index ac7669d7..6a6c2422 100644 --- a/SafeExamBrowser.UserInterface.Desktop/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.UserInterface.Desktop/Properties/AssemblyInfo.cs @@ -48,3 +48,4 @@ using System.Windows; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.UserInterface.Mobile/Properties/AssemblyInfo.cs b/SafeExamBrowser.UserInterface.Mobile/Properties/AssemblyInfo.cs index e947bf2f..bfdf9c26 100644 --- a/SafeExamBrowser.UserInterface.Mobile/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.UserInterface.Mobile/Properties/AssemblyInfo.cs @@ -48,3 +48,4 @@ using System.Windows; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/SafeExamBrowser.WindowsApi/Properties/AssemblyInfo.cs b/SafeExamBrowser.WindowsApi/Properties/AssemblyInfo.cs index 648d7710..bf6e823a 100644 --- a/SafeExamBrowser.WindowsApi/Properties/AssemblyInfo.cs +++ b/SafeExamBrowser.WindowsApi/Properties/AssemblyInfo.cs @@ -30,3 +30,4 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/appveyor.yml b/appveyor.yml index d017ef71..b31df840 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,12 +1,19 @@ +version: 3.0.0.{build} image: Visual Studio 2017 platform: x86 configuration: Release +assembly_info: + patch: true + file: AssemblyInfo.* + assembly_version: "{version}" + assembly_file_version: "{version}" + assembly_informational_version: "{version} (alpha)" before_build: - nuget restore build_script: - msbuild /verbosity:minimal "SafeExamBrowser.sln" test_script: - - .\packages\OpenCover.4.7.922\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor SafeExamBrowser.Client.UnitTests\bin\%PLATFORM%\%CONFIGURATION%\SafeExamBrowser.Client.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]* -[*Moq*]*" -mergebyhash -output:"coverage.xml" + - .\packages\OpenCover.4.7.922\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor .\SafeExamBrowser.Client.UnitTests\bin\%PLATFORM%\%CONFIGURATION%\SafeExamBrowser.Client.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]* -[*Moq*]*" -mergebyhash -output:"coverage.xml" - .\packages\OpenCover.4.7.922\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor .\SafeExamBrowser.Communication.UnitTests\bin\%PLATFORM%\%CONFIGURATION%\SafeExamBrowser.Communication.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]* -[*Moq*]*" -mergebyhash -mergeoutput -output:"coverage.xml" - .\packages\OpenCover.4.7.922\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor .\SafeExamBrowser.Configuration.UnitTests\bin\%PLATFORM%\%CONFIGURATION%\SafeExamBrowser.Configuration.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]* -[*Moq*]*" -mergebyhash -mergeoutput -output:"coverage.xml" - .\packages\OpenCover.4.7.922\tools\OpenCover.Console.exe -register:user -target:"vstest.console.exe" -targetargs:"/logger:Appveyor .\SafeExamBrowser.Core.UnitTests\bin\%PLATFORM%\%CONFIGURATION%\SafeExamBrowser.Core.UnitTests.dll" -filter:"+[*]* -[*.UnitTests]* -[*Moq*]*" -mergebyhash -mergeoutput -output:"coverage.xml"