Merge pull request #58708 from dotnet/merges/release/dev17.1-to-relea…

…se/dev17.1-vs-deps Merge release/dev17.1 to release/dev17.1-vs-deps
dotnet · Jan 7, 2022 · afe0c2c · afe0c2c
2 parents f028ed9 + 0e5c679
commit afe0c2c
Show file tree

Hide file tree

Showing 6 changed files with 1,745 additions and 330 deletions.
diff --git a/src/Compilers/CSharp/Portable/Errors/ErrorCode.cs b/src/Compilers/CSharp/Portable/Errors/ErrorCode.cs
@@ -2007,13 +2007,6 @@ internal enum ErrorCode
         // at runtime.
         ERR_CannotUseRefInUnmanagedCallersOnly = 8977,
 
-        ERR_IncorrectNullCheckSyntax = 8990,
-        ERR_MustNullCheckInImplementation = 8991,
-        ERR_NonNullableValueTypeIsNullChecked = 8992,
-        WRN_NullCheckedHasDefaultNull = 8993,
-        ERR_NullCheckingOnByRefParameter = 8994,
-        WRN_NullCheckingOnNullableType = 8995,
-
         #endregion
 
         #region diagnostics introduced for C# 11.0
@@ -2026,6 +2019,13 @@ internal enum ErrorCode
         ERR_RecordStructConstructorCallsDefaultConstructor = 8982,
         ERR_StructHasInitializersAndNoDeclaredConstructor = 8983,
 
+        ERR_IncorrectNullCheckSyntax = 8990,
+        ERR_MustNullCheckInImplementation = 8991,
+        ERR_NonNullableValueTypeIsNullChecked = 8992,
+        WRN_NullCheckedHasDefaultNull = 8993,
+        ERR_NullCheckingOnByRefParameter = 8994,
+        WRN_NullCheckingOnNullableType = 8995,
+
         #endregion
 
         // Note: you will need to re-generate compiler code after adding warnings (eng\generate-compiler-code.cmd)

diff --git a/src/Compilers/CSharp/Portable/Generated/ErrorFacts.Generated.cs b/src/Compilers/CSharp/Portable/Generated/ErrorFacts.Generated.cs