2004-05-02 Duncan Mak <duncan@ximian.com>

	* Microsoft.Vsa/Assembly/AssemblyInfo.cs: Add assembly-level
	attributes for versioning (1.0 vs. 1.1 vs. 2.0).

svn path=/trunk/mcs/; revision=26557

diff --git a/mcs/class/ChangeLog b/mcs/class/ChangeLog
index 19da04ab967012bcc8ae74921b88a68ac1d24d70..079840073a9eab52ae3aeb93d25d878b07113176 100644 (file)
--- a/mcs/class/ChangeLog
+++ b/mcs/class/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-02  Duncan Mak  <duncan@ximian.com>
+
+       * Microsoft.Vsa/Assembly/AssemblyInfo.cs: Add assembly-level
+       attributes for versioning (1.0 vs. 1.1 vs. 2.0).
+
 2004-04-22  Martin Baulig  <martin@ximian.com>
 
        Renamed the `NET_1_2' conditional to `NET_2_0' in all files.

diff --git a/mcs/class/Microsoft.VisualBasic/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.VisualBasic/Assembly/AssemblyInfo.cs
index a4f8c4c1e3390c797612f664871e4ec998b3ec5c..62b01540025b535b078d185a9bbf30973419e3c3 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Microsoft.VisualBasic/Assembly/AssemblyInfo.cs
@@ -27,7 +27,6 @@ using System.Runtime.InteropServices;
        [assembly: SatelliteContractVersion("7.0.3300.0")]
 #endif
 
-
 [assembly: AssemblyTitle("Microsoft.VisualBasic.dll")]
 [assembly: AssemblyDescription("Microsoft.VisualBasic.dll")]
 [assembly: AssemblyCompany("MONO development team")]

diff --git a/mcs/class/Microsoft.Vsa/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.Vsa/Assembly/AssemblyInfo.cs
index feca6b5a2a51216b1278f314d0237c8221176201..c3a99705d60fe58ee0cafda9924c7b1bfe146b69 100755 (executable)
--- a/mcs/class/Microsoft.Vsa/Assembly/AssemblyInfo.cs
+++ b/mcs/class/Microsoft.Vsa/Assembly/AssemblyInfo.cs
@@ -9,15 +9,19 @@
 
 using System;
 using System.Reflection;
+using System.Resources;
 using System.Runtime.InteropServices;
 
-/* TODO COMPLETE INFORMATION
-
-#if (NET_1_0)
-       [assembly: AssemblyVersion ("1.0.3300.0")]
-#endif
-#if (NET_1_1)
-       [assembly: AssemblyVersion ("1.0.5000.0")]
+#if (NET_2_0)
+       [assembly: AssemblyVersion ("2.0.3600.0")]
+#elif (NET_1_1)
+       [assembly: AssemblyVersion("7.0.5000.0")]
+       [assembly: SatelliteContractVersion("7.0.5000.0")]
+       [assembly: ComCompatibleVersion(7, 0, 3300, 0)]
+       [assembly: TypeLibVersion(7, 1)]
+#else
+       [assembly: AssemblyVersion("7.0.3300.0")]
+       [assembly: SatelliteContractVersion("7.0.3300.0")]
 #endif
 
 [assembly: AssemblyTitle ("")]
@@ -28,8 +32,6 @@ using System.Runtime.InteropServices;
 
 [assembly: ComVisible (false)]
 
-*/
-
 [assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile("../msfinal.pub")]