Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa

mcs/class/referencesource/System.Core/Microsoft/Win32/SafeHandles/NCryptSafeHandles.cs

@@ -263,7 +263,7 @@ namespace Microsoft.Win32.SafeHandles {
             T duplicate = new T();
 
             // We need to do this operation in a CER in order to ensure that everybody's state stays consistent
-            // with the current view of the world.  If the state of the various handles gets out of [....], then
+            // with the current view of the world.  If the state of the various handles gets out of sync, then
             // we'll end up leaking since reference counts will not be set up properly.
             RuntimeHelpers.PrepareConstrainedRegions();
             try { }

mcs/class/referencesource/System.Core/System.Core.txt

@@ -96,6 +96,7 @@ IO_IO_SharingViolation_File=The process cannot access the file '{0}' because it
 IO_IO_SharingViolation_NoFileName=The process cannot access the file because it is being used by another process.
 IO_IO_PipeBroken=Pipe is broken.
 IO_IO_InvalidPipeHandle=Invalid pipe handle.
+IO_OperationAborted=IO operation was aborted unexpectedly.
 ;
 ; DirectoryNotFoundException
 ;
@@ -382,3 +383,37 @@ NotSupported_MMViewStreamsFixedLength=MemoryMappedViewStreams are fixed length.
 ObjectDisposed_ViewAccessorClosed=Cannot access a closed accessor.
 ObjectDisposed_StreamIsClosed=Cannot access a closed Stream.
 
+;
+; 4.6.x string (only add at the end)
+;
+NotSupported_Method=Method not supported.
+NotSupported_SubclassOverride=Method not supported. Derived class must override.
+Cryptography_ArgDSARequiresDSAKey=Keys used with the DSACng algorithm must have an algorithm group of DSA.
+Cryptography_ArgRSAaRequiresRSAKey=Keys used with the RSACng algorithm must have an algorithm group of RSA.
+Cryptography_CngKeyWrongAlgorithm=This key is for algorithm '{0}'. Expected '{1}'.
+Cryptography_DSA_HashTooShort=The supplied hash cannot be shorter in length than the DSA key's Q value.
+Cryptography_HashAlgorithmNameNullOrEmpty=The hash algorithm name cannot be null or empty.
+Cryptography_InvalidDsaParameters_MissingFields=The specified DSA parameters are not valid; P, Q, G and Y are all required.
+Cryptography_InvalidDsaParameters_MismatchedPGY=The specified DSA parameters are not valid; P, G and Y must be the same length (the key size).
+Cryptography_InvalidDsaParameters_MismatchedQX=The specified DSA parameters are not valid; Q and X (if present) must be the same length.
+Cryptography_InvalidDsaParameters_MismatchedPJ=The specified DSA parameters are not valid; J (if present) must be shorter than P.
+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.
+Cryptography_InvalidDsaParameters_QRestriction_ShortKey=The specified DSA parameters are not valid; Q must be 20 bytes long for keys shorter than 1024 bits.
+Cryptography_InvalidDsaParameters_QRestriction_LargeKey=The specified DSA parameters are not valid; Q's length must be one of 20, 32 or 64 bytes.
+Cryptography_InvalidRsaParameters=The specified RSA parameters are not valid; both Exponent and Modulus are required fields.
+Cryptography_InvalidSignatureAlgorithm=The hash algorithm is not supported for signatures. Only MD5, SHA1, SHA256,SHA384, and SHA512 are supported at this time.
+Cryptography_KeyBlobParsingError=Key Blob not in expected format.
+Cryptography_NotSupportedKeyAlgorithm=Key Algorithm is not supported.
+Cryptography_NotValidPublicOrPrivateKey=Key is not a valid public or private key.
+Cryptography_NotValidPrivateKey=Key is not a valid private key.
+Cryptography_UnexpectedTransformTruncation=CNG provider unexpectedly terminated encryption or decryption prematurely.
+Cryptography_UnsupportedPaddingMode=The specified PaddingMode is not supported.
+Cryptography_WeakKey=Specified key is a known weak key for this algorithm and cannot be used.
+Cryptography_CurveNotSupported=The specified curve '{0}' or its parameters are not valid for this platform.
+Cryptography_InvalidCurve=The specified curve '{0}' is not valid for this platform.
+Cryptography_InvalidCurveOid=The specified Oid is not valid. The Oid.FriendlyName or Oid.Value property must be set.
+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.
+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.
+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.
+Cryptography_InvalidECNamedCurve=The specified named curve parameters are not valid. Only the Oid parameter must be set.
+Cryptography_UnknownHashAlgorithm='{0}' is not a known hash algorithm.

mcs/class/referencesource/System.Core/System/Diagnostics/Eventing/EventDescriptor.cs

@@ -28,7 +28,7 @@ namespace System.Diagnostics.Eventing
         [FieldOffset(8)]
         private long m_keywords;
 
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "opcode", Justification = "[....]: Shipped public in 3.5, breaking change to fix now.")]
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "opcode", Justification = "Microsoft: Shipped public in 3.5, breaking change to fix now.")]
         public EventDescriptor(
                 int id,
                 byte version,
@@ -98,7 +98,7 @@ namespace System.Diagnostics.Eventing
             }
         }
 
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "[....]: Shipped public in 3.5, breaking change to fix now.")]
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "Microsoft: Shipped public in 3.5, breaking change to fix now.")]
         public byte Opcode
         {
             get

mcs/class/referencesource/System.Core/System/Diagnostics/Eventing/Reader/EventLogSession.cs

@@ -52,7 +52,7 @@ namespace System.Diagnostics.Eventing.Reader {
         internal EventLogHandle renderContextHandleSystem = EventLogHandle.Zero;
         internal EventLogHandle renderContextHandleUser = EventLogHandle.Zero;
 
-        //the dummy [....] object for the two contextes.
+        //the dummy sync object for the two contextes.
         private object syncObject = null;
 
         private string server;

mcs/class/referencesource/System.Core/System/Diagnostics/Eventing/Reader/EventMetadata.cs

@@ -86,7 +86,7 @@ namespace System.Diagnostics.Eventing.Reader {
             }
         }
 
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "[....]: Shipped public in 3.5, breaking change to fix now.")]
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "Microsoft: Shipped public in 3.5, breaking change to fix now.")]
         public EventOpcode Opcode {
             get {
                 return new EventOpcode(this.opcode, this.pmReference);

mcs/class/referencesource/System.Core/System/Diagnostics/Eventing/Reader/EventOpcode.cs

@@ -20,7 +20,7 @@ using System.Diagnostics.CodeAnalysis;
 namespace System.Diagnostics.Eventing.Reader {
 
     [System.Security.Permissions.HostProtection(MayLeakOnAbort = true)]
-    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "[....]: Shipped public in 3.5, breaking change to fix now.")]
+    [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "Microsoft: Shipped public in 3.5, breaking change to fix now.")]
     public sealed class EventOpcode {
         private int value;
         private string name;

mcs/class/referencesource/System.Core/System/Diagnostics/Eventing/Reader/EventRecord.cs

@@ -30,7 +30,7 @@ namespace System.Diagnostics.Eventing.Reader {
         public abstract byte? Level { get; }
         public abstract int? Task { get; }
 
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "[....]: Shipped public in 3.5, breaking change to fix now.")]
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "Microsoft: Shipped public in 3.5, breaking change to fix now.")]
         public abstract short? Opcode { get; }
         public abstract long? Keywords { get; }
 
