Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@@ -46,7 +46,10 @@ namespace System.Reflection {
private Version _Version;
private StrongNameKeyPair _StrongNameKeyPair;
#if FEATURE_SERIALIZATION
private SerializationInfo m_siInfo; //A temporary variable which we need during deserialization.
#endif
private byte[] _HashForControl;
private AssemblyHashAlgorithm _HashAlgorithm;
@@ -94,10 +97,12 @@ namespace System.Reflection {
public String CultureName
{
get
{
get {
return (_CultureInfo == null) ? null : _CultureInfo.Name;
}
set {
_CultureInfo = (value == null) ? null : new CultureInfo(value);
}
}
public String CodeBase
@@ -309,6 +314,7 @@ namespace System.Reflection {
return s;
}
#if FEATURE_SERIALIZATION
[System.Security.SecurityCritical] // auto-generated_required
public void GetObjectData(SerializationInfo info, StreamingContext context)
{
@@ -367,6 +373,14 @@ namespace System.Reflection {
m_siInfo = null;
}
// Constructs a new AssemblyName during deserialization.
internal AssemblyName(SerializationInfo info, StreamingContext context)
{
//The graph is not valid until OnDeserialization() has been called.
m_siInfo = info;
}
#endif // FEATURE_SERIALIZATION
[System.Security.SecuritySafeCritical] // auto-generated
public AssemblyName(String assemblyName)
{
@@ -418,13 +432,6 @@ namespace System.Reflection {
nInit(out dummy, false, false);
}
// Constructs a new AssemblyName during deserialization.
internal AssemblyName(SerializationInfo info, StreamingContext context)
{
//The graph is not valid until OnDeserialization() has been called.
m_siInfo = info;
}
internal void SetProcArchIndex(PortableExecutableKinds pek, ImageFileMachine ifm)
{
ProcessorArchitecture = CalculateProcArchIndex(pek, ifm, _Flags);
@@ -503,6 +510,7 @@ namespace System.Reflection {
_StrongNameKeyPair = keyPair;
}
#if !FEATURE_CORECLR
void _AssemblyName.GetTypeInfoCount(out uint pcTInfo)
{
throw new NotImplementedException();
@@ -522,6 +530,7 @@ namespace System.Reflection {
{
throw new NotImplementedException();
}
#endif
#if FEATURE_APTCA
internal string GetNameWithPublicKey()