diff options
author | Jose Perez Rodriguez <joperezr@microsoft.com> | 2016-09-12 09:44:39 -0700 |
---|---|---|
committer | Jose Perez Rodriguez <joperezr@microsoft.com> | 2016-09-12 09:44:39 -0700 |
commit | 8d363be3973019a451a220aa8b49d3a3317dc357 (patch) | |
tree | f93c6f84fe1fdea523858ef010dd9182add9ba4d | |
parent | 0df8ca52b6ccbceeb73798318681ff8ed2842b1f (diff) | |
download | coreclr-8d363be3973019a451a220aa8b49d3a3317dc357.tar.gz coreclr-8d363be3973019a451a220aa8b49d3a3317dc357.tar.bz2 coreclr-8d363be3973019a451a220aa8b49d3a3317dc357.zip |
Adding missing String members to coreclr
-rw-r--r-- | src/mscorlib/model.xml | 7 | ||||
-rw-r--r-- | src/mscorlib/ref/mscorlib.cs | 15 | ||||
-rw-r--r-- | src/mscorlib/src/System/String.cs | 2 |
3 files changed, 20 insertions, 4 deletions
diff --git a/src/mscorlib/model.xml b/src/mscorlib/model.xml index 90b5ad12dc..8a02543bdc 100644 --- a/src/mscorlib/model.xml +++ b/src/mscorlib/model.xml @@ -7039,16 +7039,17 @@ <Member Name="CompareOrdinal(System.String,System.String)" /> <Member Name="CompareTo(System.Object)" /> <Member Name="CompareTo(System.String)" /> + <Member Name="Concat(System.Collections.Generic.IEnumerable<System.String>)" /> <Member Name="Concat(System.Object)" /> <Member Name="Concat(System.Object,System.Object)" /> <Member Name="Concat(System.Object,System.Object,System.Object)" /> + <Member Name="Concat(System.Object,System.Object,System.Object,System.Object,__arglist)" /> <Member Name="Concat(System.Object[])" /> - <Member Name="Concat<T>(System.Collections.Generic.IEnumerable<T>)" /> - <Member Name="Concat(System.Collections.Generic.IEnumerable<System.String>)" /> <Member Name="Concat(System.String,System.String)" /> <Member Name="Concat(System.String,System.String,System.String)" /> <Member Name="Concat(System.String,System.String,System.String,System.String)" /> <Member Name="Concat(System.String[])" /> + <Member Name="Concat<T>(System.Collections.Generic.IEnumerable<T>)" /> <Member Name="Contains(System.String)" /> <Member Name="Copy(System.String)" /> <Member Name="CopyTo(System.Int32,System.Char[],System.Int32,System.Int32)" /> @@ -7070,6 +7071,7 @@ <Member Name="Format(System.String,System.Object[])" /> <Member Name="get_Chars(System.Int32)" /> <Member Name="get_Length" /> + <Member Name="GetEnumerator" /> <Member Name="GetHashCode" /> <Member Name="GetTypeCode" /> <Member Name="IndexOf(System.Char)" /> @@ -7153,6 +7155,7 @@ <Member Name="TrimStart(System.Char[])" /> <Member MemberType="Property" Name="Chars(System.Int32)" /> <Member MemberType="Property" Name="Length" /> + <Member Status="ImplRoot" Name="System.Collections.IEnumerable.GetEnumerator" /> <Member Status="ImplRoot" Name="System.Collections.Generic.IEnumerable<System.Char>.GetEnumerator" /> <Member Status="ImplRoot" Name="CtorCharArray(System.Char[])" /> <Member Status="ImplRoot" Name="CtorCharArrayStartLength(System.Char[],System.Int32,System.Int32)" /> diff --git a/src/mscorlib/ref/mscorlib.cs b/src/mscorlib/ref/mscorlib.cs index de0a6934a8..e311d1e77f 100644 --- a/src/mscorlib/ref/mscorlib.cs +++ b/src/mscorlib/ref/mscorlib.cs @@ -3145,6 +3145,8 @@ namespace System public static System.String Concat(object arg0) { throw null; } public static System.String Concat(object arg0, object arg1) { throw null; } public static System.String Concat(object arg0, object arg1, object arg2) { throw null; } + [System.CLSCompliantAttribute(false)] + public static System.String Concat(object arg0, object arg1, object arg2, object arg3, __arglist) { throw null; } [System.Security.SecuritySafeCriticalAttribute] public static System.String Concat(params object[] args) { throw null; } [System.Security.SecuritySafeCriticalAttribute] @@ -3182,6 +3184,7 @@ namespace System public static System.String Format(System.String format, object arg0, object arg1) { throw null; } public static System.String Format(System.String format, object arg0, object arg1, object arg2) { throw null; } public static System.String Format(System.String format, params object[] args) { throw null; } + public System.CharEnumerator GetEnumerator() { throw null; } [System.Security.SecuritySafeCriticalAttribute] public override int GetHashCode() { throw null; } public System.TypeCode GetTypeCode() { throw null; } @@ -3254,6 +3257,12 @@ namespace System [System.Security.SecuritySafeCriticalAttribute] public System.String Replace(char oldChar, char newChar) { throw null; } public System.String Replace(System.String oldValue, System.String newValue) { throw null; } + [System.Runtime.InteropServices.ComVisibleAttribute(false)] + public string[] Split(char separator) { throw null; } + [System.Runtime.InteropServices.ComVisibleAttribute(false)] + public string[] Split(char separator, int count, System.StringSplitOptions options) { throw null; } + [System.Runtime.InteropServices.ComVisibleAttribute(false)] + public string[] Split(char separator, System.StringSplitOptions options) { throw null; } public string[] Split(params char[] separator) { throw null; } public string[] Split(char[] separator, int count) { throw null; } [System.Runtime.InteropServices.ComVisibleAttribute(false)] @@ -3261,6 +3270,12 @@ namespace System [System.Runtime.InteropServices.ComVisibleAttribute(false)] public string[] Split(char[] separator, System.StringSplitOptions options) { throw null; } [System.Runtime.InteropServices.ComVisibleAttribute(false)] + public string[] Split(System.String separator) { throw null; } + [System.Runtime.InteropServices.ComVisibleAttribute(false)] + public string[] Split(System.String separator, int count, System.StringSplitOptions options) { throw null; } + [System.Runtime.InteropServices.ComVisibleAttribute(false)] + public string[] Split(System.String separator, System.StringSplitOptions options) { throw null; } + [System.Runtime.InteropServices.ComVisibleAttribute(false)] public string[] Split(string[] separator, int count, System.StringSplitOptions options) { throw null; } [System.Runtime.InteropServices.ComVisibleAttribute(false)] public string[] Split(string[] separator, System.StringSplitOptions options) { throw null; } diff --git a/src/mscorlib/src/System/String.cs b/src/mscorlib/src/System/String.cs index d406fd09b3..4430357818 100644 --- a/src/mscorlib/src/System/String.cs +++ b/src/mscorlib/src/System/String.cs @@ -851,14 +851,12 @@ namespace System { [MethodImplAttribute(MethodImplOptions.InternalCall)] internal extern bool TryGetTrailByte(out byte data); -#if !FEATURE_CORECLR public CharEnumerator GetEnumerator() { Contract.Ensures(Contract.Result<CharEnumerator>() != null); Contract.EndContractBlock(); BCLDebug.Perf(false, "Avoid using String's CharEnumerator until C# special cases foreach on String - use the indexed property on String instead."); return new CharEnumerator(this); } -#endif // !FEATURE_CORECLR IEnumerator<char> IEnumerable<char>.GetEnumerator() { Contract.Ensures(Contract.Result<IEnumerator<char>>() != null); |