diff --git a/dotnet/Makefile b/dotnet/Makefile
index 52de01a52f3b..baf46cec555c 100644
--- a/dotnet/Makefile
+++ b/dotnet/Makefile
@@ -58,7 +58,7 @@ $(foreach platform,$(DOTNET_WINDOWS_PLATFORMS),$(eval $(call DefineWindowsTarget
 ifdef INCLUDE_HOTRESTART
 
 iOS_WINDOWS_NUGET_TARGETS += \
-	$(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/Xamarin.PreBuilt.iOS.app.zip \
+	$(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/iOS/Xamarin.PreBuilt.iOS.app.zip \
 
 endif
 
@@ -507,7 +507,7 @@ clean-local::
 	$(Q) $(DOTNET) restore package/workaround-for-maccore-issue-2427/restore.csproj /bl:package/workaround-for-maccore-issue-2427/restore.binlog $(MSBUILD_VERBOSITY)
 	$(Q) touch $@
 
-$(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/Xamarin.PreBuilt.iOS.app.zip: .stamp-install-workloads
+$(DOTNET_DESTDIR)/$(IOS_NUGET_WINDOWS_SDK_NAME)/tools/msbuild/iOS/Xamarin.PreBuilt.iOS.app.zip: .stamp-install-workloads
 	$(Q) $(MAKE) -C $(TOP)/msbuild/Xamarin.HotRestart.PreBuilt all
 	$(Q) touch $@
 
diff --git a/dotnet/Workloads/SignList.xml b/dotnet/Workloads/SignList.xml
index f90d7e6391eb..fae12d42c701 100644
--- a/dotnet/Workloads/SignList.xml
+++ b/dotnet/Workloads/SignList.xml
@@ -3,17 +3,17 @@
   <ItemGroup>
     <Skip Include="System.Reflection.MetadataLoadContext.dll" />
     <!-- Microsoft.iOS.Windows.Sdk content -->
-    <Skip Include="tools\msbuild\Microsoft.Win32.Registry.dll" />
-    <Skip Include="tools\msbuild\System.Buffers.dll" />
-    <Skip Include="tools\msbuild\System.Formats.Asn1.dll" />
-    <Skip Include="tools\msbuild\System.Memory.dll" />
-    <Skip Include="tools\msbuild\System.Numerics.Vectors.dll" />
-    <Skip Include="tools\msbuild\System.Runtime.CompilerServices.Unsafe.dll" />
-    <Skip Include="tools\msbuild\System.Security.AccessControl.dll" />
-    <Skip Include="tools\msbuild\System.Security.Cryptography.Pkcs.dll" />
-    <Skip Include="tools\msbuild\System.Security.Cryptography.ProtectedData.dll" />
-    <Skip Include="tools\msbuild\System.Security.Principal.Windows.dll" />
-    <Skip Include="tools\msbuild\ws2_32.dll" />
+    <Skip Include="tools\msbuild\iOS\Microsoft.Win32.Registry.dll" />
+    <Skip Include="tools\msbuild\iOS\System.Buffers.dll" />
+    <Skip Include="tools\msbuild\iOS\System.Formats.Asn1.dll" />
+    <Skip Include="tools\msbuild\iOS\System.Memory.dll" />
+    <Skip Include="tools\msbuild\iOS\System.Numerics.Vectors.dll" />
+    <Skip Include="tools\msbuild\iOS\System.Runtime.CompilerServices.Unsafe.dll" />
+    <Skip Include="tools\msbuild\iOS\System.Security.AccessControl.dll" />
+    <Skip Include="tools\msbuild\iOS\System.Security.Cryptography.Pkcs.dll" />
+    <Skip Include="tools\msbuild\iOS\System.Security.Cryptography.ProtectedData.dll" />
+    <Skip Include="tools\msbuild\iOS\System.Security.Principal.Windows.dll" />
+    <Skip Include="tools\msbuild\iOS\ws2_32.dll" />
     <!-- Broker.zip -->
     <Skip Include="Broker\Newtonsoft.Json.dll" />
     <Skip Include="Broker\System.Net.Mqtt.dll" />
diff --git a/mk/xamarin-reset.sh b/mk/xamarin-reset.sh
index c4f41bc7418a..24bbff6d448c 100755
--- a/mk/xamarin-reset.sh
+++ b/mk/xamarin-reset.sh
@@ -39,10 +39,10 @@ if test -d "$DEPENDENCY_PATH"; then
 	fi
 
 else
-	echo "*** [$DEPENDENCY_NAME] git $DEPENDENCY_AUTH clone $DEPENDENCY_MODULE --recursive $DEPENDENCY_DIRECTORY -b $DEPENDENCY_BRANCH --origin $DEPENDENCY_REMOTE"
+	echo "*** [$DEPENDENCY_NAME] git" "${DEPENDENCY_AUTH[@]}" "clone $DEPENDENCY_MODULE --recursive $DEPENDENCY_DIRECTORY -b $DEPENDENCY_BRANCH --origin $DEPENDENCY_REMOTE"
 	mkdir -p "$(dirname "$DEPENDENCY_PATH")"
 	cd "$(dirname "$DEPENDENCY_PATH")"
-	git $DEPENDANCY_AUTH clone "$DEPENDENCY_MODULE" --recursive "$DEPENDENCY_DIRECTORY" -b "$DEPENDENCY_BRANCH" --origin "$DEPENDENCY_REMOTE"
+	git "$DEPENDENCY_AUTH" "$DEPENDENCY_MODULE" --recursive "$DEPENDENCY_DIRECTORY" -b "$DEPENDENCY_BRANCH" --origin "$DEPENDENCY_REMOTE"
 	cd "$DEPENDENCY_DIRECTORY"
 fi
 
diff --git a/src/rgen/Microsoft.Macios.Generator/DataModel/Accessor.cs b/src/rgen/Microsoft.Macios.Generator/DataModel/Accessor.cs
index d126df718696..55df56b24810 100644
--- a/src/rgen/Microsoft.Macios.Generator/DataModel/Accessor.cs
+++ b/src/rgen/Microsoft.Macios.Generator/DataModel/Accessor.cs
@@ -44,7 +44,7 @@ public bool Equals (Accessor other)
 		var attrsComparer = new AttributesEqualityComparer ();
 		if (!attrsComparer.Equals (Attributes, other.Attributes))
 			return false;
-		var modifiersComparer = new ModifiersComparer ();
+		var modifiersComparer = new ModifiersEqualityComparer ();
 		return modifiersComparer.Equals (Modifiers, other.Modifiers);
 	}
 
diff --git a/src/rgen/Microsoft.Macios.Generator/DataModel/AccessorsEqualityComparer.cs b/src/rgen/Microsoft.Macios.Generator/DataModel/AccessorsEqualityComparer.cs
index 787bddab8a9b..a460fea45325 100644
--- a/src/rgen/Microsoft.Macios.Generator/DataModel/AccessorsEqualityComparer.cs
+++ b/src/rgen/Microsoft.Macios.Generator/DataModel/AccessorsEqualityComparer.cs
@@ -5,8 +5,8 @@
 
 namespace Microsoft.Macios.Generator.DataModel;
 
-class AccessorsEqualityComparer : IEqualityComparer<ImmutableArray<Accessor>> {
-	public bool Equals (ImmutableArray<Accessor> x, ImmutableArray<Accessor> y)
+class AccessorsEqualityComparer : EqualityComparer<ImmutableArray<Accessor>> {
+	public override bool Equals (ImmutableArray<Accessor> x, ImmutableArray<Accessor> y)
 	{
 		// property accessor kinds cannot be duplicated due to the definition of the language, create two dictionaries
 		// using the kind as a key and then re-use our dictionary comparer
@@ -16,7 +16,7 @@ public bool Equals (ImmutableArray<Accessor> x, ImmutableArray<Accessor> y)
 		return comparer.Equals (xDictionary, yDictionary);
 	}
 
-	public int GetHashCode (ImmutableArray<Accessor> obj)
+	public override int GetHashCode (ImmutableArray<Accessor> obj)
 	{
 		var hashCode = new HashCode ();
 		foreach (var accessor in obj) {
diff --git a/src/rgen/Microsoft.Macios.Generator/DataModel/AttributesEqualityComparer.cs b/src/rgen/Microsoft.Macios.Generator/DataModel/AttributesEqualityComparer.cs
index c4760c7d14c1..da83529093eb 100644
--- a/src/rgen/Microsoft.Macios.Generator/DataModel/AttributesEqualityComparer.cs
+++ b/src/rgen/Microsoft.Macios.Generator/DataModel/AttributesEqualityComparer.cs
@@ -30,9 +30,9 @@ public int Compare (AttributeCodeChange x, AttributeCodeChange y)
 		return 0;
 	}
 }
-class AttributesEqualityComparer : IEqualityComparer<ImmutableArray<AttributeCodeChange>> {
+class AttributesEqualityComparer : EqualityComparer<ImmutableArray<AttributeCodeChange>> {
 
-	public bool Equals (ImmutableArray<AttributeCodeChange> x, ImmutableArray<AttributeCodeChange> y)
+	public override bool Equals (ImmutableArray<AttributeCodeChange> x, ImmutableArray<AttributeCodeChange> y)
 	{
 		if (x.Length != y.Length)
 			return false;
@@ -46,7 +46,7 @@ public bool Equals (ImmutableArray<AttributeCodeChange> x, ImmutableArray<Attrib
 		return true;
 	}
 
-	public int GetHashCode (ImmutableArray<AttributeCodeChange> obj)
+	public override int GetHashCode (ImmutableArray<AttributeCodeChange> obj)
 	{
 		var hash = new HashCode ();
 		foreach (var change in obj) {
diff --git a/src/rgen/Microsoft.Macios.Generator/DataModel/CodeChangesEqualityComparer.cs b/src/rgen/Microsoft.Macios.Generator/DataModel/CodeChangesEqualityComparer.cs
index e4dd817fec43..b1f59c240860 100644
--- a/src/rgen/Microsoft.Macios.Generator/DataModel/CodeChangesEqualityComparer.cs
+++ b/src/rgen/Microsoft.Macios.Generator/DataModel/CodeChangesEqualityComparer.cs
@@ -4,26 +4,28 @@
 
 namespace Microsoft.Macios.Generator.DataModel;
 
-class DeclarationCodeChangesEqualityComparer : IEqualityComparer<(BaseTypeDeclarationSyntax Declaration, CodeChanges
+class DeclarationCodeChangesEqualityComparer : EqualityComparer<(BaseTypeDeclarationSyntax Declaration, CodeChanges
 	Changes)> {
 	readonly CodeChangesEqualityComparer comparer = new ();
 
-	public bool Equals ((BaseTypeDeclarationSyntax Declaration, CodeChanges Changes) x,
+	/// <inheritdoc/>
+	public override bool Equals ((BaseTypeDeclarationSyntax Declaration, CodeChanges Changes) x,
 		(BaseTypeDeclarationSyntax Declaration, CodeChanges Changes) y)
 	{
 		return comparer.Equals (x.Changes, y.Changes);
 	}
 
-	public int GetHashCode ((BaseTypeDeclarationSyntax Declaration, CodeChanges Changes) obj)
+	/// <inheritdoc/>
+	public override int GetHashCode ((BaseTypeDeclarationSyntax Declaration, CodeChanges Changes) obj)
 		=> comparer.GetHashCode (obj.Changes);
 }
 
 /// <summary>
 /// Custom code changes comparer used for the Roslyn code generation to invalidate caching.
 /// </summary>
-class CodeChangesEqualityComparer : IEqualityComparer<CodeChanges> {
+class CodeChangesEqualityComparer : EqualityComparer<CodeChanges> {
 	/// <inheritdoc />
-	public bool Equals (CodeChanges x, CodeChanges y)
+	public override bool Equals (CodeChanges x, CodeChanges y)
 	{
 		// things that mean a code change is the same:
 		// - the fully qualified symbol is the same
@@ -74,7 +76,7 @@ public bool Equals (CodeChanges x, CodeChanges y)
 	}
 
 	/// <inheritdoc />
-	public int GetHashCode (CodeChanges obj)
+	public override int GetHashCode (CodeChanges obj)
 	{
 		return HashCode.Combine (obj.FullyQualifiedSymbol, obj.EnumMembers);
 	}
diff --git a/src/rgen/Microsoft.Macios.Generator/DataModel/Constructor.cs b/src/rgen/Microsoft.Macios.Generator/DataModel/Constructor.cs
index 771ab8da354b..28ae013ea2ef 100644
--- a/src/rgen/Microsoft.Macios.Generator/DataModel/Constructor.cs
+++ b/src/rgen/Microsoft.Macios.Generator/DataModel/Constructor.cs
@@ -68,7 +68,7 @@ public bool Equals (Constructor other)
 		var attrsComparer = new AttributesEqualityComparer ();
 		if (!attrsComparer.Equals (Attributes, other.Attributes))
 			return false;
-		var modifiersComparer = new ModifiersComparer ();
+		var modifiersComparer = new ModifiersEqualityComparer ();
 		if (!modifiersComparer.Equals (Modifiers, other.Modifiers))
 			return false;
 
diff --git a/src/rgen/Microsoft.Macios.Generator/DataModel/ConstructorsEqualityComparer.cs b/src/rgen/Microsoft.Macios.Generator/DataModel/ConstructorsEqualityComparer.cs
index d6f3fa2224a9..8d27fdf125ea 100644
--- a/src/rgen/Microsoft.Macios.Generator/DataModel/ConstructorsEqualityComparer.cs
+++ b/src/rgen/Microsoft.Macios.Generator/DataModel/ConstructorsEqualityComparer.cs
@@ -5,8 +5,9 @@
 
 namespace Microsoft.Macios.Generator.DataModel;
 
-class ConstructorsEqualityComparer : IEqualityComparer<ImmutableArray<Constructor>> {
-	public bool Equals (ImmutableArray<Constructor> x, ImmutableArray<Constructor> y)
+class ConstructorsEqualityComparer : EqualityComparer<ImmutableArray<Constructor>> {
+	/// <inheritdoc/>
+	public override bool Equals (ImmutableArray<Constructor> x, ImmutableArray<Constructor> y)
 	{
 		// group the constructors based on the number of parameters. We create two dictionaries, that will have 
 		// the number of params as the key, and a list of constructors as the value
@@ -19,7 +20,8 @@ public bool Equals (ImmutableArray<Constructor> x, ImmutableArray<Constructor> y
 		return dictionaryComparer.Equals (xConstructors, yConstructors);
 	}
 
-	public int GetHashCode (ImmutableArray<Constructor> obj)
+	/// <inheritdoc/>
+	public override int GetHashCode (ImmutableArray<Constructor> obj)
 	{
 		var hashCode = new HashCode ();
 		foreach (var ctr in obj) {
diff --git a/src/rgen/Microsoft.Macios.Generator/DataModel/EnumMembersEqualityComparer.cs b/src/rgen/Microsoft.Macios.Generator/DataModel/EnumMembersEqualityComparer.cs
index 6476664a7374..7f759f8b9cc0 100644
--- a/src/rgen/Microsoft.Macios.Generator/DataModel/EnumMembersEqualityComparer.cs
+++ b/src/rgen/Microsoft.Macios.Generator/DataModel/EnumMembersEqualityComparer.cs
@@ -5,9 +5,10 @@
 
 namespace Microsoft.Macios.Generator.DataModel;
 
-class EnumMembersEqualityComparer : IEqualityComparer<ImmutableArray<EnumMember>> {
+class EnumMembersEqualityComparer : EqualityComparer<ImmutableArray<EnumMember>> {
 
-	public bool Equals (ImmutableArray<EnumMember> x, ImmutableArray<EnumMember> y)
+	/// <inheritdoc/>
+	public override bool Equals (ImmutableArray<EnumMember> x, ImmutableArray<EnumMember> y)
 	{
 		if (x.Length != y.Length)
 			return false;
@@ -20,7 +21,8 @@ public bool Equals (ImmutableArray<EnumMember> x, ImmutableArray<EnumMember> y)
 		return true;
 	}
 
-	public int GetHashCode (ImmutableArray<EnumMember> obj)
+	/// <inheritdoc/>
+	public override int GetHashCode (ImmutableArray<EnumMember> obj)
 	{
 		var hash = new HashCode ();
 		foreach (var change in obj) {
diff --git a/src/rgen/Microsoft.Macios.Generator/DataModel/Event.cs b/src/rgen/Microsoft.Macios.Generator/DataModel/Event.cs
index c577ccdc8b62..f3935b46d8e7 100644
--- a/src/rgen/Microsoft.Macios.Generator/DataModel/Event.cs
+++ b/src/rgen/Microsoft.Macios.Generator/DataModel/Event.cs
@@ -58,7 +58,7 @@ public bool Equals (Event other)
 		if (!attrsComparer.Equals (Attributes, other.Attributes))
 			return false;
 
-		var modifiersComparer = new ModifiersComparer ();
+		var modifiersComparer = new ModifiersEqualityComparer ();
 		if (!modifiersComparer.Equals (Modifiers, other.Modifiers))
 			return false;
 
diff --git a/src/rgen/Microsoft.Macios.Generator/DataModel/EventEqualityComparer.cs b/src/rgen/Microsoft.Macios.Generator/DataModel/EventEqualityComparer.cs
index 088a81409fcd..bee09b9e1736 100644
--- a/src/rgen/Microsoft.Macios.Generator/DataModel/EventEqualityComparer.cs
+++ b/src/rgen/Microsoft.Macios.Generator/DataModel/EventEqualityComparer.cs
@@ -5,9 +5,10 @@
 
 namespace Microsoft.Macios.Generator.DataModel;
 
-class EventEqualityComparer : IEqualityComparer<ImmutableArray<Event>> {
+class EventEqualityComparer : EqualityComparer<ImmutableArray<Event>> {
 
-	public bool Equals (ImmutableArray<Event> x, ImmutableArray<Event> y)
+	/// <inheritdoc/>
+	public override bool Equals (ImmutableArray<Event> x, ImmutableArray<Event> y)
 	{
 		// properties are unique by their name, that means that we can build two dicts and comparethem
 		var xDictionary = Enumerable.ToDictionary (x, property => property.Name);
@@ -17,7 +18,8 @@ public bool Equals (ImmutableArray<Event> x, ImmutableArray<Event> y)
 		return comparer.Equals (xDictionary, yDictionary);
 	}
 
-	public int GetHashCode (ImmutableArray<Event> obj)
+	/// <inheritdoc/>
+	public override int GetHashCode (ImmutableArray<Event> obj)
 	{
 		var hash = new HashCode ();
 		foreach (var property in obj) {
diff --git a/src/rgen/Microsoft.Macios.Generator/DataModel/Method.cs b/src/rgen/Microsoft.Macios.Generator/DataModel/Method.cs
index be9b887cc8a7..8b1ed44e3730 100644
--- a/src/rgen/Microsoft.Macios.Generator/DataModel/Method.cs
+++ b/src/rgen/Microsoft.Macios.Generator/DataModel/Method.cs
@@ -80,7 +80,7 @@ public bool Equals (Method other)
 		var attrsComparer = new AttributesEqualityComparer ();
 		if (!attrsComparer.Equals (Attributes, other.Attributes))
 			return false;
-		var modifiersComparer = new ModifiersComparer ();
+		var modifiersComparer = new ModifiersEqualityComparer ();
 		if (!modifiersComparer.Equals (Modifiers, other.Modifiers))
 			return false;
 
diff --git a/src/rgen/Microsoft.Macios.Generator/DataModel/MethodsEqualityComparer.cs b/src/rgen/Microsoft.Macios.Generator/DataModel/MethodsEqualityComparer.cs
index 015c595aabe6..ffd3bad75f02 100644
--- a/src/rgen/Microsoft.Macios.Generator/DataModel/MethodsEqualityComparer.cs
+++ b/src/rgen/Microsoft.Macios.Generator/DataModel/MethodsEqualityComparer.cs
@@ -5,9 +5,9 @@
 
 namespace Microsoft.Macios.Generator.DataModel;
 
-class MethodsEqualityComparer : IEqualityComparer<ImmutableArray<Method>> {
+class MethodsEqualityComparer : EqualityComparer<ImmutableArray<Method>> {
 	/// <inheritdoc/>
-	public bool Equals (ImmutableArray<Method> x, ImmutableArray<Method> y)
+	public override bool Equals (ImmutableArray<Method> x, ImmutableArray<Method> y)
 	{
 		// to compare two lists, we need to do the following:
 		// 1. Group all the methods by return type + name + param count, this way we
@@ -27,7 +27,7 @@ public bool Equals (ImmutableArray<Method> x, ImmutableArray<Method> y)
 	}
 
 	/// <inheritdoc/>
-	public int GetHashCode (ImmutableArray<Method> obj)
+	public override int GetHashCode (ImmutableArray<Method> obj)
 	{
 		var hashCode = new HashCode ();
 		foreach (var ctr in obj) {
diff --git a/src/rgen/Microsoft.Macios.Generator/DataModel/ModifiersComparer.cs b/src/rgen/Microsoft.Macios.Generator/DataModel/ModifiersEqualityComparer.cs
similarity index 70%
rename from src/rgen/Microsoft.Macios.Generator/DataModel/ModifiersComparer.cs
rename to src/rgen/Microsoft.Macios.Generator/DataModel/ModifiersEqualityComparer.cs
index 13b897fa4559..80eb3030da42 100644
--- a/src/rgen/Microsoft.Macios.Generator/DataModel/ModifiersComparer.cs
+++ b/src/rgen/Microsoft.Macios.Generator/DataModel/ModifiersEqualityComparer.cs
@@ -6,8 +6,9 @@
 
 namespace Microsoft.Macios.Generator.DataModel;
 
-public class ModifiersComparer : IEqualityComparer<ImmutableArray<SyntaxToken>> {
-	public bool Equals (ImmutableArray<SyntaxToken> x, ImmutableArray<SyntaxToken> y)
+public class ModifiersEqualityComparer : EqualityComparer<ImmutableArray<SyntaxToken>> {
+	/// <inheritdoc/>
+	public override bool Equals (ImmutableArray<SyntaxToken> x, ImmutableArray<SyntaxToken> y)
 	{
 		if (x.Length != y.Length)
 			return false;
@@ -21,7 +22,8 @@ public bool Equals (ImmutableArray<SyntaxToken> x, ImmutableArray<SyntaxToken> y
 		return true;
 	}
 
-	public int GetHashCode (ImmutableArray<SyntaxToken> obj)
+	/// <inheritdoc/>
+	public override int GetHashCode (ImmutableArray<SyntaxToken> obj)
 	{
 		var hash = new HashCode ();
 		foreach (var token in obj) {
diff --git a/src/rgen/Microsoft.Macios.Generator/DataModel/ParameterEqualityComparer.cs b/src/rgen/Microsoft.Macios.Generator/DataModel/ParameterEqualityComparer.cs
index 65e55dd835d4..563adb3e40f3 100644
--- a/src/rgen/Microsoft.Macios.Generator/DataModel/ParameterEqualityComparer.cs
+++ b/src/rgen/Microsoft.Macios.Generator/DataModel/ParameterEqualityComparer.cs
@@ -5,10 +5,10 @@
 
 namespace Microsoft.Macios.Generator.DataModel;
 
-class ParameterEqualityComparer : IEqualityComparer<ImmutableArray<Parameter>> {
+class ParameterEqualityComparer : EqualityComparer<ImmutableArray<Parameter>> {
 
 	/// <inheritdoc/>
-	public bool Equals (ImmutableArray<Parameter> x, ImmutableArray<Parameter> y)
+	public override bool Equals (ImmutableArray<Parameter> x, ImmutableArray<Parameter> y)
 	{
 		// we know as a fact that parameter names have to be unique, otherwise we could not 
 		// compile the code. So make sure that all the parameters with the same name are the same
@@ -20,7 +20,7 @@ public bool Equals (ImmutableArray<Parameter> x, ImmutableArray<Parameter> y)
 	}
 
 	/// <inheritdoc/>
-	public int GetHashCode (ImmutableArray<Parameter> obj)
+	public override int GetHashCode (ImmutableArray<Parameter> obj)
 	{
 		var hashCode = new HashCode ();
 		foreach (var constructor in obj) {
diff --git a/src/rgen/Microsoft.Macios.Generator/DataModel/PropertiesEqualityComparer.cs b/src/rgen/Microsoft.Macios.Generator/DataModel/PropertiesEqualityComparer.cs
index c7dbd4fe42fc..4428001df0d5 100644
--- a/src/rgen/Microsoft.Macios.Generator/DataModel/PropertiesEqualityComparer.cs
+++ b/src/rgen/Microsoft.Macios.Generator/DataModel/PropertiesEqualityComparer.cs
@@ -5,8 +5,9 @@
 
 namespace Microsoft.Macios.Generator.DataModel;
 
-class PropertiesEqualityComparer : IEqualityComparer<ImmutableArray<Property>> {
-	public bool Equals (ImmutableArray<Property> x, ImmutableArray<Property> y)
+class PropertiesEqualityComparer : EqualityComparer<ImmutableArray<Property>> {
+	/// <inheritdoc/>
+	public override bool Equals (ImmutableArray<Property> x, ImmutableArray<Property> y)
 	{
 		// properties are unique by their name, that means that we can build two dicts and comparethem
 		var xDictionary = Enumerable.ToDictionary (x, property => property.Name);
@@ -16,7 +17,8 @@ public bool Equals (ImmutableArray<Property> x, ImmutableArray<Property> y)
 		return comparer.Equals (xDictionary, yDictionary);
 	}
 
-	public int GetHashCode (ImmutableArray<Property> obj)
+	/// <inheritdoc/>
+	public override int GetHashCode (ImmutableArray<Property> obj)
 	{
 		var hash = new HashCode ();
 		foreach (var property in obj) {
diff --git a/src/rgen/Microsoft.Macios.Generator/DataModel/Property.cs b/src/rgen/Microsoft.Macios.Generator/DataModel/Property.cs
index a689df8409a5..6a8ff5cfe961 100644
--- a/src/rgen/Microsoft.Macios.Generator/DataModel/Property.cs
+++ b/src/rgen/Microsoft.Macios.Generator/DataModel/Property.cs
@@ -60,7 +60,7 @@ public bool Equals (Property other)
 		if (!attrsComparer.Equals (Attributes, other.Attributes))
 			return false;
 
-		var modifiersComparer = new ModifiersComparer ();
+		var modifiersComparer = new ModifiersEqualityComparer ();
 		if (!modifiersComparer.Equals (Modifiers, other.Modifiers))
 			return false;
 
diff --git a/src/rgen/Microsoft.Macios.Generator/DictionaryComparer.cs b/src/rgen/Microsoft.Macios.Generator/DictionaryComparer.cs
index 23b7983b5ec1..02f8e3058f2c 100644
--- a/src/rgen/Microsoft.Macios.Generator/DictionaryComparer.cs
+++ b/src/rgen/Microsoft.Macios.Generator/DictionaryComparer.cs
@@ -5,11 +5,12 @@
 namespace Microsoft.Macios.Generator;
 
 public class DictionaryComparer<TKey, TValue> (IEqualityComparer<TValue>? valueComparer = null)
-	: IEqualityComparer<IDictionary<TKey, TValue>>
+	: EqualityComparer<IDictionary<TKey, TValue>>
 	where TKey : notnull {
 	readonly IEqualityComparer<TValue> valueComparer = valueComparer ?? EqualityComparer<TValue>.Default;
 
-	public bool Equals (IDictionary<TKey, TValue>? x, IDictionary<TKey, TValue>? y)
+	/// <inheritdoc/>
+	public override bool Equals (IDictionary<TKey, TValue>? x, IDictionary<TKey, TValue>? y)
 	{
 		if (x is null && y is null)
 			return true;
@@ -24,7 +25,8 @@ public bool Equals (IDictionary<TKey, TValue>? x, IDictionary<TKey, TValue>? y)
 		return x.All (pair => valueComparer.Equals (pair.Value, y [pair.Key]));
 	}
 
-	public int GetHashCode (IDictionary<TKey, TValue> obj)
+	/// <inheritdoc/>
+	public override int GetHashCode (IDictionary<TKey, TValue> obj)
 	{
 		var hash = new HashCode ();
 		foreach (var (key, value) in obj) {
diff --git a/src/rgen/Microsoft.Macios.Generator/ListComparer.cs b/src/rgen/Microsoft.Macios.Generator/ListComparer.cs
index f2038513f150..1d90776f5a97 100644
--- a/src/rgen/Microsoft.Macios.Generator/ListComparer.cs
+++ b/src/rgen/Microsoft.Macios.Generator/ListComparer.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.Macios.Generator;
 
-public class ListComparer<T> : IEqualityComparer<List<T>> {
+public class ListComparer<T> : EqualityComparer<List<T>> {
 	readonly IComparer<T> comparer;
 	readonly IEqualityComparer<T> valueComparer;
 
@@ -13,7 +13,8 @@ public ListComparer (IComparer<T> sortComparer, IEqualityComparer<T>? equalityCo
 		valueComparer = equalityComparer ?? EqualityComparer<T>.Default;
 	}
 
-	public bool Equals (List<T>? x, List<T>? y)
+	/// <inheritdoc/>
+	public override bool Equals (List<T>? x, List<T>? y)
 	{
 		// bases cases for null or diff size
 		if (x is null && y is null)
@@ -37,7 +38,8 @@ public bool Equals (List<T>? x, List<T>? y)
 		return true;
 	}
 
-	public int GetHashCode (List<T> obj)
+	/// <inheritdoc/>
+	public override int GetHashCode (List<T> obj)
 	{
 		var hash = new HashCode ();
 		foreach (var element in obj) {
diff --git a/tests/rgen/Microsoft.Macios.Generator.Tests/DataModel/ModifiersComparerTests.cs b/tests/rgen/Microsoft.Macios.Generator.Tests/DataModel/ModifiersEqualityComparerTests.cs
similarity index 81%
rename from tests/rgen/Microsoft.Macios.Generator.Tests/DataModel/ModifiersComparerTests.cs
rename to tests/rgen/Microsoft.Macios.Generator.Tests/DataModel/ModifiersEqualityComparerTests.cs
index 852b0a04c2f5..3e9255ee5679 100644
--- a/tests/rgen/Microsoft.Macios.Generator.Tests/DataModel/ModifiersComparerTests.cs
+++ b/tests/rgen/Microsoft.Macios.Generator.Tests/DataModel/ModifiersEqualityComparerTests.cs
@@ -6,15 +6,15 @@
 
 namespace Microsoft.Macios.Generator.Tests.DataModel;
 
-public class ModifiersComparerTests {
-	readonly ModifiersComparer comparer = new ModifiersComparer ();
+public class ModifiersEqualityComparerTests {
+	readonly ModifiersEqualityComparer equalityComparer = new ModifiersEqualityComparer ();
 
 	[Fact]
 	public void CompareEmpty ()
 	{
 		var x = ImmutableArray<SyntaxToken>.Empty;
 		var y = ImmutableArray<SyntaxToken>.Empty;
-		Assert.True (comparer.Equals (x, y));
+		Assert.True (equalityComparer.Equals (x, y));
 	}
 
 	[Fact]
@@ -27,7 +27,7 @@ public void CompareDifferentSize ()
 		ImmutableArray<SyntaxToken> y = [
 			SyntaxFactory.Token (SyntaxKind.PublicKeyword),
 		];
-		Assert.False (comparer.Equals (x, y));
+		Assert.False (equalityComparer.Equals (x, y));
 	}
 
 	[Fact]
@@ -41,7 +41,7 @@ public void CompareDifferentModifiers ()
 			SyntaxFactory.Token (SyntaxKind.ProtectedKeyword),
 			SyntaxFactory.Token (SyntaxKind.PublicKeyword),
 		];
-		Assert.False (comparer.Equals (x, y));
+		Assert.False (equalityComparer.Equals (x, y));
 	}
 
 	[Fact]
@@ -56,7 +56,7 @@ public void CompareSameModifiersDiffOrder ()
 			SyntaxFactory.Token (SyntaxKind.PublicKeyword),
 		];
 
-		Assert.True (comparer.Equals (x, y));
+		Assert.True (equalityComparer.Equals (x, y));
 	}
 
 	[Fact]
@@ -71,6 +71,6 @@ public void CompareSameModifiers ()
 			SyntaxFactory.Token (SyntaxKind.PrivateKeyword),
 		];
 
-		Assert.True (comparer.Equals (x, y));
+		Assert.True (equalityComparer.Equals (x, y));
 	}
 }
diff --git a/tools/devops/automation/templates/build/api-diff-build-and-detect.yml b/tools/devops/automation/templates/build/api-diff-build-and-detect.yml
index 9cf2465bedc7..922f6928e7a4 100644
--- a/tools/devops/automation/templates/build/api-diff-build-and-detect.yml
+++ b/tools/devops/automation/templates/build/api-diff-build-and-detect.yml
@@ -35,15 +35,6 @@ parameters:
 # build the source code (build.yml) and detect changes (the nested api-diff.yml)
 steps:
 
-# The following checkout(s) are needed due in order to get the proper set of credentials stored in the git config.
-# Without this, then when the `make reset` command is run, any modules that aren't configured already as submodules
-# will be cloned again. This is fine for all GitHub repos, but falls over for AzDo repos.
-- checkout: macios-adr-tmp
-  clean: true
-  persistCredentials: true
-  fetchTags: false
-  path: a/change-detection/tmp/src/macios-adr # Path is rooted from $(Pipeline.Workspace) e.g./Users/builder/azdo/_work/18
-
 - template: build.yml
   parameters:
     isPR: ${{ parameters.isPR }}