.NET: Improve resolving AITool from DI
#3175
+170
−67
Merged