Ignore NullableContextAttribute in API Compat and fix build break due to Range parsin...

Commit migrated from https://github.com/dotnet/corefx/commit/b3643ab830694eedffb1c9c80051e41517ea0d5f

diff --git a/eng/DefaultGenApiDocIds.txt b/eng/DefaultGenApiDocIds.txt
index e3fa48c..7b7d4e6 100644 (file)
--- a/eng/DefaultGenApiDocIds.txt
+++ b/eng/DefaultGenApiDocIds.txt
@@ -22,6 +22,7 @@ T:System.Runtime.CompilerServices.CompilerGeneratedAttribute
 T:System.Runtime.CompilerServices.IteratorStateMachineAttribute
 T:System.Runtime.CompilerServices.MethodImpl
 T:System.Runtime.CompilerServices.NullableAttribute
+T:System.Runtime.CompilerServices.NullableContextAttribute
 T:System.Runtime.CompilerServices.TypeForwardedFromAttribute
 T:System.Runtime.ConstrainedExecution.ReliabilityContractAttribute
 T:System.Runtime.InteropServices.ClassInterfaceAttribute
@@ -51,4 +52,4 @@ T:System.Reflection.DefaultMemberAttribute
 
 // These do not need to be persisted in the implementation
 T:System.ComponentModel.EditorBrowsableAttribute
-T:System.ObsoleteAttribute
\ No newline at end of file
+T:System.ObsoleteAttribute

diff --git a/src/libraries/System.Runtime/tests/System/Text/Unicode/Utf16UtilityTests.ValidateChars.netcoreapp.cs b/src/libraries/System.Runtime/tests/System/Text/Unicode/Utf16UtilityTests.ValidateChars.netcoreapp.cs
index 7e5281e..3c509df 100644 (file)
--- a/src/libraries/System.Runtime/tests/System/Text/Unicode/Utf16UtilityTests.ValidateChars.netcoreapp.cs
+++ b/src/libraries/System.Runtime/tests/System/Text/Unicode/Utf16UtilityTests.ValidateChars.netcoreapp.cs
@@ -281,7 +281,7 @@ namespace System.Text.Unicode.Tests
             int idx;
             while ((idx = input.IndexOf('<')) >= 0)
             {
-                input = input[..idx] + (char)ushort.Parse(input.Substring(idx + 1, 4), NumberStyles.AllowHexSpecifier, CultureInfo.InvariantCulture) + input[idx + 6..];
+                input = input[..idx] + (char)ushort.Parse(input.Substring(idx + 1, 4), NumberStyles.AllowHexSpecifier, CultureInfo.InvariantCulture) + input[(idx + 6)..];
             }
 
             return input;