diff options
| author | Boris Kirzner <borisk@mono-cvs.ximian.com> | 2005-05-29 18:36:27 +0400 |
|---|---|---|
| committer | Boris Kirzner <borisk@mono-cvs.ximian.com> | 2005-05-29 18:36:27 +0400 |
| commit | 32a7d770ef1bfcb29f197f0817b52d69351eb92c (patch) | |
| tree | 90954ab7b88c704c5a109224d63aaff9f69e88f3 /mcs/class/System.Data/Assembly | |
| parent | df9e42ed38d2b2a8461e4d3bf2d73330bf01e148 (diff) | |
Changes toward common code base with TARGET_JVM
svn path=/trunk/mcs/; revision=45163
Diffstat (limited to 'mcs/class/System.Data/Assembly')
| -rw-r--r-- | mcs/class/System.Data/Assembly/AssemblyInfo.cs | 4 | ||||
| -rw-r--r-- | mcs/class/System.Data/Assembly/ChangeLog | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/mcs/class/System.Data/Assembly/AssemblyInfo.cs b/mcs/class/System.Data/Assembly/AssemblyInfo.cs index 68dcfca3b43..d9c34bbeea1 100644 --- a/mcs/class/System.Data/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.Data/Assembly/AssemblyInfo.cs @@ -60,7 +60,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("(c) 2003 Various Authors")] [assembly: AssemblyTrademark("")] +#if !TARGET_JVM [assembly: CLSCompliant(true)] +#endif [assembly: AssemblyDefaultAlias("System.Data.dll")] [assembly: AssemblyInformationalVersion("0.0.0.1")] [assembly: NeutralResourcesLanguage("en-US")] @@ -69,4 +71,6 @@ using System.Runtime.InteropServices; [assembly: AllowPartiallyTrustedCallers] [assembly: AssemblyDelaySign(true)] +#if !TARGET_JVM [assembly: AssemblyKeyFile("../ecma.pub")] +#endif diff --git a/mcs/class/System.Data/Assembly/ChangeLog b/mcs/class/System.Data/Assembly/ChangeLog index af1e0492668..608c761d11c 100644 --- a/mcs/class/System.Data/Assembly/ChangeLog +++ b/mcs/class/System.Data/Assembly/ChangeLog @@ -1,3 +1,7 @@ +2005-05-29 Boris Kirzner <borisk@mainsoft.com> + + * AssemblyInfo.cs: added #if !TARGET_JVM for attribues not currently supported in TARGET_JVM. + 2004-04-06 Andreas Nahr <ClassDevelopment@A-SoftTech.com> * AssemblyInfo.cs: also remove the fixme |