diff options
| author | Andreas N <andreas@mono-cvs.ximian.com> | 2003-07-12 21:40:25 +0400 |
|---|---|---|
| committer | Andreas N <andreas@mono-cvs.ximian.com> | 2003-07-12 21:40:25 +0400 |
| commit | 550e0645c63e3d27a953707d8c180368adf941da (patch) | |
| tree | daab9e28c542bdfd95fa3e1333fd9d070289e06c /mcs/class/System/Assembly | |
| parent | f4ca9969f58d33a52ccb8f307052a8d9f9c37988 (diff) | |
2003-07-12 Andreas Nahr <ClassDevelopment@A-SoftTech.com>
* AssemblyInfo.cs: Added support for .Net 1.0 build
svn path=/trunk/mcs/; revision=16147
Diffstat (limited to 'mcs/class/System/Assembly')
| -rw-r--r-- | mcs/class/System/Assembly/AssemblyInfo.cs | 17 | ||||
| -rw-r--r-- | mcs/class/System/Assembly/ChangeLog | 4 |
2 files changed, 16 insertions, 5 deletions
diff --git a/mcs/class/System/Assembly/AssemblyInfo.cs b/mcs/class/System/Assembly/AssemblyInfo.cs index 67633abd5a9..0405a1d6115 100644 --- a/mcs/class/System/Assembly/AssemblyInfo.cs +++ b/mcs/class/System/Assembly/AssemblyInfo.cs @@ -4,7 +4,7 @@ // Author: // Andreas Nahr (ClassDevelopment@A-SoftTech.com) // -// (C) 2002 Ximian, Inc. http://www.ximian.com +// (C) 2003 Ximian, Inc. http://www.ximian.com // using System; @@ -15,21 +15,28 @@ using System.Runtime.CompilerServices; // General Information about the system assembly -[assembly: AssemblyVersion("1.0.5000.0")] +#if (NET_1_0) + [assembly: AssemblyVersion("1.0.3300.0")] + [assembly: SatelliteContractVersion("1.0.3300.0")] +#endif +#if (NET_1_1) + [assembly: AssemblyVersion("1.0.5000.0")] + [assembly: SatelliteContractVersion("1.0.5000.0")] +#endif [assembly: AssemblyTitle("System.dll")] [assembly: AssemblyDescription("System.dll")] [assembly: AssemblyConfiguration("Development version")] -[assembly: AssemblyCompany("MONO dev team")] +[assembly: AssemblyCompany("MONO development team")] [assembly: AssemblyProduct("MONO CLI")] -[assembly: AssemblyCopyright("Various Authors")] +[assembly: AssemblyCopyright("(c) 2003 Various Authors")] [assembly: AssemblyTrademark("")] [assembly: CLSCompliant(true)] [assembly: AssemblyDefaultAlias("System.dll")] [assembly: AssemblyInformationalVersion("0.0.0.1")] [assembly: NeutralResourcesLanguage("en-US")] -[assembly: SatelliteContractVersion("1.0.5000.0")] + [assembly: AllowPartiallyTrustedCallers] //[assembly: AssemblyDelaySign(false)] diff --git a/mcs/class/System/Assembly/ChangeLog b/mcs/class/System/Assembly/ChangeLog index dfb61d2cbe6..fce7ab35f4b 100644 --- a/mcs/class/System/Assembly/ChangeLog +++ b/mcs/class/System/Assembly/ChangeLog @@ -1,3 +1,7 @@ +2003-07-12 Andreas Nahr <ClassDevelopment@A-SoftTech.com> + + * AssemblyInfo.cs: Added support for .Net 1.0 build + 2003-07-10 Andreas Nahr <ClassDevelopment@A-SoftTech.com> * AssemblyInfo.cs: Added |