diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2004-06-24 18:43:35 +0400 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2004-06-24 18:43:35 +0400 |
| commit | f6e4fb2e6a008d338b24b0bfd098851fbc8c01db (patch) | |
| tree | 9c1e74a231a913c396e2d70285fb881c956f989f /mcs/class/ICSharpCode.SharpZipLib | |
| parent | cd66bf819254299c5cd97d92cc6a4be3390cf222 (diff) | |
* IBM.Data.DB2/Makefile: Disable for 'net_2_0'.
* ICSharpCode.SharpZipLib/AssemblyInfo.cs (AssemblyVersion): Set different version for the
net_2_0 profile.
svn path=/trunk/mcs/; revision=30315
Diffstat (limited to 'mcs/class/ICSharpCode.SharpZipLib')
| -rw-r--r-- | mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs | 5 | ||||
| -rw-r--r-- | mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/ChangeLog | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs b/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs index 0d12d34a500..a7be065d43d 100644 --- a/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs +++ b/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs @@ -47,7 +47,12 @@ using System.Runtime.CompilerServices; [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
+#if NET_2_0 +[assembly: AssemblyVersion("2.6.0.0")]
+#else +// not worrying about the NET_1_0 profile for now. [assembly: AssemblyVersion("0.6.0.0")]
+#endif [assembly: AssemblyDelaySign(true)]
[assembly: AssemblyKeyFile ("SharpZipLib.pub")]
diff --git a/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/ChangeLog b/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/ChangeLog index b22e95fb173..514b0719bf6 100644 --- a/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/ChangeLog +++ b/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/ChangeLog @@ -1,5 +1,10 @@ +2004-06-24 Raja R Harinath <rharinath@novell.com> + + * AssemblyInfo.cs (AssemblyVersion): Set different version for the + net_2_0 profile. + 2004-05-28 Duncan Mak <duncan@ximian.com> * AssemblyInfo.cs: Use the new SharpZipLib.pub. * Zip/Compression/DeflaterHuffman.cs (FlushBlock): Add some - parenthesis to help the generics compiler read this source.
\ No newline at end of file + parenthesis to help the generics compiler read this source. |