diff options
| author | Alex Perovich <alperovi@microsoft.com> | 2017-03-24 23:11:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-24 23:11:49 +0300 |
| commit | 42de63265bc8b4a75c96c48eb464f6c0dd7fdcac (patch) | |
| tree | da8119c3ae6659a68112531d0e18920b2c813ea7 | |
| parent | d305e276c9959b4ede6a5c82e0ebb9f17a53b414 (diff) | |
| parent | f46798e156c6e8e7071af8dd020f83e9dd96427d (diff) | |
Merge pull request #3092 from dotnet/mirror-merge-9061591
Mirror changes from dotnet/coreclr
3 files changed, 10 insertions, 4 deletions
diff --git a/src/System.Private.CoreLib/shared/System/MarshalByRefObject.cs b/src/System.Private.CoreLib/shared/System/MarshalByRefObject.cs index 9014de00c..1f1739b9c 100644 --- a/src/System.Private.CoreLib/shared/System/MarshalByRefObject.cs +++ b/src/System.Private.CoreLib/shared/System/MarshalByRefObject.cs @@ -13,12 +13,12 @@ namespace System public object GetLifetimeService() { - throw new PlatformNotSupportedException(); + throw new PlatformNotSupportedException(SR.PlatformNotSupported_Remoting); } public virtual object InitializeLifetimeService() { - throw new PlatformNotSupportedException(); + throw new PlatformNotSupportedException(SR.PlatformNotSupported_Remoting); } protected MarshalByRefObject MemberwiseClone(bool cloneIdentity) diff --git a/src/System.Private.CoreLib/shared/System/Reflection/StrongNameKeyPair.cs b/src/System.Private.CoreLib/shared/System/Reflection/StrongNameKeyPair.cs index 8d2bf1f88..c04ddd6d1 100644 --- a/src/System.Private.CoreLib/shared/System/Reflection/StrongNameKeyPair.cs +++ b/src/System.Private.CoreLib/shared/System/Reflection/StrongNameKeyPair.cs @@ -50,14 +50,14 @@ namespace System.Reflection public StrongNameKeyPair(string keyPairContainer) { - throw new PlatformNotSupportedException(); + throw new PlatformNotSupportedException(SR.PlatformNotSupported_StrongNameSigning); } public byte[] PublicKey { get { - throw new PlatformNotSupportedException(); + throw new PlatformNotSupportedException(SR.PlatformNotSupported_StrongNameSigning); } } diff --git a/src/System.Private.CoreLib/src/Resources/Strings.resx b/src/System.Private.CoreLib/src/Resources/Strings.resx index 14ad894b7..04204afca 100644 --- a/src/System.Private.CoreLib/src/Resources/Strings.resx +++ b/src/System.Private.CoreLib/src/Resources/Strings.resx @@ -2299,4 +2299,10 @@ <data name="Serialization_StringBuilderMaxCapacity" xml:space="preserve"> <value>The serialized MaxCapacity property of StringBuilder must be positive and greater than or equal to the String length.</value> </data> + <data name="PlatformNotSupported_Remoting" xml:space="preserve"> + <value>Remoting is not supported on this platform.</value> + </data> + <data name="PlatformNotSupported_StrongNameSigning" xml:space="preserve"> + <value>Strong-name signing is not supported on this platform.</value> + </data> </root> |