From 2e77de3dcf669b013479cd10fa3c65b4f4dab018 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Mon, 26 Oct 2020 09:58:41 +0100
Subject: [PATCH] [tools] Renumber RemoveRejectedTypesStep's error code base to
 match other ExceptionalSubStep subclasses. (#9955)

Also document which numbers each subclass uses in Errors.resx. This makes it
much easier to figure out the next number to use.
---
 tools/linker/RemoveRejectedTypesStep.cs |  2 +-
 tools/mtouch/Errors.resx                | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/tools/linker/RemoveRejectedTypesStep.cs b/tools/linker/RemoveRejectedTypesStep.cs
index 832f2a9a05..d484b57c6e 100644
--- a/tools/linker/RemoveRejectedTypesStep.cs
+++ b/tools/linker/RemoveRejectedTypesStep.cs
@@ -27,7 +27,7 @@ namespace Xamarin.Linker {
 		}
 
 		protected override string Name { get; } = "Removing Rejected Type";
-		protected override int ErrorCode { get; } = 2660;
+		protected override int ErrorCode { get; } = 2220;
 
 		public List<(string originalFullName, string replacementTypeName)> TypeReferencesToBeRemoved = new List<(string,string)> () {
 			// order is important for nested types (that's why tuples are used instead of a Dictionary)
diff --git a/tools/mtouch/Errors.resx b/tools/mtouch/Errors.resx
index 6203d83557..9d91b9426c 100644
--- a/tools/mtouch/Errors.resx
+++ b/tools/mtouch/Errors.resx
@@ -1177,7 +1177,15 @@
 		</value>
 	</data>
 
-	<!-- 2020 -> 2099 is used by the linker -->
+	<!-- 2020 -> 2099 is used by ExceptionalSubStep subclasses in the linker -->
+	<!-- 202x: OptimizeGeneratedCodeSubStep -->
+	<!-- 203x: RemoveUserResourcesSubStep -->
+	<!-- 204x: CoreHttpMessageHandler -->
+	<!-- 205x: RemoveCode -->
+	<!-- 206x: SealerSubStep -->
+	<!-- 207x: MetadataReducerSubStep -->
+	<!-- 208x: MarkNSObjects -->
+	<!-- 209x: InlinerSubStep -->
 
 	<data name="MT2101" xml:space="preserve">
 		<value>Can't resolve the reference '{0}', referenced from the method '{1}' in '{2}'.
@@ -1274,6 +1282,11 @@
 		</value>
 	</data>
 
+	<!-- 2200 -> 2299 is used by/reserved for ExceptionalSubStep subclasses in the linker -->
+	<!-- 220x: PreserveSmartEnumConversionsSubStep -->
+	<!-- 221x: RemoveBitcodeIncompatibleCodeStep -->
+	<!-- 222x: RemoveRejectedTypesStep -->
+	
 	<data name="MX3001" xml:space="preserve">
 		<value>Could not {0} the assembly '{1}'
 		</value>