Merge pull request #7884 from AlexGhiondea/Port_SecureString
authorAlexGhiondea <AlexGhiondea@users.noreply.github.com>
Mon, 31 Oct 2016 20:06:26 +0000 (13:06 -0700)
committerGitHub <noreply@github.com>
Mon, 31 Oct 2016 20:06:26 +0000 (13:06 -0700)
Bring to CoreCLR the SecureString implementation from CoreFx.

1  2 
clr.coreclr.props
src/mscorlib/corefx/SR.cs
src/mscorlib/model.xml
src/mscorlib/mscorlib.shared.sources.props

Simple merge
@@@ -494,12 -494,27 +494,32 @@@ namespace Syste
          {
              get { return Environment.GetResourceString("InvalidOperation_NativeOverlappedReused"); }
          }
+         
+         public static string ArgumentOutOfRange_Length
+         {
+             get { return Environment.GetResourceString("ArgumentOutOfRange_Length"); }
+         }
+         public static string ArgumentOutOfRange_IndexString 
+         {
+             get { return Environment.GetResourceString("ArgumentOutOfRange_IndexString"); }
+         }
+         public static string ArgumentOutOfRange_Capacity 
+         {
+             get { return Environment.GetResourceString("ArgumentOutOfRange_Capacity"); }
+         }
+         public static string Arg_CryptographyException 
+         {
+             get { return Environment.GetResourceString("Arg_CryptographyException"); }
+         }
  
 +        public static string ArgumentException_BufferNotFromPool
 +        {
 +            get { return Environment.GetResourceString("ArgumentException_BufferNotFromPool"); }
 +        }
 +
          public static string Format(string formatString, params object[] args)
          {
              return string.Format(CultureInfo.CurrentCulture, formatString, args);
Simple merge