[System.Core][System.ComponentModel.DataAnnotations] Update strings

3 files changed, 32 insertions, 34 deletions

diff --git a/mcs/class/System.Core/ReferenceSources/SR.cs b/mcs/class/System.Core/ReferenceSources/SR.cs
index 99a84d5fd78..1fbc0324aff 100644
--- a/mcs/class/System.Core/ReferenceSources/SR.cs
+++ b/mcs/class/System.Core/ReferenceSources/SR.cs
@@ -51,6 +51,7 @@ partial class SR
 	public const string IO_IO_SharingViolation_NoFileName = "The process cannot access the file because it is being used by another process.";
 	public const string IO_IO_PipeBroken = "Pipe is broken.";
 	public const string IO_IO_InvalidPipeHandle = "Invalid pipe handle.";
+	public const string IO_OperationAborted = "IO operation was aborted unexpectedly.";
 	public const string IO_DriveNotFound_Drive = "Could not find the drive '{0}'. The drive might not be ready or might not be mapped.";
 	public const string IO_PathNotFound_Path = "Could not find a part of the path '{0}'.";
 	public const string IO_PathNotFound_NoPathName = "Could not find a part of the path.";
@@ -218,4 +219,35 @@ partial class SR
 	public const string NotSupported_MMViewStreamsFixedLength = "MemoryMappedViewStreams are fixed length.";
 	public const string ObjectDisposed_ViewAccessorClosed = "Cannot access a closed accessor.";
 	public const string ObjectDisposed_StreamIsClosed = "Cannot access a closed Stream.";
+	public const string NotSupported_Method = "Method not supported.";
+	public const string NotSupported_SubclassOverride = "Method not supported. Derived class must override.";
+	public const string Cryptography_ArgDSARequiresDSAKey = "Keys used with the DSACng algorithm must have an algorithm group of DSA.";
+	public const string Cryptography_ArgRSAaRequiresRSAKey = "Keys used with the RSACng algorithm must have an algorithm group of RSA.";
+	public const string Cryptography_CngKeyWrongAlgorithm = "This key is for algorithm '{0}'. Expected '{1}'.";
+	public const string Cryptography_DSA_HashTooShort = "The supplied hash cannot be shorter in length than the DSA key's Q value.";
+	public const string Cryptography_HashAlgorithmNameNullOrEmpty = "The hash algorithm name cannot be null or empty.";
+	public const string Cryptography_InvalidDsaParameters_MissingFields = "The specified DSA parameters are not valid; P, Q, G and Y are all required.";
+	public const string Cryptography_InvalidDsaParameters_MismatchedPGY = "The specified DSA parameters are not valid; P, G and Y must be the same length (the key size).";
+	public const string Cryptography_InvalidDsaParameters_MismatchedQX = "The specified DSA parameters are not valid; Q and X (if present) must be the same length.";
+	public const string Cryptography_InvalidDsaParameters_MismatchedPJ = "The specified DSA parameters are not valid; J (if present) must be shorter than P.";
+	public const string Cryptography_InvalidDsaParameters_SeedRestriction_ShortKey = "The specified DSA parameters are not valid; Seed, if present, must be 20 bytes long for keys shorter than 1024 bits.";
+	public const string Cryptography_InvalidDsaParameters_QRestriction_ShortKey = "The specified DSA parameters are not valid; Q must be 20 bytes long for keys shorter than 1024 bits.";
+	public const string Cryptography_InvalidDsaParameters_QRestriction_LargeKey = "The specified DSA parameters are not valid; Q's length must be one of 20, 32 or 64 bytes.";
+	public const string Cryptography_InvalidRsaParameters = "The specified RSA parameters are not valid; both Exponent and Modulus are required fields.";
+	public const string Cryptography_InvalidSignatureAlgorithm = "The hash algorithm is not supported for signatures. Only MD5, SHA1, SHA256,SHA384, and SHA512 are supported at this time.";
+	public const string Cryptography_KeyBlobParsingError = "Key Blob not in expected format.";
+	public const string Cryptography_NotSupportedKeyAlgorithm = "Key Algorithm is not supported.";
+	public const string Cryptography_NotValidPublicOrPrivateKey = "Key is not a valid public or private key.";
+	public const string Cryptography_NotValidPrivateKey = "Key is not a valid private key.";
+	public const string Cryptography_UnexpectedTransformTruncation = "CNG provider unexpectedly terminated encryption or decryption prematurely.";
+	public const string Cryptography_UnsupportedPaddingMode = "The specified PaddingMode is not supported.";
+	public const string Cryptography_WeakKey = "Specified key is a known weak key for this algorithm and cannot be used.";
+	public const string Cryptography_CurveNotSupported = "The specified curve '{0}' or its parameters are not valid for this platform.";
+	public const string Cryptography_InvalidCurve = "The specified curve '{0}' is not valid for this platform.";
+	public const string Cryptography_InvalidCurveOid = "The specified Oid is not valid. The Oid.FriendlyName or Oid.Value property must be set.";
+	public const string Cryptography_InvalidCurveKeyParameters = "The specified key parameters are not valid. Q.X and Q.Y are required fields. Q.X, Q.Y must be the same length. If D is specified it must be the same length as Q.X and Q.Y for named curves or the same length as Order for explicit curves.";
+	public const string Cryptography_InvalidECCharacteristic2Curve = "The specified Characteristic2 curve parameters are not valid. Polynomial, A, B, G.X, G.Y, and Order are required. A, B, G.X, G.Y must be the same length, and the same length as Q.X, Q.Y and D if those are specified. Seed, Cofactor and Hash are optional. Other parameters are not allowed.";
+	public const string Cryptography_InvalidECPrimeCurve = "The specified prime curve parameters are not valid. Prime, A, B, G.X, G.Y and Order are required and must be the same length, and the same length as Q.X, Q.Y and D if those are specified. Seed, Cofactor and Hash are optional. Other parameters are not allowed.";
+	public const string Cryptography_InvalidECNamedCurve = "The specified named curve parameters are not valid. Only the Oid parameter must be set.";
+	public const string Cryptography_UnknownHashAlgorithm = "'{0}' is not a known hash algorithm.";
 }
diff --git a/mcs/class/System.Core/ReferenceSources/SR.missing.cs b/mcs/class/System.Core/ReferenceSources/SR.missing.cs
deleted file mode 100644
index b91bd7018c3..00000000000
--- a/mcs/class/System.Core/ReferenceSources/SR.missing.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// SR.missing.cs: Manually collected missing resource strings for ReferenceSources
-//
-// Authors:
-//	Marek Safar  <marek.safar@gmail.com>
-//
-// Copyright (C) 2014 Xamarin Inc (http://www.xamarin.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-partial class SR
-{
-	public const string Cryptography_HashAlgorithmNameNullOrEmpty = "Cryptography_HashAlgorithmNameNullOrEmpty";
-	public const string NotSupported_SubclassOverride = "NotSupported_SubclassOverride";
-}
diff --git a/mcs/class/System.Core/common_System.Core.dll.sources b/mcs/class/System.Core/common_System.Core.dll.sources
index 9e54bcb3f72..1c43593fb48 100644
--- a/mcs/class/System.Core/common_System.Core.dll.sources
+++ b/mcs/class/System.Core/common_System.Core.dll.sources
@@ -33,7 +33,6 @@ System.IO.Pipes/PipeStreamImpersonationWorker.cs
 System.IO.Pipes/PipeTransmissionMode.cs
 
 ReferenceSources/SR.cs
-ReferenceSources/SR.missing.cs
 
 corefx/LambdaExpression.cs
 corefx/SR.cs