@@ -55,7 +55,7 @@ namespace System.Diagnostics.Eventing.Reader {
 
         public abstract string LevelDisplayName { get; }
 
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "[....]: Shipped public in 3.5, breaking change to fix now.")]
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "Microsoft: Shipped public in 3.5, breaking change to fix now.")]
         public abstract string OpcodeDisplayName { get; }
         public abstract string TaskDisplayName { get; }
         public abstract IEnumerable<string> KeywordsDisplayNames { get; }

mcs/class/referencesource/System.Core/System/Diagnostics/Eventing/Reader/ProviderMetadata.cs

@@ -440,7 +440,7 @@ namespace System.Diagnostics.Eventing.Reader {
             }
         }
 
-        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcodes", Justification = "[....]: Shipped public in 3.5, breaking change to fix now.")]
+        [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcodes", Justification = "Microsoft: Shipped public in 3.5, breaking change to fix now.")]
         public IList<EventOpcode> Opcodes {
             get {
                 List<EventOpcode> eo;

mcs/class/referencesource/System.Core/System/IO/BufferedStream2.cs

@@ -265,7 +265,7 @@ internal abstract class BufferedStream2 : Stream
             // (either synchronously or asynchronously) before the first one 
             // returns.  This would involve some sort of complex buffer locking
             // that we probably don't want to get into, at least not in V1.
-            // If we did a [....] read to fill the buffer, we could avoid the
+            // If we did a sync read to fill the buffer, we could avoid the
             // problem, and any async read less than 64K gets turned into a
             // synchronous read by NT anyways...       -- 
 
@@ -508,7 +508,7 @@ internal abstract class BufferedStream2 : Stream
 
     // Reading is done by blocks from the file, but someone could read
     // 1 byte from the buffer then write.  At that point, the OS's file
-    // pointer is out of [....] with the stream's position.  All write 
+    // pointer is out of sync with the stream's position.  All write 
     // functions should call this function to preserve the position in the file.
     [MethodImplAttribute(MethodImplOptions.Synchronized)]
     protected void FlushRead() {

mcs/class/referencesource/System.Core/System/IO/LogStream.cs

@@ -278,7 +278,7 @@ internal class LogStream : BufferedStream2
         }
 
         if (r == 0) {
-            // We should never silently ---- an error here without some
+            // We should never silently swallow an error here without some
             // extra work.  We must make sure that BeginWriteCore won't return an 
             // IAsyncResult that will cause EndWrite to block, since the OS won't
             // call AsyncFSCallback for us.  

mcs/class/referencesource/System.Core/System/IO/MemoryMappedFiles/MemoryMappedView.cs

@@ -167,7 +167,7 @@ namespace System.IO.MemoryMappedFiles {
 
         }
 
-        // Flushes the changes such that they are in [....] with the FileStream bits (ones obtained
+        // Flushes the changes such that they are in sync with the FileStream bits (ones obtained
         // with the win32 ReadFile and WriteFile functions).  Need to call FileStream's Flush to 
         // flush to the disk.
         // NOTE: This will flush all bytes before and after the view up until an offset that is a multiple

mcs/class/referencesource/System.Core/System/IO/MemoryMappedFiles/MemoryMappedViewAccessor.cs

@@ -76,7 +76,7 @@ namespace System.IO.MemoryMappedFiles {
             }
         }
 
-        // Flushes the changes such that they are in [....] with the FileStream bits (ones obtained
+        // Flushes the changes such that they are in sync with the FileStream bits (ones obtained
         // with the win32 ReadFile and WriteFile functions).  Need to call FileStream's Flush to 
         // flush to the disk.
         // NOTE: This will flush all bytes before and after the view up until an offset that is a

mcs/class/referencesource/System.Core/System/IO/MemoryMappedFiles/MemoryMappedViewStream.cs

@@ -78,7 +78,7 @@ namespace System.IO.MemoryMappedFiles {
             }
         }
 
-        // Flushes the changes such that they are in [....] with the FileStream bits (ones obtained
+        // Flushes the changes such that they are in sync with the FileStream bits (ones obtained
         // with the win32 ReadFile and WriteFile functions).  Need to call FileStream's Flush to 
         // flush to the disk.
         // NOTE: This will flush all bytes before and after the view up until an offset that is a 

mcs/class/referencesource/System.Core/System/IO/Pipes/PipeStream.cs

@@ -256,7 +256,7 @@ namespace System.IO.Pipes {
             CheckReadOperations();
 
             if (!m_isAsync) {
-                // special case when this is called for [....] broken pipes because otherwise Stream's
+                // special case when this is called for sync broken pipes because otherwise Stream's
                 // Begin/EndRead hang. Reads return 0 bytes in this case so we can call the user's
                 // callback immediately
                 if (m_state == PipeState.Broken) {
@@ -645,7 +645,7 @@ namespace System.IO.Pipes {
             }
 
             if (r == 0) {
-                // We should never silently ---- an error here without some
+                // We should never silently swallow an error here without some
                 // extra work.  We must make sure that BeginReadCore won't return an 
                 // IAsyncResult that will cause EndRead to block, since the OS won't
                 // call AsyncPSCallback for us.  
@@ -695,7 +695,7 @@ namespace System.IO.Pipes {
             }
 
             if (r == 0) {
-                // We should never silently ---- an error here without some
+                // We should never silently swallow an error here without some
                 // extra work.  We must make sure that BeginWriteCore won't return an 
                 // IAsyncResult that will cause EndWrite to block, since the OS won't
                 // call AsyncPSCallback for us.  

mcs/class/referencesource/System.Core/System/Linq/Enumerable.cs.REMOVED.git-id

@@ -1 +1 @@
-d1dc03000a9f0b6357a67dd3f7b9c72da5e9be1a
+aef6a32d8ec54693b7c067fa73fbe8a7bc2d7a63

mcs/class/referencesource/System.Core/System/Linq/Parallel/Channels/AsynchronousChannel.cs

@@ -7,7 +7,7 @@
 //
 // AsynchronousOneToOneChannel.cs
 //
-// <OWNER>[....]</OWNER>
+// <OWNER>Microsoft</OWNER>
 //
 // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 

mcs/class/referencesource/System.Core/System/Linq/Parallel/Channels/SynchronousChannel.cs

@@ -7,7 +7,7 @@
 //
 // SynchronousChannel.cs
 //
-// <OWNER>[....]</OWNER>
+// <OWNER>Microsoft</OWNER>
 //
 // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 

mcs/class/referencesource/System.Core/System/Linq/Parallel/Enumerables/AggregationMinMaxHelpers.cs

@@ -7,7 +7,7 @@
 //
 // AggregationMinMaxHelpers.cs
 //
-// <OWNER>[....]</OWNER>
+// <OWNER>Microsoft</OWNER>
 //
 // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 

mcs/class/referencesource/System.Core/System/Linq/Parallel/Enumerables/EmptyEnumerable.cs

@@ -7,7 +7,7 @@
 //
 // EmptyEnumerable.cs
 //
-// <OWNER>[....]</OWNER>
+// <OWNER>Microsoft</OWNER>
 //
 // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 

mcs/class/referencesource/System.Core/System/Linq/Parallel/Enumerables/EnumerableWrapperWeakToStrong.cs

@@ -7,7 +7,7 @@
 //
 // EnumerableWrapperWeakToStrong.cs
 //
-// <OWNER>[....]</OWNER>
+// <OWNER>Microsoft</OWNER>
 //
 // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-