diff options
| author | Sebastien Pouliot <sebastien@ximian.com> | 2005-09-09 03:25:51 +0400 |
|---|---|---|
| committer | Sebastien Pouliot <sebastien@ximian.com> | 2005-09-09 03:25:51 +0400 |
| commit | 8e80fefe0e309e360839e2e173ef34a95ad44cb0 (patch) | |
| tree | a0da5ff6d6c9aebd5ee4277291b0bdb2b5e0f743 | |
| parent | 2f164e665329c6561bca2c9f2d2f4b1b8120abc3 (diff) | |
2005-09-08 Sebastien Pouliot <sebastien@ximian.com>
* AssemblyName.cs: Apply second half of Chris Micacchi's patch
svn path=/trunk/mcs/; revision=49755
| -rw-r--r-- | mcs/class/corlib/System.Reflection/AssemblyName.cs | 2 | ||||
| -rw-r--r-- | mcs/class/corlib/System.Reflection/ChangeLog | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mcs/class/corlib/System.Reflection/AssemblyName.cs b/mcs/class/corlib/System.Reflection/AssemblyName.cs index 874cac7a244..579b07eb1e8 100644 --- a/mcs/class/corlib/System.Reflection/AssemblyName.cs +++ b/mcs/class/corlib/System.Reflection/AssemblyName.cs @@ -262,7 +262,7 @@ namespace System.Reflection { info.AddValue ("_Name", name); info.AddValue ("_PublicKey", publicKey); - info.AddValue ("_PublicToken", keyToken); + info.AddValue ("_PublicKeyToken", keyToken); info.AddValue ("_CultureInfo", cultureinfo != null ? cultureinfo.LCID : -1); info.AddValue ("_CodeBase", codebase); info.AddValue ("_Version", Version); diff --git a/mcs/class/corlib/System.Reflection/ChangeLog b/mcs/class/corlib/System.Reflection/ChangeLog index df60e7a84f0..4567ac0ad94 100644 --- a/mcs/class/corlib/System.Reflection/ChangeLog +++ b/mcs/class/corlib/System.Reflection/ChangeLog @@ -1,3 +1,7 @@ +2005-09-08 Sebastien Pouliot <sebastien@ximian.com> + + * AssemblyName.cs: Apply second half of Chris Micacchi's patch + 2005-09-07 Miguel de Icaza <miguel@novell.com> * AssemblyName.cs: Apply patch from Chris Micacchi to serialize |