From dcdf9ebcf826912b8e28845bf73d1054d0cde659 Mon Sep 17 00:00:00 2001 From: Tim Danner Date: Thu, 4 Jun 2015 14:01:26 -0500 Subject: [PATCH] Move AssemblyVersion and AssemblyFileVersion attributes back to the separate AssemblyInfo.cs files so I can set the version from TeamCity. --- Src/CommonAssemblyInfo.cs | 7 ------- Src/Contract/Properties/AssemblyInfo.cs | 3 +++ Src/Logging/Properties/AssemblyInfo.cs | 3 +++ Src/SwisPowerShell/Properties/AssemblyInfo.cs | 3 +++ Src/SwqlStudio/Properties/AssemblyInfo.cs | 3 +++ 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Src/CommonAssemblyInfo.cs b/Src/CommonAssemblyInfo.cs index 5f8bdcd33..201b3ced9 100644 --- a/Src/CommonAssemblyInfo.cs +++ b/Src/CommonAssemblyInfo.cs @@ -2,10 +2,3 @@ [assembly: AssemblyCompany("SolarWinds, Inc.")] [assembly: AssemblyCopyright("Copyright © 2015 SolarWinds Worldwide, LLC. All rights reserved.")] -[assembly: AssemblyVersion(GlobalConstants.Version)] -[assembly: AssemblyFileVersion(GlobalConstants.Version)] - -internal static class GlobalConstants -{ - public const string Version = "1.11.0.0"; -} diff --git a/Src/Contract/Properties/AssemblyInfo.cs b/Src/Contract/Properties/AssemblyInfo.cs index a03de0269..a29138713 100644 --- a/Src/Contract/Properties/AssemblyInfo.cs +++ b/Src/Contract/Properties/AssemblyInfo.cs @@ -22,3 +22,6 @@ [assembly: InternalsVisibleTo("InformationService.Contract.Tests")] [assembly: InternalsVisibleTo("SolarWinds.InformationService.Core.Tests")] + +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Src/Logging/Properties/AssemblyInfo.cs b/Src/Logging/Properties/AssemblyInfo.cs index 8d56f1735..d3eb62d09 100644 --- a/Src/Logging/Properties/AssemblyInfo.cs +++ b/Src/Logging/Properties/AssemblyInfo.cs @@ -18,3 +18,6 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("0df76c47-6a23-4147-a215-251bcdb09452")] + +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Src/SwisPowerShell/Properties/AssemblyInfo.cs b/Src/SwisPowerShell/Properties/AssemblyInfo.cs index a945a794e..cdfd087cc 100644 --- a/Src/SwisPowerShell/Properties/AssemblyInfo.cs +++ b/Src/SwisPowerShell/Properties/AssemblyInfo.cs @@ -18,3 +18,6 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("8660f489-de80-4bf6-be1f-b48f05e42188")] + +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Src/SwqlStudio/Properties/AssemblyInfo.cs b/Src/SwqlStudio/Properties/AssemblyInfo.cs index 60e9f1ce9..139bb5f76 100644 --- a/Src/SwqlStudio/Properties/AssemblyInfo.cs +++ b/Src/SwqlStudio/Properties/AssemblyInfo.cs @@ -18,3 +18,6 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("85e57129-3aa6-4c0c-9532-c1167a4195cc")] + +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")]