Temporarily removed svn version stamping in assembly info, to avoid excessive check-ins of changed files. Need to implement solution that generates these files from templates instead.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@613130 13f79535-47bb-0310-9956-ffa450edef68

15 files changed, 25 insertions, 31 deletions

diff --git a/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs b/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
index a8058ad6d0..fa7f41dbda 100644
--- a/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information

 // associated with an assembly.

 [assembly: AssemblyTitle("Apache.Qpid.Buffer.Tests")]

-[assembly: AssemblyDescription("Built from svn revision number:  612518:612870M")]

+[assembly: AssemblyDescription("Built from svn revision number: ")]

 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("Apache Software Foundation")]

 [assembly: AssemblyProduct("Apache.Qpid.Buffer.Tests")]

diff --git a/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs b/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
index 4ee5d11647..f8fa3f97b9 100644
--- a/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
@@ -24,7 +24,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Apache.Qpid.ByteBuffer")]
-[assembly: AssemblyDescription("Built from svn revision number:  612518:612870M")]
+[assembly: AssemblyDescription("Built from svn revision number: ")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Apache Software Foundation")]
 [assembly: AssemblyProduct("Apache.Qpid.ByteBuffer")]
diff --git a/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs b/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
index 1c8fa8ee97..6359567f04 100644
--- a/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
@@ -27,7 +27,7 @@ using log4net.Config;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Apache.Qpid.Client.Tests")]
-[assembly: AssemblyDescription("Built from svn revision number:  612518:612870M")]
+[assembly: AssemblyDescription("Built from svn revision number: ")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Apache Software Foundation")]
 [assembly: AssemblyProduct("Apache.Qpid.Client.Tests")]
diff --git a/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs b/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
index 8ededdf228..e50bacdfc7 100644
--- a/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
@@ -24,7 +24,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Apache.Qpid.Transport.Blocking")]
-[assembly: AssemblyDescription("Built from svn revision number:  612518:612870M")]
+[assembly: AssemblyDescription("Built from svn revision number: ")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Apache Software Foundation")]
 [assembly: AssemblyProduct("Apache.Qpid.Transport.Blocking")]
diff --git a/dotnet/Qpid.Client/Properties/AssemblyInfo.cs b/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
index 627a7297b8..4343c30bf5 100644
--- a/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
@@ -24,7 +24,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Apache.Qpid.Client")]
-[assembly: AssemblyDescription("Built from svn revision number:  612518:612870M")]
+[assembly: AssemblyDescription("Built from svn revision number: ")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Apache Software Foundation")]
 [assembly: AssemblyProduct("Apache.Qpid.Client")]
diff --git a/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs b/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
index 4e9c22fe94..4729dc6ab8 100644
--- a/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
@@ -24,7 +24,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Apache.Qpid.Codec")]
-[assembly: AssemblyDescription("Built from svn revision number:  612518:612870M")]
+[assembly: AssemblyDescription("Built from svn revision number: ")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Apache Software Foundation")]
 [assembly: AssemblyProduct("Apache.Qpid.Codec")]
diff --git a/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs b/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
index 3b334bbfd8..96a94b6498 100644
--- a/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
@@ -4,7 +4,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Apache.Qpid.Common.Tests")]
-[assembly: AssemblyDescription("Built from svn revision number:  612518:612870M")]
+[assembly: AssemblyDescription("Built from svn revision number: ")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Apache Software Foundation")]
 [assembly: AssemblyProduct("Apache.Qpid.Common.Tests")]
diff --git a/dotnet/Qpid.Common/Properties/AssemblyInfo.cs b/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
index a7e48637ff..3d3f444f3e 100644
--- a/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
@@ -24,7 +24,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Apache.Qpid.Common")]
-[assembly: AssemblyDescription("Built from svn revision number:  612518:612870M")]
+[assembly: AssemblyDescription("Built from svn revision number: ")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Apache Software Foundation")]
 [assembly: AssemblyProduct("Apache.Qpid.Common")]
diff --git a/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs b/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
index 46ba734c9f..ab14b1faf0 100644
--- a/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Apache.Qpid.Messaging")]
-[assembly: AssemblyDescription("Built from svn revision number:  612518:612870M")]
+[assembly: AssemblyDescription("Built from svn revision number: ")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Apache Software Foundation")]
 [assembly: AssemblyProduct("Apache.Qpid.Messaging")]
diff --git a/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs b/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
index 77892680a1..74665f7b73 100644
--- a/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information

 // associated with an assembly.

 [assembly: AssemblyTitle("Apache.Qpid.Sasl.Tests")]

-[assembly: AssemblyDescription("Built from svn revision number:  612518:612870M")]

+[assembly: AssemblyDescription("Built from svn revision number: ")]

 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("Apache Software Foundation")]

 [assembly: AssemblyProduct("Apache.Qpid.Sasl.Tests")]

diff --git a/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs b/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
index 4a98e78ea4..8b4f9ce230 100644
--- a/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
+++ b/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information

 // associated with an assembly.

 [assembly: AssemblyTitle("Apache.Qpid.Sasl")]

-[assembly: AssemblyDescription("Built from svn revision number:  612518:612870M")]

+[assembly: AssemblyDescription("Built from svn revision number: ")]

 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("Apache Software Foundation")]

 [assembly: AssemblyProduct("Apache.Qpid.Sasl")]

diff --git a/dotnet/TestClient/Properties/AssemblyInfo.cs b/dotnet/TestClient/Properties/AssemblyInfo.cs
index 315c831bec..f230a443f0 100644
--- a/dotnet/TestClient/Properties/AssemblyInfo.cs
+++ b/dotnet/TestClient/Properties/AssemblyInfo.cs
@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information

 // associated with an assembly.

 [assembly: AssemblyTitle("TestClient")]

-[assembly: AssemblyDescription("Built from svn revision number:  612518:612870M")]

+[assembly: AssemblyDescription("Built from svn revision number: ")]

 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("Apache Software Foundation")]

 [assembly: AssemblyProduct("TestClient")]

diff --git a/dotnet/TopicListener/Properties/AssemblyInfo.cs b/dotnet/TopicListener/Properties/AssemblyInfo.cs
index b39f394d71..7a37b285fc 100644
--- a/dotnet/TopicListener/Properties/AssemblyInfo.cs
+++ b/dotnet/TopicListener/Properties/AssemblyInfo.cs
@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information

 // associated with an assembly.

 [assembly: AssemblyTitle("TopicListener")]

-[assembly: AssemblyDescription("Built from svn revision number:  612518:612870M")]

+[assembly: AssemblyDescription("Built from svn revision number: ")]

 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("Apache Software Foundation")]

 [assembly: AssemblyProduct("TopicListener")]

diff --git a/dotnet/TopicPublisher/Properties/AssemblyInfo.cs b/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
index 9fa32935ab..d9585963d9 100644
--- a/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
+++ b/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information

 // associated with an assembly.

 [assembly: AssemblyTitle("TopicPublisher")]

-[assembly: AssemblyDescription("Built from svn revision number:  612518:612870M")]

+[assembly: AssemblyDescription("Built from svn revision number: ")]

 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("Apache Software Foundation")]

 [assembly: AssemblyProduct("TopicPublisher")]

diff --git a/dotnet/default.build b/dotnet/default.build
index f41709c154..5dafa7fd9c 100644
--- a/dotnet/default.build
+++ b/dotnet/default.build
@@ -115,34 +115,28 @@
                         reader.Close();

 

                         // Substitute the version numbers.

-                        string replacement = string.Format(

-                                                           "[assembly: AssemblyVersion(\"{0}.{1}.{2}.{3}\")]",

+                        string replacement = string.Format("[assembly: AssemblyVersion(\"{0}.{1}.{2}.{3}\")]",

                                                            project.Properties["build.version.major"],

                                                            project.Properties["build.version.minor"],

                                                            project.Properties["build.version.build"],

-                                                           project.Properties["build.version.revision"]

-                                                           );

+                                                           project.Properties["build.version.revision"]);

                         contents = Regex.Replace(contents, @"\[assembly: AssemblyVersion\("".*""\)\]", replacement);

 

                         // Substitute the company name and copyright.

-                        replacement = string.Format(

-                                                           "[assembly: AssemblyCompany(\"{0}\")]",

-                                                           project.Properties["build.company"]

-                                                           );

+                        replacement = string.Format("[assembly: AssemblyCompany(\"{0}\")]",

+                                                    project.Properties["build.company"]);

                         contents = Regex.Replace(contents, @"\[assembly: AssemblyCompany\("".*""\)\]", replacement);

 

-                        replacement = string.Format(

-                                                           "[assembly: AssemblyCopyright(\"{0}\")]",

-                                                           project.Properties["build.copyright"]

-                                                           );

+                        replacement = string.Format("[assembly: AssemblyCopyright(\"{0}\")]",

+                                                    project.Properties["build.copyright"]);

                         contents = Regex.Replace(contents, @"\[assembly: AssemblyCopyright\("".*""\)\]", replacement);

 

                         // Update the description.

-                        replacement = string.Format(

-                                                           "[assembly: AssemblyDescription(\"{0} {1}\")]",

-                                                           project.Properties["build.description"],

-                                                           project.Properties["build.svnversion"]

-                                                           );

+                        //replacement = string.Format("[assembly: AssemblyDescription(\"{0} {1}\")]",

+                        //                            project.Properties["build.description"],

+                        //                            project.Properties["build.svnversion"]);

+                        replacement = string.Format("[assembly: AssemblyDescription(\"{0}\")]",

+                                                    project.Properties["build.description"]);

                         contents = Regex.Replace(contents, @"\[assembly: AssemblyDescription\("".*""\)\]", replacement);

 

                         // Write out the file with the substituted version.