From f58b2872781054c90727ee20de6096f357044c49 Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Tue, 6 Dec 2016 23:54:37 +0100 Subject: [PATCH] Streamline assembly versions (#153) * Align all component versions to 2.0.* * Enable patching of assemblies in AppVeyor * Fix the slash * And escaping... --- appveyor.yml | 9 ++++++++- src/Core/ServiceWrapper/Properties/AssemblyInfo.cs | 4 ++-- src/Core/ServiceWrapper/pom.xml | 2 +- src/Core/WinSWCore/Properties/AssemblyInfo.cs | 4 ++-- .../RunawayProcessKiller/Properties/AssemblyInfo.cs | 4 ++-- .../SharedDirectoryMapper/Properties/AssemblyInfo.cs | 4 ++-- src/Test/winswTests/Properties/AssemblyInfo.cs | 4 ++-- 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2fac0f1..0b56dbb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ -version: 2.0.0.{build} +version: 2.0.{build} # Do not build on tags (GitHub and BitBucket) skip_tags: true @@ -22,6 +22,13 @@ before_build: # Generates a temporary SNK. Not for real signing - cmd: "\"C:/Program Files/Microsoft SDKs/Windows/v7.1/Bin/sn.exe\" -k winsw_key.snk" +assembly_info: + patch: true + file: "**\\AssemblyInfo.*" + assembly_version: $(appveyor_build_version) + assembly_file_version: $(appveyor_build_version) + assembly_informational_version: '$(appveyor_build_version)-rc' + build: parallel: true project: src\winsw.sln diff --git a/src/Core/ServiceWrapper/Properties/AssemblyInfo.cs b/src/Core/ServiceWrapper/Properties/AssemblyInfo.cs index 5be6403..5456f5d 100644 --- a/src/Core/ServiceWrapper/Properties/AssemblyInfo.cs +++ b/src/Core/ServiceWrapper/Properties/AssemblyInfo.cs @@ -28,5 +28,5 @@ using System.Runtime.InteropServices; // 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("1.19.1.0")] -[assembly: AssemblyFileVersion("1.19.1.0")] +[assembly: AssemblyVersion("2.0.*")] +[assembly: AssemblyFileVersion("2.0.*")] diff --git a/src/Core/ServiceWrapper/pom.xml b/src/Core/ServiceWrapper/pom.xml index 3d1d934..3cd15f7 100755 --- a/src/Core/ServiceWrapper/pom.xml +++ b/src/Core/ServiceWrapper/pom.xml @@ -3,7 +3,7 @@ com.sun.winsw winsw pom - 1.19.2-SNAPSHOT + 2.0-SNAPSHOT Windows service wrapper diff --git a/src/Core/WinSWCore/Properties/AssemblyInfo.cs b/src/Core/WinSWCore/Properties/AssemblyInfo.cs index 5cb6f2a..a21c377 100644 --- a/src/Core/WinSWCore/Properties/AssemblyInfo.cs +++ b/src/Core/WinSWCore/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("2.0.*")] +[assembly: AssemblyFileVersion("2.0.*")] diff --git a/src/Plugins/RunawayProcessKiller/Properties/AssemblyInfo.cs b/src/Plugins/RunawayProcessKiller/Properties/AssemblyInfo.cs index a0f90d5..a86ad03 100644 --- a/src/Plugins/RunawayProcessKiller/Properties/AssemblyInfo.cs +++ b/src/Plugins/RunawayProcessKiller/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("2.0.*")] +[assembly: AssemblyFileVersion("2.0.*")] diff --git a/src/Plugins/SharedDirectoryMapper/Properties/AssemblyInfo.cs b/src/Plugins/SharedDirectoryMapper/Properties/AssemblyInfo.cs index 5d8fa29..bc7eb3d 100644 --- a/src/Plugins/SharedDirectoryMapper/Properties/AssemblyInfo.cs +++ b/src/Plugins/SharedDirectoryMapper/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("2.0.*")] +[assembly: AssemblyFileVersion("2.0.*")] diff --git a/src/Test/winswTests/Properties/AssemblyInfo.cs b/src/Test/winswTests/Properties/AssemblyInfo.cs index 2c8f6a6..22480bd 100644 --- a/src/Test/winswTests/Properties/AssemblyInfo.cs +++ b/src/Test/winswTests/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // 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("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("2.0.*")] +[assembly: AssemblyFileVersion("2.0.*")]