diff options
| author | Morgan Brown <morganbr@users.noreply.github.com> | 2017-05-26 19:13:06 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-05-28 11:03:00 -0700 |
| commit | 42b5e15d656ac466ece6587005ffb646d4c9e9a3 (patch) | |
| tree | df3d10d40d64beef00ef1cacc272fc1ddb1f0c81 /src | |
| parent | 68570e183b2dc53682079d8ab4dac24f893aebfa (diff) | |
| download | coreclr-42b5e15d656ac466ece6587005ffb646d4c9e9a3.tar.gz coreclr-42b5e15d656ac466ece6587005ffb646d4c9e9a3.tar.bz2 coreclr-42b5e15d656ac466ece6587005ffb646d4c9e9a3.zip | |
Fix build breaks
* Remove UnitySerializationHolder references
* Remove the fields of StrongNameKeyPair
* Initialize BadImageFormatException._fusionLog
* Remove MemberInfoSerializationHolder references
Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mscorlib/shared/System/BadImageFormatException.cs | 2 | ||||
| -rw-r--r-- | src/mscorlib/shared/System/Reflection/StrongNameKeyPair.cs | 16 |
2 files changed, 3 insertions, 15 deletions
diff --git a/src/mscorlib/shared/System/BadImageFormatException.cs b/src/mscorlib/shared/System/BadImageFormatException.cs index 6bed5e9b78..adedcb2a3f 100644 --- a/src/mscorlib/shared/System/BadImageFormatException.cs +++ b/src/mscorlib/shared/System/BadImageFormatException.cs @@ -20,7 +20,7 @@ namespace System public partial class BadImageFormatException : SystemException { private String _fileName; // The name of the corrupt PE file. - private String _fusionLog; // fusion log (when applicable) + private String _fusionLog = null; // fusion log (when applicable) public BadImageFormatException() : base(SR.Arg_BadImageFormatException) diff --git a/src/mscorlib/shared/System/Reflection/StrongNameKeyPair.cs b/src/mscorlib/shared/System/Reflection/StrongNameKeyPair.cs index 6efa626946..a0ba97f835 100644 --- a/src/mscorlib/shared/System/Reflection/StrongNameKeyPair.cs +++ b/src/mscorlib/shared/System/Reflection/StrongNameKeyPair.cs @@ -9,11 +9,6 @@ namespace System.Reflection { public class StrongNameKeyPair : IDeserializationCallback, ISerializable { - private bool _keyPairExported; - private byte[] _keyPairArray; - private string _keyPairContainer; - private byte[] _publicKey; - // Build key pair from file. public StrongNameKeyPair(FileStream keyPairFile) { @@ -21,10 +16,8 @@ namespace System.Reflection throw new ArgumentNullException(nameof(keyPairFile)); int length = (int)keyPairFile.Length; - _keyPairArray = new byte[length]; - keyPairFile.Read(_keyPairArray, 0, length); - - _keyPairExported = true; + byte[] keyPairArray = new byte[length]; + keyPairFile.Read(keyPairArray, 0, length); } // Build key pair from byte array in memory. @@ -32,11 +25,6 @@ namespace System.Reflection { if (keyPairArray == null) throw new ArgumentNullException(nameof(keyPairArray)); - - _keyPairArray = new byte[keyPairArray.Length]; - Array.Copy(keyPairArray, _keyPairArray, keyPairArray.Length); - - _keyPairExported = true; } protected StrongNameKeyPair(SerializationInfo info, StreamingContext context) |